From 3d63d883dbb63227dea44ba928f02936e9f208b8 Mon Sep 17 00:00:00 2001 From: dreamsyntax Date: Fri, 14 Nov 2025 14:49:22 -0700 Subject: [PATCH] Target .NET 10 --- .github/workflows/build-and-publish.yml | 7 ++++++- .github/workflows/reloaded-utils-server.yml | 4 ++-- .../Reloaded.Utils.Server.csproj | 4 ++-- source/Publish.ps1 | 2 +- .../Reloaded.Mod.Installer.Cli.csproj | 4 ++-- .../Reloaded.Mod.Installer.Lib.csproj | 4 ++-- .../Reloaded.Mod.Installer.csproj | 4 ++-- .../Reloaded.Mod.Launcher.Lib.csproj | 4 ++-- .../Reloaded.Mod.Launcher.csproj | 2 +- .../Reloaded.Mod.Loader.Server.csproj | 4 ++-- .../Reloaded.Mod.Loader.Tests.csproj | 2 +- .../Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj | 14 ++++++-------- 12 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 832e81a9..aa1b0f6f 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -77,7 +77,12 @@ jobs: uses: actions/setup-dotnet@v5 with: dotnet-version: '9.0.x' - + + - name: Setup Dotnet SDK (10.0) + uses: actions/setup-dotnet@v5 + with: + dotnet-version: '10.0.x' + - name: Get Dotnet Info run: dotnet --info diff --git a/.github/workflows/reloaded-utils-server.yml b/.github/workflows/reloaded-utils-server.yml index 704febba..bd8f96a8 100644 --- a/.github/workflows/reloaded-utils-server.yml +++ b/.github/workflows/reloaded-utils-server.yml @@ -56,10 +56,10 @@ jobs: with: dotnet-version: 5.0.x - - name: Setup .NET Core SDK (9.0) + - name: Setup Dotnet SDK (10.0) uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.0.x + dotnet-version: '10.0.x' - name: Setup Node.js uses: actions/setup-node@v6 diff --git a/source/Mods/Reloaded.Utils.Server/Reloaded.Utils.Server.csproj b/source/Mods/Reloaded.Utils.Server/Reloaded.Utils.Server.csproj index 54ba8598..6d86f4d7 100644 --- a/source/Mods/Reloaded.Utils.Server/Reloaded.Utils.Server.csproj +++ b/source/Mods/Reloaded.Utils.Server/Reloaded.Utils.Server.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows false true 12.0 @@ -52,7 +52,7 @@ - + diff --git a/source/Publish.ps1 b/source/Publish.ps1 index f74c8232..ed569add 100644 --- a/source/Publish.ps1 +++ b/source/Publish.ps1 @@ -81,7 +81,7 @@ dotnet publish "$communityProjectPath" -c Release -r win-x64 --self-contained fa dotnet publish "$installerProjectPath" -f net472 -o "$installerPublishDirectory" # Build Installer (Static/Linux) -dotnet publish "$installerCliProjectPath" -f net9.0-windows -r win-x64 -o "$installerStaticPublishDirectory" +dotnet publish "$installerCliProjectPath" -f net10.0-windows -r win-x64 -o "$installerStaticPublishDirectory" # Build Templates dotnet pack "$templateProjectPath" -o "$templatePublishDirectory" diff --git a/source/Reloaded.Mod.Installer.Cli/Reloaded.Mod.Installer.Cli.csproj b/source/Reloaded.Mod.Installer.Cli/Reloaded.Mod.Installer.Cli.csproj index 09c3de4d..9db3f5f1 100644 --- a/source/Reloaded.Mod.Installer.Cli/Reloaded.Mod.Installer.Cli.csproj +++ b/source/Reloaded.Mod.Installer.Cli/Reloaded.Mod.Installer.Cli.csproj @@ -2,7 +2,7 @@ Exe - NET472;net9.0-windows + NET472;net10.0-windows preview app.manifest Setup-Linux @@ -11,7 +11,7 @@ portable - + true diff --git a/source/Reloaded.Mod.Installer.Lib/Reloaded.Mod.Installer.Lib.csproj b/source/Reloaded.Mod.Installer.Lib/Reloaded.Mod.Installer.Lib.csproj index 649e352e..0a7cde7c 100644 --- a/source/Reloaded.Mod.Installer.Lib/Reloaded.Mod.Installer.Lib.csproj +++ b/source/Reloaded.Mod.Installer.Lib/Reloaded.Mod.Installer.Lib.csproj @@ -1,12 +1,12 @@  - NET472;net9.0-windows + NET472;net10.0-windows preview enable - + true diff --git a/source/Reloaded.Mod.Installer/Reloaded.Mod.Installer.csproj b/source/Reloaded.Mod.Installer/Reloaded.Mod.Installer.csproj index 56c355dd..b2e41206 100644 --- a/source/Reloaded.Mod.Installer/Reloaded.Mod.Installer.csproj +++ b/source/Reloaded.Mod.Installer/Reloaded.Mod.Installer.csproj @@ -2,7 +2,7 @@ Exe - NET472;net9.0-windows + NET472;net10.0-windows true preview app.manifest @@ -15,7 +15,7 @@ <_SuppressWpfTrimError>true - + true diff --git a/source/Reloaded.Mod.Launcher.Lib/Reloaded.Mod.Launcher.Lib.csproj b/source/Reloaded.Mod.Launcher.Lib/Reloaded.Mod.Launcher.Lib.csproj index b241c1eb..8638b650 100644 --- a/source/Reloaded.Mod.Launcher.Lib/Reloaded.Mod.Launcher.Lib.csproj +++ b/source/Reloaded.Mod.Launcher.Lib/Reloaded.Mod.Launcher.Lib.csproj @@ -1,7 +1,7 @@ - net7.0-windows + net10.0-windows preview true CS0067 @@ -15,7 +15,7 @@ - + diff --git a/source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj b/source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj index eb7d3493..6390822f 100644 --- a/source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj +++ b/source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj @@ -2,7 +2,7 @@ WinExe - net9.0-windows + net10.0-windows preview true Reloaded-II diff --git a/source/Reloaded.Mod.Loader.Server/Reloaded.Mod.Loader.Server.csproj b/source/Reloaded.Mod.Loader.Server/Reloaded.Mod.Loader.Server.csproj index 7cdf568d..0aa1b450 100644 --- a/source/Reloaded.Mod.Loader.Server/Reloaded.Mod.Loader.Server.csproj +++ b/source/Reloaded.Mod.Loader.Server/Reloaded.Mod.Loader.Server.csproj @@ -1,7 +1,7 @@  - net5.0;net9.0 + net5.0;net10.0 12.0 1701;1702;CS1591;NU5104;CS0067 enable @@ -29,7 +29,7 @@ all - + all diff --git a/source/Reloaded.Mod.Loader.Tests/Reloaded.Mod.Loader.Tests.csproj b/source/Reloaded.Mod.Loader.Tests/Reloaded.Mod.Loader.Tests.csproj index 9e81fa52..c37a5966 100644 --- a/source/Reloaded.Mod.Loader.Tests/Reloaded.Mod.Loader.Tests.csproj +++ b/source/Reloaded.Mod.Loader.Tests/Reloaded.Mod.Loader.Tests.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows false false preview diff --git a/source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj b/source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj index d8021f14..bd9f2b96 100644 --- a/source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj +++ b/source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj @@ -1,12 +1,10 @@  - net9.0-windows - 9.0.8 - Minor - - preview + net10.0-windows + Minor + preview Reloaded.Mod.Loader - true + true Reloaded.Mod.Loader true false @@ -14,7 +12,7 @@ true false $(NoWarn);NU1605;NU1701 - 1.29.5 + 1.29.5 false x86;x64 false @@ -98,7 +96,7 @@ - +