Skip to content

Commit 5928f68

Browse files
winnerspiroswinnerspiros
authored
Merge pull request #108 from winnerspiros/copilot/upgrade-project-to-latest-net
Fix iOS trim analyzer warnings and Android 16KB ELF page alignment
2 parents 92102f5 + 34ff418 commit 5928f68

826 files changed

Lines changed: 2996 additions & 3537 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: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@v6
1818

19-
- name: Install .NET 8.0.x
19+
- name: Install .NET 10.0.x
2020
uses: actions/setup-dotnet@v5
2121
with:
22-
dotnet-version: "8.0.x"
22+
dotnet-version: "10.0.x"
2323

2424
- name: Restore Tools
2525
run: dotnet tool restore
@@ -50,7 +50,7 @@ jobs:
5050
exit $exit_code
5151
5252
- name: InspectCode
53-
uses: JetBrains/ReSharper-InspectCode@v0.11
53+
uses: JetBrains/ReSharper-InspectCode@v0.12
5454
with:
5555
# this is WTF tier but if you don't specify *both* of these the defaults assume `build: true`
5656
build: false
@@ -78,10 +78,10 @@ jobs:
7878
- name: Checkout
7979
uses: actions/checkout@v6
8080

81-
- name: Install .NET 8.0.x
81+
- name: Install .NET 10.0.x
8282
uses: actions/setup-dotnet@v5
8383
with:
84-
dotnet-version: "8.0.x"
84+
dotnet-version: "10.0.x"
8585

8686
- name: Compile
8787
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
@@ -123,10 +123,10 @@ jobs:
123123
distribution: microsoft
124124
java-version: 11
125125

126-
- name: Install .NET 8.0.x
126+
- name: Install .NET 10.0.x
127127
uses: actions/setup-dotnet@v5
128128
with:
129-
dotnet-version: "8.0.x"
129+
dotnet-version: "10.0.x"
130130

131131
- name: Install .NET workloads
132132
run: dotnet workload install android
@@ -136,24 +136,19 @@ jobs:
136136

137137
build-only-ios:
138138
name: Build only (iOS)
139-
runs-on: macos-15
139+
runs-on: macos-26
140140
timeout-minutes: 60
141141
steps:
142142
- name: Checkout
143143
uses: actions/checkout@v6
144144

145-
- name: Install .NET 8.0.x
145+
- name: Install .NET 10.0.x
146146
uses: actions/setup-dotnet@v5
147147
with:
148-
dotnet-version: "8.0.x"
148+
dotnet-version: "10.0.x"
149149

150150
- name: Install .NET Workloads
151151
run: dotnet workload install ios
152152

153-
# https://github.com/dotnet/macios/issues/19157
154-
# https://github.com/actions/runner-images/issues/12758
155-
- name: Use Xcode 16.4
156-
run: sudo xcode-select -switch /Applications/Xcode_16.4.app
157-
158153
- name: Build
159154
run: dotnet build -c Debug osu.iOS.slnf

‎.github/workflows/deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848

4949
- name: Set artifacts directory
5050
id: artifactsPath
51-
run: echo "::set-output name=nuget_artifacts::${{github.workspace}}/artifacts"
51+
run: echo "nuget_artifacts=${{github.workspace}}/artifacts" >> "$GITHUB_OUTPUT"
5252

53-
- name: Install .NET 8.0.x
53+
- name: Install .NET 10.0.x
5454
uses: actions/setup-dotnet@v5
5555
with:
56-
dotnet-version: "8.0.x"
56+
dotnet-version: "10.0.x"
5757

5858
- name: Pack
5959
run: |

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
distribution: microsoft
2525
java-version: 17
2626

27-
- name: Install .NET 8.0.x
27+
- name: Install .NET 10.0.x
2828
uses: actions/setup-dotnet@v5
2929
with:
30-
dotnet-version: "8.0.x"
30+
dotnet-version: "10.0.x"
3131

