diff --git a/.github/workflows/ci-launcher.yml b/.github/workflows/ci-launcher.yml index 6745df9c..1468d991 100644 --- a/.github/workflows/ci-launcher.yml +++ b/.github/workflows/ci-launcher.yml @@ -70,12 +70,12 @@ jobs: - name: Build run: | cd OTAPI.Client.Launcher - dotnet publish -r ${{ matrix.profile.runtime_identifier }} --framework net9.0 -p:PublishReadyToRun=true --self-contained false -c Release + dotnet publish -r ${{ matrix.profile.runtime_identifier }} --framework net10.0 -p:PublishReadyToRun=true --self-contained false -c Release if ${{ matrix.profile.runs_on != 'macos-latest' }} ; then - 7z a ../${{ matrix.profile.archive_name }} './bin/Release/net9.0/${{ matrix.profile.runtime_identifier }}/publish/*' + 7z a ../${{ matrix.profile.archive_name }} './bin/Release/net10.0/${{ matrix.profile.runtime_identifier }}/publish/*' else mkdir -p OTAPI.app/Contents/Resources - mv bin/Release/net9.0/osx-x64/publish OTAPI.app/Contents/MacOS + mv bin/Release/net10.0/osx-x64/publish OTAPI.app/Contents/MacOS cp ../docs/MacOS.Info.plist OTAPI.app/Contents/Info.plist cp OTAPI.osx.sh OTAPI.app/Contents/MacOS/OTAPI chmod +x OTAPI.app/Contents/MacOS/OTAPI @@ -85,7 +85,7 @@ jobs: # - uses: actions/upload-artifact@v2 # with: # name: ${{ matrix.profile.name }} Launcher - # path: OTAPI.Client.Launcher/bin/Release/net9.0/${{ matrix.profile.runtime_identifier }}/publish + # path: OTAPI.Client.Launcher/bin/Release/net10.0/${{ matrix.profile.runtime_identifier }}/publish - uses: "marvinpinto/action-automatic-releases@latest" with: diff --git a/.github/workflows/ci-nuget.yml b/.github/workflows/ci-nuget.yml index 87abc6d7..15231cac 100644 --- a/.github/workflows/ci-nuget.yml +++ b/.github/workflows/ci-nuget.yml @@ -50,27 +50,27 @@ jobs: - name: Build the project run: | dotnet build OTAPI.Mods.slnf - (cd OTAPI.Patcher/bin/Debug/net9.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net9.0) + (cd OTAPI.Patcher/bin/Debug/net10.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net10.0) dotnet build OTAPI.Server.Launcher.slnf - (cd OTAPI.Server.Launcher/bin/Debug/net9.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init) + (cd OTAPI.Server.Launcher/bin/Debug/net10.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init) - uses: actions/upload-artifact@v4 with: name: ${{ matrix.profile.name }} NuGet Package - path: OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }} + path: OTAPI.Patcher/bin/Debug/net10.0/${{ matrix.profile.package_path }} - uses: actions/upload-artifact@v4 with: name: ${{ matrix.profile.name }} Binaries path: | - OTAPI.Patcher/bin/Debug/net9.0/artifact-*/* + OTAPI.Patcher/bin/Debug/net10.0/artifact-*/* - uses: actions/upload-artifact@v4 with: name: ${{ matrix.profile.name }} Wiki MD files - path: OTAPI.Patcher/bin/Debug/net9.0/*.mfw.md + path: OTAPI.Patcher/bin/Debug/net10.0/*.mfw.md - name: "Releasing to NuGet: ${{ matrix.profile.name }}" env: NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} - run: dotnet nuget push OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }} --source https://api.nuget.org/v3/index.json --api-key "$NUGET_API_KEY" + run: dotnet nuget push OTAPI.Patcher/bin/Debug/net10.0/${{ matrix.profile.package_path }} --source https://api.nuget.org/v3/index.json --api-key "$NUGET_API_KEY" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b8f15af..b2101917 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,27 +66,27 @@ jobs: - name: Server patch run: | dotnet build OTAPI.Mods.slnf - cd OTAPI.Patcher/bin/Debug/net9.0 - dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net9.0 + cd OTAPI.Patcher/bin/Debug/net10.0 + dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net10.0 - name: Server boot run: | dotnet build OTAPI.Server.Launcher.slnf - cd OTAPI.Server.Launcher/bin/Debug/net9.0 + cd OTAPI.Server.Launcher/bin/Debug/net10.0 dotnet OTAPI.Server.Launcher.dll -test-init - uses: actions/upload-artifact@v4 with: name: ${{ matrix.os.name }} ${{ matrix.profile.name }} NuGet Package - path: OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }} + path: OTAPI.Patcher/bin/Debug/net10.0/${{ matrix.profile.package_path }} - uses: actions/upload-artifact@v4 with: name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Binaries path: | - OTAPI.Patcher/bin/Debug/net9.0/artifact-*/* + OTAPI.Patcher/bin/Debug/net10.0/artifact-*/* - uses: actions/upload-artifact@v4 with: name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Wiki MD files - path: OTAPI.Patcher/bin/Debug/net9.0/*.mfw.md + path: OTAPI.Patcher/bin/Debug/net10.0/*.mfw.md diff --git a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj index d886eba9..8c02c9c5 100644 --- a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj +++ b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj @@ -1,7 +1,7 @@  WinExe - net9.0 + net10.0 enable embedded Always @@ -62,7 +62,7 @@ true - + true diff --git a/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs b/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs index 88a2e4fd..f39bdca9 100644 --- a/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs +++ b/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs @@ -51,7 +51,7 @@ public static void CopyOTAPI(this IPlatformTarget target, string otapiFolder, IR File.WriteAllText(Path.Combine(otapiFolder, "Terraria.runtimeconfig.json"), @"{ ""runtimeOptions"": { - ""tfm"": ""net9.0"", + ""tfm"": ""net10.0"", ""framework"": { ""name"": ""Microsoft.NETCore.App"", ""version"": ""9.0.0"" @@ -419,8 +419,8 @@ public static void GenerateTypings(this IPlatformTarget target, string rootFolde if (File.Exists(dll)) return Assembly.LoadFile(dll); - exe = Path.Combine(patcherDir, "bin", "Debug", "net9.0", "EmbeddedResources", $"{asr.Name}.exe"); - dll = Path.Combine(patcherDir, "bin", "Debug", "net9.0", "EmbeddedResources", $"{asr.Name}.dll"); + exe = Path.Combine(patcherDir, "bin", "Debug", "net10.0", "EmbeddedResources", $"{asr.Name}.exe"); + dll = Path.Combine(patcherDir, "bin", "Debug", "net10.0", "EmbeddedResources", $"{asr.Name}.dll"); if (File.Exists(exe)) return Assembly.LoadFile(exe); diff --git a/OTAPI.Common/OTAPI.Common.csproj b/OTAPI.Common/OTAPI.Common.csproj index d758188f..4ba1f1fc 100644 --- a/OTAPI.Common/OTAPI.Common.csproj +++ b/OTAPI.Common/OTAPI.Common.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 disable diff --git a/OTAPI.Patcher/NugetPackageBuilder.cs b/OTAPI.Patcher/NugetPackageBuilder.cs index 34eca3c8..be7dd7c2 100644 --- a/OTAPI.Patcher/NugetPackageBuilder.cs +++ b/OTAPI.Patcher/NugetPackageBuilder.cs @@ -52,7 +52,7 @@ public void Build(ModFwModder modder) var commitSha = Common.GetGitCommitSha(); nuspec_xml = nuspec_xml.Replace("[INJECT_GIT_HASH]", String.IsNullOrWhiteSpace(commitSha) ? "" : $" git#{commitSha}"); - var platforms = new[] { "net9.0" }; // relinker only does net9 currently. until there is a reason to implement it... + var platforms = new[] { "net10.0" }; // relinker only does net9 currently. until there is a reason to implement it... var steamworks = modder.Module.AssemblyReferences.First(x => x.Name == "Steamworks.NET"); var newtonsoft = modder.Module.AssemblyReferences.First(x => x.Name == "Newtonsoft.Json"); var dependencies = new[] diff --git a/OTAPI.Patcher/OTAPI.Patcher.csproj b/OTAPI.Patcher/OTAPI.Patcher.csproj index 3ec1b268..0e2719bc 100644 --- a/OTAPI.Patcher/OTAPI.Patcher.csproj +++ b/OTAPI.Patcher/OTAPI.Patcher.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 3.3.3 true win;osx;linux; @@ -15,7 +15,7 @@ - + diff --git a/OTAPI.Scripts/OTAPI.Scripts.csproj b/OTAPI.Scripts/OTAPI.Scripts.csproj index 13a96bbb..2c5dd145 100644 --- a/OTAPI.Scripts/OTAPI.Scripts.csproj +++ b/OTAPI.Scripts/OTAPI.Scripts.csproj @@ -1,32 +1,32 @@ - net9.0 + net10.0 true true true enable - - + + - - ..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.exe + + ..\OTAPI.Patcher\bin\Debug\net10.0\OTAPI.exe - - ..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.dll + + ..\OTAPI.Patcher\bin\Debug\net10.0\OTAPI.dll - - ..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.Runtime.dll + + ..\OTAPI.Patcher\bin\Debug\net10.0\OTAPI.Runtime.dll - - ..\OTAPI.Patcher\bin\Debug\net9.0\EmbeddedResources\Steamworks.NET.dll + + ..\OTAPI.Patcher\bin\Debug\net10.0\EmbeddedResources\Steamworks.NET.dll - - ..\OTAPI.Client.Launcher\bin\x64\Debug\net9.0\client\OTAPI.exe + + ..\OTAPI.Client.Launcher\bin\x64\Debug\net10.0\client\OTAPI.exe - - ..\OTAPI.Client.Launcher\bin\x64\Debug\net9.0\client\OTAPI.Runtime.dll + + ..\OTAPI.Client.Launcher\bin\x64\Debug\net10.0\client\OTAPI.Runtime.dll diff --git a/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj b/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj index cbf3e8d0..279214f2 100644 --- a/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj +++ b/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 true Debug;Release @@ -28,7 +28,7 @@ true - + true diff --git a/build.sh b/build.sh index b21f9452..90cc92f8 100755 --- a/build.sh +++ b/build.sh @@ -1,24 +1,27 @@ dotnet restore OTAPI.Mods.slnf dotnet restore OTAPI.Server.Launcher.slnf dotnet build OTAPI.Mods.slnf -cd OTAPI.Patcher/bin/Debug/net9.0 -dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=p -latest=n --framework net9.0 + +cd OTAPI.Patcher/bin/Debug/net10.0 +dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=p -latest=n --framework net10.0 cd ../../../../ dotnet build OTAPI.Server.Launcher.slnf -cd OTAPI.Server.Launcher/bin/Debug/net9.0 +cd OTAPI.Server.Launcher/bin/Debug/net10.0 dotnet OTAPI.Server.Launcher.dll -test-init cd ../../../../ -cd OTAPI.Patcher/bin/Debug/net9.0 -dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=m -latest=n --framework net9.0 + +cd OTAPI.Patcher/bin/Debug/net10.0 +dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=m -latest=n --framework net10.0 cd ../../../../ dotnet build OTAPI.Server.Launcher.slnf -cd OTAPI.Server.Launcher/bin/Debug/net9.0 +cd OTAPI.Server.Launcher/bin/Debug/net10.0 dotnet OTAPI.Server.Launcher.dll -test-init cd ../../../../ -cd OTAPI.Patcher/bin/Debug/net9.0 -dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=t -latest=n --framework net9.0 + +cd OTAPI.Patcher/bin/Debug/net10.0 +dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=t -latest=n --framework net10.0 cd ../../../../ dotnet build OTAPI.Server.Launcher.slnf -cd OTAPI.Server.Launcher/bin/Debug/net9.0 +cd OTAPI.Server.Launcher/bin/Debug/net10.0 dotnet OTAPI.Server.Launcher.dll -test-init cd ../../../../ \ No newline at end of file diff --git a/examples/RuntimeExample.Client/RuntimeExample.Client.csproj b/examples/RuntimeExample.Client/RuntimeExample.Client.csproj index 676b43ea..d0ce0971 100644 --- a/examples/RuntimeExample.Client/RuntimeExample.Client.csproj +++ b/examples/RuntimeExample.Client/RuntimeExample.Client.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/RuntimeExample.Server/RuntimeExample.Server.csproj b/examples/RuntimeExample.Server/RuntimeExample.Server.csproj index 3ca4e2db..fb133a40 100644 --- a/examples/RuntimeExample.Server/RuntimeExample.Server.csproj +++ b/examples/RuntimeExample.Server/RuntimeExample.Server.csproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 Debug;Release