Skip to content

Commit 9aed214

Browse files
CopilotCopilot
committed
Merge remote-tracking branch 'upstream/master' into copilot/sync-with-original-fork
# Conflicts: # osu.Android/AndroidManifest.xml # osu.Game.Tests/Visual/Navigation/TestSceneScreenFooterNavigation.cs # osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedge.cs # osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs # osu.Game/Scoring/ScoreInfo.cs
2 parents d57e951 + 2b587c8 commit 9aed214

697 files changed

Lines changed: 24235 additions & 18862 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.

‎.config/dotnet-tools.json‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,25 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2023.3.3",
6+
"version": "2025.2.3",
77
"commands": [
88
"jb"
9-
]
10-
},
11-
"nvika": {
12-
"version": "4.0.0",
13-
"commands": [
14-
"nvika"
15-
]
9+
],
10+
"rollForward": false
1611
},
1712
"codefilesanity": {
1813
"version": "0.0.37",
1914
"commands": [
2015
"CodeFileSanity"
21-
]
16+
],
17+
"rollForward": false
2218
},
2319
"ppy.localisationanalyser.tools": {
2420
"version": "2025.1208.0",
2521
"commands": [
2622
"localisation"
27-
]
23+
],
24+
"rollForward": false
2825
}
2926
}
30-
}
27+
}

‎.github/workflows/_diffcalc_processor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout diffcalc-sheet-generator
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848
with:
4949
path: ${{ inputs.id }}
5050
repository: 'smoogipoo/diffcalc-sheet-generator'

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ concurrency:
66

77
permissions:
88
contents: read # to fetch code (actions/checkout)
9+
security-events: write # for reporting InspectCode issues
910

1011
jobs:
1112
inspect-code:
1213
name: Code Quality
1314
runs-on: ubuntu-latest
1415
steps:
1516
- name: Checkout
16-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1718

1819
- name: Install .NET 8.0.x
19-
uses: actions/setup-dotnet@v4
20+
uses: actions/setup-dotnet@v5
2021
with:
2122
dotnet-version: "8.0.x"
2223
cache: false
@@ -28,7 +29,7 @@ jobs:
2829
run: dotnet restore osu.Desktop.slnf
2930

3031
- name: Restore inspectcode cache
31-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3233
with:
3334
path: ${{ github.workspace }}/inspectcode
3435
key: inspectcode-${{ hashFiles('.config/dotnet-tools.json', '.github/workflows/ci.yml', 'osu.sln*', 'osu*.slnf', '.editorconfig', '.globalconfig', 'CodeAnalysis/*', '**/*.csproj', '**/*.props') }}
@@ -50,10 +51,14 @@ jobs:
5051
exit $exit_code
5152
5253
- name: InspectCode
53-
run: dotnet jb inspectcode $(pwd)/osu.Desktop.slnf --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
54-
55-
- name: NVika
56-
run: dotnet nvika parsereport "${{github.workspace}}/inspectcodereport.xml" --treatwarningsaserrors
54+
uses: JetBrains/ReSharper-InspectCode@v0.11
55+
with:
56+
# this is WTF tier but if you don't specify *both* of these the defaults assume `build: true`
57+
build: false
58+
no-build: true
59+
solution: ./osu.Desktop.slnf
60+
caches-home: inspectcode
61+
verbosity: WARN
5762

5863
test:
5964
name: Test
@@ -73,10 +78,10 @@ jobs:
7378
timeout-minutes: 120
7479
steps:
7580
- name: Checkout
76-
uses: actions/checkout@v4
81+
uses: actions/checkout@v6
7782

7883
- name: Install .NET 8.0.x
79-
uses: actions/setup-dotnet@v4
84+
uses: actions/setup-dotnet@v5
8085
with:
8186
dotnet-version: "8.0.x"
8287
cache: false
@@ -105,7 +110,7 @@ jobs:
105110
# Attempt to upload results even if test fails.
106111
# https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
107112
- name: Upload Test Results
108-
uses: actions/upload-artifact@v4
113+
uses: actions/upload-artifact@v7
109114
if: ${{ always() }}
110115
with:
111116
name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.suite}}
@@ -117,16 +122,16 @@ jobs:
117122
timeout-minutes: 60
118123
steps:
119124
- name: Checkout
120-
uses: actions/checkout@v4
125+
uses: actions/checkout@v6
121126

