From c46edfab858051e4b800b2705df2c019c1d975cd Mon Sep 17 00:00:00 2001 From: Michael Kuklinski <14104310+ameisen@users.noreply.github.com> Date: Tue, 21 Apr 2020 23:13:41 -0500 Subject: [PATCH] Update .NET Core to 3.1, and update NuGet Packages (#1121) * Updated all NuGet packages to latest, and updated the framework from .NET Core 3.0 to 3.1. * Updating appveyor settings for 3.1 Updating appveyor to use the netcoreapp3.1 path instead of 3.0. * Removing unneeded NuGet package System.Runtime.CompilerServices.Unsafe. * Removing unused NuGet package SharpFontCore. * Removing unused NuGet package TimeZoneConverter.Posix * Cleaning up by adding newline to a csproj. * Simplfying a NuGet conditional include, and adding a warning disable for an annoying NuGet package. * I'm not sure if .travis.yml is still used, but I'm updating its 'dotnet' version to the correct SDK. * Making the runtime version into its own environment variable so it's a bit easier to change in the future. * Removing OpenTK.NetStandard reference from Ryujinx.Common * Fixing indentation in Common.csproj * Updating the README to specify .NET Core 3.1. * Reverting the update of the GTKSharp package so it doesn't block the PR. --- .travis.yml | 2 +- ARMeilleure/ARMeilleure.csproj | 2 +- README.md | 2 +- Ryujinx.Audio/Ryujinx.Audio.csproj | 3 +-- Ryujinx.Common/Ryujinx.Common.csproj | 9 +++++---- Ryujinx.Debugger/Ryujinx.Debugger.csproj | 2 +- Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj | 2 +- Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj | 2 +- Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj | 4 ++-- Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj | 2 +- Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj | 2 +- Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj | 2 +- Ryujinx.HLE/Ryujinx.HLE.csproj | 3 +-- Ryujinx.LLE/Luea.csproj | 2 +- Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj | 2 +- Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj | 4 ++-- Ryujinx.Tests/Ryujinx.Tests.csproj | 6 +++--- Ryujinx/Ryujinx.csproj | 8 ++++---- appveyor.yml | 7 ++++--- 19 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c6ca236b..d4512e470 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ os: osx language: csharp solution: Ryujinx.sln mono: none -dotnet: 2.0.0 +dotnet: 3.1.3 script: - dotnet restore - dotnet build diff --git a/ARMeilleure/ARMeilleure.csproj b/ARMeilleure/ARMeilleure.csproj index 9567838ec..f73df09f9 100644 --- a/ARMeilleure/ARMeilleure.csproj +++ b/ARMeilleure/ARMeilleure.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 diff --git a/README.md b/README.md index 3d415d1be..8072e7239 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ ## Usage -To run this emulator, you need the [.NET Core 3.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet-core). +To run this emulator, you need the [.NET Core 3.1 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet-core). If you use a pre-built version, you can use the graphical interface to run your games and homebrew. diff --git a/Ryujinx.Audio/Ryujinx.Audio.csproj b/Ryujinx.Audio/Ryujinx.Audio.csproj index 80940c770..b9aefd291 100644 --- a/Ryujinx.Audio/Ryujinx.Audio.csproj +++ b/Ryujinx.Audio/Ryujinx.Audio.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 Debug;Release;Profile Debug;Profile Release @@ -28,7 +28,6 @@ - diff --git a/Ryujinx.Common/Ryujinx.Common.csproj b/Ryujinx.Common/Ryujinx.Common.csproj index 14f1b1e7b..26fb73c49 100644 --- a/Ryujinx.Common/Ryujinx.Common.csproj +++ b/Ryujinx.Common/Ryujinx.Common.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 Debug;Release;Profile Debug;Profile Release @@ -27,10 +27,11 @@ - + + NU1701 + - - + diff --git a/Ryujinx.Debugger/Ryujinx.Debugger.csproj b/Ryujinx.Debugger/Ryujinx.Debugger.csproj index a67662cc0..90ec5b462 100644 --- a/Ryujinx.Debugger/Ryujinx.Debugger.csproj +++ b/Ryujinx.Debugger/Ryujinx.Debugger.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 Debug;Release;Profile Release;Profile Debug diff --git a/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj b/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj index 3f2df4092..f7838fb34 100644 --- a/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj +++ b/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj @@ -6,7 +6,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 diff --git a/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj b/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj index a55c4d1ce..49e93aa1e 100644 --- a/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj +++ b/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj @@ -9,7 +9,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 diff --git a/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj b/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj index 63289e53d..8170358ee 100644 --- a/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj +++ b/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 @@ -14,7 +14,7 @@ - + diff --git a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj index 275400555..43dc78165 100644 --- a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj +++ b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj @@ -2,7 +2,7 @@ true - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 diff --git a/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj b/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj index 55864c6dd..a71e5291b 100644 --- a/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj +++ b/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj @@ -15,7 +15,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 diff --git a/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj b/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj index 2009fbeef..861fd287b 100644 --- a/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj +++ b/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj @@ -5,7 +5,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 true diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj index 367d7218f..8a7d4a0f0 100644 --- a/Ryujinx.HLE/Ryujinx.HLE.csproj +++ b/Ryujinx.HLE/Ryujinx.HLE.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 Debug;Release;Profile Debug;Profile Release @@ -54,7 +54,6 @@ - diff --git a/Ryujinx.LLE/Luea.csproj b/Ryujinx.LLE/Luea.csproj index 0184d1be7..f17d8def3 100644 --- a/Ryujinx.LLE/Luea.csproj +++ b/Ryujinx.LLE/Luea.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 Exe Debug;Release;Profile Debug;Profile Release diff --git a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj index 10d66cd28..300714995 100644 --- a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj +++ b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj @@ -5,7 +5,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 Exe Debug;Release;Profile Debug;Profile Release diff --git a/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj b/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj index f99f504a7..2afdd784d 100644 --- a/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj +++ b/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 true Debug;Release;Profile Debug;Profile Release @@ -22,7 +22,7 @@ - + diff --git a/Ryujinx.Tests/Ryujinx.Tests.csproj b/Ryujinx.Tests/Ryujinx.Tests.csproj index b256cc6c8..ef7becfff 100644 --- a/Ryujinx.Tests/Ryujinx.Tests.csproj +++ b/Ryujinx.Tests/Ryujinx.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 Exe false @@ -27,9 +27,9 @@ - + - + diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj index 9bb79b093..28a0b6017 100644 --- a/Ryujinx/Ryujinx.csproj +++ b/Ryujinx/Ryujinx.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 win-x64;osx-x64;linux-x64 Exe true @@ -19,7 +19,7 @@ false - + false Ryujinx.ico @@ -74,10 +74,10 @@ - + - + diff --git a/appveyor.yml b/appveyor.yml index 4fcf50503..9c0c44f30 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ branches: - master image: Visual Studio 2019 environment: + appveyor_dotnet_runtime: netcoreapp3.1 matrix: - config: Release config_name: '-' @@ -20,13 +21,13 @@ build_script: dotnet publish -c $env:config -r osx-x64 /p:Version=$env:APPVEYOR_BUILD_VERSION - 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-win_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\$env:config\netcoreapp3.0\win-x64\publish\ + 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-win_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\$env:config\$env:appveyor_dotnet_runtime\win-x64\publish\ - 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-linux_x64.tar $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\$env:config\netcoreapp3.0\linux-x64\publish\ + 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-linux_x64.tar $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\$env:config\$env:appveyor_dotnet_runtime\linux-x64\publish\ 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-linux_x64.tar.gz ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-linux_x64.tar - 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-osx_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\$env:config\netcoreapp3.0\osx-x64\publish\ + 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-osx_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\$env:config\$env:appveyor_dotnet_runtime\osx-x64\publish\ artifacts: - path: ryujinx%config_name%%APPVEYOR_BUILD_VERSION%-win_x64.zip