Skip to content

Commit 9c20d9c

Browse files
UltraFeedUltraFeed
authored
Use Directory.Packages.props (#6575)
1 parent d2cda16 commit 9c20d9c

File tree

5 files changed

+187
-166
lines changed

5 files changed

+187
-166
lines changed

‎Directory.Packages.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
7+
<NoWarn>$(NoWarn);NU1507</NoWarn>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />
12+
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.3" />
13+
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.3" />
14+
<PackageVersion Include="CliWrap" Version="3.7.1" />
15+
<PackageVersion Include="Downloader" Version="3.3.3" />
16+
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
17+
<PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
18+
<PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
19+
<PackageVersion Include="QRCoder" Version="1.6.0" />
20+
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
21+
<PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
22+
<PackageVersion Include="Semi.Avalonia" Version="11.2.1.3" />
23+
<PackageVersion Include="Splat.NLog" Version="15.2.22" />
24+
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
25+
<PackageVersion Include="TaskScheduler" Version="2.11.0" />
26+
<PackageVersion Include="WebDav.Client" Version="2.8.0" />
27+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
28+
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
29+
</ItemGroup>
30+
31+
</Project>

‎v2rayN/AmazTool/AmazTool.csproj‎

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

3-
<PropertyGroup>
4-
<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>
10-
</PropertyGroup>
11-
12-
<ItemGroup>
13-
<Compile Update="Resx\Resource.Designer.cs">
14-
<DesignTime>True</DesignTime>
15-
<AutoGen>True</AutoGen>
16-
<DependentUpon>Resource.resx</DependentUpon>
17-
</Compile>
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<EmbeddedResource Update="Resx\Resource.resx">
22-
<Generator>ResXFileCodeGenerator</Generator>
23-
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
24-
</EmbeddedResource>
25-
</ItemGroup>
3+
<PropertyGroup>
4+
<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>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<Compile Update="Resx\Resource.Designer.cs">
14+
<DesignTime>True</DesignTime>
15+
<AutoGen>True</AutoGen>
16+
<DependentUpon>Resource.resx</DependentUpon>
17+
</Compile>
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<EmbeddedResource Update="Resx\Resource.resx">
22+
<Generator>ResXFileCodeGenerator</Generator>
23+
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
24+
</EmbeddedResource>
25+
</ItemGroup>
2626

2727
</Project>

‎v2rayN/ServiceLib/ServiceLib.csproj‎

Lines changed: 68 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,80 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<Version>7.7.0</Version>
8-
</PropertyGroup>
9-
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<Version>7.7.0</Version>
8+
</PropertyGroup>
9+
1010
<ItemGroup>
11-
<PackageReference Include="Downloader" Version="3.3.3" />
12-
<PackageReference Include="ReactiveUI" Version="20.1.63" />
13-
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
14-
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
15-
<PackageReference Include="Splat.NLog" Version="15.2.22" />
16-
<PackageReference Include="WebDav.Client" Version="2.8.0" />
17-
<PackageReference Include="YamlDotNet" Version="16.3.0" />
18-
<PackageReference Include="QRCoder" Version="1.6.0" />
19-
<PackageReference Include="CliWrap" Version="3.7.1" />
20-
<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" />
21-
<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
22-
<PackageReference Include="TaskScheduler" Version="2.11.0" />
11+
<PackageReference Include="Downloader" />
12+
<PackageReference Include="ReactiveUI.Fody" />
13+
<PackageReference Include="sqlite-net-pcl" />
14+
<PackageReference Include="Splat.NLog" />
15+
<PackageReference Include="WebDav.Client" />
16+
<PackageReference Include="YamlDotNet" />
17+
<PackageReference Include="QRCoder" />
18+
<PackageReference Include="CliWrap" />
19+
<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" />
20+
<PackageReference Include="TaskScheduler" />
21+
</ItemGroup>
2322

23+
<ItemGroup>
24+
<EmbeddedResource Include="Sample\clash_mixin_yaml" />
25+
<EmbeddedResource Include="Sample\clash_tun_yaml" />
26+
<EmbeddedResource Include="Sample\custom_routing_black" />
27+
<EmbeddedResource Include="Sample\custom_routing_global" />
28+
<EmbeddedResource Include="Sample\custom_routing_white" />
29+
<EmbeddedResource Include="Sample\dns_singbox_normal" />
30+
<EmbeddedResource Include="Sample\dns_v2ray_normal" />
31+
<EmbeddedResource Include="Sample\pac" />
32+
<EmbeddedResource Include="Sample\SampleClientConfig" />
33+
<EmbeddedResource Include="Sample\SampleHttpRequest" />
34+
<EmbeddedResource Include="Sample\SampleHttpResponse" />
35+
<EmbeddedResource Include="Sample\SampleInbound" />
36+
<EmbeddedResource Include="Sample\SampleOutbound" />
37+
<EmbeddedResource Include="Sample\SingboxSampleClientConfig" />
38+
<EmbeddedResource Include="Sample\SingboxSampleOutbound" />
39+
<EmbeddedResource Include="Sample\tun_singbox_dns" />
40+
<EmbeddedResource Include="Sample\tun_singbox_inbound" />
41+
<EmbeddedResource Include="Sample\tun_singbox_rules" />
42+
<EmbeddedResource Include="Sample\linux_autostart_config" />
2443
</ItemGroup>
25-
26-
<ItemGroup>
27-
<EmbeddedResource Include="Sample\clash_mixin_yaml" />
28-
<EmbeddedResource Include="Sample\clash_tun_yaml" />
29-
<EmbeddedResource Include="Sample\custom_routing_black" />
30-
<EmbeddedResource Include="Sample\custom_routing_global" />
31-
<EmbeddedResource Include="Sample\custom_routing_white" />
32-
<EmbeddedResource Include="Sample\dns_singbox_normal" />
33-
<EmbeddedResource Include="Sample\dns_v2ray_normal" />
34-
<EmbeddedResource Include="Sample\pac" />
35-
<EmbeddedResource Include="Sample\SampleClientConfig" />
36-
<EmbeddedResource Include="Sample\SampleHttpRequest" />
37-
<EmbeddedResource Include="Sample\SampleHttpResponse" />
38-
<EmbeddedResource Include="Sample\SampleInbound" />
39-
<EmbeddedResource Include="Sample\SampleOutbound" />
40-
<EmbeddedResource Include="Sample\SingboxSampleClientConfig" />
41-
<EmbeddedResource Include="Sample\SingboxSampleOutbound" />
42-
<EmbeddedResource Include="Sample\tun_singbox_dns" />
43-
<EmbeddedResource Include="Sample\tun_singbox_inbound" />
44-
<EmbeddedResource Include="Sample\tun_singbox_rules" />
45-
<EmbeddedResource Include="Sample\linux_autostart_config" />
46-
</ItemGroup>
4744

4845
<ItemGroup>
49-
<Compile Update="Resx\ResUI.Designer.cs">
50-
<DependentUpon>ResUI.resx</DependentUpon>
51-
<DesignTime>True</DesignTime>
52-
<AutoGen>True</AutoGen>
53-
</Compile>
46+
<Compile Update="Resx\ResUI.Designer.cs">
47+
<DependentUpon>ResUI.resx</DependentUpon>
48+
<DesignTime>True</DesignTime>
49+
<AutoGen>True</AutoGen>
50+
</Compile>
5451
</ItemGroup>
5552

5653
<ItemGroup>
57-
<EmbeddedResource Update="Resx\ResUI.fa-Ir.resx">
58-
<SubType>Designer</SubType>
59-
<Generator>PublicResXFileCodeGenerator</Generator>
60-
</EmbeddedResource>
61-
<EmbeddedResource Update="Resx\ResUI.hu.resx">
62-
<Generator>PublicResXFileCodeGenerator</Generator>
63-
</EmbeddedResource>
64-
<EmbeddedResource Update="Resx\ResUI.resx">
65-
<SubType>Designer</SubType>
66-
<LastGenOutput>ResUI.Designer.cs</LastGenOutput>
67-
<Generator>PublicResXFileCodeGenerator</Generator>
68-
</EmbeddedResource>
69-
<EmbeddedResource Update="Resx\ResUI.ru.resx">
70-
<SubType>Designer</SubType>
71-
<Generator>PublicResXFileCodeGenerator</Generator>
72-
</EmbeddedResource>
73-
<EmbeddedResource Update="Resx\ResUI.zh-Hans.resx">
74-
<SubType>Designer</SubType>
75-
<Generator>PublicResXFileCodeGenerator</Generator>
76-
</EmbeddedResource>
77-
<EmbeddedResource Update="Resx\ResUI.zh-Hant.resx">
78-
<SubType>Designer</SubType>
79-
<Generator>PublicResXFileCodeGenerator</Generator>
80-
</EmbeddedResource>
54+
<EmbeddedResource Update="Resx\ResUI.fa-Ir.resx">
55+
<SubType>Designer</SubType>
56+
<Generator>PublicResXFileCodeGenerator</Generator>
57+
</EmbeddedResource>
58+
<EmbeddedResource Update="Resx\ResUI.hu.resx">
59+
<Generator>PublicResXFileCodeGenerator</Generator>
60+
</EmbeddedResource>
61+
<EmbeddedResource Update="Resx\ResUI.resx">
62+
<SubType>Designer</SubType>
63+
<LastGenOutput>ResUI.Designer.cs</LastGenOutput>
64+
<Generator>PublicResXFileCodeGenerator</Generator>
65+
</EmbeddedResource>
66+
<EmbeddedResource Update="Resx\ResUI.ru.resx">
67+
<SubType>Designer</SubType>
68+
<Generator>PublicResXFileCodeGenerator</Generator>
69+
</EmbeddedResource>
70+
<EmbeddedResource Update="Resx\ResUI.zh-Hans.resx">
71+
<SubType>Designer</SubType>
72+
<Generator>PublicResXFileCodeGenerator</Generator>
73+
</EmbeddedResource>
74+
<EmbeddedResource Update="Resx\ResUI.zh-Hant.resx">
75+
<SubType>Designer</SubType>
76+
<Generator>PublicResXFileCodeGenerator</Generator>
77+
</EmbeddedResource>
8178
</ItemGroup>
8279

83-
</Project>
80+
</Project>

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

Lines changed: 45 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,50 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<Nullable>enable</Nullable>
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<Nullable>enable</Nullable>
67
<ImplicitUsings>enable</ImplicitUsings>
78
<ApplicationIcon>Assets\v2rayN.ico</ApplicationIcon>
8-
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
9-
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
10-
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
11-
<AssemblyName>v2rayN</AssemblyName>
12-
</PropertyGroup>
13-
14-
<ItemGroup>
15-
<AvaloniaResource Include="Assets\**" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<ProjectCapability Include="Avalonia" />
20-
</ItemGroup>
21-
22-
<ItemGroup>
23-
<PackageReference Include="Avalonia" Version="11.2.3" />
24-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
25-
<PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
26-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
27-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
28-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
29-
<PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
30-
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
31-
<PackageReference Include="Semi.Avalonia" Version="11.2.1.3" />
32-
<PackageReference Include="Semi.Avalonia.DataGrid" Version="11.2.1.3" />
33-
<PackageReference Include="ReactiveUI" Version="20.1.63" />
34-
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
9+
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
10+
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
11+
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
12+
<AssemblyName>v2rayN</AssemblyName>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<AvaloniaResource Include="Assets\**" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectCapability Include="Avalonia" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="Avalonia.Desktop" />
25+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
26+
<PackageReference Include="Avalonia.ReactiveUI" />
27+
<PackageReference Include="MessageBox.Avalonia" />
28+
<PackageReference Include="Semi.Avalonia" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<EmbeddedResource Include="Assets\v2rayN.ico">
37+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
38+
</EmbeddedResource>
39+
</ItemGroup>
40+
41+
<ItemGroup>
42+
<None Update="v2rayN.png">
43+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
44+
</None>
45+
<None Update="v2rayN.icns">
46+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
47+
</None>
3548
</ItemGroup>
3649

37-
<ItemGroup>
38-
<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<EmbeddedResource Include="Assets\v2rayN.ico">
43-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
44-
</EmbeddedResource>
45-
</ItemGroup>
46-
47-
<ItemGroup>
48-
<None Update="v2rayN.png">
49-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
50-
</None>
51-
<None Update="v2rayN.icns">
52-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
53-
</None>
54-
</ItemGroup>
55-
56-
</Project>
50+
</Project>

‎v2rayN/v2rayN/v2rayN.csproj‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,34 @@
55
<OutputType>WinExe</OutputType>
66
<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
77
<Nullable>enable</Nullable>
8-
<UseWPF>true</UseWPF>
8+
<UseWPF>true</UseWPF>
99
<ApplicationManifest>app.manifest</ApplicationManifest>
1010
<ImplicitUsings>enable</ImplicitUsings>
1111
<ApplicationIcon>Resources\v2rayN.ico</ApplicationIcon>
1212
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
1313
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
1414
</PropertyGroup>
15-
15+
1616
<ItemGroup>
17-
<PackageReference Include="MaterialDesignThemes" Version="5.2.1" />
18-
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" />
19-
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
20-
<PackageReference Include="ReactiveUI.WPF" Version="20.1.63" />
17+
<PackageReference Include="MaterialDesignThemes" />
18+
<PackageReference Include="H.NotifyIcon.Wpf" />
19+
<PackageReference Include="ReactiveUI.WPF" />
2120
</ItemGroup>
22-
23-
<ItemGroup>
24-
<AdditionalFiles Include="app.manifest" />
25-
<EmbeddedResource Include="Resources\v2rayN.ico">
26-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
27-
</EmbeddedResource>
28-
<Resource Include="Resources\NotifyIcon1.ico" />
29-
<Resource Include="Resources\NotifyIcon2.ico" />
30-
<Resource Include="Resources\NotifyIcon3.ico" />
31-
<Resource Include="Resources\NotifyIcon4.ico" />
32-
<Resource Include="Resources\v2rayN.ico" />
33-
</ItemGroup>
34-
21+
22+
<ItemGroup>
23+
<AdditionalFiles Include="app.manifest" />
24+
<EmbeddedResource Include="Resources\v2rayN.ico">
25+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
26+
</EmbeddedResource>
27+
<Resource Include="Resources\NotifyIcon1.ico" />
28+
<Resource Include="Resources\NotifyIcon2.ico" />
29+
<Resource Include="Resources\NotifyIcon3.ico" />
30+
<Resource Include="Resources\NotifyIcon4.ico" />
31+
<Resource Include="Resources\v2rayN.ico" />
32+
</ItemGroup>
33+
3534
<ItemGroup>
36-
<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
35+
<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
3736
</ItemGroup>
3837

39-
</Project>
38+
</Project>

0 commit comments

Comments
 (0)