Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update framework #21629

Merged
merged 26 commits into from
Dec 19, 2022
Merged

Update framework #21629

merged 26 commits into from
Dec 19, 2022

Conversation

peppy
Copy link
Member

@peppy peppy commented Dec 13, 2022

Includes required changes for new URL safeties.

@peppy
Copy link
Member Author

peppy commented Dec 13, 2022

This one's going to require the fixes to be applied for android (and potentially iOS) as a result of framework-side changes.

@peppy peppy mentioned this pull request Dec 16, 2022
1 task
@peppy
Copy link
Member Author

peppy commented Dec 16, 2022

@frenzibyte i'll leave the mobile projects to you to figure out. looks like the csproj needs updating at very least.

@frenzibyte
Copy link
Member

Should be fixed now, looks to be happening due to GH actions not yet using Xcode 14.1, so I've had to manually pin it to do so. See actions/runner-images#6771 for more information.

@peppy
Copy link
Member Author

peppy commented Dec 19, 2022

There's a theory that this may be ready to go now, if CI passes. @smoogipoo would appreciate a one-over (feel free to apply any changes you deem necessary directly).

@smoogipoo
Copy link
Contributor

Wanna wait for new o!f package with ppy/osu-framework#5592 before merging this one?

@peppy
Copy link
Member Author

peppy commented Dec 19, 2022

Well this one works fine as-is, since none of the veldrid stuff is in.

So I figure it's best to review / merge this first then we'll do a second bump. But if you'd rather do it all at once I'm fine with that too.

@smoogipoo smoogipoo merged commit 1262c44 into ppy:master Dec 19, 2022
Comment on lines +2 to +5
"sdk": {
"version": "6.0.300",
"rollForward": "major"
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed in #17462 but still exists here, was that intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was an oversight, I'll pull it into a follow-up branch I have.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants