From 82eb3fd6bd2b7b3d50e6efa928f1c8545c9cac25 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 3 Sep 2024 10:16:50 +0800
Subject: [PATCH] Unified processing version

---
 v2rayN/ServiceLib/Common/SemanticVersion.cs | 2 +-
 v2rayN/ServiceLib/Common/Utils.cs           | 3 +--
 v2rayN/ServiceLib/ServiceLib.csproj         | 3 ++-
 v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj | 5 ++---
 v2rayN/v2rayN/v2rayN.csproj                 | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/v2rayN/ServiceLib/Common/SemanticVersion.cs b/v2rayN/ServiceLib/Common/SemanticVersion.cs
index ec4c4931c0..c631de5b3f 100644
--- a/v2rayN/ServiceLib/Common/SemanticVersion.cs
+++ b/v2rayN/ServiceLib/Common/SemanticVersion.cs
@@ -27,7 +27,7 @@ public SemanticVersion(string version)
                     this.minor = int.Parse(parts[1]);
                     this.patch = 0;
                 }
-                else if (parts.Length == 3)
+                else if (parts.Length == 3 || parts.Length == 4)
                 {
                     this.major = int.Parse(parts[0]);
                     this.minor = int.Parse(parts[1]);
diff --git a/v2rayN/ServiceLib/Common/Utils.cs b/v2rayN/ServiceLib/Common/Utils.cs
index ec161ced0c..dd36758d7e 100644
--- a/v2rayN/ServiceLib/Common/Utils.cs
+++ b/v2rayN/ServiceLib/Common/Utils.cs
@@ -593,8 +593,7 @@ public static string GetVersionInfo()
         {
             try
             {
-                string location = GetExePath();
-                return FileVersionInfo.GetVersionInfo(location)?.FileVersion ?? "0.0";
+                return Assembly.GetExecutingAssembly()?.GetName()?.Version?.ToString() ?? "0.0";
             }
             catch (Exception ex)
             {
diff --git a/v2rayN/ServiceLib/ServiceLib.csproj b/v2rayN/ServiceLib/ServiceLib.csproj
index bc138c00cc..b37840c50f 100644
--- a/v2rayN/ServiceLib/ServiceLib.csproj
+++ b/v2rayN/ServiceLib/ServiceLib.csproj
@@ -4,6 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
+	<Version>6.55</Version>
   </PropertyGroup>
 
 	<ItemGroup>
@@ -12,7 +13,7 @@
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="Splat.NLog" Version="15.1.1" />
-		<PackageReference Include="YamlDotNet" Version="16.0.0" />
+		<PackageReference Include="YamlDotNet" Version="16.1.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 	</ItemGroup>
 	
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
index c5496803fc..f0f36b6513 100644
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -7,7 +7,6 @@
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-		<FileVersion>6.55</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -26,8 +25,8 @@
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
         <PackageReference Include="MessageBox.Avalonia" Version="3.1.6" />		
-        <PackageReference Include="Semi.Avalonia" Version="11.1.0.2" />
-        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.1.0.2" />
+        <PackageReference Include="Semi.Avalonia" Version="11.1.0.3" />
+        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.1.0.3" />
         <PackageReference Include="ReactiveUI" Version="20.1.1" />
         <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 	</ItemGroup>
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 9318fe4d28..01628743be 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -10,7 +10,6 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
-		<FileVersion>6.56</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>