Merge branch 'master' into path-repeated-segment

Author: smoogipoo

.github/workflows/ci.yml

@@ -129,7 +129,7 @@ jobs:
 
   build-only-ios:
     name: Build only (iOS)
-    runs-on: macos-latest
+    runs-on: macos-15
     timeout-minutes: 60
     steps:
       - name: Checkout
@@ -141,7 +141,12 @@ jobs:
           dotnet-version: "8.0.x"
 
       - name: Restore .NET workloads
-        run: dotnet workload install ios --from-rollback-file workloads.json
+        run: dotnet workload install ios
+
+      # https://github.com/dotnet/macios/issues/19157
+      # https://github.com/actions/runner-images/issues/12758
+      - name: Use Xcode 16.4
+        run: sudo xcode-select -switch /Applications/Xcode_16.4.app
 
       - name: Compile
         run: dotnet build -c Debug osu-framework.iOS.slnf

.github/workflows/deploy-pack.yml

@@ -147,7 +147,7 @@ jobs:
 
   pack-ios:
     name: Pack (iOS)
-    runs-on: macos-latest
+    runs-on: macos-15
     environment: production
     defaults:
       run:
@@ -166,7 +166,12 @@ jobs:
           dotnet-version: "8.0.x"
 
       - name: Restore .NET Workloads
-        run: dotnet workload install ios --from-rollback-file workloads.json
+        run: dotnet workload install ios
+
+      # https://github.com/dotnet/macios/issues/19157
+      # https://github.com/actions/runner-images/issues/12758
+      - name: Use Xcode 16.4
+        run: sudo xcode-select -switch /Applications/Xcode_16.4.app
 
       - name: Pack (iOS Framework)
         run: dotnet pack -c Release osu.Framework.iOS /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}}

osu.Framework.Android/AndroidGameSurface.cs

@@ -46,13 +46,13 @@ private void init()
 
         public bool IsSurfaceReady => isSurfaceReady;
 
-        public override void HandlePause()
+        protected override void HandlePause()
         {
             base.HandlePause();
             isSurfaceReady = false;
         }
 
-        public override void HandleResume()
+        protected override void HandleResume()
         {
             base.HandleResume();
             isSurfaceReady = true;

osu.Framework.Android/AndroidGameWindow.cs

@@ -9,7 +9,7 @@ namespace osu.Framework.Android
 {
     internal class AndroidGameWindow : SDL3MobileWindow
     {
-        public override IntPtr SurfaceHandle => AndroidGameActivity.Surface.NativeSurface?.Handle ?? IntPtr.Zero;
+        public override IntPtr SurfaceHandle => AndroidGameActivity.Surface.Holder?.Surface?.Handle ?? IntPtr.Zero;
 
         public AndroidGameWindow(GraphicsSurfaceType surfaceType, string appName)
             : base(surfaceType, appName)