fix: remove spurious NamespacedResourceStore from TestSkin, fix KiaiHitExplosion null Drawable, fix iOS xcode-select

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/04bea131-bdfb-4c81-8a1a-dbba5215f82e

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>

Author: Copilot

.github/workflows/ci.yml

@@ -284,12 +284,10 @@ jobs:
           # Fix: MacOSX.sdk in Xcode 26.5 is a minimal stub. Replace it with a symlink to the
           # real versioned SDK found across Xcode installs. Real SDKs have hundreds of headers;
           # stubs have ≤1.
-          ACTIVE_XCODE="/Applications/Xcode_26.5.app"
-          sudo xcode-select -switch "$ACTIVE_XCODE"
-          SDKS_DIR="$ACTIVE_XCODE/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs"
-          MACOS_SDK="$SDKS_DIR/MacOSX.sdk"
+          PREFERRED_XCODE="/Applications/Xcode_26.5.app"
           REAL_SDK=""
-          # Search ALL Xcode_26.x.app installs (including active) for versioned MacOSX[N].sdk.
+          REAL_XCODE=""
+          # Search ALL Xcode_26.x.app installs for versioned MacOSX[N].sdk.
           # Validate by usr/include header count: stubs ≤1 file, real SDKs have hundreds.
           for xapp in $(ls -d /Applications/Xcode_26.*.app 2>/dev/null | sort -rV); do
             sdk_dir="$xapp/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs"
@@ -299,6 +297,7 @@ jobs:
               hdr_count=$(ls "$cand/usr/include" 2>/dev/null | wc -l | tr -d ' ')
               if [ "${hdr_count:-0}" -gt 5 ]; then
                 REAL_SDK="$cand"
+                REAL_XCODE="$xapp"
                 break 2
               fi
             done
@@ -314,7 +313,18 @@ jobs:
               fi
             done
           fi
+          # Switch to preferred Xcode if it exists, otherwise the one that has the real SDK.
+          if [ -d "$PREFERRED_XCODE" ]; then
+            sudo xcode-select -switch "$PREFERRED_XCODE"
+          elif [ -n "$REAL_XCODE" ]; then
+            sudo xcode-select -switch "$REAL_XCODE"
+            echo "Note: Xcode_26.5.app not found; using $REAL_XCODE for xcode-select"
+          fi
+          # Replace stub MacOSX.sdk in the active Xcode with a symlink to the real versioned SDK.
           if [ -n "$REAL_SDK" ]; then
+            ACTIVE_DEV="$(xcode-select -p)"
+            ACTIVE_SDKS_DIR="$ACTIVE_DEV/Platforms/MacOSX.platform/Developer/SDKs"
+            MACOS_SDK="$ACTIVE_SDKS_DIR/MacOSX.sdk"
             sudo rm -rf "$MACOS_SDK"
             sudo ln -sfn "$REAL_SDK" "$MACOS_SDK"
             echo "Created MacOSX.sdk symlink -> $REAL_SDK"

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs

@@ -10,7 +10,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -211,11 +210,7 @@ public Colour4 HyperDashFruitColour
             }
 
             public TestSkin()
-                : base(new SkinInfo(), null,
-                    new NamespacedResourceStore<byte[]>(
-                        new DllResourceStore(typeof(TestSceneHyperDashColouring).Assembly),
-                        @"Resources/special-skin"),
-                    string.Empty)
+                : base(new SkinInfo(), null, null, string.Empty)
             {
             }
         }

osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs

@@ -23,9 +23,9 @@ public partial class KiaiHitExplosion : Container
 
         private SkinnableDrawable skinnable = null!;
 
-        public override double LifetimeStart => skinnable.Drawable.LifetimeStart;
+        public override double LifetimeStart => skinnable?.Drawable?.LifetimeStart ?? base.LifetimeStart;
 
-        public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
+        public override double LifetimeEnd => skinnable?.Drawable?.LifetimeEnd ?? base.LifetimeEnd;
 
         public KiaiHitExplosion(DrawableHitObject judgedObject, HitType hitType)
         {