diff options
| author | Andrey Sukharev <SukharevAndrey@users.noreply.github.com> | 2022-12-12 18:03:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 16:03:10 +0100 |
| commit | 535fbec6751d1726c0b0b0ab6de3a9430ff7ec72 (patch) | |
| tree | cc914d1321a83b3808f8ee1217a8371f3210e04a | |
| parent | 6fe88115a302f4b4da38d8aac1baac7ada548be0 (diff) | |
Use NuGet Central Package Management to manage package versions solution-wise (#4095)1.1.466
| -rw-r--r-- | Directory.Packages.props | 54 | ||||
| -rw-r--r-- | Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj | 4 | ||||
| -rw-r--r-- | Ryujinx.Ava/Ryujinx.Ava.csproj | 46 | ||||
| -rw-r--r-- | Ryujinx.Common/Ryujinx.Common.csproj | 4 | ||||
| -rw-r--r-- | Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj | 2 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj | 18 | ||||
| -rw-r--r-- | Ryujinx.HLE/Ryujinx.HLE.csproj | 14 | ||||
| -rw-r--r-- | Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj | 8 | ||||
| -rw-r--r-- | Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj | 4 | ||||
| -rw-r--r-- | Ryujinx.Input/Ryujinx.Input.csproj | 2 | ||||
| -rw-r--r-- | Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj | 6 | ||||
| -rw-r--r-- | Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj | 2 | ||||
| -rw-r--r-- | Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj | 2 | ||||
| -rw-r--r-- | Ryujinx.Tests/Ryujinx.Tests.csproj | 12 | ||||
| -rw-r--r-- | Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj | 2 | ||||
| -rw-r--r-- | Ryujinx.sln | 1 | ||||
| -rw-r--r-- | Ryujinx/Ryujinx.csproj | 24 |
17 files changed, 130 insertions, 75 deletions
diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..c5601984 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,54 @@ +<Project> + <PropertyGroup> + <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> + </PropertyGroup> + <ItemGroup> + <PackageVersion Include="Avalonia" Version="0.10.18" /> + <PackageVersion Include="Avalonia.Controls.DataGrid" Version="0.10.18" /> + <PackageVersion Include="Avalonia.Desktop" Version="0.10.18" /> + <PackageVersion Include="Avalonia.Diagnostics" Version="0.10.18" /> + <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="0.10.18" /> + <PackageVersion Include="Avalonia.Svg" Version="0.10.18" /> + <PackageVersion Include="Avalonia.Svg.Skia" Version="0.10.18" /> + <PackageVersion Include="CommandLineParser" Version="2.9.1" /> + <PackageVersion Include="Concentus" Version="1.1.7" /> + <PackageVersion Include="Crc32.NET" Version="1.2.0" /> + <PackageVersion Include="DiscordRichPresence" Version="1.1.3.18" /> + <PackageVersion Include="DynamicData" Version="7.12.11" /> + <PackageVersion Include="FluentAvaloniaUI" Version="1.4.5" /> + <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" /> + <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" /> + <PackageVersion Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" /> + <PackageVersion Include="LibHac" Version="0.17.0" /> + <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" /> + <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" /> + <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> + <PackageVersion Include="MsgPack.Cli" Version="1.0.1" /> + <PackageVersion Include="NUnit" Version="3.13.3" /> + <PackageVersion Include="NUnit3TestAdapter" Version="3.17.0" /> + <PackageVersion Include="OpenTK.Core" Version="4.7.5" /> + <PackageVersion Include="OpenTK.Graphics" Version="4.7.5" /> + <PackageVersion Include="OpenTK.OpenAL" Version="4.7.5" /> + <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.7.5" /> + <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" /> + <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build12" /> + <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" /> + <PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" /> + <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.24.2-build21" /> + <PackageVersion Include="shaderc.net" Version="0.1.0" /> + <PackageVersion Include="SharpZipLib" Version="1.4.1" /> + <PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" /> + <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" /> + <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.16.0" /> + <PackageVersion Include="SixLabors.ImageSharp" Version="1.0.4" /> + <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" /> + <PackageVersion Include="SPB" Version="0.0.4-build28" /> + <PackageVersion Include="System.Drawing.Common" Version="7.0.0" /> + <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" /> + <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" /> + <PackageVersion Include="System.Management" Version="7.0.0" /> + <PackageVersion Include="System.Net.NameResolution" Version="4.3.0" /> + <PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0" /> + <PackageVersion Include="XamlNameReferenceGenerator" Version="1.5.1" /> + </ItemGroup> +</Project> diff --git a/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj b/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj index 9736c348..115a3760 100644 --- a/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj +++ b/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj @@ -1,11 +1,11 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net7.0</TargetFramework> </PropertyGroup> <ItemGroup> - <PackageReference Include="OpenTK.OpenAL" Version="4.7.5" /> + <PackageReference Include="OpenTK.OpenAL" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.Ava/Ryujinx.Ava.csproj b/Ryujinx.Ava/Ryujinx.Ava.csproj index a16641ac..6da11849 100644 --- a/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net7.0</TargetFramework> <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers> @@ -18,31 +18,31 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Avalonia" Version="0.10.18" /> - <PackageReference Include="Avalonia.Desktop" Version="0.10.18" /> - <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" /> - <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.18" /> - <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.18" /> - <PackageReference Include="Avalonia.Svg" Version="0.10.18" /> - <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.18" /> - <PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" /> - <PackageReference Include="DynamicData" Version="7.12.11" /> - <PackageReference Include="FluentAvaloniaUI" Version="1.4.5" /> - <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" /> + <PackageReference Include="Avalonia" /> + <PackageReference Include="Avalonia.Desktop" /> + <PackageReference Include="Avalonia.Diagnostics" /> + <PackageReference Include="Avalonia.Controls.DataGrid" /> + <PackageReference Include="Avalonia.Markup.Xaml.Loader" /> + <PackageReference Include="Avalonia.Svg" /> + <PackageReference Include="Avalonia.Svg.Skia" /> + <PackageReference Include="jp2masa.Avalonia.Flexbox" /> + <PackageReference Include="DynamicData" /> + <PackageReference Include="FluentAvaloniaUI" /> + <PackageReference Include="XamlNameReferenceGenerator" /> - <PackageReference Include="OpenTK.Core" Version="4.7.5" /> - <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" /> - <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build12" /> - <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" /> - <PackageReference Include="Silk.NET.Vulkan" Version="2.16.0" /> - <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" /> - <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.16.0" /> - <PackageReference Include="SPB" Version="0.0.4-build28" /> - <PackageReference Include="SharpZipLib" Version="1.4.1" /> - <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" /> + <PackageReference Include="OpenTK.Core" /> + <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" /> + <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" /> + <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" /> + <PackageReference Include="Silk.NET.Vulkan" /> + <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" /> + <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" /> + <PackageReference Include="SPB" /> + <PackageReference Include="SharpZipLib" /> + <PackageReference Include="SixLabors.ImageSharp" /> <!--NOTE: DO NOT REMOVE, THIS IS REQUIRED AS A RESULT OF A TRIMMING ISSUE IN AVALONIA --> - <PackageReference Include="System.Drawing.Common" Version="7.0.0" /> + <PackageReference Include="System.Drawing.Common" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.Common/Ryujinx.Common.csproj b/Ryujinx.Common/Ryujinx.Common.csproj index 9a83c2b4..ca5de76a 100644 --- a/Ryujinx.Common/Ryujinx.Common.csproj +++ b/Ryujinx.Common/Ryujinx.Common.csproj @@ -6,8 +6,8 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="MsgPack.Cli" Version="1.0.1" /> - <PackageReference Include="System.Management" Version="7.0.0" /> + <PackageReference Include="MsgPack.Cli" /> + <PackageReference Include="System.Management" /> </ItemGroup> </Project> diff --git a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj index 9a4869ce..9fd2c48a 100644 --- a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj +++ b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj @@ -6,7 +6,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="OpenTK.Graphics" Version="4.7.5" /> + <PackageReference Include="OpenTK.Graphics" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj b/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj index e4e199e9..87f14a6a 100644 --- a/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj +++ b/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net7.0</TargetFramework> @@ -13,14 +13,14 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.7.5" /> - <PackageReference Include="shaderc.net" Version="0.1.0" /> - <PackageReference Include="Silk.NET.Vulkan" Version="2.16.0" /> - <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" /> - <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.16.0" /> - <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" /> - <PackageReference Include="System.Net.NameResolution" Version="4.3.0" /> - <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" /> + <PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" /> + <PackageReference Include="shaderc.net" /> + <PackageReference Include="Silk.NET.Vulkan" /> + <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" /> + <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" /> + <PackageReference Include="System.IO.FileSystem.Primitives" /> + <PackageReference Include="System.Net.NameResolution" /> + <PackageReference Include="System.Threading.ThreadPool" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj index ec5d2680..1e814ca9 100644 --- a/Ryujinx.HLE/Ryujinx.HLE.csproj +++ b/Ryujinx.HLE/Ryujinx.HLE.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net7.0</TargetFramework> @@ -21,12 +21,12 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Concentus" Version="1.1.7" /> - <PackageReference Include="LibHac" Version="0.17.0" /> - <PackageReference Include="MsgPack.Cli" Version="1.0.1" /> - <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" /> - <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" /> - <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" /> + <PackageReference Include="Concentus" /> + <PackageReference Include="LibHac" /> + <PackageReference Include="MsgPack.Cli" /> + <PackageReference Include="SixLabors.ImageSharp" /> + <PackageReference Include="SixLabors.ImageSharp.Drawing" /> + <PackageReference Include="System.IdentityModel.Tokens.Jwt" /> </ItemGroup> <!-- Due to Concentus. --> diff --git a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj index 6a8b38f7..44a16205 100644 --- a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj +++ b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net7.0</TargetFramework> @@ -11,8 +11,8 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="OpenTK.Core" Version="4.7.5" /> - <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build12" /> + <PackageReference Include="OpenTK.Core" /> + <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" /> </ItemGroup> <ItemGroup> @@ -28,7 +28,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="CommandLineParser" Version="2.9.1" /> + <PackageReference Include="CommandLineParser" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj b/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj index 0fd79794..67fab2d5 100644 --- a/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj +++ b/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj @@ -5,11 +5,11 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3"> + <PackageReference Include="Microsoft.CodeAnalysis.Analyzers"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" /> + <PackageReference Include="Microsoft.CodeAnalysis.CSharp" /> </ItemGroup> </Project> diff --git a/Ryujinx.Input/Ryujinx.Input.csproj b/Ryujinx.Input/Ryujinx.Input.csproj index 55111f77..40b82246 100644 --- a/Ryujinx.Input/Ryujinx.Input.csproj +++ b/Ryujinx.Input/Ryujinx.Input.csproj @@ -6,7 +6,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Crc32.NET" Version="1.2.0" /> + <PackageReference Include="Crc32.NET" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj b/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj index 46478c61..4dcb6962 100644 --- a/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj +++ b/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj @@ -6,9 +6,9 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> - <PackageReference Include="NUnit" Version="3.13.3" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" /> + <PackageReference Include="NUnit" /> + <PackageReference Include="NUnit3TestAdapter" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj b/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj index 96bebac0..955e6d3f 100644 --- a/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj +++ b/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj @@ -5,7 +5,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Ryujinx.SDL2-CS" Version="2.24.2-build21" /> + <PackageReference Include="Ryujinx.SDL2-CS" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj index 5c6ca6fb..74b4ec2f 100644 --- a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj +++ b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj @@ -11,7 +11,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="CommandLineParser" Version="2.9.1" /> + <PackageReference Include="CommandLineParser" /> </ItemGroup> </Project> diff --git a/Ryujinx.Tests/Ryujinx.Tests.csproj b/Ryujinx.Tests/Ryujinx.Tests.csproj index e85c4f1c..5976e998 100644 --- a/Ryujinx.Tests/Ryujinx.Tests.csproj +++ b/Ryujinx.Tests/Ryujinx.Tests.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net7.0</TargetFramework> @@ -18,9 +18,9 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> - <PackageReference Include="NUnit" Version="3.13.3" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" /> + <PackageReference Include="NUnit" /> + <PackageReference Include="NUnit3TestAdapter" /> </ItemGroup> <ItemGroup> @@ -35,14 +35,14 @@ <Target Name="CopyUnicorn" AfterTargets="Build"> <ItemGroup> - <UnicornLib Include="..\Ryujinx.Tests.Unicorn\libs\$(TargetOS)\*unicorn.*"/> + <UnicornLib Include="..\Ryujinx.Tests.Unicorn\libs\$(TargetOS)\*unicorn.*" /> </ItemGroup> <Copy SourceFiles="@(UnicornLib)" DestinationFolder="$(OutputPath)" ContinueOnError="true" /> </Target> <Target Name="CleanUnicorn" BeforeTargets="Clean"> <ItemGroup> - <UnicornLib Include="$(OutputPath)/unicorn.*"/> + <UnicornLib Include="$(OutputPath)/unicorn.*" /> </ItemGroup> <Delete Files="@(UnicornLib)" /> </Target> diff --git a/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj b/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj index ed89e08d..d8696a9c 100644 --- a/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj +++ b/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj @@ -41,7 +41,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="DiscordRichPresence" Version="1.1.3.18" /> + <PackageReference Include="DiscordRichPresence" /> </ItemGroup> <ItemGroup> diff --git a/Ryujinx.sln b/Ryujinx.sln index 1332e129..0915ef98 100644 --- a/Ryujinx.sln +++ b/Ryujinx.sln @@ -34,6 +34,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + Directory.Packages.props = Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Memory", "Ryujinx.Memory\Ryujinx.Memory.csproj", "{A5E6C691-9E22-4263-8F40-42F002CE66BE}" diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj index b4cc0516..d8176ee3 100644 --- a/Ryujinx/Ryujinx.csproj +++ b/Ryujinx/Ryujinx.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net7.0</TargetFramework> @@ -19,17 +19,17 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" /> - <PackageReference Include="GtkSharp.Dependencies" Version="1.1.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" /> - <PackageReference Include="GtkSharp.Dependencies.osx" Version="0.0.5" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" /> - <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build12" /> - <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" /> - <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" /> - <PackageReference Include="OpenTK.Core" Version="4.7.5" /> - <PackageReference Include="OpenTK.Graphics" Version="4.7.5" /> - <PackageReference Include="SPB" Version="0.0.4-build28" /> - <PackageReference Include="SharpZipLib" Version="1.4.1" /> - <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" /> + <PackageReference Include="Ryujinx.GtkSharp" /> + <PackageReference Include="GtkSharp.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" /> + <PackageReference Include="GtkSharp.Dependencies.osx" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" /> + <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" /> + <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" /> + <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" /> + <PackageReference Include="OpenTK.Core" /> + <PackageReference Include="OpenTK.Graphics" /> + <PackageReference Include="SPB" /> + <PackageReference Include="SharpZipLib" /> + <PackageReference Include="SixLabors.ImageSharp" /> </ItemGroup> <ItemGroup> |