Skip to content

Commit f34ef00

Browse files
authored
Merge pull request #314 from winnerspiros/copilot/merge-prioritize-our-fork
Merge upstream ppy/osu master (3 commits) — prioritize winnerspiros fork
2 parents 67f33a1 + 7c2ec32 commit f34ef00

4 files changed

Lines changed: 3 additions & 7 deletions

File tree

osu.Android.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</PropertyGroup>
103103

104104
<ItemGroup>
105-
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.508.2" />
105+
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.508.3" />
106106
<!-- `ppy.osu.Framework.NativeLibs` is a transitive dependency of `ppy.osu.Framework`
107107
that ships desktop-only natives (Linux/macOS/Windows) under `runtimes/<rid>/native/`
108108
— including a bare Linux `libbass.so`/`libbass_fx.so`/`libbassmix.so` for linux-arm64.

osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using osu.Framework.Graphics.Textures;
1414
using osu.Framework.Testing;
1515
using osu.Game.Audio;
16-
using osu.Game.Configuration;
1716
using osu.Game.Rulesets.Osu;
1817
using osu.Game.Skinning;
1918
using osu.Game.Tests.Beatmaps;
@@ -30,9 +29,6 @@ public partial class TestSceneBeatmapSkinLookupDisables : OsuTestScene
3029
private BeatmapSkinSource beatmapSource;
3130
private SkinRequester requester;
3231

33-
[Resolved]
34-
private OsuConfigManager config { get; set; }
35-
3632
[SetUp]
3733
public void SetUp() => Schedule(() =>
3834
{

osu.Game/osu.Game.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
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.508.2" />
41+
<PackageReference Include="ppy.osu.Framework" Version="2026.508.3" />
4242
<!--
4343
Explicitly pin `ppy.Veldrid.SPIRV` to the winnerspiros fork build that
4444
`ppy.osu.Framework 2026.507.1` was compiled against.This version is the only

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.508.2" />
36+
<PackageReference Include="ppy.osu.Framework.iOS" Version="2026.508.3" />
3737
</ItemGroup>
3838
</Project>

0 commit comments

Comments
 (0)