Skip to content

Commit cc92346

Browse files
authored
fix: suppress ILLink trim warnings in osu.Game/osu.Desktop and fix iOS runner for Xcode 26
1 parent e983ae8 commit cc92346

4 files changed

Lines changed: 10 additions & 3 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ jobs:
564564
name: Build iOS
565565
needs: prepare
566566
if: needs.prepare.outputs.build_ios == 'true'
567-
runs-on: macos-latest
567+
runs-on: macos-26
568568
timeout-minutes: 60
569569
permissions:
570570
contents: write

osu.Desktop/Windows/GameplayWinKeyBlocker.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ private void updateBlocking()
3636
{
3737
bool shouldDisable = isActive.Value && disableWinKey.Value && localUserPlaying.Value == LocalUserPlayingState.Playing;
3838

39-
#pragma warning disable IL3000
39+
#pragma warning disable IL3000, IL3002
4040
if (shouldDisable)
4141
host.InputThread.Scheduler.Add(WindowsKey.Disable);
4242
else
4343
host.InputThread.Scheduler.Add(WindowsKey.Enable);
44-
#pragma warning restore IL3000
44+
#pragma warning restore IL3000, IL3002
4545
}
4646
}
4747
}

osu.Desktop/osu.Desktop.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<ApplicationIcon>lazer.ico</ApplicationIcon>
1212
<Version>0.0.0</Version>
1313
<FileVersion>0.0.0</FileVersion>
14+
<!-- WindowsKey.Disable() carries [RequiresAssemblyFiles] (IL3002); we already guard the call-site
15+
with a pragma but add the project-level suppression for completeness. -->
16+
<NoWarn>$(NoWarn);IL3002</NoWarn>
1417
</PropertyGroup>
1518
<PropertyGroup>
1619
<StartupObject>osu.Desktop.Program</StartupObject>

osu.Game/osu.Game.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6+
<!-- The codebase uses extensive reflection (Newtonsoft.Json, Realm, AutoMapper, Activator.CreateInstance)
7+
that cannot be statically analysed by the ILLink trim analyser. Suppress trim analysis warnings
8+
here to keep the build output clean; iOS already suppresses these in osu.iOS.props. -->
9+
<NoWarn>$(NoWarn);IL2026;IL2067;IL3000</NoWarn>
610
</PropertyGroup>
711
<PropertyGroup Label="Nuget">
812
<Title>osu!</Title>

0 commit comments

Comments
 (0)