Skip to content

Commit 98d4801

Browse files
UltraFeedUltraFeed
authored
Use Directory.Build.props for centralized configuration management (#6591)
* use Directory.Buld.props * remove some properties
1 parent 0e50bfb commit 98d4801

File tree

6 files changed

+91
-46
lines changed

6 files changed

+91
-46
lines changed

‎Directory.Build.props‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<Version>7.7.0</Version>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9+
<ErrorReport>none</ErrorReport>
10+
<NoWarn>CA1031;CS1591;NU1507</NoWarn>
11+
<Nullable>annotations</Nullable>
12+
<ImplicitUsings>enable</ImplicitUsings>
13+
<AnalysisLevel>latest-all</AnalysisLevel>
14+
15+
<Authors>2dust</Authors>
16+
<Company>2dust</Company>
17+
<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
18+
<PackageReadmeFile>README.md</PackageReadmeFile>
19+
<Copyright>Copyright © 2017-$([System.DateTime]::UtcNow.Year) $(Company)</Copyright>
20+
<Description>A GUI client for Windows, Linux and macOS, supports Xray, sing-box and others.</Description>
21+
<RepositoryType>Git</RepositoryType>
22+
<RepositoryBranch>master</RepositoryBranch>
23+
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
24+
<PackageProjectUrl>https://github.com/$(Company)/v2rayN</PackageProjectUrl>
25+
<PackageReleaseNotes>$(PackageProjectUrl)/releases</PackageReleaseNotes>
26+
27+
<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
28+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
29+
<RollForward>latestMinor</RollForward>
30+
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
31+
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
32+
</PropertyGroup>
33+
34+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
35+
<DebugType>embedded</DebugType>
36+
<Optimize>false</Optimize>
37+
<InvariantGlobalization>false</InvariantGlobalization>
38+
</PropertyGroup>
39+
40+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
41+
<DebuggerSupport>false</DebuggerSupport>
42+
<DebugSymbols>false</DebugSymbols>
43+
<DebugType>none</DebugType>
44+
<Optimize>true</Optimize>
45+
46+
<EventSourceSupport>false</EventSourceSupport>
47+
<StackTraceSupport>false</StackTraceSupport>
48+
<MetricsSupport>false</MetricsSupport>
49+
<HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
50+
<MetadataUpdaterSupport>false</MetadataUpdaterSupport>
51+
52+
<EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
53+
<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
54+
<UseNativeHttpHandler>true</UseNativeHttpHandler>
55+
<AutoreleasePoolSupport>false</AutoreleasePoolSupport>
56+
<InvariantGlobalization>false</InvariantGlobalization>
57+
<UseSystemResourceKeys>true</UseSystemResourceKeys>
58+
59+
<PublishTrimmed>false</PublishTrimmed>
60+
<PublishReadyToRun>false</PublishReadyToRun>
61+
<PublishSingleFile>true</PublishSingleFile>
62+
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
63+
</PropertyGroup>
64+
65+
</Project>

‎Directory.Packages.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
55
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
66
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
7-
<NoWarn>$(NoWarn);NU1507</NoWarn>
87
</PropertyGroup>
98

109
<ItemGroup>

‎v2rayN/AmazTool/AmazTool.csproj‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,19 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
9-
<FileVersion>1.3.1</FileVersion>
105
</PropertyGroup>
116

127
<ItemGroup>
8+
<EmbeddedResource Update="Resx\Resource.resx">
9+
<Generator>ResXFileCodeGenerator</Generator>
10+
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
11+
</EmbeddedResource>
12+
1313
<Compile Update="Resx\Resource.Designer.cs">
1414
<DesignTime>True</DesignTime>
1515
<AutoGen>True</AutoGen>
1616
<DependentUpon>Resource.resx</DependentUpon>
1717
</Compile>
1818
</ItemGroup>
1919

20-
<ItemGroup>
21-
<EmbeddedResource Update="Resx\Resource.resx">
22-
<Generator>ResXFileCodeGenerator</Generator>
23-
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
24-
</EmbeddedResource>
25-
</ItemGroup>
26-
2720
</Project>

‎v2rayN/ServiceLib/ServiceLib.csproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<Version>7.7.0</Version>
4+
<OutputType>Library</OutputType>
85
</PropertyGroup>
96

107
<ItemGroup>
118
<PackageReference Include="Downloader" />
12-
<PackageReference Include="ReactiveUI"/>
9+
<PackageReference Include="ReactiveUI">
10+
<TreatAsUsed>true</TreatAsUsed>
11+
</PackageReference>
1312
<PackageReference Include="ReactiveUI.Fody" />
1413
<PackageReference Include="sqlite-net-pcl" />
1514
<PackageReference Include="Splat.NLog" />
@@ -49,9 +48,6 @@
4948
<DesignTime>True</DesignTime>
5049
<AutoGen>True</AutoGen>
5150
</Compile>
52-
</ItemGroup>
53-
54-
<ItemGroup>
5551
<EmbeddedResource Update="Resx\ResUI.fa-Ir.resx">
5652
<SubType>Designer</SubType>
5753
<Generator>PublicResXFileCodeGenerator</Generator>

‎v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,42 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<Nullable>enable</Nullable>
7-
<ImplicitUsings>enable</ImplicitUsings>
85
<ApplicationIcon>Assets\v2rayN.ico</ApplicationIcon>
96
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
10-
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
117
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
128
<AssemblyName>v2rayN</AssemblyName>
139
</PropertyGroup>
1410

1511
<ItemGroup>
16-
<PackageReference Include="Avalonia.Controls.DataGrid" />
12+
<PackageReference Include="Avalonia.Controls.DataGrid">
13+
<TreatAsUsed>true</TreatAsUsed>
14+
</PackageReference>
1715
<PackageReference Include="Avalonia.Desktop" />
1816
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
1917
<PackageReference Include="Avalonia.ReactiveUI" />
2018
<PackageReference Include="MessageBox.Avalonia" />
2119
<PackageReference Include="Semi.Avalonia" />
22-
<PackageReference Include="Semi.Avalonia.DataGrid" />
23-
<PackageReference Include="ReactiveUI"/>
24-
<PackageReference Include="ReactiveUI.Fody"/>
25-
</ItemGroup>
26-
27-
<ItemGroup>
28-
<AvaloniaResource Include="Assets\**" />
20+
<PackageReference Include="Semi.Avalonia.DataGrid">
21+
<TreatAsUsed>true</TreatAsUsed>
22+
</PackageReference>
23+
<PackageReference Include="ReactiveUI">
24+
<TreatAsUsed>true</TreatAsUsed>
25+
</PackageReference>
26+
<PackageReference Include="ReactiveUI.Fody">
27+
<TreatAsUsed>true</TreatAsUsed>
28+
</PackageReference>
2929
</ItemGroup>
3030

3131
<ItemGroup>
3232
<ProjectCapability Include="Avalonia" />
33-
</ItemGroup>
34-
35-
<ItemGroup>
33+
<AvaloniaResource Include="Assets\**" />
3634
<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
3735
</ItemGroup>
3836

3937
<ItemGroup>
4038
<EmbeddedResource Include="Assets\v2rayN.ico">
4139
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
4240
</EmbeddedResource>
43-
</ItemGroup>
44-
45-
<ItemGroup>
4641
<None Update="v2rayN.png">
4742
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
4843
</None>

‎v2rayN/v2rayN/v2rayN.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
<PropertyGroup>
44
<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
55
<OutputType>WinExe</OutputType>
6-
<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
7-
<Nullable>enable</Nullable>
86
<UseWPF>true</UseWPF>
9-
<ApplicationManifest>app.manifest</ApplicationManifest>
10-
<ImplicitUsings>enable</ImplicitUsings>
117
<ApplicationIcon>Resources\v2rayN.ico</ApplicationIcon>
12-
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
13-
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
8+
<ApplicationManifest>app.manifest</ApplicationManifest>
149
</PropertyGroup>
1510

1611
<ItemGroup>
1712
<PackageReference Include="MaterialDesignThemes" />
1813
<PackageReference Include="H.NotifyIcon.Wpf" />
19-
<PackageReference Include="ReactiveUI.Fody"/>
14+
<PackageReference Include="ReactiveUI.Fody">
15+
<TreatAsUsed>true</TreatAsUsed>
16+
</PackageReference>
2017
<PackageReference Include="ReactiveUI.WPF" />
2118
</ItemGroup>
2219

0 commit comments

Comments
 (0)