Skip to content

Commit 22eb4fe

Browse files
Susko3Susko3
committed
Merge branch 'master' into windows-raw-keyboard
2 parents 3058d8c + 1aceac5 commit 22eb4fe

File tree

228 files changed

+3922
-2009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+3922
-2009
lines changed

‎.github/workflows/build-ffmpeg.yml‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ jobs:
173173

174174
build-linux:
175175
name: Build Linux (x64)
176-
# Use 20.04 to target glibc 2.31 like the other native libs
177-
runs-on: ubuntu-20.04
176+
runs-on: ubuntu-22.04
178177
steps:
179178
- name: Install dependencies
180179
run: |
@@ -186,13 +185,33 @@ jobs:
186185

187186
- name: Build
188187
run: osu.Framework.NativeLibs/scripts/ffmpeg/build-linux.sh
188+
env:
189+
arch: x64
189190

190191
- name: Upload
191192
uses: actions/upload-artifact@v4
192193
with:
193194
name: linux-x64
194195
path: linux-x64
195196

197+
build-linux-arm64:
198+
name: Build Linux (arm64)
199+
runs-on: ubuntu-22.04-arm
200+
steps:
201+
- name: Checkout
202+
uses: actions/checkout@v4
203+
204+
- name: Build
205+
run: osu.Framework.NativeLibs/scripts/ffmpeg/build-linux.sh
206+
env:
207+
arch: arm64
208+
209+
- name: Upload
210+
uses: actions/upload-artifact@v4
211+
with:
212+
name: linux-arm64
213+
path: linux-arm64
214+
196215
build-android:
197216
name: Build Android
198217
runs-on: ubuntu-22.04
@@ -245,6 +264,10 @@ jobs:
245264
with:
246265
name: linux-x64
247266
path: osu.Framework.NativeLibs/runtimes/linux-x64/native
267+
- uses: actions/download-artifact@v4
268+
with:
269+
name: linux-arm64
270+
path: osu.Framework.NativeLibs/runtimes/linux-arm64/native
248271
- uses: actions/download-artifact@v4
249272
with:
250273
name: win-arm64

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104

105105
build-only-android:
106106
name: Build only (Android)
107-
runs-on: windows-2019
107+
runs-on: windows-latest
108108
timeout-minutes: 60
109109
steps:
110110
- name: Checkout
@@ -122,17 +122,14 @@ jobs:
122122
dotnet-version: "8.0.x"
123123

124124
- name: Restore .NET workloads
125-
# since windows image 20241113.3.0, not specifying a version here
126-
# installs the .NET 7 version of android workload for very unknown reasons.
127-
# revisit once we upgrade to .NET 9, it's probably fixed there.
128-
run: dotnet workload install android --version (dotnet --version)
125+
run: dotnet workload install android
129126

130127
- name: Compile
131128
run: dotnet build -c Debug osu-framework.Android.slnf
132129

133130
build-only-ios:
134131
name: Build only (iOS)
135-
runs-on: macos-latest
132+
runs-on: macos-15
136133
timeout-minutes: 60
137134
steps:
138135
- name: Checkout
@@ -144,7 +141,12 @@ jobs:
144141
dotnet-version: "8.0.x"
145142

146143
- name: Restore .NET workloads
147-
run: dotnet workload install ios --from-rollback-file workloads.json
144+
run: dotnet workload install ios
145+
146+
# https://github.com/dotnet/macios/issues/19157
147+
# https://github.com/actions/runner-images/issues/12758
148+
- name: Use Xcode 16.4
149+
run: sudo xcode-select -switch /Applications/Xcode_16.4.app
148150

149151
- name: Compile
150152
run: dotnet build -c Debug osu-framework.iOS.slnf

‎.github/workflows/deploy-pack.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,7 @@ jobs:
131131
java-version: 11
132132

133133
- name: Restore .NET workloads
134-
# since windows image 20241113.3.0, not specifying a version here
135-
# installs the .NET 7 version of android workload for very unknown reasons.
136-
# revisit once we upgrade to .NET 9, it's probably fixed there.
137-
run: dotnet workload install android --version (dotnet --version)
134+
run: dotnet workload install android
138135

139136
- name: Pack (Android Framework)
140137
run: dotnet pack -c Release osu.Framework.Android /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
@@ -150,7 +147,7 @@ jobs:
150147

151148
pack-ios:
152149
name: Pack (iOS)
153-
runs-on: macos-latest
150+
runs-on: macos-15
154151
environment: production
155152
defaults:
156153
run:
@@ -169,7 +166,12 @@ jobs:
169166
dotnet-version: "8.0.x"
170167

171168
- name: Restore .NET Workloads
172-
run: dotnet workload install ios --from-rollback-file workloads.json
169+
run: dotnet workload install ios
170+
171+
# https://github.com/dotnet/macios/issues/19157
172+
# https://github.com/actions/runner-images/issues/12758
173+
- name: Use Xcode 16.4
174+
run: sudo xcode-select -switch /Applications/Xcode_16.4.app
173175

174176
- name: Pack (iOS Framework)
175177
run: dotnet pack -c Release osu.Framework.iOS /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}}

‎osu-framework.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
8989
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertTypeCheckPatternToNullCheck/@EntryIndexedValue">DO_NOT_SHOW</s:String>
9090
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
91+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DuplicatedStatements/@EntryIndexedValue">HINT</s:String>
9192
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
9293
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
9394
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>

‎osu.Framework.Android/AndroidGameSurface.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ private void init()
4646

4747
public bool IsSurfaceReady => isSurfaceReady;
4848

49-
public override void HandlePause()
49+
protected override void HandlePause()
5050
{
5151
base.HandlePause();
5252
isSurfaceReady = false;
5353
}
5454

55-
public override void HandleResume()
55+
protected override void HandleResume()
5656
{
5757
base.HandleResume();
5858
isSurfaceReady = true;

‎osu.Framework.Android/AndroidGameWindow.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
// See the LICENCE file in the repository root for full licence text.
33

44
using System;
5-
using osu.Framework.Bindables;
65
using osu.Framework.Platform;
76
using osu.Framework.Platform.SDL3;
87

98
namespace osu.Framework.Android
109
{
1110
internal class AndroidGameWindow : SDL3MobileWindow
1211
{
13-
public override IntPtr SurfaceHandle => AndroidGameActivity.Surface.NativeSurface?.Handle ?? IntPtr.Zero;
12+
public override IntPtr SurfaceHandle => AndroidGameActivity.Surface.Holder?.Surface?.Handle ?? IntPtr.Zero;
1413

1514
public AndroidGameWindow(GraphicsSurfaceType surfaceType, string appName)
1615
: base(surfaceType, appName)
@@ -22,10 +21,6 @@ public override void Create()
2221
base.Create();
2322

2423
SafeAreaPadding.BindTo(AndroidGameActivity.Surface.SafeAreaPadding);
25-
26-
// Android SDL doesn't receive these events at start, so it never receives focus until it comes back from background
27-
((BindableBool)CursorInWindow).Value = true;
28-
Focused = true;
2924
}
3025
}
3126
}

‎osu.Framework.Android/arm64-v8a/libbass.so‎

-1.82 KB
Binary file not shown.

‎osu.Framework.Android/arm64-v8a/libbass_fx.so‎

-21.3 KB
Binary file not shown.

‎osu.Framework.Android/arm64-v8a/libbassmix.so‎

-4.98 KB
Binary file not shown.

‎osu.Framework.Android/arm64-v8a/libveldrid-spirv.so‎

-17.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)