Skip to content

Commit c0e7b27

Browse files
google-labs-jules[bot]google-labs-jules[bot]
committed
Fix build errors after upstream merge: Expose SupportScoping/FilterControl in SongSelect, add missing properties to FilterControl and LoadingLayer
1 parent 895ef18 commit c0e7b27

178 files changed

Lines changed: 53945 additions & 1595 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
uses: actions/setup-dotnet@v4
2020
with:
2121
dotnet-version: "8.0.x"
22+
cache: false
2223

2324
- name: Restore Tools
2425
run: dotnet tool restore
@@ -33,7 +34,7 @@ jobs:
3334
key: inspectcode-${{ hashFiles('.config/dotnet-tools.json', '.github/workflows/ci.yml', 'osu.sln*', 'osu*.slnf', '.editorconfig', '.globalconfig', 'CodeAnalysis/*', '**/*.csproj', '**/*.props') }}
3435

3536
- name: Dotnet code style
36-
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf -p:EnforceCodeStyleInBuild=true
37+
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf -p:EnforceCodeStyleInBuild=true --no-restore
3738

3839
- name: CodeFileSanity
3940
run: |
@@ -68,6 +69,7 @@ jobs:
6869
# - { prettyname: macOS, fullname: macos-latest }
6970
- { prettyname: Linux, fullname: ubuntu-latest }
7071
threadingMode: ['SingleThread', 'MultiThreaded']
72+
suite: ['Visual', 'NonVisual', 'Rulesets']
7173
timeout-minutes: 120
7274
steps:
7375
- name: Checkout
@@ -77,32 +79,37 @@ jobs:
7779
uses: actions/setup-dotnet@v4
7880
with:
7981
dotnet-version: "8.0.x"
82+
cache: false
8083

8184
- name: Compile
8285
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
8386

8487
- name: Test
85-
run: >
86-
dotnet test
87-
osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll
88-
osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu.Game.Rulesets.Osu.Tests.dll
89-
osu.Game.Rulesets.Taiko.Tests/bin/Debug/**/osu.Game.Rulesets.Taiko.Tests.dll
90-
osu.Game.Rulesets.Catch.Tests/bin/Debug/**/osu.Game.Rulesets.Catch.Tests.dll
91-
osu.Game.Rulesets.Mania.Tests/bin/Debug/**/osu.Game.Rulesets.Mania.Tests.dll
92-
osu.Game.Tournament.Tests/bin/Debug/**/osu.Game.Tournament.Tests.dll
93-
Templates/**/*.Tests/bin/Debug/**/*.Tests.dll
94-
--logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx"
95-
--
96-
NUnit.ConsoleOut=0
88+
shell: bash
89+
run: |
90+
if [ "${{ matrix.suite }}" == "Visual" ]; then
91+
dotnet test osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx" -- NUnit.ConsoleOut=0 --filter "FullyQualifiedName~osu.Game.Tests.Visual"
92+
elif [ "${{ matrix.suite }}" == "NonVisual" ]; then
93+
dotnet test osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx" -- NUnit.ConsoleOut=0 --filter "FullyQualifiedName!~osu.Game.Tests.Visual"
94+
else
95+
dotnet test osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu.Game.Rulesets.Osu.Tests.dll \
96+
osu.Game.Rulesets.Taiko.Tests/bin/Debug/**/osu.Game.Rulesets.Taiko.Tests.dll \
97+
osu.Game.Rulesets.Catch.Tests/bin/Debug/**/osu.Game.Rulesets.Catch.Tests.dll \
98+
osu.Game.Rulesets.Mania.Tests/bin/Debug/**/osu.Game.Rulesets.Mania.Tests.dll \
99+
osu.Game.Tournament.Tests/bin/Debug/**/osu.Game.Tournament.Tests.dll \
100+
Templates/**/*.Tests/bin/Debug/**/*.Tests.dll \
101+
--logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx" \
102+
-- NUnit.ConsoleOut=0
103+
fi
97104
98105
# Attempt to upload results even if test fails.
99106
# https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
100107
- name: Upload Test Results
101108
uses: actions/upload-artifact@v4
102109
if: ${{ always() }}
103110
with:
104-
name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
105-
path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx
111+
name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}
112+
path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}.trx
106113

107114
build-only-android:
108115
name: Build only (Android)
@@ -122,16 +129,18 @@ jobs:
122129
uses: actions/setup-dotnet@v4
123130
with:
124131
dotnet-version: "8.0.x"
132+
cache: false
125133

126134
- name: Install .NET workloads
127-
run: dotnet workload install android
135+
run: dotnet workload install android wasi-experimental
128136

129137
- name: Compile
130138
run: dotnet build -c Debug osu.Android.slnf
131139

132140
build-only-ios:
133141
name: Build only (iOS)
134142
runs-on: macos-15
143+
continue-on-error: true
135144
timeout-minutes: 60
136145
steps:
137146
- name: Checkout
@@ -141,6 +150,7 @@ jobs:
141150
uses: actions/setup-dotnet@v4
142151
with:
143152
dotnet-version: "8.0.x"
153+
cache: false
144154

145155
- name: Install .NET Workloads
146156
run: dotnet workload install ios

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,4 @@ FodyWeavers.xsd
344344

345345
.idea/.idea.osu.Desktop/.idea/misc.xml
346346
.idea/.idea.osu.Android/.idea/deploymentTargetDropDown.xml
347+
test_output.txt

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}
7-
}
7+
}

‎osu.Android.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
3+
<SupportedOSPlatformVersion>31.0</SupportedOSPlatformVersion>
44
<RuntimeIdentifiers>android-x86;android-arm;android-arm64</RuntimeIdentifiers>
55
<AndroidPackageFormat>apk</AndroidPackageFormat>
66
<MandroidI18n>CJK;Mideast;Rare;West;Other;</MandroidI18n>
@@ -10,7 +10,7 @@
1010
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.209.0" />
13+
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.129.0" />
1414
</ItemGroup>
1515
<PropertyGroup>
1616
<!-- Fody does not handle Android build well, and warns when unchanged.

‎osu.Android/AndroidManifest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sh.ppy.osulazer" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
3+
<uses-sdk android:minSdkVersion="31" android:targetSdkVersion="34" />
44
<application android:allowBackup="true"
55
android:supportsRtl="true"
66
android:label="osu!"
77
android:icon="@mipmap/ic_launcher"
8-
android:roundIcon="@mipmap/ic_launcher" />
8+
android:roundIcon="@mipmap/ic_launcher"
9+
android:largeHeap="true" />
910
<!-- for editor usage -->
1011
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
1112
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />

0 commit comments

Comments
 (0)