3232
- name: Install .NET Android workload
3333
run: dotnet workload install android
@@ -89,7 +89,7 @@ jobs:
8989
run: >
9090
dotnet publish -c Release
9191
osu.Android/osu.Android.csproj
92-
-f net8.0-android
92+
-f net10.0-android
9393
-p:Version=${{ steps.version.outputs.version }}
9494
-p:ApplicationDisplayVersion=${{ steps.version.outputs.version }}
9595
-p:ApplicationVersion=${{ github.run_number }}
@@ -104,7 +104,7 @@ jobs:
104104
run: >
105105
dotnet publish -c Release
106106
osu.Android/osu.Android.csproj
107-
-f net8.0-android
107+
-f net10.0-android
108108
-p:Version=${{ steps.version.outputs.version }}
109109
-p:ApplicationDisplayVersion=${{ steps.version.outputs.version }}
110110
-p:ApplicationVersion=${{ github.run_number }}
@@ -113,7 +113,7 @@ jobs:
113113
- name: Find APK
114114
id: find_apk
115115
run: |
116-
PUBLISH_DIR="osu.Android/bin/Release/net8.0-android/publish"
116+
PUBLISH_DIR="osu.Android/bin/Release/net10.0-android/publish"
117117
APK=$(find "$PUBLISH_DIR" -maxdepth 1 -name "*.apk" 2>/dev/null | head -1)
118118
if [ -z "$APK" ]; then
119119
APK=$(find osu.Android/bin/Release -name "*.apk" | head -1)

‎.github/workflows/report-nunit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
github-token: ${{ github.token }}
3737

3838
- name: Annotate CI run with test results
39-
uses: dorny/test-reporter@v2.6.0
39+
uses: dorny/test-reporter@v2
4040
with:
4141
name: Results
4242
path: "*.trx"

‎.github/workflows/update-web-mod-definitions.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ jobs:
1212
name: Update osu-web mod definitions
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Install .NET 8.0.x
16-
uses: actions/setup-dotnet@v4
15+
- name: Install .NET 10.0.x
16+
uses: actions/setup-dotnet@v5
1717
with:
18-
dotnet-version: "8.0.x"
18+
dotnet-version: "10.0.x"
1919

2020
- name: Checkout ppy/osu
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222
with:
2323
path: osu
2424

2525
- name: Checkout ppy/osu-tools
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2727
with:
2828
repository: ppy/osu-tools
2929
path: osu-tools
3030

3131
- name: Checkout ppy/osu-web
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333
with:
3434
repository: ppy/osu-web
3535
path: osu-web
@@ -47,7 +47,7 @@ jobs:
4747
working-directory: ./osu-tools
4848

4949
- name: Create pull request with changes
50-
uses: peter-evans/create-pull-request@v6
50+
uses: peter-evans/create-pull-request@v8
5151
with:
5252
title: Update mod definitions
5353
body: "This PR has been auto-generated to update the mod definitions to match ppy/osu@${{ github.ref_name }}."

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Contains required properties for osu!framework projects. -->
22
<Project>
33
<PropertyGroup Label="C#">
4-
<LangVersion>12.0</LangVersion>
4+
<LangVersion>14.0</LangVersion>
55
<Nullable>enable</Nullable>
66
<!-- Stabilises hot reload, see: https://platform.uno/docs/articles/studio/Hot%20Reload/hot-reload-overview.html?tabs=vswin%2Cwindows%2Cskia-desktop%2Ccommon-issues -->
77
<GenerateAssemblyInfo Condition="'$(Configuration)'=='Debug'">false</GenerateAssemblyInfo>

‎Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<ItemGroup Label="Package References">
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1313
<PackageReference Include="NUnit" Version="4.5.1" />
14-
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
14+
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
1818
</ItemGroup>
1919
<PropertyGroup Label="Project">
2020
<OutputType>WinExe</OutputType>
21-
<TargetFramework>net8.0</TargetFramework>
21+
<TargetFramework>net10.0</TargetFramework>
2222
<RootNamespace>osu.Game.Rulesets.EmptyFreeform.Tests</RootNamespace>
2323
</PropertyGroup>
2424
</Project>

‎Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
2424
return new DifficultyAttributes(mods, 0);
2525
}
2626

27-
protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
27+
protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => [];
2828

29-
protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
29+
protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => [];
3030
}
3131
}

‎Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
4242
return new[] { new EmptyFreeformModAutoplay() };
4343

4444
default:
45-
return Array.Empty<Mod>();
45+
return [];
4646
}
4747
}
4848

‎Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup Label="Project">
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<AssemblyTitle>osu.Game.Rulesets.EmptyFreeform</AssemblyTitle>
55
<OutputType>Library</OutputType>
66
<PlatformTarget>AnyCPU</PlatformTarget>

0 commit comments

Comments
 (0)