From 98d4801b7eca4ea9bdcae710c0b8d5e5bac7887c Mon Sep 17 00:00:00 2001
From: Anatoliy <malahtolya@gmail.com>
Date: Tue, 28 Jan 2025 18:01:59 +0600
Subject: [PATCH] Use Directory.Build.props for centralized configuration
 management (#6591)

* use Directory.Buld.props

* remove some properties
---
 Directory.Build.props                       | 65 +++++++++++++++++++++
 Directory.Packages.props                    |  1 -
 v2rayN/AmazTool/AmazTool.csproj             | 17 ++----
 v2rayN/ServiceLib/ServiceLib.csproj         | 12 ++--
 v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj | 31 +++++-----
 v2rayN/v2rayN/v2rayN.csproj                 | 11 ++--
 6 files changed, 91 insertions(+), 46 deletions(-)
 create mode 100644 Directory.Build.props

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 00000000..982a6a51
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,65 @@
+<Project>
+
+	<PropertyGroup>
+		<Version>7.7.0</Version>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+		<ErrorReport>none</ErrorReport>
+		<NoWarn>CA1031;CS1591;NU1507</NoWarn>
+		<Nullable>annotations</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<AnalysisLevel>latest-all</AnalysisLevel>
+
+		<Authors>2dust</Authors>
+		<Company>2dust</Company>
+		<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<Copyright>Copyright © 2017-$([System.DateTime]::UtcNow.Year) $(Company)</Copyright>
+		<Description>A GUI client for Windows, Linux and macOS, supports Xray, sing-box and others.</Description>
+		<RepositoryType>Git</RepositoryType>
+		<RepositoryBranch>master</RepositoryBranch>
+		<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
+		<PackageProjectUrl>https://github.com/$(Company)/v2rayN</PackageProjectUrl>
+		<PackageReleaseNotes>$(PackageProjectUrl)/releases</PackageReleaseNotes>
+
+		<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
+		<EnableWindowsTargeting>true</EnableWindowsTargeting>
+		<RollForward>latestMinor</RollForward>
+		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+		<DebugType>embedded</DebugType>
+		<Optimize>false</Optimize>
+		<InvariantGlobalization>false</InvariantGlobalization>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+		<DebuggerSupport>false</DebuggerSupport>
+		<DebugSymbols>false</DebugSymbols>
+		<DebugType>none</DebugType>
+		<Optimize>true</Optimize>
+
+		<EventSourceSupport>false</EventSourceSupport>
+		<StackTraceSupport>false</StackTraceSupport>
+		<MetricsSupport>false</MetricsSupport>
+		<HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
+		<MetadataUpdaterSupport>false</MetadataUpdaterSupport>
+
+		<EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
+		<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+		<UseNativeHttpHandler>true</UseNativeHttpHandler>
+		<AutoreleasePoolSupport>false</AutoreleasePoolSupport>
+		<InvariantGlobalization>false</InvariantGlobalization>
+		<UseSystemResourceKeys>true</UseSystemResourceKeys>
+
+		<PublishTrimmed>false</PublishTrimmed>
+		<PublishReadyToRun>false</PublishReadyToRun>
+		<PublishSingleFile>true</PublishSingleFile>
+		<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+	</PropertyGroup>
+
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index dc72aabe..3b6715c4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,6 @@
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 		<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 		<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
-		<NoWarn>$(NoWarn);NU1507</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/v2rayN/AmazTool/AmazTool.csproj b/v2rayN/AmazTool/AmazTool.csproj
index 93b72591..4657a889 100644
--- a/v2rayN/AmazTool/AmazTool.csproj
+++ b/v2rayN/AmazTool/AmazTool.csproj
@@ -2,14 +2,14 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
-		<FileVersion>1.3.1</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
+		<EmbeddedResource Update="Resx\Resource.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resource.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+
 		<Compile Update="Resx\Resource.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
@@ -17,11 +17,4 @@
 		</Compile>
 	</ItemGroup>
 
-	<ItemGroup>
-		<EmbeddedResource Update="Resx\Resource.resx">
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>Resource.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/v2rayN/ServiceLib/ServiceLib.csproj b/v2rayN/ServiceLib/ServiceLib.csproj
index fd3a94e7..4def8966 100644
--- a/v2rayN/ServiceLib/ServiceLib.csproj
+++ b/v2rayN/ServiceLib/ServiceLib.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Version>7.7.0</Version>
+		<OutputType>Library</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Downloader" />
-		<PackageReference Include="ReactiveUI"/>
+		<PackageReference Include="ReactiveUI">
+			<TreatAsUsed>true</TreatAsUsed>
+		</PackageReference>
 		<PackageReference Include="ReactiveUI.Fody" />
 		<PackageReference Include="sqlite-net-pcl" />
 		<PackageReference Include="Splat.NLog" />
@@ -49,9 +48,6 @@
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
 		</Compile>
-	</ItemGroup>
-
-	<ItemGroup>
 		<EmbeddedResource Update="Resx\ResUI.fa-Ir.resx">
 			<SubType>Designer</SubType>
 			<Generator>PublicResXFileCodeGenerator</Generator>
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
index 6b896e02..f234f4ce 100644
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -2,37 +2,35 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>Assets\v2rayN.ico</ApplicationIcon>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-		<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
 		<AssemblyName>v2rayN</AssemblyName>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Controls.DataGrid" />
+		<PackageReference Include="Avalonia.Controls.DataGrid">
+			<TreatAsUsed>true</TreatAsUsed>
+		</PackageReference>
 		<PackageReference Include="Avalonia.Desktop" />
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
 		<PackageReference Include="Avalonia.ReactiveUI" />
 		<PackageReference Include="MessageBox.Avalonia" />
 		<PackageReference Include="Semi.Avalonia" />
-		<PackageReference Include="Semi.Avalonia.DataGrid" />
-		<PackageReference Include="ReactiveUI"/>
-		<PackageReference Include="ReactiveUI.Fody"/>
-	</ItemGroup>
-
-	<ItemGroup>
-		<AvaloniaResource Include="Assets\**" />
+		<PackageReference Include="Semi.Avalonia.DataGrid">
+			<TreatAsUsed>true</TreatAsUsed>
+		</PackageReference>
+		<PackageReference Include="ReactiveUI">
+			<TreatAsUsed>true</TreatAsUsed>
+		</PackageReference>
+		<PackageReference Include="ReactiveUI.Fody">
+			<TreatAsUsed>true</TreatAsUsed>
+		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectCapability Include="Avalonia" />
-	</ItemGroup>
-
-	<ItemGroup>
+		<AvaloniaResource Include="Assets\**" />
 		<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
 	</ItemGroup>
 
@@ -40,9 +38,6 @@
 		<EmbeddedResource Include="Assets\v2rayN.ico">
 			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</EmbeddedResource>
-	</ItemGroup>
-
-	<ItemGroup>
 		<None Update="v2rayN.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index a6535234..af1e3db6 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -3,20 +3,17 @@
 	<PropertyGroup>
 		<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
-		<Nullable>enable</Nullable>
 		<UseWPF>true</UseWPF>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>Resources\v2rayN.ico</ApplicationIcon>
-		<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
-		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="MaterialDesignThemes" />
 		<PackageReference Include="H.NotifyIcon.Wpf" />
-		<PackageReference Include="ReactiveUI.Fody"/>
+		<PackageReference Include="ReactiveUI.Fody">
+			<TreatAsUsed>true</TreatAsUsed>
+		</PackageReference>
 		<PackageReference Include="ReactiveUI.WPF" />
 	</ItemGroup>