122127
- name: Setup JDK 11
123-
uses: actions/setup-java@v4
128+
uses: actions/setup-java@v5
124129
with:
125130
distribution: microsoft
126131
java-version: 11
127132

128133
- name: Install .NET 8.0.x
129-
uses: actions/setup-dotnet@v4
134+
uses: actions/setup-dotnet@v5
130135
with:
131136
dotnet-version: "8.0.x"
132137
cache: false
@@ -144,10 +149,10 @@ jobs:
144149
timeout-minutes: 60
145150
steps:
146151
- name: Checkout
147-
uses: actions/checkout@v4
152+
uses: actions/checkout@v6
148153

149154
- name: Install .NET 8.0.x
150-
uses: actions/setup-dotnet@v4
155+
uses: actions/setup-dotnet@v5
151156
with:
152157
dotnet-version: "8.0.x"
153158
cache: false

‎.github/workflows/deploy.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ name: Pack and nuget
33
on:
44
push:
55
tags:
6-
- '*'
6+
- '*.*.*'
7+
- '!*-*'
78

89
jobs:
910
notify_pending_production_deploy:
@@ -43,14 +44,14 @@ jobs:
4344
environment: production
4445
steps:
4546
- name: Checkout
46-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4748

4849
- name: Set artifacts directory
4950
id: artifactsPath
5051
run: echo "::set-output name=nuget_artifacts::${{github.workspace}}/artifacts"
5152

5253
- name: Install .NET 8.0.x
53-
uses: actions/setup-dotnet@v4
54+
uses: actions/setup-dotnet@v5
5455
with:
5556
dotnet-version: "8.0.x"
5657

@@ -76,7 +77,7 @@ jobs:
7677
dotnet pack -c Release Templates /p:Version=${{ github.ref_name }} -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
7778
7879
- name: Upload artifacts
79-
uses: actions/upload-artifact@v4
80+
uses: actions/upload-artifact@v7
8081
with:
8182
name: osu
8283
path: |

‎.github/workflows/pull-request-copy-labels.yml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ jobs:
2222
timeout-minutes: 5
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626
with:
2727
repository: ${{ github.event.workflow_run.repository.full_name }}
2828
ref: ${{ github.event.workflow_run.head_sha }}
2929

3030
- name: Download results
31-
uses: actions/download-artifact@v4
31+
uses: actions/download-artifact@v8
3232
with:
3333
pattern: osu-test-results-*
3434
merge-multiple: true
3535
run-id: ${{ github.event.workflow_run.id }}
3636
github-token: ${{ github.token }}
3737

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

‎.github/workflows/sentry-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
with:
1818
fetch-depth: 0
1919

2020
- name: Create Sentry release
21-
uses: getsentry/action-release@v1
21+
uses: getsentry/action-release@v3
2222
env:
2323
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
2424
SENTRY_ORG: ppy

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ jobs:
3838
run: ./UseLocalOsu.sh
3939
working-directory: ./osu-tools
4040

41+
- name: Build tools
42+
run: dotnet build PerformanceCalculator --nologo --verbosity quiet
43+
working-directory: ./osu-tools
44+
4145
- name: Regenerate mod definitions
42-
run: dotnet run --project PerformanceCalculator -- mods > ../osu-web/database/mods.json
46+
run: dotnet run --project PerformanceCalculator --no-build -- mods > ../osu-web/database/mods.json
4347
working-directory: ./osu-tools
4448

4549
- name: Create pull request with changes

‎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
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111
<ItemGroup Label="Package References">
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13-
<PackageReference Include="NUnit" Version="3.14.0" />
14-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
13+
<PackageReference Include="NUnit" Version="4.5.1" />
14+
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />

‎Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111
<ItemGroup Label="Package References">
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13-
<PackageReference Include="NUnit" Version="3.14.0" />
14-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
13+
<PackageReference Include="NUnit" Version="4.5.1" />
14+
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />

0 commit comments

Comments
 (0)