From 2c9e7a6d7c300922b902b1a2987c71cb8908a52b Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Thu, 1 Feb 2024 21:56:22 +0900 Subject: [PATCH 01/10] Upgrade to .NET 8 SDK --- SampleGame.Android/SampleGame.Android.csproj | 2 +- SampleGame.Desktop/SampleGame.Desktop.csproj | 2 +- SampleGame.iOS/SampleGame.iOS.csproj | 2 +- SampleGame/SampleGame.csproj | 2 +- global.json | 8 ++++---- osu.Framework.Android/osu.Framework.Android.csproj | 2 +- osu.Framework.Benchmarks/osu.Framework.Benchmarks.csproj | 2 +- osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj | 2 +- .../osu.Framework.SourceGeneration.Tests.csproj | 2 +- osu.Framework.Templates/osu.Framework.Templates.csproj | 2 +- .../TemplateGame.Desktop/TemplateGame.Desktop.csproj | 2 +- .../TemplateGame.Game.Tests.csproj | 2 +- .../TemplateGame.Game/TemplateGame.Game.csproj | 2 +- .../TemplateGame.Resources/TemplateGame.Resources.csproj | 2 +- .../TemplateGame.iOS/TemplateGame.iOS.csproj | 2 +- .../FlappyDon.Desktop/FlappyDon.Desktop.csproj | 2 +- .../FlappyDon.Game.Tests/FlappyDon.Game.Tests.csproj | 2 +- .../template-flappy/FlappyDon.Game/FlappyDon.Game.csproj | 2 +- .../FlappyDon.Resources/FlappyDon.Resources.csproj | 2 +- .../template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj | 2 +- .../osu.Framework.Tests.Android.csproj | 2 +- osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj | 2 +- osu.Framework.Tests/osu.Framework.Tests.csproj | 2 +- osu.Framework.iOS/osu.Framework.iOS.csproj | 2 +- osu.Framework/osu.Framework.csproj | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/SampleGame.Android/SampleGame.Android.csproj b/SampleGame.Android/SampleGame.Android.csproj index 2562ffd9d0..ab0f71c358 100644 --- a/SampleGame.Android/SampleGame.Android.csproj +++ b/SampleGame.Android/SampleGame.Android.csproj @@ -1,7 +1,7 @@  - net6.0-android + net8.0-android Exe SampleGame.Android SampleGame.Android diff --git a/SampleGame.Desktop/SampleGame.Desktop.csproj b/SampleGame.Desktop/SampleGame.Desktop.csproj index 7881e7b82d..7ddb6db1a2 100644 --- a/SampleGame.Desktop/SampleGame.Desktop.csproj +++ b/SampleGame.Desktop/SampleGame.Desktop.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 WinExe diff --git a/SampleGame.iOS/SampleGame.iOS.csproj b/SampleGame.iOS/SampleGame.iOS.csproj index a1bcaa4619..8048e4f2ba 100644 --- a/SampleGame.iOS/SampleGame.iOS.csproj +++ b/SampleGame.iOS/SampleGame.iOS.csproj @@ -1,7 +1,7 @@  Exe - net6.0-ios + net8.0-ios 13.4 diff --git a/SampleGame/SampleGame.csproj b/SampleGame/SampleGame.csproj index 423a124a7e..d3d384f9c7 100644 --- a/SampleGame/SampleGame.csproj +++ b/SampleGame/SampleGame.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/global.json b/global.json index 5dcd5f425a..da113e4cbd 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "6.0.100", - "rollForward": "latestFeature" + "version": "8.0.0", + "rollForward": "latestFeature", + "allowPrerelease": false } -} - +} \ No newline at end of file diff --git a/osu.Framework.Android/osu.Framework.Android.csproj b/osu.Framework.Android/osu.Framework.Android.csproj index 7457146e36..402993632f 100644 --- a/osu.Framework.Android/osu.Framework.Android.csproj +++ b/osu.Framework.Android/osu.Framework.Android.csproj @@ -1,6 +1,6 @@  - net6.0-android + net8.0-android 21.0 Library true diff --git a/osu.Framework.Benchmarks/osu.Framework.Benchmarks.csproj b/osu.Framework.Benchmarks/osu.Framework.Benchmarks.csproj index 5de346abd4..d57bbc2401 100644 --- a/osu.Framework.Benchmarks/osu.Framework.Benchmarks.csproj +++ b/osu.Framework.Benchmarks/osu.Framework.Benchmarks.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe false diff --git a/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj b/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj index 30eafe42b2..60a90fac55 100644 --- a/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj +++ b/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 Library osu!framework Libraries osu.Framework.NativeLibs diff --git a/osu.Framework.SourceGeneration.Tests/osu.Framework.SourceGeneration.Tests.csproj b/osu.Framework.SourceGeneration.Tests/osu.Framework.SourceGeneration.Tests.csproj index 113a17463b..80822f343b 100644 --- a/osu.Framework.SourceGeneration.Tests/osu.Framework.SourceGeneration.Tests.csproj +++ b/osu.Framework.SourceGeneration.Tests/osu.Framework.SourceGeneration.Tests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 diff --git a/osu.Framework.Templates/osu.Framework.Templates.csproj b/osu.Framework.Templates/osu.Framework.Templates.csproj index 16374258bc..2bf5b6c6af 100644 --- a/osu.Framework.Templates/osu.Framework.Templates.csproj +++ b/osu.Framework.Templates/osu.Framework.Templates.csproj @@ -5,7 +5,7 @@ osu! framework templates Templates that can be used as starting points for new games, built with of osu! framework. dotnet-new;templates;osu;framework - net6.0 + net8.0 true false content diff --git a/osu.Framework.Templates/templates/template-empty/TemplateGame.Desktop/TemplateGame.Desktop.csproj b/osu.Framework.Templates/templates/template-empty/TemplateGame.Desktop/TemplateGame.Desktop.csproj index 712149e3f0..c9c5471a47 100644 --- a/osu.Framework.Templates/templates/template-empty/TemplateGame.Desktop/TemplateGame.Desktop.csproj +++ b/osu.Framework.Templates/templates/template-empty/TemplateGame.Desktop/TemplateGame.Desktop.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 WinExe TemplateGame game.ico diff --git a/osu.Framework.Templates/templates/template-empty/TemplateGame.Game.Tests/TemplateGame.Game.Tests.csproj b/osu.Framework.Templates/templates/template-empty/TemplateGame.Game.Tests/TemplateGame.Game.Tests.csproj index dc05f72bb3..ed71b6365d 100644 --- a/osu.Framework.Templates/templates/template-empty/TemplateGame.Game.Tests/TemplateGame.Game.Tests.csproj +++ b/osu.Framework.Templates/templates/template-empty/TemplateGame.Game.Tests/TemplateGame.Game.Tests.csproj @@ -1,7 +1,7 @@  WinExe - net6.0 + net8.0 false diff --git a/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGame.Game.csproj b/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGame.Game.csproj index 483e947fef..31dd2699f0 100644 --- a/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGame.Game.csproj +++ b/osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGame.Game.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/osu.Framework.Templates/templates/template-empty/TemplateGame.Resources/TemplateGame.Resources.csproj b/osu.Framework.Templates/templates/template-empty/TemplateGame.Resources/TemplateGame.Resources.csproj index 12d1268ea5..cbe37760e8 100644 --- a/osu.Framework.Templates/templates/template-empty/TemplateGame.Resources/TemplateGame.Resources.csproj +++ b/osu.Framework.Templates/templates/template-empty/TemplateGame.Resources/TemplateGame.Resources.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 diff --git a/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj b/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj index 7a9a4298fa..2cca8636a2 100644 --- a/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj +++ b/osu.Framework.Templates/templates/template-empty/TemplateGame.iOS/TemplateGame.iOS.csproj @@ -1,7 +1,7 @@  Exe - net6.0-ios + net8.0-ios 13.4 iPhone Developer true diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Desktop/FlappyDon.Desktop.csproj b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Desktop/FlappyDon.Desktop.csproj index c3a28513f5..d45fb64239 100644 --- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Desktop/FlappyDon.Desktop.csproj +++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Desktop/FlappyDon.Desktop.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 WinExe FlappyDon game.ico diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game.Tests/FlappyDon.Game.Tests.csproj b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game.Tests/FlappyDon.Game.Tests.csproj index cf94079149..a64227e2c0 100644 --- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game.Tests/FlappyDon.Game.Tests.csproj +++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game.Tests/FlappyDon.Game.Tests.csproj @@ -1,7 +1,7 @@  WinExe - net6.0 + net8.0 false diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDon.Game.csproj b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDon.Game.csproj index 4f82d5f67f..38222c9881 100644 --- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDon.Game.csproj +++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDon.Game.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Resources/FlappyDon.Resources.csproj b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Resources/FlappyDon.Resources.csproj index 3c455c3d1a..a4125eccbf 100644 --- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.Resources/FlappyDon.Resources.csproj +++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.Resources/FlappyDon.Resources.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 diff --git a/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj b/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj index 9f55b0b6a2..a53d5b0248 100644 --- a/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj +++ b/osu.Framework.Templates/templates/template-flappy/FlappyDon.iOS/FlappyDon.iOS.csproj @@ -1,7 +1,7 @@  Exe - net6.0-ios + net8.0-ios 13.4 iPhone Developer true diff --git a/osu.Framework.Tests.Android/osu.Framework.Tests.Android.csproj b/osu.Framework.Tests.Android/osu.Framework.Tests.Android.csproj index c888c13927..d8837c0727 100644 --- a/osu.Framework.Tests.Android/osu.Framework.Tests.Android.csproj +++ b/osu.Framework.Tests.Android/osu.Framework.Tests.Android.csproj @@ -1,7 +1,7 @@  - net6.0-android + net8.0-android Exe osu.Framework.Tests.Android osu.Framework.Tests.Android diff --git a/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj b/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj index 7c4b258c80..49ad31c953 100644 --- a/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj +++ b/osu.Framework.Tests.iOS/osu.Framework.Tests.iOS.csproj @@ -1,7 +1,7 @@  Exe - net6.0-ios + net8.0-ios 13.4 osu.Framework.Tests osu.Framework.Tests diff --git a/osu.Framework.Tests/osu.Framework.Tests.csproj b/osu.Framework.Tests/osu.Framework.Tests.csproj index 5739b75490..3f9b9cc588 100644 --- a/osu.Framework.Tests/osu.Framework.Tests.csproj +++ b/osu.Framework.Tests/osu.Framework.Tests.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 WinExe diff --git a/osu.Framework.iOS/osu.Framework.iOS.csproj b/osu.Framework.iOS/osu.Framework.iOS.csproj index d127e61c22..a7d74a034c 100644 --- a/osu.Framework.iOS/osu.Framework.iOS.csproj +++ b/osu.Framework.iOS/osu.Framework.iOS.csproj @@ -1,6 +1,6 @@  - net6.0-ios + net8.0-ios 13.4 Library true diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj index e7f2d5929b..7f07c4edbd 100644 --- a/osu.Framework/osu.Framework.csproj +++ b/osu.Framework/osu.Framework.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 Library true osu!framework From 6e3ecd6765f56d2fe9b9ebf2ca4bbaef3a1a47b7 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Thu, 1 Feb 2024 22:17:45 +0900 Subject: [PATCH 02/10] Upgrade to C# 12 --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0cca5b6ca3..099fabfcb1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@  - 10.0 + 12.0 true enable From b7213e35b163fdbf32c9c064eb41d0fef37bd766 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Thu, 1 Feb 2024 22:18:13 +0900 Subject: [PATCH 03/10] Adjust CI workflows --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/deploy-nativelibs.yml | 4 ++-- .github/workflows/deploy-pack.yml | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 333e560d13..eb66bc9c1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install .NET 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Restore Tools run: dotnet tool restore @@ -69,10 +69,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install .NET 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Setup Go uses: actions/setup-go@v3 @@ -114,10 +114,10 @@ jobs: distribution: microsoft java-version: 11 - - name: Install .NET 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Restore .NET workloads run: dotnet workload install android @@ -133,10 +133,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install .NET 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Restore .NET workloads # `dotnet workload restore` is bugged in .NET 7.0.101+ when restoring iOS projects, diff --git a/.github/workflows/deploy-nativelibs.yml b/.github/workflows/deploy-nativelibs.yml index b037de3a7d..9e7904bd43 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 6.0.x + - name: Setup .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.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 d6d8eec8fd..1a0e72a3e1 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 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.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 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.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 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Setup JDK 11 uses: actions/setup-java@v3 @@ -160,10 +160,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" - - name: Install .NET 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v3 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Restore .NET Workloads # `dotnet workload restore` is bugged in .NET 7.0.101+ when restoring iOS projects, From a03a17165656567e5ed159e9547d65d64f5c9ca4 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Fri, 2 Feb 2024 01:01:37 +0900 Subject: [PATCH 04/10] Remove System.Drawing.Common PackageReference --- osu.Framework.iOS.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/osu.Framework.iOS.props b/osu.Framework.iOS.props index 5ce2a00048..d80894430a 100644 --- a/osu.Framework.iOS.props +++ b/osu.Framework.iOS.props @@ -21,10 +21,6 @@ iossimulator-x64 - - - - From 6d35b7c61959c37fa7ff420ad735a521524a27cd Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Fri, 2 Feb 2024 01:21:13 +0900 Subject: [PATCH 05/10] Remove Appveyor config --- appveyor.yml | 7 ----- appveyor_deploy.yml | 62 -------------------------------------- appveyor_native_deploy.yml | 7 ----- 3 files changed, 76 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 appveyor_deploy.yml delete mode 100644 appveyor_native_deploy.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index b8ece6dd35..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,7 +0,0 @@ -clone_depth: 1 -skip_tags: true -version: '{build}' -image: Visual Studio 2022 -test: off -build_script: - - cmd: PowerShell -Version 2.0 .\build.ps1 diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml deleted file mode 100644 index 701e8156d9..0000000000 --- a/appveyor_deploy.yml +++ /dev/null @@ -1,62 +0,0 @@ -clone_depth: 1 -version: '{build}' -test: off -skip_non_tags: true - -environment: - matrix: - - job_name: framework-desktop - job_group: framework-base - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - - job_name: framework-xamarin - job_group: framework-base - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - - job_name: templates - job_depends_on: framework-base - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - -nuget: - project_feed: true - -for: - - - matrix: - only: - - job_name: framework-desktop - build_script: - - cmd: PowerShell -Version 2.0 .\build.ps1 -Target DeployFrameworkDesktop - - - matrix: - only: - - job_name: framework-xamarin - build_script: - - cmd: PowerShell -Version 2.0 .\build.ps1 -Target DeployFrameworkXamarin - - - matrix: - only: - - job_name: templates - build_script: - - cmd: dotnet remove osu.Framework.Templates\templates\template-empty\TemplateGame.Game\TemplateGame.Game.csproj reference osu.Framework\osu.Framework.csproj - - cmd: dotnet remove osu.Framework.Templates\templates\template-empty\TemplateGame.iOS\TemplateGame.iOS.csproj reference osu.Framework\osu.Framework.csproj - - cmd: dotnet remove osu.Framework.Templates\templates\template-empty\TemplateGame.iOS\TemplateGame.iOS.csproj reference osu.Framework.iOS\osu.Framework.iOS.csproj - - cmd: dotnet remove osu.Framework.Templates\templates\template-flappy\FlappyDon.Game\FlappyDon.Game.csproj reference osu.Framework\osu.Framework.csproj - - cmd: dotnet remove osu.Framework.Templates\templates\template-flappy\FlappyDon.iOS\FlappyDon.iOS.csproj reference osu.Framework\osu.Framework.csproj - - cmd: dotnet remove osu.Framework.Templates\templates\template-flappy\FlappyDon.iOS\FlappyDon.iOS.csproj reference osu.Framework.iOS\osu.Framework.iOS.csproj - - cmd: dotnet add osu.Framework.Templates\templates\template-empty\TemplateGame.Game\TemplateGame.Game.csproj package ppy.osu.Framework -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add osu.Framework.Templates\templates\template-empty\TemplateGame.iOS\TemplateGame.iOS.csproj package ppy.osu.Framework -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add osu.Framework.Templates\templates\template-empty\TemplateGame.iOS\TemplateGame.iOS.csproj package ppy.osu.Framework.iOS -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add osu.Framework.Templates\templates\template-empty\FlappyDon.Game\FlappyDon.Game.csproj package ppy.osu.Framework -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add osu.Framework.Templates\templates\template-empty\FlappyDon.iOS\FlappyDon.iOS.csproj package ppy.osu.Framework -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add osu.Framework.Templates\templates\template-empty\FlappyDon.iOS\FlappyDon.iOS.csproj package ppy.osu.Framework.iOS -v %APPVEYOR_REPO_TAG_NAME% - - # Can't remove framework props import in template iOS projects. String-replacement happens inside build.cake instead. - - - cmd: PowerShell -Version 2.0 .\build.ps1 -Target DeployFrameworkTemplates - -deploy: - - provider: Environment - name: nuget - skip_symbols: false - artifact: /.*(\.|\.s)nupkg/ - - provider: Environment - name: github diff --git a/appveyor_native_deploy.yml b/appveyor_native_deploy.yml deleted file mode 100644 index b789d69201..0000000000 --- a/appveyor_native_deploy.yml +++ /dev/null @@ -1,7 +0,0 @@ -clone_depth: 1 -version: '{build}' -image: Visual Studio 2022 -test: off -skip_non_tags: true -build_script: - - cmd: PowerShell -Version 2.0 .\build.ps1 -Target DeployNativeLibs From 3c8a3bb2a41d44cbe555a245381b7bb1a0fccb34 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Fri, 2 Feb 2024 01:24:48 +0900 Subject: [PATCH 06/10] Fix redundant casts --- osu.Framework/Graphics/OpenGL/Buffers/GLVertexBuffer.cs | 2 +- osu.Framework/Graphics/OpenGL/GLRenderer.cs | 2 +- osu.Framework/Platform/Windows/WindowsWindow.cs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Framework/Graphics/OpenGL/Buffers/GLVertexBuffer.cs b/osu.Framework/Graphics/OpenGL/Buffers/GLVertexBuffer.cs index ad83db295a..524f925252 100644 --- a/osu.Framework/Graphics/OpenGL/Buffers/GLVertexBuffer.cs +++ b/osu.Framework/Graphics/OpenGL/Buffers/GLVertexBuffer.cs @@ -143,7 +143,7 @@ public void UpdateRange(int startIndex, int endIndex) int countVertices = endIndex - startIndex; GL.BindBuffer(BufferTarget.ArrayBuffer, vboId); - GL.BufferSubData(BufferTarget.ArrayBuffer, (IntPtr)(startIndex * STRIDE), (IntPtr)(countVertices * STRIDE), ref getMemory().Span[startIndex]); + GL.BufferSubData(BufferTarget.ArrayBuffer, startIndex * STRIDE, (IntPtr)(countVertices * STRIDE), ref getMemory().Span[startIndex]); FrameStatistics.Add(StatisticsCounterType.VerticesUpl, countVertices); } diff --git a/osu.Framework/Graphics/OpenGL/GLRenderer.cs b/osu.Framework/Graphics/OpenGL/GLRenderer.cs index f864712d88..73271068fa 100644 --- a/osu.Framework/Graphics/OpenGL/GLRenderer.cs +++ b/osu.Framework/Graphics/OpenGL/GLRenderer.cs @@ -308,7 +308,7 @@ public void DrawVertices(PrimitiveType type, int vertexStart, int verticesCount) } } - GL.DrawElements(type, verticesCount, DrawElementsType.UnsignedShort, (IntPtr)(vertexStart * sizeof(ushort))); + GL.DrawElements(type, verticesCount, DrawElementsType.UnsignedShort, vertexStart * sizeof(ushort)); } protected override void SetScissorStateImplementation(bool enabled) diff --git a/osu.Framework/Platform/Windows/WindowsWindow.cs b/osu.Framework/Platform/Windows/WindowsWindow.cs index 49c83a45b8..72041de6d2 100644 --- a/osu.Framework/Platform/Windows/WindowsWindow.cs +++ b/osu.Framework/Platform/Windows/WindowsWindow.cs @@ -298,14 +298,14 @@ internal override void SetIconFromGroup(IconGroup iconGroup) smallIcon = iconGroup.CreateIcon(small_icon_size, small_icon_size); largeIcon = iconGroup.CreateIcon(large_icon_size, large_icon_size); - var windowHandle = WindowHandle; + IntPtr windowHandle = WindowHandle; if (windowHandle == IntPtr.Zero || largeIcon == null || smallIcon == null) base.SetIconFromGroup(iconGroup); else { - SendMessage(windowHandle, seticon_message, (IntPtr)icon_small, smallIcon.Handle); - SendMessage(windowHandle, seticon_message, (IntPtr)icon_big, largeIcon.Handle); + SendMessage(windowHandle, seticon_message, icon_small, smallIcon.Handle); + SendMessage(windowHandle, seticon_message, icon_big, largeIcon.Handle); } } From b2d6f135d1c9b51f44fb2d49ad7878fcb2a13b4a Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Fri, 2 Feb 2024 01:43:22 +0900 Subject: [PATCH 07/10] Fix more compiler warnings/errors --- Directory.Build.props | 4 ++++ .../templates/template-empty/Directory.Build.props | 4 ++++ .../templates/template-flappy/Directory.Build.props | 4 ++++ osu.Framework/Extensions/OSPlatformExtensions.cs | 4 ++-- osu.Framework/Graphics/Veldrid/Batches/VeldridVertexBatch.cs | 2 +- osu.Framework/Graphics/Veldrid/Shaders/VeldridShaderPart.cs | 4 ++-- osu.Framework/Utils/PathApproximator.cs | 4 ++-- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 099fabfcb1..fb2120b7ad 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,6 +5,10 @@ true enable + + true + $(NoWarn);CS1591 + osu-framework.licenseheader diff --git a/osu.Framework.Templates/templates/template-empty/Directory.Build.props b/osu.Framework.Templates/templates/template-empty/Directory.Build.props index 8824b1f46e..74d05ff690 100644 --- a/osu.Framework.Templates/templates/template-empty/Directory.Build.props +++ b/osu.Framework.Templates/templates/template-empty/Directory.Build.props @@ -3,4 +3,8 @@ $(MSBuildThisFileDirectory)app.manifest + + true + $(NoWarn);CS1591 + diff --git a/osu.Framework.Templates/templates/template-flappy/Directory.Build.props b/osu.Framework.Templates/templates/template-flappy/Directory.Build.props index 8824b1f46e..74d05ff690 100644 --- a/osu.Framework.Templates/templates/template-flappy/Directory.Build.props +++ b/osu.Framework.Templates/templates/template-flappy/Directory.Build.props @@ -3,4 +3,8 @@ $(MSBuildThisFileDirectory)app.manifest + + true + $(NoWarn);CS1591 + diff --git a/osu.Framework/Extensions/OSPlatformExtensions.cs b/osu.Framework/Extensions/OSPlatformExtensions.cs index 277e619bc5..f9b4370453 100644 --- a/osu.Framework/Extensions/OSPlatformExtensions.cs +++ b/osu.Framework/Extensions/OSPlatformExtensions.cs @@ -12,7 +12,7 @@ public static class OSPlatformExtensions { /// /// Checks whether this is supported on the current runtime platform as specified by - /// and . + /// [SupportedOSPlatform] and [UnsupportedOSPlatform]. /// /// The to check the attributes of. /// true if this is supported, false otherwise. @@ -34,7 +34,7 @@ public static bool IsSupportedOnCurrentOSPlatform(this MemberInfo member) } /// - /// Returns whether the provided matches the current (runtime) platform. + /// Returns whether the provided [OSPlatformAttribute] matches the current (runtime) platform. /// /// This is currently a naive check which doesn't support specific OS versions. private static bool matchesCurrentPlatform(OSPlatformAttribute attribute) diff --git a/osu.Framework/Graphics/Veldrid/Batches/VeldridVertexBatch.cs b/osu.Framework/Graphics/Veldrid/Batches/VeldridVertexBatch.cs index c8f499f746..778b9a2ba7 100644 --- a/osu.Framework/Graphics/Veldrid/Batches/VeldridVertexBatch.cs +++ b/osu.Framework/Graphics/Veldrid/Batches/VeldridVertexBatch.cs @@ -19,7 +19,7 @@ internal abstract class VeldridVertexBatch : IVertexBatch /// Most documentation recommends that three buffers are used to avoid contention. /// /// We already have a triple buffer (see ) governing draw nodes. - /// In theory we could set this to two, but there's also a global usage of a vertex batch in (see ). + /// In theory we could set this to two, but there's also a global usage of a vertex batch in (see ). /// /// So this is for now an unfortunate memory overhead. Further work could be done to provide /// these in a way they were not created per draw-node, reducing buffer overhead from 9 to 3. diff --git a/osu.Framework/Graphics/Veldrid/Shaders/VeldridShaderPart.cs b/osu.Framework/Graphics/Veldrid/Shaders/VeldridShaderPart.cs index 6cabf12ee3..2c61e7aeb3 100644 --- a/osu.Framework/Graphics/Veldrid/Shaders/VeldridShaderPart.cs +++ b/osu.Framework/Graphics/Veldrid/Shaders/VeldridShaderPart.cs @@ -142,7 +142,7 @@ private string loadFile(byte[]? bytes, bool mainFile) } /// - /// Creates a based off this shader with a list of attributes passed through as input & output. + /// Creates a based off this shader with a list of attributes passed through as input & output. /// Attributes from the list that are already defined in this shader will be ignored. /// /// @@ -154,7 +154,7 @@ private string loadFile(byte[]? bytes, bool mainFile) /// This creates a new rather than altering this existing instance since this is cached at a level and should remain immutable. /// /// - /// The list of attributes to include in the shader as input & output. + /// The list of attributes to include in the shader as input & output. public VeldridShaderPart WithPassthroughInput(IReadOnlyList attributes) { string result = code; diff --git a/osu.Framework/Utils/PathApproximator.cs b/osu.Framework/Utils/PathApproximator.cs index 21a2cfdfdb..1609ff6f12 100644 --- a/osu.Framework/Utils/PathApproximator.cs +++ b/osu.Framework/Utils/PathApproximator.cs @@ -308,7 +308,7 @@ public static List LagrangePolynomialToPiecewiseLinear(ReadOnlySpanThe rate of optimization. Larger values converge faster but can be unstable. /// The B1 parameter for the Adam optimizer. Between 0 and 1. /// The B2 parameter for the Adam optimizer. Between 0 and 1. - /// The initial bezier control points to use before optimization. The length of this list should be equal to . + /// The initial bezier control points to use before optimization. The length of this list should be equal to . /// Mask determining which control point positions are fixed and cannot be changed by the optimiser. /// A List of vectors representing the bezier control points. public static List PiecewiseLinearToBezier(ReadOnlySpan inputPath, @@ -337,7 +337,7 @@ public static List LagrangePolynomialToPiecewiseLinear(ReadOnlySpanThe rate of optimization. Larger values converge faster but can be unstable. /// The B1 parameter for the Adam optimizer. Between 0 and 1. /// The B2 parameter for the Adam optimizer. Between 0 and 1. - /// The initial B-spline control points to use before optimization. The length of this list should be equal to . + /// The initial B-spline control points to use before optimization. The length of this list should be equal to . /// Mask determining which control point positions are fixed and cannot be changed by the optimiser. /// A List of vectors representing the B-spline control points. public static List PiecewiseLinearToBSpline(ReadOnlySpan inputPath, From 9fd0c9725d10b9af46e2075ffe1065ba52e8e1be Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Fri, 2 Feb 2024 19:10:27 +0900 Subject: [PATCH 08/10] Fix CI inspection --- osu.Framework.Tests/IO/TestWebRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Framework.Tests/IO/TestWebRequest.cs b/osu.Framework.Tests/IO/TestWebRequest.cs index 0ca699676d..263fa788de 100644 --- a/osu.Framework.Tests/IO/TestWebRequest.cs +++ b/osu.Framework.Tests/IO/TestWebRequest.cs @@ -416,7 +416,7 @@ public async Task TestCancelRequest() bool hasThrown = false; request.Failed += exception => hasThrown = exception != null; - cancellationSource.Cancel(); + await cancellationSource.CancelAsync().ConfigureAwait(false); await request.PerformAsync(cancellationSource.Token).ConfigureAwait(false); Assert.IsTrue(request.Completed); From c63f042e9ef4de02079e4083f6366889c64de2c2 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Sun, 4 Feb 2024 17:32:49 +0900 Subject: [PATCH 09/10] Increase Android SDK target version --- SampleGame.Android/AndroidManifest.xml | 2 +- osu.Framework.Tests.Android/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SampleGame.Android/AndroidManifest.xml b/SampleGame.Android/AndroidManifest.xml index 4b48759573..b99f1e5588 100644 --- a/SampleGame.Android/AndroidManifest.xml +++ b/SampleGame.Android/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/osu.Framework.Tests.Android/AndroidManifest.xml b/osu.Framework.Tests.Android/AndroidManifest.xml index 97126835c1..0fbd41c388 100644 --- a/osu.Framework.Tests.Android/AndroidManifest.xml +++ b/osu.Framework.Tests.Android/AndroidManifest.xml @@ -1,6 +1,6 @@  - + From cb38fe99c7e2552644b78180ad97450fba07ea5c Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Mon, 5 Feb 2024 18:01:44 +0900 Subject: [PATCH 10/10] Update global.json version --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index da113e4cbd..789bff3bd0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.0", + "version": "8.0.100", "rollForward": "latestFeature", "allowPrerelease": false }