From 3dbce2acaa7141bde7056b99d02f0cc42979d774 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Mon, 8 Jun 2026 19:46:14 +0900 Subject: [PATCH 1/6] Upgrade to .NET 10 --- .github/workflows/ci.yml | 16 +++++++-------- .github/workflows/deploy-nativelibs.yml | 4 ++-- .github/workflows/deploy-pack.yml | 16 +++++++-------- .../.idea/runConfigurations/Benchmarks.xml | 6 +++--- .../.idea/runConfigurations/SampleGame.xml | 6 +++--- .../.idea/runConfigurations/VisualTests.xml | 6 +++--- .vscode/launch.json | 20 +++++++++---------- SampleGame.Android/SampleGame.Android.csproj | 2 +- SampleGame.Desktop/SampleGame.Desktop.csproj | 2 +- SampleGame.iOS/SampleGame.iOS.csproj | 2 +- SampleGame/SampleGame.csproj | 2 +- global.json | 4 ++-- .../osu.Framework.Android.csproj | 2 +- .../osu.Framework.Benchmarks.csproj | 2 +- .../osu.Framework.NativeLibs.csproj | 2 +- ...su.Framework.SourceGeneration.Tests.csproj | 2 +- .../osu.Framework.Templates.csproj | 2 +- .../TemplateGame_Desktop.xml | 6 +++--- .../runConfigurations/TemplateGame_Tests.xml | 6 +++--- .../template-empty/.vscode/launch.json | 16 +++++++-------- .../TemplateGame.Desktop.csproj | 2 +- .../TemplateGame.Game.Tests.csproj | 2 +- .../TemplateGame.Game.csproj | 2 +- .../TemplateGame.Resources.csproj | 2 +- .../TemplateGame.iOS/TemplateGame.iOS.csproj | 2 +- .../runConfigurations/FlappyDon_Desktop.xml | 6 +++--- .../runConfigurations/FlappyDon_Tests.xml | 6 +++--- .../template-flappy/.vscode/launch.json | 16 +++++++-------- .../FlappyDon.Desktop.csproj | 2 +- .../FlappyDon.Game.Tests.csproj | 2 +- .../FlappyDon.Game/FlappyDon.Game.csproj | 2 +- .../FlappyDon.Resources.csproj | 2 +- .../FlappyDon.iOS/FlappyDon.iOS.csproj | 2 +- .../osu.Framework.Tests.Android.csproj | 2 +- .../osu.Framework.Tests.iOS.csproj | 2 +- .../osu.Framework.Tests.csproj | 2 +- osu.Framework.iOS/osu.Framework.iOS.csproj | 2 +- osu.Framework/osu.Framework.csproj | 2 +- 38 files changed, 91 insertions(+), 91 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08660f8cde..bc1ecbc9e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,10 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore Tools run: dotnet tool restore @@ -78,10 +78,10 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Setup Go uses: actions/setup-go@v6 @@ -125,10 +125,10 @@ jobs: distribution: microsoft java-version: 11 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore .NET workloads run: dotnet workload install android @@ -144,10 +144,10 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore .NET workloads run: dotnet workload install ios diff --git a/.github/workflows/deploy-nativelibs.yml b/.github/workflows/deploy-nativelibs.yml index 7666bc1f1c..90edca2dee 100644 --- a/.github/workflows/deploy-nativelibs.yml +++ b/.github/workflows/deploy-nativelibs.yml @@ -46,10 +46,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" - - name: Setup .NET 8.0.x + - name: Setup .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Build NativeLibs run: dotnet pack -c Release osu.Framework.NativeLibs /p:Configuration=Release /p:Version=${{needs.check-if-tag.outputs.version}} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}} diff --git a/.github/workflows/deploy-pack.yml b/.github/workflows/deploy-pack.yml index e18aaf1959..3060b5a88d 100644 --- a/.github/workflows/deploy-pack.yml +++ b/.github/workflows/deploy-pack.yml @@ -53,10 +53,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}\artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Pack (Framework) run: dotnet pack -c Release osu.Framework /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg -o ${{steps.artifactsPath.outputs.nuget_artifacts}} @@ -84,10 +84,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Replace project references run: osu.Framework.Templates/replace-references.sh ${{ github.ref_name }} @@ -119,10 +119,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}\artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Setup JDK 11 uses: actions/setup-java@v5 @@ -160,10 +160,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore .NET Workloads run: dotnet workload install ios diff --git a/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml b/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml index 11482fa08b..3bebf90f1f 100644 --- a/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml +++ b/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml @@ -1,8 +1,8 @@ -