1
0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 05:30:11 +08:00

Merge pull request #33101 from peppy/update-framework

Update framework
This commit is contained in:
Bartłomiej Dach
2025-05-12 11:13:28 +02:00
committed by GitHub
Unverified
4 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.Android" Version="2025.419.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2025.512.0" />
</ItemGroup>
<PropertyGroup>
<!-- Fody does not handle Android build well, and warns when unchanged.
+3 -3
View File
@@ -524,12 +524,12 @@ namespace osu.Game.Screens.Select
private ScheduledDelegate? selectionChangedDebounce;
private void updateCarouselSelection(ValueChangedEvent<WorkingBeatmap>? e = null)
private void updateCarouselSelection(ValueChangedEvent<WorkingBeatmap?> e = default)
{
var beatmap = e?.NewValue ?? Beatmap.Value;
var beatmap = e.NewValue ?? Beatmap.Value;
if (beatmap is DummyWorkingBeatmap || !this.IsCurrentScreen()) return;
if (beatmap.BeatmapSetInfo.Protected && e != null)
if (beatmap.BeatmapSetInfo.Protected)
{
Logger.Log($"Denying working beatmap switch to protected beatmap {beatmap}");
Beatmap.Value = e.OldValue;
+1 -1
View File
@@ -35,7 +35,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Realm" Version="20.1.0" />
<PackageReference Include="ppy.osu.Framework" Version="2025.419.0" />
<PackageReference Include="ppy.osu.Framework" Version="2025.512.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2025.425.0" />
<PackageReference Include="Sentry" Version="5.1.1" />
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
+1 -1
View File
@@ -17,6 +17,6 @@
<MtouchInterpreter>-all</MtouchInterpreter>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.iOS" Version="2025.419.0" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2025.512.0" />
</ItemGroup>
</Project>