Merge upstream ppy/osu master (3 commits) — prioritize winnerspiros fork - #314
Merged
Conversation
…oritize-our-fork Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
winnerspiros
May 8, 2026 16:30
View session
|
|
…e + LINQ hot-path opt) Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/29ac7f90-1c85-4add-b966-2cb397c12074 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
winnerspiros
approved these changes
May 8, 2026
There was a problem hiding this comment.
Pull request overview
Updates the repo to use the latest winnerspiros osu-framework packages after merging upstream, keeping Android/iOS and core framework package versions aligned.
Changes:
- Bump
ppy.osu.Frameworkto2026.508.3inosu.Game/osu.Game.csproj. - Bump
ppy.osu.Framework.Androidandppy.osu.Framework.iOSto2026.508.3. - Remove an unused
OsuConfigManagerdependency from a skin lookup test scene.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| osu.Game/osu.Game.csproj | Bumps core framework package; retains SPIRV pin and its explanatory comment. |
| osu.Android.props | Bumps Android framework package to match the core framework version. |
| osu.iOS.props | Bumps iOS framework package to match the core framework version. |
| osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs | Removes unused config manager resolution/import. |
Comments suppressed due to low confidence (1)
osu.Game/osu.Game.csproj:45
- The
ppy.Veldrid.SPIRVpin comment referencesppy.osu.Framework 2026.507.1and has a missing space (against.This). Since this PR bumpsppy.osu.Frameworkto 2026.508.3, please update the comment to reflect the current framework version (or make it version-agnostic) and fix the sentence spacing to avoid misleading future version bumps.
<!--
Explicitly pin `ppy.Veldrid.SPIRV` to the winnerspiros fork build that
`ppy.osu.Framework 2026.507.1` was compiled against.This version is the only
one whose `runtimes/android-arm64/native/libveldrid-spirv.so` is aligned to 16 KB
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.