Skip to content

Commit f8f8a13

Browse files
chore: bump framework to 2026.520.3; fix iOS Xcode 26.5; fix Catch hyper-dash colour tests
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/4ce2919b-353e-4a49-9712-a665dd5f72a9 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent 5b3f5c6 commit f8f8a13

5 files changed

Lines changed: 14 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,14 +278,13 @@ jobs:
278278

279279
# https://github.com/dotnet/macios/issues/19157
280280
# https://github.com/actions/runner-images/issues/12758
281-
- name: Use Xcode 26.4
281+
- name: Use Xcode 26.5
282282
run: |
283-
# Pin to Xcode 26.4 — the .NET iOS workload (net10.0_26.4) requires exactly Xcode 26.4.
284-
# Using Xcode 26.5 causes a hard build failure: "requires Xcode 26.4, current is 26.5".
285-
# Fix: MacOSX.sdk in Xcode 26.4 is a minimal stub. Replace it with a symlink to the
283+
# Pin to Xcode 26.5 — the .NET iOS workload (net10.0_26.5) requires exactly Xcode 26.5.
284+
# Fix: MacOSX.sdk in Xcode 26.5 is a minimal stub. Replace it with a symlink to the
286285
# real versioned SDK found across Xcode installs. Real SDKs have hundreds of headers;
287286
# stubs have ≤1.
288-
ACTIVE_XCODE="/Applications/Xcode_26.4.app"
287+
ACTIVE_XCODE="/Applications/Xcode_26.5.app"
289288
sudo xcode-select -switch "$ACTIVE_XCODE"
290289
SDKS_DIR="$ACTIVE_XCODE/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs"
291290
MACOS_SDK="$SDKS_DIR/MacOSX.sdk"

osu.Android.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</PropertyGroup>
5353

5454
<ItemGroup>
55-
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.520.1" />
55+
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.520.3" />
5656
<!-- `ppy.osu.Framework.NativeLibs` is a transitive dependency of `ppy.osu.Framework`
5757
that ships desktop-only natives (Linux/macOS/Windows) under `runtimes/<rid>/native/`
5858
— including a bare Linux `libbass.so`/`libbass_fx.so`/`libbassmix.so` for linux-arm64.

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using osu.Framework.Graphics;
1111
using osu.Framework.Graphics.Containers;
1212
using osu.Framework.Graphics.Sprites;
13+
using osu.Framework.IO.Stores;
1314
using osu.Framework.Testing;
1415
using osu.Game.Beatmaps;
1516
using osu.Game.Beatmaps.ControlPoints;
@@ -210,7 +211,11 @@ public Colour4 HyperDashFruitColour
210211
}
211212

212213
public TestSkin()
213-
: base(new SkinInfo(), null, null, string.Empty)
214+
: base(new SkinInfo(), null,
215+
new NamespacedResourceStore<byte[]>(
216+
new DllResourceStore(typeof(TestSceneHyperDashColouring).Assembly),
217+
@"Resources/special-skin"),
218+
string.Empty)
214219
{
215220
}
216221
}

osu.Game/osu.Game.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
</PackageReference>
4040
<PackageReference Include="Realm" Version="20.1.0" />
41-
<PackageReference Include="ppy.osu.Framework" Version="2026.520.1" />
41+
<PackageReference Include="ppy.osu.Framework" Version="2026.520.3" />
4242
<!--
4343
Explicitly pin `ppy.Veldrid.SPIRV` to the winnerspiros fork build that
44-
`ppy.osu.Framework 2026.520.1` was compiled against. This version is the only
44+
`ppy.osu.Framework 2026.520.3` was compiled against. This version is the only
4545
one whose `runtimes/android-arm64/native/libveldrid-spirv.so` is aligned to 16 KB
4646
pages (required by Android 16+). It lives only as a release asset on
4747
<https://github.com/winnerspiros/veldrid-spirv/releases/tag/1.0> and is vendored

osu.iOS.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<PackageReference Include="ppy.osu.Framework.iOS" Version="2026.520.1" />
36+
<PackageReference Include="ppy.osu.Framework.iOS" Version="2026.520.3" />
3737
</ItemGroup>
3838
</Project>

0 commit comments

Comments
 (0)