From 535fbec6751d1726c0b0b0ab6de3a9430ff7ec72 Mon Sep 17 00:00:00 2001 From: Andrey Sukharev Date: Mon, 12 Dec 2022 18:03:10 +0300 Subject: [PATCH] Use NuGet Central Package Management to manage package versions solution-wise (#4095) --- Directory.Packages.props | 54 +++++++++++++++++++ .../Ryujinx.Audio.Backends.OpenAL.csproj | 4 +- Ryujinx.Ava/Ryujinx.Ava.csproj | 46 ++++++++-------- Ryujinx.Common/Ryujinx.Common.csproj | 4 +- .../Ryujinx.Graphics.OpenGL.csproj | 2 +- .../Ryujinx.Graphics.Vulkan.csproj | 18 +++---- Ryujinx.HLE/Ryujinx.HLE.csproj | 14 ++--- .../Ryujinx.Headless.SDL2.csproj | 8 +-- .../Ryujinx.Horizon.Generators.csproj | 4 +- Ryujinx.Input/Ryujinx.Input.csproj | 2 +- .../Ryujinx.Memory.Tests.csproj | 6 +-- .../Ryujinx.SDL2.Common.csproj | 2 +- .../Ryujinx.ShaderTools.csproj | 2 +- Ryujinx.Tests/Ryujinx.Tests.csproj | 12 ++--- Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj | 2 +- Ryujinx.sln | 1 + Ryujinx/Ryujinx.csproj | 24 ++++----- 17 files changed, 130 insertions(+), 75 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..c56019847 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,54 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj b/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj index 9736c348e..115a37601 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 @@ - + net7.0 - + diff --git a/Ryujinx.Ava/Ryujinx.Ava.csproj b/Ryujinx.Ava/Ryujinx.Ava.csproj index a16641ac4..6da118491 100644 --- a/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -1,4 +1,4 @@ - + net7.0 win10-x64;osx-x64;linux-x64 @@ -18,31 +18,31 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + diff --git a/Ryujinx.Common/Ryujinx.Common.csproj b/Ryujinx.Common/Ryujinx.Common.csproj index 9a83c2b4b..ca5de76a6 100644 --- a/Ryujinx.Common/Ryujinx.Common.csproj +++ b/Ryujinx.Common/Ryujinx.Common.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj index 9a4869cec..9fd2c48a5 100644 --- a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj +++ b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj @@ -6,7 +6,7 @@ - + diff --git a/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj b/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj index e4e199e96..87f14a6ab 100644 --- a/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj +++ b/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -13,14 +13,14 @@ - - - - - - - - + + + + + + + + diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj index ec5d26807..1e814ca98 100644 --- a/Ryujinx.HLE/Ryujinx.HLE.csproj +++ b/Ryujinx.HLE/Ryujinx.HLE.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -21,12 +21,12 @@ - - - - - - + + + + + + diff --git a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj index 6a8b38f7b..44a162051 100644 --- a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj +++ b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -11,8 +11,8 @@ - - + + @@ -28,7 +28,7 @@ - + diff --git a/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj b/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj index 0fd79794f..67fab2d55 100644 --- a/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj +++ b/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj @@ -5,11 +5,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Ryujinx.Input/Ryujinx.Input.csproj b/Ryujinx.Input/Ryujinx.Input.csproj index 55111f77f..40b82246c 100644 --- a/Ryujinx.Input/Ryujinx.Input.csproj +++ b/Ryujinx.Input/Ryujinx.Input.csproj @@ -6,7 +6,7 @@ - + diff --git a/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj b/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj index 46478c61d..4dcb69623 100644 --- a/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj +++ b/Ryujinx.Memory.Tests/Ryujinx.Memory.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj b/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj index 96bebac0a..955e6d3f1 100644 --- a/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj +++ b/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj @@ -5,7 +5,7 @@ - + diff --git a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj index 5c6ca6fb9..74b4ec2f7 100644 --- a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj +++ b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj @@ -11,7 +11,7 @@ - + diff --git a/Ryujinx.Tests/Ryujinx.Tests.csproj b/Ryujinx.Tests/Ryujinx.Tests.csproj index e85c4f1cd..5976e998b 100644 --- a/Ryujinx.Tests/Ryujinx.Tests.csproj +++ b/Ryujinx.Tests/Ryujinx.Tests.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -18,9 +18,9 @@ - - - + + + @@ -35,14 +35,14 @@ - + - + diff --git a/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj b/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj index ed89e08de..d8696a9cd 100644 --- a/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj +++ b/Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj @@ -41,7 +41,7 @@ - + diff --git a/Ryujinx.sln b/Ryujinx.sln index 1332e129b..0915ef987 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 b4cc05162..d8176ee35 100644 --- a/Ryujinx/Ryujinx.csproj +++ b/Ryujinx/Ryujinx.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -19,17 +19,17 @@ - - - - - - - - - - - + + + + + + + + + + +