github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Unified processing version

pull/5636/head
2dust 2024-09-03 10:16:50 +08:00
parent 3d3d3f83df
commit 82eb3fd6bd
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2rayN/ServiceLib/Common/SemanticVersion.cs
View File

@ -27,7 +27,7 @@
this.minor = int.Parse(parts[1]); this.minor = int.Parse(parts[1]);
this.patch = 0; this.patch = 0;
} }
else if (parts.Length == 3) else if (parts.Length == 3 || parts.Length == 4)
{ {
this.major = int.Parse(parts[0]); this.major = int.Parse(parts[0]);
this.minor = int.Parse(parts[1]); this.minor = int.Parse(parts[1]);

3
v2rayN/ServiceLib/Common/Utils.cs
View File

@ -593,8 +593,7 @@ namespace ServiceLib.Common
{ {
try try
{ {
string location = GetExePath(); return Assembly.GetExecutingAssembly()?.GetName()?.Version?.ToString() ?? "0.0";
return FileVersionInfo.GetVersionInfo(location)?.FileVersion ?? "0.0";
} }
catch (Exception ex) catch (Exception ex)
{ {

3
v2rayN/ServiceLib/ServiceLib.csproj
View File

@ -4,6 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>6.55</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -12,7 +13,7 @@
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" /> <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" /> <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
<PackageReference Include="Splat.NLog" Version="15.1.1" /> <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" /> <PackageReference Include="QRCoder" Version="1.6.0" />
</ItemGroup> </ItemGroup>

5
v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
View File

@ -7,7 +7,6 @@
<ApplicationIcon>v2rayN.ico</ApplicationIcon> <ApplicationIcon>v2rayN.ico</ApplicationIcon>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport> <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault> <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<FileVersion>6.55</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -26,8 +25,8 @@
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
<PackageReference Include="MessageBox.Avalonia" Version="3.1.6" /> <PackageReference Include="MessageBox.Avalonia" Version="3.1.6" />
<PackageReference Include="Semi.Avalonia" Version="11.1.0.2" /> <PackageReference Include="Semi.Avalonia" Version="11.1.0.3" />
<PackageReference Include="Semi.Avalonia.DataGrid" Version="11.1.0.2" /> <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.1.0.3" />
<PackageReference Include="ReactiveUI" Version="20.1.1" /> <PackageReference Include="ReactiveUI" Version="20.1.1" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" /> <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
</ItemGroup> </ItemGroup>

1
v2rayN/v2rayN/v2rayN.csproj
View File

@ -10,7 +10,6 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<ApplicationIcon>v2rayN.ico</ApplicationIcon> <ApplicationIcon>v2rayN.ico</ApplicationIcon>
<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright> <Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
<FileVersion>6.56</FileVersion>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup> </PropertyGroup>