Merge branch 'master' into mod-disable

.config/dotnet-tools.json

@@ -21,7 +21,7 @@
  ]
  },
  "ppy.localisationanalyser.tools": {
- "version": "2023.1117.0",
+ "version": "2024.517.0",
  "commands": [
  "localisation"
  ]

.editorconfig

@@ -196,6 +196,9 @@ csharp_style_prefer_switch_expression = false:none
 
 csharp_style_namespace_declarations = block_scoped:warning
 
+#Style - C# 12 features
+csharp_style_prefer_primary_constructors = false
+
 [*.{yaml,yml}]
 insert_final_newline = true
 indent_style = space

.github/workflows/ci.yml

@@ -13,19 +13,12 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
- # FIXME: Tools won't run in .NET 6.0 unless you install 3.1.x LTS side by side.
- # https://itnext.io/how-to-support-multiple-net-sdks-in-github-actions-workflows-b988daa884e
- - name: Install .NET 3.1.x LTS
- uses: actions/setup-dotnet@v3
+ - name: Install .NET 8.0.x
+ uses: actions/setup-dotnet@v4
  with:
- dotnet-version: "3.1.x"
-
- - name: Install .NET 6.0.x
- uses: actions/setup-dotnet@v3
- with:
- dotnet-version: "6.0.x"
+ dotnet-version: "8.0.x"
 
  - name: Restore Tools
  run: dotnet tool restore
@@ -34,7 +27,7 @@ jobs:
  run: dotnet restore osu.Desktop.slnf
 
  - name: Restore inspectcode cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ${{ github.workspace }}/inspectcode
  key: inspectcode-${{ hashFiles('.config/dotnet-tools.json', '.github/workflows/ci.yml', 'osu.sln*', 'osu*.slnf', '.editorconfig', '.globalconfig', 'CodeAnalysis/*', '**/*.csproj', '**/*.props') }}
@@ -77,12 +70,12 @@ jobs:
  timeout-minutes: 60
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
- - name: Install .NET 6.0.x
- uses: actions/setup-dotnet@v3
+ - name: Install .NET 8.0.x
+ uses: actions/setup-dotnet@v4
  with:
- dotnet-version: "6.0.x"
+ dotnet-version: "8.0.x"
 
  - name: Compile
  run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
@@ -106,18 +99,18 @@ jobs:
  timeout-minutes: 60
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Setup JDK 11
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: microsoft
  java-version: 11
 
- - name: Install .NET 6.0.x
- uses: actions/setup-dotnet@v3
+ - name: Install .NET 8.0.x
+ uses: actions/setup-dotnet@v4
  with:
- dotnet-version: "6.0.x"
+ dotnet-version: "8.0.x"
 
  - name: Install .NET workloads
  run: dotnet workload install maui-android
@@ -133,15 +126,18 @@ jobs:
  timeout-minutes: 60
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
- - name: Install .NET 6.0.x
- uses: actions/setup-dotnet@v3
+ - name: Install .NET 8.0.x
+ uses: actions/setup-dotnet@v4
  with:
- dotnet-version: "6.0.x"
+ dotnet-version: "8.0.x"
 
  - name: Install .NET Workloads
  run: dotnet workload install maui-ios
 
+ - name: Select Xcode 15.2
+ run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
+
  - name: Build
  run: dotnet build -c Debug osu.iOS

.github/workflows/diffcalc.yml

@@ -110,10 +110,14 @@ jobs:
  if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') }}
  steps:
  - name: Check permissions
- if: ${{ github.event_name != 'workflow_dispatch' }}
- uses: actions-cool/check-user-permission@a0668c9aec87f3875fc56170b6452a453e9dd819 # v2.2.0
- with:
- require: 'write'
+ run: |
+ ALLOWED_USERS=(smoogipoo peppy bdach)
+ for i in "${ALLOWED_USERS[@]}"; do
+ if [[ "${{ github.actor }}" == "$i" ]]; then
+ exit 0
+ fi
+ done
+ exit 1
 
  create-comment:
  name: Create PR comment
@@ -122,7 +126,7 @@ jobs:
  if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
  steps:
  - name: Create comment
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  message: |
@@ -140,7 +144,7 @@ jobs:
  GOOGLE_CREDS_FILE: ${{ steps.set-outputs.outputs.GOOGLE_CREDS_FILE }}
  steps:
  - name: Checkout diffcalc-sheet-generator
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  path: ${{ env.EXECUTION_ID }}
  repository: 'smoogipoo/diffcalc-sheet-generator'
@@ -249,7 +253,7 @@ jobs:
 
  - name: Restore cache
  id: restore-cache
- uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
+ uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
  with:
  path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
  key: ${{ steps.query.outputs.DATA_NAME }}
@@ -280,7 +284,7 @@ jobs:
 
  - name: Restore cache
  id: restore-cache
- uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
+ uses: maxnowack/local-cache@720e69c948191660a90aa1cf6a42fc4d2dacdf30 # v2
  with:
  path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
  key: ${{ steps.query.outputs.DATA_NAME }}
@@ -354,7 +358,7 @@ jobs:
  steps:
  - name: Update comment on success
  if: ${{ needs.generator.result == 'success' }}
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  mode: upsert
@@ -365,7 +369,7 @@ jobs:
 
  - name: Update comment on failure
  if: ${{ needs.generator.result == 'failure' }}
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  mode: upsert
@@ -375,7 +379,7 @@ jobs:
 
  - name: Update comment on cancellation
  if: ${{ needs.generator.result == 'cancelled' }}
- uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
+ uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
  with:
  comment_tag: ${{ env.EXECUTION_ID }}
  mode: delete

.github/workflows/report-nunit.yml

@@ -28,7 +28,7 @@ jobs:
  timeout-minutes: 5
  steps:
  - name: Annotate CI run with test results
- uses: dorny/test-reporter@v1.6.0
+ uses: dorny/test-reporter@v1.8.0
  with:
  artifact: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
  name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}})

.github/workflows/sentry-release.yml

@@ -13,7 +13,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  fetch-depth: 0
 

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

@@ -12,24 +12,24 @@ jobs:
  name: Update osu-web mod definitions
  runs-on: ubuntu-latest
  steps:
- - name: Install .NET 6.0.x
- uses: actions/setup-dotnet@v3
+ - name: Install .NET 8.0.x
+ uses: actions/setup-dotnet@v4
  with:
- dotnet-version: "6.0.x"
+ dotnet-version: "8.0.x"
 
  - name: Checkout ppy/osu
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  path: osu
 
  - name: Checkout ppy/osu-tools
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: ppy/osu-tools
  path: osu-tools
 
  - name: Checkout ppy/osu-web
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  repository: ppy/osu-web
  path: osu-web
@@ -43,7 +43,7 @@ jobs:
  working-directory: ./osu-tools
 
  - name: Create pull request with changes
- uses: peter-evans/create-pull-request@v5
+ uses: peter-evans/create-pull-request@v6
  with:
  title: Update mod definitions
  body: "This PR has been auto-generated to update the mod definitions to match ppy/osu@${{ github.ref_name }}."

.gitignore

@@ -340,4 +340,5 @@ inspectcode
 # Fody (pulled in by Realm) - schema file
 FodyWeavers.xsd
 
-.idea/.idea.osu.Desktop/.idea/misc.xml
+.idea/.idea.osu.Desktop/.idea/misc.xml
+.idea/.idea.osu.Android/.idea/deploymentTargetDropDown.xml