Skip to content

Commit 1ae2fb1

Browse files
Final CI stability and code quality fixes
- Resolve RulesetInfo and OsuTestScene resolution issues in TestRoomRequestsHandler. - Use AndroidLinkSkip for Microsoft.CSharp preservation in osu.Android.props. - Fix SpectatorClient formatting and block indentation. - Refine TestMultiplayerClient with safer First() calls and correct operator precedence. - Maintain Android 16 compatibility and .NET 10 trimmer rooting.
1 parent aa5c348 commit 1ae2fb1

2 files changed

Lines changed: 23 additions & 23 deletions

File tree

osu.Android.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@
161161
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
162162
<!-- Disable ELF alignment patching in Release to prevent APK signature corruption. -->
163163
<PatchElfPageSizeEnabled>false</PatchElfPageSizeEnabled>
164+
<!-- Root Microsoft.CSharp to prevent XACAS7023 DirectoryNotFoundException. -->
165+
<AndroidLinkSkip>$(AndroidLinkSkip);Microsoft.CSharp</AndroidLinkSkip>
164166
</PropertyGroup>
165167

166168
<ItemGroup Condition="'$(Configuration)' == 'Release'">
167-
<TrimmerRootAssembly Include="Microsoft.CSharp" RootMode="all" />
168-
<!-- Root Microsoft.CSharp to prevent XACAS7023 DirectoryNotFoundException. -->
169169
<!-- Explicitly reference Microsoft.CSharp for the trimmer. -->
170170
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" NoWarn="NU1510" />
171171
</ItemGroup>

osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,6 @@ public bool HandleRequest(APIRequest request, APIUser localUser, BeatmapManager
7070
return true;
7171
}
7272

73-
case GetRoomsRequest getRoomsRequest:
74-
{
75-
var roomsWithoutParticipants = new List<Room>();
76-
77-
foreach (var r in ServerSideRooms)
78-
{
79-
if (createResponseRoom(r, false) is Room roomsRes)
80-
roomsWithoutParticipants.Add(roomsRes);
81-
}
82-
83-
getRoomsRequest.TriggerSuccess(roomsWithoutParticipants);
84-
return true;
85-
}
86-
87-
case GetRoomRequest getRoomRequest:
88-
{
89-
if (createResponseRoom(ServerSideRooms.FirstOrDefault(r => r.RoomID == getRoomRequest.RoomId), true) is Room getRes)
90-
getRoomRequest.TriggerSuccess(getRes);
91-
return true;
92-
}
93-
9473
case CreateRoomScoreRequest createRoomScoreRequest:
9574
createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
9675
return true;
@@ -158,6 +137,27 @@ public bool HandleRequest(APIRequest request, APIUser localUser, BeatmapManager
158137
getBeatmapsRequest.TriggerSuccess(new GetBeatmapsResponse { Beatmaps = createResponseBeatmaps(beatmapManager, getBeatmapsRequest.BeatmapIds.ToArray()) });
159138
return true;
160139
}
140+
141+
case GetRoomsRequest getRoomsRequest:
142+
{
143+
var roomsWithoutParticipants = new List<Room>();
144+
145+
foreach (var r in ServerSideRooms)
146+
{
147+
if (createResponseRoom(r, false) is Room roomsRes)
148+
roomsWithoutParticipants.Add(roomsRes);
149+
}
150+
151+
getRoomsRequest.TriggerSuccess(roomsWithoutParticipants);
152+
return true;
153+
}
154+
155+
case GetRoomRequest getRoomRequest:
156+
{
157+
if (createResponseRoom(ServerSideRooms.FirstOrDefault(r => r.RoomID == getRoomRequest.RoomId), true) is Room getRes)
158+
getRoomRequest.TriggerSuccess(getRes);
159+
return true;
160+
}
161161
}
162162

163163
return false;

0 commit comments

Comments
 (0)