Skip to content

Commit 5dc3c66

Browse files
authored
Merge pull request #34372 from peppy/temporary-framework-revert
Revert "Update framework"
2 parents a0e300c + d36c50d commit 5dc3c66

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

osu.Android.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ppy.osu.Framework.Android" Version="2025.721.0" />
13+
<PackageReference Include="ppy.osu.Framework.Android" Version="2025.715.0" />
1414
</ItemGroup>
1515
<PropertyGroup>
1616
<!-- Fody does not handle Android build well, and warns when unchanged.

osu.Game/Screens/Edit/Submission/SubmissionStageProgress.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,9 @@ protected override void LoadComplete()
149149
progress.BindValueChanged(_ => Scheduler.AddOnce(updateProgress), true);
150150

151151
progressSampleChannel = progressSample?.GetChannel();
152-
if (progressSampleChannel != null)
153-
progressSampleChannel.ManualFree = true;
152+
// TODO: add back once framework revert is reverted.
153+
// if (progressSampleChannel != null)
154+
// progressSampleChannel.ManualFree = true;
154155
}
155156

156157
public void SetNotStarted() => status.Value = StageStatusType.NotStarted;

osu.Game/osu.Game.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
3737
<PackageReference Include="Realm" Version="20.1.0" />
38-
<PackageReference Include="ppy.osu.Framework" Version="2025.721.0" />
38+
<PackageReference Include="ppy.osu.Framework" Version="2025.715.0" />
3939
<PackageReference Include="ppy.osu.Game.Resources" Version="2025.708.0" />
4040
<PackageReference Include="Sentry" Version="5.1.1" />
4141
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->

osu.iOS.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<MtouchInterpreter>-all</MtouchInterpreter>
1818
</PropertyGroup>
1919
<ItemGroup>
20-
<PackageReference Include="ppy.osu.Framework.iOS" Version="2025.721.0" />
20+
<PackageReference Include="ppy.osu.Framework.iOS" Version="2025.715.0" />
2121
</ItemGroup>
2222
</Project>

0 commit comments

Comments
 (0)