Use Directory.Packages.props (#6575)
Some checks are pending
release Linux / build (Release) (push) Waiting to run
release macOS / build (Release) (push) Waiting to run
release Windows / build (Release) (push) Waiting to run

This commit is contained in:
Anatoliy 2025-01-24 07:57:38 +06:00 committed by GitHub
parent d2cda16378
commit 9c20d9cb1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 191 additions and 170 deletions

31
Directory.Packages.props Normal file
View file

@ -0,0 +1,31 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.3" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.3" />
<PackageVersion Include="CliWrap" Version="3.7.1" />
<PackageVersion Include="Downloader" Version="3.3.3" />
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
<PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
<PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
<PackageVersion Include="QRCoder" Version="1.6.0" />
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
<PackageVersion Include="Semi.Avalonia" Version="11.2.1.3" />
<PackageVersion Include="Splat.NLog" Version="15.2.22" />
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
<PackageVersion Include="TaskScheduler" Version="2.11.0" />
<PackageVersion Include="WebDav.Client" Version="2.8.0" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
</ItemGroup>
</Project>

View file

@ -1,27 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright> <Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
<FileVersion>1.3.1</FileVersion> <FileVersion>1.3.1</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Resx\Resource.Designer.cs"> <Compile Update="Resx\Resource.Designer.cs">
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resource.resx</DependentUpon> <DependentUpon>Resource.resx</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Update="Resx\Resource.resx"> <EmbeddedResource Update="Resx\Resource.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resource.Designer.cs</LastGenOutput> <LastGenOutput>Resource.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -1,83 +1,80 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>7.7.0</Version> <Version>7.7.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Downloader" Version="3.3.3" /> <PackageReference Include="Downloader" />
<PackageReference Include="ReactiveUI" Version="20.1.63" /> <PackageReference Include="ReactiveUI.Fody" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" /> <PackageReference Include="sqlite-net-pcl" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" /> <PackageReference Include="Splat.NLog" />
<PackageReference Include="Splat.NLog" Version="15.2.22" /> <PackageReference Include="WebDav.Client" />
<PackageReference Include="WebDav.Client" Version="2.8.0" /> <PackageReference Include="YamlDotNet" />
<PackageReference Include="YamlDotNet" Version="16.3.0" /> <PackageReference Include="QRCoder" />
<PackageReference Include="QRCoder" Version="1.6.0" /> <PackageReference Include="CliWrap" />
<PackageReference Include="CliWrap" Version="3.7.1" /> <PackageReference Include="ZXing.Net.Bindings.SkiaSharp" />
<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" /> <PackageReference Include="TaskScheduler" />
<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
<PackageReference Include="TaskScheduler" Version="2.11.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Sample\clash_mixin_yaml" />
<EmbeddedResource Include="Sample\clash_tun_yaml" />
<EmbeddedResource Include="Sample\custom_routing_black" />
<EmbeddedResource Include="Sample\custom_routing_global" />
<EmbeddedResource Include="Sample\custom_routing_white" />
<EmbeddedResource Include="Sample\dns_singbox_normal" />
<EmbeddedResource Include="Sample\dns_v2ray_normal" />
<EmbeddedResource Include="Sample\pac" />
<EmbeddedResource Include="Sample\SampleClientConfig" />
<EmbeddedResource Include="Sample\SampleHttpRequest" />
<EmbeddedResource Include="Sample\SampleHttpResponse" />
<EmbeddedResource Include="Sample\SampleInbound" />
<EmbeddedResource Include="Sample\SampleOutbound" />
<EmbeddedResource Include="Sample\SingboxSampleClientConfig" />
<EmbeddedResource Include="Sample\SingboxSampleOutbound" />
<EmbeddedResource Include="Sample\tun_singbox_dns" />
<EmbeddedResource Include="Sample\tun_singbox_inbound" />
<EmbeddedResource Include="Sample\tun_singbox_rules" />
<EmbeddedResource Include="Sample\linux_autostart_config" />
</ItemGroup>
<ItemGroup>
<Compile Update="Resx\ResUI.Designer.cs">
<DependentUpon>ResUI.resx</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Update="Resx\ResUI.fa-Ir.resx"> <EmbeddedResource Include="Sample\clash_mixin_yaml" />
<SubType>Designer</SubType> <EmbeddedResource Include="Sample\clash_tun_yaml" />
<Generator>PublicResXFileCodeGenerator</Generator> <EmbeddedResource Include="Sample\custom_routing_black" />
</EmbeddedResource> <EmbeddedResource Include="Sample\custom_routing_global" />
<EmbeddedResource Update="Resx\ResUI.hu.resx"> <EmbeddedResource Include="Sample\custom_routing_white" />
<Generator>PublicResXFileCodeGenerator</Generator> <EmbeddedResource Include="Sample\dns_singbox_normal" />
</EmbeddedResource> <EmbeddedResource Include="Sample\dns_v2ray_normal" />
<EmbeddedResource Update="Resx\ResUI.resx"> <EmbeddedResource Include="Sample\pac" />
<SubType>Designer</SubType> <EmbeddedResource Include="Sample\SampleClientConfig" />
<LastGenOutput>ResUI.Designer.cs</LastGenOutput> <EmbeddedResource Include="Sample\SampleHttpRequest" />
<Generator>PublicResXFileCodeGenerator</Generator> <EmbeddedResource Include="Sample\SampleHttpResponse" />
</EmbeddedResource> <EmbeddedResource Include="Sample\SampleInbound" />
<EmbeddedResource Update="Resx\ResUI.ru.resx"> <EmbeddedResource Include="Sample\SampleOutbound" />
<SubType>Designer</SubType> <EmbeddedResource Include="Sample\SingboxSampleClientConfig" />
<Generator>PublicResXFileCodeGenerator</Generator> <EmbeddedResource Include="Sample\SingboxSampleOutbound" />
</EmbeddedResource> <EmbeddedResource Include="Sample\tun_singbox_dns" />
<EmbeddedResource Update="Resx\ResUI.zh-Hans.resx"> <EmbeddedResource Include="Sample\tun_singbox_inbound" />
<SubType>Designer</SubType> <EmbeddedResource Include="Sample\tun_singbox_rules" />
<Generator>PublicResXFileCodeGenerator</Generator> <EmbeddedResource Include="Sample\linux_autostart_config" />
</EmbeddedResource> </ItemGroup>
<EmbeddedResource Update="Resx\ResUI.zh-Hant.resx">
<SubType>Designer</SubType> <ItemGroup>
<Generator>PublicResXFileCodeGenerator</Generator> <Compile Update="Resx\ResUI.Designer.cs">
</EmbeddedResource> <DependentUpon>ResUI.resx</DependentUpon>
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Resx\ResUI.fa-Ir.resx">
<SubType>Designer</SubType>
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resx\ResUI.hu.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resx\ResUI.resx">
<SubType>Designer</SubType>
<LastGenOutput>ResUI.Designer.cs</LastGenOutput>
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resx\ResUI.ru.resx">
<SubType>Designer</SubType>
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resx\ResUI.zh-Hans.resx">
<SubType>Designer</SubType>
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resx\ResUI.zh-Hant.resx">
<SubType>Designer</SubType>
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -1,56 +1,50 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <OutputType>WinExe</OutputType>
<Nullable>enable</Nullable> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<ApplicationIcon>Assets\v2rayN.ico</ApplicationIcon> <ApplicationIcon>Assets\v2rayN.ico</ApplicationIcon>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport> <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<Copyright>Copyright © 2017-2025 (GPLv3)</Copyright> <Copyright>Copyright © 2017-2025 (GPLv3)</Copyright>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault> <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<AssemblyName>v2rayN</AssemblyName> <AssemblyName>v2rayN</AssemblyName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
<ProjectCapability Include="Avalonia" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.3" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
<PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
<PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
<PackageReference Include="Semi.Avalonia" Version="11.2.1.3" />
<PackageReference Include="Semi.Avalonia.DataGrid" Version="11.2.1.3" />
<PackageReference Include="ReactiveUI" Version="20.1.63" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" /> <ProjectCapability Include="Avalonia" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Assets\v2rayN.ico"> <PackageReference Include="Avalonia.Desktop" />
<CopyToOutputDirectory>Never</CopyToOutputDirectory> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
</EmbeddedResource> <PackageReference Include="Avalonia.ReactiveUI" />
</ItemGroup> <PackageReference Include="MessageBox.Avalonia" />
<PackageReference Include="Semi.Avalonia" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="v2rayN.png"> <ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
<CopyToOutputDirectory>Always</CopyToOutputDirectory> </ItemGroup>
</None>
<None Update="v2rayN.icns"> <ItemGroup>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <EmbeddedResource Include="Assets\v2rayN.ico">
</None> <CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ItemGroup> </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Update="v2rayN.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="v2rayN.icns">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project> </Project>

View file

@ -14,26 +14,25 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MaterialDesignThemes" Version="5.2.1" /> <PackageReference Include="MaterialDesignThemes" />
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" /> <PackageReference Include="H.NotifyIcon.Wpf" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" /> <PackageReference Include="ReactiveUI.WPF" />
<PackageReference Include="ReactiveUI.WPF" Version="20.1.63" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="app.manifest" /> <AdditionalFiles Include="app.manifest" />
<EmbeddedResource Include="Resources\v2rayN.ico"> <EmbeddedResource Include="Resources\v2rayN.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory> <CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource> </EmbeddedResource>
<Resource Include="Resources\NotifyIcon1.ico" /> <Resource Include="Resources\NotifyIcon1.ico" />
<Resource Include="Resources\NotifyIcon2.ico" /> <Resource Include="Resources\NotifyIcon2.ico" />
<Resource Include="Resources\NotifyIcon3.ico" /> <Resource Include="Resources\NotifyIcon3.ico" />
<Resource Include="Resources\NotifyIcon4.ico" /> <Resource Include="Resources\NotifyIcon4.ico" />
<Resource Include="Resources\v2rayN.ico" /> <Resource Include="Resources\v2rayN.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" /> <ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>