Merge pull request #21572 from peppy/update-framework

Update framework
2026-05-16 23:43:27 +08:00 · 2022-12-08 14:37:37 +09:00 · 2022-12-08 14:06:38 +09:00 · 2022-12-08 12:59:31 +09:00 · 2022-12-08 12:38:05 +09:00 · 2022-12-08 11:40:24 +09:00
3765 changed files with 81800 additions and 47468 deletions
@@ -2,14 +2,8 @@
  "version": 1,
  "isRoot": true,
  "tools": {
-    "dotnet-format": {
-      "version": "3.1.37601",
-      "commands": [
-        "dotnet-format"
-      ]
-    },
    "jetbrains.resharper.globaltools": {
-      "version": "2020.3.2",
+      "version": "2022.2.3",
      "commands": [
        "jb"
      ]
@@ -27,10 +21,10 @@
      ]
    },
    "ppy.localisationanalyser.tools": {
-      "version": "2022.320.0",
+      "version": "2022.809.0",
      "commands": [
        "localisation"
      ]
    }
  }
-}
+}
@@ -1,6 +1,14 @@
 # EditorConfig is awesome: http://editorconfig.org
 root = true

+[*.{csproj,props,targets}]
+charset = utf-8-bom
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
 [*.cs]
 end_of_line = crlf
 insert_final_newline = true
@@ -8,8 +16,19 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true

+#license header
+file_header_template = Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.\nSee the LICENCE file in the repository root for full licence text.
+
 #Roslyn naming styles

+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case

@@ -172,23 +191,11 @@ csharp_style_prefer_index_operator = false:silent
 csharp_style_prefer_range_operator = false:silent
 csharp_style_prefer_switch_expression = false:none

-#Supressing roslyn built-in analyzers
-# Suppress: EC112
-
-#Private method is unused
-dotnet_diagnostic.IDE0051.severity = silent
-#Private member is unused
-dotnet_diagnostic.IDE0052.severity = silent
-
-#Rules for disposable
-dotnet_diagnostic.IDE0067.severity = none
-dotnet_diagnostic.IDE0068.severity = none
-dotnet_diagnostic.IDE0069.severity = none
-
-#Disable operator overloads requiring alternate named methods
-dotnet_diagnostic.CA2225.severity = none
-
-# Banned APIs
-dotnet_diagnostic.RS0030.severity = error
+[*.{yaml,yml}]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true

+dotnet_diagnostic.OLOC001.words_in_name = 5
 dotnet_diagnostic.OLOC001.license_header = // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.\n// See the LICENCE file in the repository root for full licence text.
@@ -1,2 +1,8 @@
 # Normalize all the line endings
 32a74f95a5c80a0ed18e693f13a47522099df5c3
+# Partial everything
+7bc8908ca9c026fed1d831eb6e58df7624a8d614
+# Add a few more missing partial specs
+212d78865a6b5f091173a347bad5686834d1d5fe
+# Add partial specs in mobile projects too
+00c11b2b4e389e48f3995d63484a6bc66a7afbdb
@@ -1,100 +1,13 @@
 on: [push, pull_request]
 name: Continuous Integration
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)

 jobs:
-  test:
-    name: Test
-    runs-on: ${{matrix.os.fullname}}
-    env:
-      OSU_EXECUTION_MODE: ${{matrix.threadingMode}}
-    strategy:
-       fail-fast: false
-       matrix:
-          os:
-            - { prettyname: Windows, fullname: windows-latest }
-            - { prettyname: macOS, fullname: macos-latest }
-            - { prettyname: Linux, fullname: ubuntu-latest }
-          threadingMode: ['SingleThread', 'MultiThreaded']
-    timeout-minutes: 60
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0.x"
-
-      # FIXME: libavformat is not included in Ubuntu. Let's fix that.
-      # https://github.com/ppy/osu-framework/issues/4349
-      # Remove this once https://github.com/actions/virtual-environments/issues/3306 has been resolved.
-      - name: Install libavformat-dev
-        if: ${{matrix.os.fullname == 'ubuntu-latest'}}
-        run: |
-         sudo apt-get update && \
-         sudo apt-get -y install libavformat-dev
-
-      - name: Compile
-        run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
-
-      - name: Test
-        run: dotnet test $pwd/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx"
-        shell: pwsh
-
-      # Attempt to upload results even if test fails.
-      # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
-      - name: Upload Test Results
-        uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
-          path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx
-
-  build-only-android:
-    name: Build only (Android)
-    runs-on: macos-latest
-    timeout-minutes: 60
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      # Pin Xamarin.Android version to 11.2 for now to avoid build failures caused by a Xamarin-side regression.
-      # See: https://github.com/xamarin/xamarin-android/issues/6284
-      # This can be removed/reverted when the fix makes it to upstream and is deployed on github runners.
-      - name: Set default Xamarin SDK version
-        run: |
-            $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --android=11.2
-
-      - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0.x"
-
-      # Contrary to seemingly any other msbuild, msbuild running on macOS/Mono
-      # cannot accept .sln(f) files as arguments.
-      # Build just the main game for now.
-      - name: Build
-        run: msbuild osu.Android/osu.Android.csproj /restore /p:Configuration=Debug
-
-  build-only-ios:
-    name: Build only (iOS)
-    runs-on: macos-latest
-    timeout-minutes: 60
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0.x"
-
-      # Contrary to seemingly any other msbuild, msbuild running on macOS/Mono
-      # cannot accept .sln(f) files as arguments.
-      # Build just the main game for now.
-      - name: Build
-        run: msbuild osu.iOS/osu.iOS.csproj /restore /p:Configuration=Debug
-
  inspect-code:
    name: Code Quality
    runs-on: ubuntu-latest
@@ -120,6 +33,15 @@ jobs:
      - name: Restore Packages
        run: dotnet restore

+      - name: Restore inspectcode cache
+        uses: actions/cache@v3
+        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') }}
+
+      - name: Dotnet code style
+        run: dotnet build -c Debug -warnaserror osu.Desktop.slnf -p:EnforceCodeStyleInBuild=true
+
      - name: CodeFileSanity
        run: |
          # TODO: Add ignore filters and GitHub Workflow Command Reporting in CFS. That way we don't have to do this workaround.
@@ -133,12 +55,85 @@ jobs:
          done <<< $(dotnet codefilesanity)
          exit $exit_code

-      # Temporarily disabled due to test failures, but it won't work anyway until the tool is upgraded.
-      # - name: .NET Format (Dry Run)
-      #   run: dotnet format --dry-run --check
-
      - name: InspectCode
-        run: dotnet jb inspectcode $(pwd)/osu.Desktop.slnf --output=$(pwd)/inspectcodereport.xml --cachesDir=$(pwd)/inspectcode --verbosity=WARN
+        run: dotnet jb inspectcode $(pwd)/osu.Desktop.slnf --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN

      - name: NVika
        run: dotnet nvika parsereport "${{github.workspace}}/inspectcodereport.xml" --treatwarningsaserrors
+
+  test:
+    name: Test
+    runs-on: ${{matrix.os.fullname}}
+    env:
+      OSU_EXECUTION_MODE: ${{matrix.threadingMode}}
+    strategy:
+       fail-fast: false
+       matrix:
+          os:
+            - { prettyname: Windows, fullname: windows-latest }
+            - { prettyname: macOS, fullname: macos-latest }
+            - { prettyname: Linux, fullname: ubuntu-latest }
+          threadingMode: ['SingleThread', 'MultiThreaded']
+    timeout-minutes: 60
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install .NET 6.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.x"
+
+      - name: Compile
+        run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
+
+      - name: Test
+        run: dotnet test $pwd/**/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx" -- NUnit.ConsoleOut=0
+        shell: pwsh
+
+      # Attempt to upload results even if test fails.
+      # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
+          path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx
+
+  build-only-android:
+    name: Build only (Android)
+    runs-on: windows-latest
+    timeout-minutes: 60
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install .NET 6.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.x"
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1
+
+      - name: Build
+        run: msbuild osu.Android/osu.Android.csproj /restore /p:Configuration=Debug
+
+  build-only-ios:
+    name: Build only (iOS)
+    runs-on: macos-latest
+    timeout-minutes: 60
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install .NET 6.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.x"
+
+      # Contrary to seemingly any other msbuild, msbuild running on macOS/Mono
+      # cannot accept .sln(f) files as arguments.
+      # Build just the main game for now.
+      - name: Build
+        run: msbuild osu.iOS/osu.iOS.csproj /restore /p:Configuration=Debug
@@ -8,8 +8,12 @@ on:
    workflows: ["Continuous Integration"]
    types:
      - completed
+permissions: {}
 jobs:
  annotate:
+    permissions:
+      checks: write # to create checks (dorny/test-reporter)
+
    name: Annotate CI run with test results
    runs-on: ubuntu-latest
    if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
@@ -24,7 +28,7 @@ jobs:
    timeout-minutes: 5
    steps:
      - name: Annotate CI run with test results
-        uses: dorny/test-reporter@v1.4.2
+        uses: dorny/test-reporter@v1.6.0
        with:
          artifact: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
          name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}})
@@ -0,0 +1,29 @@
+name: Add Release to Sentry
+
+on:
+  push:
+    tags:
+      - '*'
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  sentry_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Create Sentry release
+        uses: getsentry/action-release@v1
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ppy
+          SENTRY_PROJECT: osu
+          SENTRY_URL: https://sentry.ppy.sh/
+        with:
+          environment: production
+          version: osu@${{ github.ref_name }}
@@ -340,3 +340,5 @@ inspectcode
 # Fody (pulled in by Realm) - schema file
 FodyWeavers.xsd
 **/FodyWeavers.xml
+
+.idea/.idea.osu.Desktop/.idea/misc.xml
@@ -0,0 +1,59 @@
+is_global = true
+
+# .NET Code Style
+# IDE styles reference: https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/
+
+# IDE0001: Simplify names
+dotnet_diagnostic.IDE0001.severity = warning
+
+# IDE0002: Simplify member access
+dotnet_diagnostic.IDE0002.severity = warning
+
+# IDE0003: Remove qualification
+dotnet_diagnostic.IDE0003.severity = warning
+
+# IDE0004: Remove unnecessary cast
+dotnet_diagnostic.IDE0004.severity = warning
+
+# IDE0005: Remove unnecessary imports
+dotnet_diagnostic.IDE0005.severity = warning
+
+# IDE0034: Simplify default literal
+dotnet_diagnostic.IDE0034.severity = warning
+
+# IDE0036: Sort modifiers
+dotnet_diagnostic.IDE0036.severity = warning
+
+# IDE0040: Add accessibility modifier
+dotnet_diagnostic.IDE0040.severity = warning
+
+# IDE0049: Use keyword for type name
+dotnet_diagnostic.IDE0040.severity = warning
+
+# IDE0055: Fix formatting
+dotnet_diagnostic.IDE0055.severity = warning
+
+# IDE0051: Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+
+# IDE0052: Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+# IDE0073: File header
+dotnet_diagnostic.IDE0073.severity = warning
+
+# IDE0130: Namespace mismatch with folder
+dotnet_diagnostic.IDE0130.severity = warning
+
+# IDE1006: Naming style
+dotnet_diagnostic.IDE1006.severity = warning
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
+
+# Temporarily disable analysing CanBeNull = true in NRT contexts due to mobile issues.
+# See: https://github.com/ppy/osu/pull/19677
+dotnet_diagnostic.OSUF001.severity = none
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="com.jetbrains.rider.android.RiderAndroidMiscFileCreationComponent">
-    <option name="ENSURE_MISC_FILE_EXISTS" value="true" />
-  </component>
-</project>
@@ -6,12 +6,20 @@ T:System.IComparable;Don't use non-generic IComparable. Use generic version inst
 T:SixLabors.ImageSharp.IDeepCloneable`1;Use osu.Game.Utils.IDeepCloneable<T> instead.
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
-T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
-T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
 T:NuGet.Packaging.CollectionExtensions;Don't use internal extension methods.
 M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
 M:Realms.IRealmCollection`1.SubscribeForNotifications`1(Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IRealmCollection<T>,NotificationCallbackDelegate<T>) instead.
+M:System.Guid.#ctor;Probably meaning to use Guid.NewGuid() instead. If actually wanting empty, use Guid.Empty.
 M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Linq.IQueryable{``0},Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IQueryable<T>,NotificationCallbackDelegate<T>) instead.
 M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Collections.Generic.IList{``0},Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IList<T>,NotificationCallbackDelegate<T>) instead.
 M:System.Threading.Tasks.Task.Wait();Don't use Task.Wait. Use Task.WaitSafely() to ensure we avoid deadlocks.
 P:System.Threading.Tasks.Task`1.Result;Don't use Task.Result. Use Task.GetResultSafely() to ensure we avoid deadlocks.
+M:System.Threading.ManualResetEventSlim.Wait();Specify a timeout to avoid waiting forever.
+M:System.Char.ToLower(System.Char);char.ToLower() changes behaviour depending on CultureInfo.CurrentCulture. Use char.ToLowerInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture.
+M:System.Char.ToUpper(System.Char);char.ToUpper() changes behaviour depending on CultureInfo.CurrentCulture. Use char.ToUpperInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture.
+M:System.String.ToLower();string.ToLower() changes behaviour depending on CultureInfo.CurrentCulture. Use string.ToLowerInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture or use LocalisableString.
+M:System.String.ToUpper();string.ToUpper() changes behaviour depending on CultureInfo.CurrentCulture. Use string.ToUpperInvariant() instead. If wanting culture-sensitive behaviour, explicitly provide CultureInfo.CurrentCulture or use LocalisableString.
+M:Humanizer.InflectorExtensions.Pascalize(System.String);Humanizer's .Pascalize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToPascalCase() instead.
+M:Humanizer.InflectorExtensions.Camelize(System.String);Humanizer's .Camelize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToCamelCase() instead.
+M:Humanizer.InflectorExtensions.Underscore(System.String);Humanizer's .Underscore() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToSnakeCase() instead.
+M:Humanizer.InflectorExtensions.Kebaberize(System.String);Humanizer's .Kebaberize() extension method changes behaviour depending on CultureInfo.CurrentCulture. Use StringDehumanizeExtensions.ToKebabCase() instead.
@@ -1,8 +1,9 @@
-<!-- Contains required properties for osu!framework projects. -->
+<!-- Contains required properties for osu!framework projects. -->
 <Project>
  <PropertyGroup Label="C#">
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Nullable>enable</Nullable>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationManifest>$(MSBuildThisFileDirectory)app.manifest</ApplicationManifest>
@@ -3,25 +3,25 @@ GEM
  specs:
    CFPropertyList (3.0.5)
      rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.570.0)
-    aws-sdk-core (3.130.0)
+    aws-partitions (1.653.0)
+    aws-sdk-core (3.166.0)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.55.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.117.1)
+      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.2)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@@ -34,10 +34,10 @@ GEM
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.92.1)
-    faraday (1.10.0)
+    excon (0.93.1)
+    faraday (1.10.2)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -56,8 +56,8 @@ GEM
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
@@ -66,7 +66,7 @@ GEM
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
    fastimage (2.2.6)
-    fastlane (2.205.1)
+    fastlane (2.210.1)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -110,9 +110,9 @@ GEM
      souyuz (= 0.11.1)
    fastlane-plugin-xamarin (0.6.3)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.16.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-androidpublisher_v3 (0.29.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-core (0.9.1)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -121,27 +121,27 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.11.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.15.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.12.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.1)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.43.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.1.2)
+    googleauth (1.3.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
@@ -149,30 +149,30 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    jmespath (1.6.1)
-    json (2.6.1)
-    jwt (2.3.0)
+    json (2.6.2)
+    jwt (2.5.0)
    memoist (0.16.2)
    mini_magick (4.11.0)
    mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
    multi_json (1.15.0)
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.9)
+      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    optparse (0.1.1)
    os (1.1.4)
    plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.0)
    racc (1.6.0)
    rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
@@ -182,9 +182,9 @@ GEM
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.16.1)
+    signet (0.17.0)
      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
@@ -205,11 +205,11 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
    unicode-display_width (1.8.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
@@ -5,7 +5,7 @@ dotnet tool restore
  # - cmd: dotnet format --dry-run --check

 dotnet CodeFileSanity
-dotnet jb inspectcode "osu.Desktop.slnf" --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
+dotnet jb inspectcode "osu.Desktop.slnf" --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
 dotnet nvika parsereport "inspectcodereport.xml" --treatwarningsaserrors

 exit $LASTEXITCODE
@@ -2,5 +2,5 @@

 dotnet tool restore
 dotnet CodeFileSanity
-dotnet jb inspectcode "osu.Desktop.slnf" --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
+dotnet jb inspectcode "osu.Desktop.slnf" --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
 dotnet nvika parsereport "inspectcodereport.xml" --treatwarningsaserrors
@@ -1,5 +1,5 @@
 <p align="center">
-  <img width="500px" src="assets/lazer.png">
+  <img width="500" alt="osu! logo" src="assets/lazer.png">
 </p>

 # osu!
@@ -8,6 +8,7 @@
 [![GitHub release](https://img.shields.io/github/release/ppy/osu.svg)](https://github.com/ppy/osu/releases/latest)
 [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu)
 [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/osu-web/localized.svg)](https://crowdin.com/project/osu-web)

 A free-to-win rhythm game. Rhythm is just a *click* away!

@@ -31,7 +32,7 @@ If you are looking to install or test osu! without setting up a development envi

 **Latest build:**

-| [Windows 8.1+ (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe) | macOS 10.15+ ([Intel](https://github.com/ppy/osu/releases/latest/download/osu.app.Intel.zip), [Apple Silicon](https://github.com/ppy/osu/releases/latest/download/osu.app.Apple.Silicon.zip)) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS 10+](https://osu.ppy.sh/home/testflight) | [Android 5+](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
+| [Windows 8.1+ (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe) | macOS 10.15+ ([Intel](https://github.com/ppy/osu/releases/latest/download/osu.app.Intel.zip), [Apple Silicon](https://github.com/ppy/osu/releases/latest/download/osu.app.Apple.Silicon.zip)) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS 10+](https://osu.ppy.sh/home/testflight) | [Android 5+](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk) |
 | ------------- | ------------- | ------------- | ------------- | ------------- |

 - The iOS testflight link may fill up (Apple has a hard limit of 10,000 users). We reset it occasionally when this happens. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements of link resets.
@@ -104,6 +105,8 @@ When it comes to contributing to the project, the two main things you can do to

 Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured, with any libraries we are using, or with any processes involved with contributing, *please* bring it up. We welcome all feedback so we can make contributing to this project as painless as possible.

+If you wish to help with localisation efforts, head over to [crowdin](https://crowdin.com/project/osu-web).
+
 For those interested, we love to reward quality contributions via [bounties](https://docs.google.com/spreadsheets/d/1jNXfj_S3Pb5PErA-czDdC9DUu4IgUbe1Lt8E7CYUJuE/view?&rm=minimal#gid=523803337), paid out via PayPal or osu!supporter tags. Don't hesitate to [request a bounty](https://docs.google.com/forms/d/e/1FAIpQLSet_8iFAgPMG526pBZ2Kic6HSh7XPM3fE8xPcnWNkMzINDdYg/viewform) for your work on this project.

 ## Licence
@@ -9,7 +9,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.EmptyFreeform.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
    {
        [BackgroundDependencyLoader]
        private void load()
@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.EmptyFreeform.Tests
 {
    [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
    {
        protected override Ruleset CreatePlayerRuleset() => new EmptyFreeformRuleset();
    }
@@ -9,11 +9,9 @@
      <GenerateProgramFile>false</GenerateProgramFile>
    </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -25,6 +26,6 @@ namespace osu.Game.Rulesets.EmptyFreeform

        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => new Skill[0];
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;

 namespace osu.Game.Rulesets.EmptyFreeform
 {
-    public class EmptyFreeformInputManager : RulesetInputManager<EmptyFreeformAction>
+    public partial class EmptyFreeformInputManager : RulesetInputManager<EmptyFreeformAction>
    {
        public EmptyFreeformInputManager(RulesetInfo ruleset)
            : base(ruleset, 0, SimultaneousBindingMode.Unique)
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -20,7 +21,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.EmptyFreeform
 {
-    public class EmptyFreeformRuleset : Ruleset
+    public partial class EmptyFreeformRuleset : Ruleset
    {
        public override string Description => "a very emptyfreeformruleset ruleset";

@@ -41,7 +42,7 @@ namespace osu.Game.Rulesets.EmptyFreeform
                    return new[] { new EmptyFreeformModAutoplay() };

                default:
-                    return new Mod[] { null };
+                    return Array.Empty<Mod>();
            }
        }

@@ -55,7 +56,7 @@ namespace osu.Game.Rulesets.EmptyFreeform

        public override Drawable CreateIcon() => new Icon(ShortName[0]);

-        public class Icon : CompositeDrawable
+        public partial class Icon : CompositeDrawable
        {
            public Icon(char c)
            {
@@ -76,5 +77,8 @@ namespace osu.Game.Rulesets.EmptyFreeform
                };
            }
        }
+
+        // Leave this line intact. It will bake the correct version into the ruleset on each build/release.
+        public override string RulesetAPIVersionSupported => CURRENT_RULESET_API_VERSION;
    }
 }
@@ -9,7 +9,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.EmptyFreeform.Objects.Drawables
 {
-    public class DrawableEmptyFreeformHitObject : DrawableHitObject<EmptyFreeformHitObject>
+    public partial class DrawableEmptyFreeformHitObject : DrawableHitObject<EmptyFreeformHitObject>
    {
        public DrawableEmptyFreeformHitObject(EmptyFreeformHitObject hitObject)
            : base(hitObject)
@@ -17,7 +17,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.EmptyFreeform.UI
 {
    [Cached]
-    public class DrawableEmptyFreeformRuleset : DrawableRuleset<EmptyFreeformHitObject>
+    public partial class DrawableEmptyFreeformRuleset : DrawableRuleset<EmptyFreeformHitObject>
    {
        public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
            : base(ruleset, beatmap, mods)
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.EmptyFreeform.UI
 {
    [Cached]
-    public class EmptyFreeformPlayfield : Playfield
+    public partial class EmptyFreeformPlayfield : Playfield
    {
        [BackgroundDependencyLoader]
        private void load()
@@ -9,7 +9,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.Pippidon.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
    {
        [BackgroundDependencyLoader]
        private void load()
@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Pippidon.Tests
 {
    [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
    {
        protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
    }
@@ -9,11 +9,9 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
@@ -16,7 +16,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
 {
-    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    public partial class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
    {
        private const double time_preempt = 600;
        private const double time_fadein = 400;
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -25,6 +26,6 @@ namespace osu.Game.Rulesets.Pippidon

        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => new Skill[0];
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;

 namespace osu.Game.Rulesets.Pippidon
 {
-    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    public partial class PippidonInputManager : RulesetInputManager<PippidonAction>
    {
        public PippidonInputManager(RulesetInfo ruleset)
            : base(ruleset, 0, SimultaneousBindingMode.Unique)
@@ -1,10 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
@@ -37,7 +36,7 @@ namespace osu.Game.Rulesets.Pippidon
                    return new[] { new PippidonModAutoplay() };

                default:
-                    return new Mod[] { null };
+                    return Array.Empty<Mod>();
            }
        }

@@ -49,9 +48,9 @@ namespace osu.Game.Rulesets.Pippidon
            new KeyBinding(InputKey.X, PippidonAction.Button2),
        };

-        public override Drawable CreateIcon() => new Sprite
-        {
-            Texture = new TextureStore(new TextureLoaderStore(CreateResourceStore()), false).Get("Textures/coin"),
-        };
+        public override Drawable CreateIcon() => new PippidonRulesetIcon(this);
+
+        // Leave this line intact. It will bake the correct version into the ruleset on each build/release.
+        public override string RulesetAPIVersionSupported => CURRENT_RULESET_API_VERSION;
    }
 }
@@ -0,0 +1,26 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Rendering;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public partial class PippidonRulesetIcon : Sprite
+    {
+        private readonly Ruleset ruleset;
+
+        public PippidonRulesetIcon(Ruleset ruleset)
+        {
+            this.ruleset = ruleset;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IRenderer renderer)
+        {
+            Texture = new TextureStore(renderer, new TextureLoaderStore(ruleset.CreateResourceStore()), false).Get("Textures/coin");
+        }
+    }
+}
@@ -17,7 +17,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
    [Cached]
-    public class DrawablePippidonRuleset : DrawableRuleset<PippidonHitObject>
+    public partial class DrawablePippidonRuleset : DrawableRuleset<PippidonHitObject>
    {
        public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
            : base(ruleset, beatmap, mods)
@@ -10,7 +10,7 @@ using osuTK;

 namespace osu.Game.Rulesets.Pippidon.UI
 {
-    public class PippidonCursorContainer : GameplayCursorContainer
+    public partial class PippidonCursorContainer : GameplayCursorContainer
    {
        private Sprite cursorSprite;
        private Texture cursorTexture;
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
    [Cached]
-    public class PippidonPlayfield : Playfield
+    public partial class PippidonPlayfield : Playfield
    {
        protected override GameplayCursorContainer CreateCursor() => new PippidonCursorContainer();

@@ -7,7 +7,7 @@ using osuTK;

 namespace osu.Game.Rulesets.Pippidon.UI
 {
-    public class PippidonPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
+    public partial class PippidonPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
    {
        public PippidonPlayfieldAdjustmentContainer()
        {
@@ -9,7 +9,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.EmptyScrolling.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
    {
        [BackgroundDependencyLoader]
        private void load()
@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.EmptyScrolling.Tests
 {
    [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
    {
        protected override Ruleset CreatePlayerRuleset() => new EmptyScrollingRuleset();
    }
@@ -9,11 +9,9 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -25,6 +26,6 @@ namespace osu.Game.Rulesets.EmptyScrolling

        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => new Skill[0];
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;

 namespace osu.Game.Rulesets.EmptyScrolling
 {
-    public class EmptyScrollingInputManager : RulesetInputManager<EmptyScrollingAction>
+    public partial class EmptyScrollingInputManager : RulesetInputManager<EmptyScrollingAction>
    {
        public EmptyScrollingInputManager(RulesetInfo ruleset)
            : base(ruleset, 0, SimultaneousBindingMode.Unique)
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -34,7 +35,7 @@ namespace osu.Game.Rulesets.EmptyScrolling
                    return new[] { new EmptyScrollingModAutoplay() };

                default:
-                    return new Mod[] { null };
+                    return Array.Empty<Mod>();
            }
        }

@@ -53,5 +54,8 @@ namespace osu.Game.Rulesets.EmptyScrolling
            Text = ShortName[0].ToString(),
            Font = OsuFont.Default.With(size: 18),
        };
+
+        // Leave this line intact. It will bake the correct version into the ruleset on each build/release.
+        public override string RulesetAPIVersionSupported => CURRENT_RULESET_API_VERSION;
    }
 }
@@ -9,7 +9,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.EmptyScrolling.Objects.Drawables
 {
-    public class DrawableEmptyScrollingHitObject : DrawableHitObject<EmptyScrollingHitObject>
+    public partial class DrawableEmptyScrollingHitObject : DrawableHitObject<EmptyScrollingHitObject>
    {
        public DrawableEmptyScrollingHitObject(EmptyScrollingHitObject hitObject)
            : base(hitObject)
@@ -18,7 +18,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 namespace osu.Game.Rulesets.EmptyScrolling.UI
 {
    [Cached]
-    public class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset<EmptyScrollingHitObject>
+    public partial class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset<EmptyScrollingHitObject>
    {
        public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
            : base(ruleset, beatmap, mods)
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 namespace osu.Game.Rulesets.EmptyScrolling.UI
 {
    [Cached]
-    public class EmptyScrollingPlayfield : ScrollingPlayfield
+    public partial class EmptyScrollingPlayfield : ScrollingPlayfield
    {
        [BackgroundDependencyLoader]
        private void load()
@@ -9,7 +9,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.Pippidon.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
    {
        [BackgroundDependencyLoader]
        private void load()
@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Pippidon.Tests
 {
    [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
    {
        protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
    }
@@ -9,11 +9,9 @@
    <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
@@ -21,8 +21,11 @@ namespace osu.Game.Rulesets.Pippidon.Beatmaps
        public PippidonBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
            : base(beatmap, ruleset)
        {
-            minPosition = beatmap.HitObjects.Min(getUsablePosition);
-            maxPosition = beatmap.HitObjects.Max(getUsablePosition);
+            if (beatmap.HitObjects.Any())
+            {
+                minPosition = beatmap.HitObjects.Min(getUsablePosition);
+                maxPosition = beatmap.HitObjects.Max(getUsablePosition);
+            }
        }

        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition && h is IHasYPosition);
@@ -17,7 +17,7 @@ using osuTK.Graphics;

 namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
 {
-    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    public partial class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
    {
        private BindableNumber<int> currentLane;

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -25,6 +26,6 @@ namespace osu.Game.Rulesets.Pippidon

        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();

-        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => new Skill[0];
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate) => Array.Empty<Skill>();
    }
 }
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;

 namespace osu.Game.Rulesets.Pippidon
 {
-    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    public partial class PippidonInputManager : RulesetInputManager<PippidonAction>
    {
        public PippidonInputManager(RulesetInfo ruleset)
            : base(ruleset, 0, SimultaneousBindingMode.Unique)
@@ -1,10 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
@@ -34,7 +33,7 @@ namespace osu.Game.Rulesets.Pippidon
                    return new[] { new PippidonModAutoplay() };

                default:
-                    return new Mod[] { null };
+                    return Array.Empty<Mod>();
            }
        }

@@ -46,10 +45,9 @@ namespace osu.Game.Rulesets.Pippidon
            new KeyBinding(InputKey.S, PippidonAction.MoveDown),
        };

-        public override Drawable CreateIcon() => new Sprite
-        {
-            Margin = new MarginPadding { Top = 3 },
-            Texture = new TextureStore(new TextureLoaderStore(CreateResourceStore()), false).Get("Textures/coin"),
-        };
+        public override Drawable CreateIcon() => new PippidonRulesetIcon(this);
+
+        // Leave this line intact. It will bake the correct version into the ruleset on each build/release.
+        public override string RulesetAPIVersionSupported => CURRENT_RULESET_API_VERSION;
    }
 }
@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Rendering;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public partial class PippidonRulesetIcon : Sprite
+    {
+        private readonly Ruleset ruleset;
+
+        public PippidonRulesetIcon(Ruleset ruleset)
+        {
+            this.ruleset = ruleset;
+
+            Margin = new MarginPadding { Top = 3 };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IRenderer renderer)
+        {
+            Texture = new TextureStore(renderer, new TextureLoaderStore(ruleset.CreateResourceStore()), false).Get("Textures/coin");
+        }
+    }
+}
@@ -18,7 +18,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
    [Cached]
-    public class DrawablePippidonRuleset : DrawableScrollingRuleset<PippidonHitObject>
+    public partial class DrawablePippidonRuleset : DrawableScrollingRuleset<PippidonHitObject>
    {
        public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
            : base(ruleset, beatmap, mods)
@@ -15,7 +15,7 @@ using osuTK;

 namespace osu.Game.Rulesets.Pippidon.UI
 {
-    public class PippidonCharacter : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
+    public partial class PippidonCharacter : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
    {
        public readonly BindableInt LanePosition = new BindableInt
        {
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
    [Cached]
-    public class PippidonPlayfield : ScrollingPlayfield
+    public partial class PippidonPlayfield : ScrollingPlayfield
    {
        public const float LANE_HEIGHT = 70;

@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Pippidon.UI
            });
        }

-        private class LaneContainer : BeatSyncedContainer
+        private partial class LaneContainer : BeatSyncedContainer
        {
            private OsuColour colours;
            private FillFlowContainer fill;
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Pippidon.UI
                }
            }

-            private class Lane : CompositeDrawable
+            private partial class Lane : CompositeDrawable
            {
                public Lane()
                {
@@ -0,0 +1,17 @@
+# Run this script to use a local copy of osu-framework rather than fetching it from nuget.
+# It expects the osu-framework directory to be at the same level as the osu directory
+#
+# https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects
+
+$CSPROJ="osu.Game/osu.Game.csproj"
+$SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Framework;
+dotnet sln $SLN add ../osu-framework/osu.Framework/osu.Framework.csproj ../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj;
+dotnet add $CSPROJ reference ../osu-framework/osu.Framework/osu.Framework.csproj
+
+$SLNF=Get-Content "osu.Desktop.slnf" | ConvertFrom-Json
+$TMP=New-TemporaryFile
+$SLNF.solution.projects += ("../osu-framework/osu.Framework/osu.Framework.csproj", "../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj")
+ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8
+Move-Item -Path $TMP -Destination "osu.Desktop.slnf" -Force
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Run this script to use a local copy of osu-framework rather than fetching it from nuget.
+# It expects the osu-framework directory to be at the same level as the osu directory
+#
+# https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects
+
+CSPROJ="osu.Game/osu.Game.csproj"
+SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Framework
+dotnet sln $SLN add ../osu-framework/osu.Framework/osu.Framework.csproj ../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj
+dotnet add $CSPROJ reference ../osu-framework/osu.Framework/osu.Framework.csproj
+
+SLNF="osu.Desktop.slnf"
+tmp=$(mktemp)
+jq '.solution.projects += ["../osu-framework/osu.Framework/osu.Framework.csproj", "../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj"]' osu.Desktop.slnf > $tmp
+mv -f $tmp $SLNF
@@ -0,0 +1,12 @@
+$CSPROJ="osu.Game/osu.Game.csproj"
+$SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Game.Resources;
+dotnet sln $SLN add ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+dotnet add $CSPROJ reference ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+
+$SLNF=Get-Content "osu.Desktop.slnf" | ConvertFrom-Json
+$TMP=New-TemporaryFile
+$SLNF.solution.projects += ("../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj")
+ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8
+Move-Item -Path $TMP -Destination "osu.Desktop.slnf" -Force
@@ -0,0 +1,11 @@
+CSPROJ="osu.Game/osu.Game.csproj"
+SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Game.Resources;
+dotnet sln $SLN add ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+dotnet add $CSPROJ reference ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+
+SLNF="osu.Desktop.slnf"
+TMP=$(mktemp)
+jq '.solution.projects += ["../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj"]' $SLNF > $TMP
+mv -f $TMP $SLNF
@@ -138,10 +138,10 @@ platform :ios do
  end

  lane :testflight_prune_dry do
-    clean_testflight_testers(days_of_inactivity:45, dry_run: true)
+    clean_testflight_testers(days_of_inactivity:30, dry_run: true)
  end

  lane :testflight_prune do
-    clean_testflight_testers(days_of_inactivity: 45)
+    clean_testflight_testers(days_of_inactivity: 30)
  end
 end
@@ -1,4 +1,4 @@
-<Project>
+<Project>
  <PropertyGroup>
    <LangVersion>8.0</LangVersion>
    <OutputPath>bin\$(Configuration)</OutputPath>
@@ -51,11 +51,11 @@
    <Reference Include="Java.Interop" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.407.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.408.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1207.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1208.0" />
  </ItemGroup>
  <ItemGroup Label="Transitive Dependencies">
    <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
-    <PackageReference Include="Realm" Version="10.10.0" />
+    <PackageReference Include="Realm" Version="10.18.0" />
  </ItemGroup>
 </Project>
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Android.Input;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Android
+{
+    public partial class AndroidJoystickSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => JoystickSettingsStrings.JoystickGamepad;
+
+        private readonly AndroidJoystickHandler joystickHandler;
+
+        private readonly Bindable<bool> enabled = new BindableBool(true);
+
+        private SettingsSlider<float> deadzoneSlider = null!;
+
+        private Bindable<float> handlerDeadzone = null!;
+
+        private Bindable<float> localDeadzone = null!;
+
+        public AndroidJoystickSettings(AndroidJoystickHandler joystickHandler)
+        {
+            this.joystickHandler = joystickHandler;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // use local bindable to avoid changing enabled state of game host's bindable.
+            handlerDeadzone = joystickHandler.DeadzoneThreshold.GetBoundCopy();
+            localDeadzone = handlerDeadzone.GetUnboundCopy();
+
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = CommonStrings.Enabled,
+                    Current = enabled
+                },
+                deadzoneSlider = new SettingsSlider<float>
+                {
+                    LabelText = JoystickSettingsStrings.DeadzoneThreshold,
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true,
+                    Current = localDeadzone,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            enabled.BindTo(joystickHandler.Enabled);
+            enabled.BindValueChanged(e => deadzoneSlider.Current.Disabled = !e.NewValue, true);
+
+            handlerDeadzone.BindValueChanged(val =>
+            {
+                bool disabled = localDeadzone.Disabled;
+
+                localDeadzone.Disabled = false;
+                localDeadzone.Value = val.NewValue;
+                localDeadzone.Disabled = disabled;
+            }, true);
+
+            localDeadzone.BindValueChanged(val => handlerDeadzone.Value = val.NewValue);
+        }
+    }
+}
@@ -0,0 +1,97 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Android.OS;
+using osu.Framework.Allocation;
+using osu.Framework.Android.Input;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Localisation;
+using osu.Game.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Input;
+
+namespace osu.Android
+{
+    public partial class AndroidMouseSettings : SettingsSubsection
+    {
+        private readonly AndroidMouseHandler mouseHandler;
+
+        protected override LocalisableString Header => MouseSettingsStrings.Mouse;
+
+        private Bindable<double> handlerSensitivity = null!;
+
+        private Bindable<double> localSensitivity = null!;
+
+        private Bindable<bool> relativeMode = null!;
+
+        public AndroidMouseSettings(AndroidMouseHandler mouseHandler)
+        {
+            this.mouseHandler = mouseHandler;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager osuConfig)
+        {
+            // use local bindable to avoid changing enabled state of game host's bindable.
+            handlerSensitivity = mouseHandler.Sensitivity.GetBoundCopy();
+            localSensitivity = handlerSensitivity.GetUnboundCopy();
+
+            relativeMode = mouseHandler.UseRelativeMode.GetBoundCopy();
+
+            // High precision/pointer capture is only available on Android 8.0 and up
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
+            {
+                AddRange(new Drawable[]
+                {
+                    new SettingsCheckbox
+                    {
+                        LabelText = MouseSettingsStrings.HighPrecisionMouse,
+                        TooltipText = MouseSettingsStrings.HighPrecisionMouseTooltip,
+                        Current = relativeMode,
+                        Keywords = new[] { @"raw", @"input", @"relative", @"cursor", @"captured", @"pointer" },
+                    },
+                    new MouseSettings.SensitivitySetting
+                    {
+                        LabelText = MouseSettingsStrings.CursorSensitivity,
+                        Current = localSensitivity,
+                    },
+                });
+            }
+
+            AddRange(new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = MouseSettingsStrings.DisableMouseWheelVolumeAdjust,
+                    TooltipText = MouseSettingsStrings.DisableMouseWheelVolumeAdjustTooltip,
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel),
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = MouseSettingsStrings.DisableMouseButtons,
+                    Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons),
+                },
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            relativeMode.BindValueChanged(relative => localSensitivity.Disabled = !relative.NewValue, true);
+
+            handlerSensitivity.BindValueChanged(val =>
+            {
+                bool disabled = localSensitivity.Disabled;
+
+                localSensitivity.Disabled = false;
+                localSensitivity.Value = val.NewValue;
+                localSensitivity.Disabled = disabled;
+            }, true);
+
+            localSensitivity.BindValueChanged(val => handlerSensitivity.Value = val.NewValue);
+        }
+    }
+}
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using Android.Content.PM;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -9,7 +11,7 @@ using osu.Game;

 namespace osu.Android
 {
-    public class GameplayScreenRotationLocker : Component
+    public partial class GameplayScreenRotationLocker : Component
    {
        private Bindable<bool> localUserPlaying;

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -1,18 +1,24 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using System;
 using Android.App;
 using Android.OS;
 using osu.Framework.Allocation;
+using osu.Framework.Android.Input;
+using osu.Framework.Input.Handlers;
+using osu.Framework.Platform;
 using osu.Game;
+using osu.Game.Overlays.Settings;
 using osu.Game.Updater;
 using osu.Game.Utils;
 using Xamarin.Essentials;

 namespace osu.Android
 {
-    public class OsuGameAndroid : OsuGame
+    public partial class OsuGameAndroid : OsuGame
    {
        [Cached]
        private readonly OsuGameActivity gameActivity;
@@ -73,15 +79,36 @@ namespace osu.Android
            LoadComponentAsync(new GameplayScreenRotationLocker(), Add);
        }

+        public override void SetHost(GameHost host)
+        {
+            base.SetHost(host);
+            host.Window.CursorState |= CursorState.Hidden;
+        }
+
        protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();

        protected override BatteryInfo CreateBatteryInfo() => new AndroidBatteryInfo();

+        public override SettingsSubsection CreateSettingsSubsectionFor(InputHandler handler)
+        {
+            switch (handler)
+            {
+                case AndroidMouseHandler mh:
+                    return new AndroidMouseSettings(mh);
+
+                case AndroidJoystickHandler jh:
+                    return new AndroidJoystickSettings(jh);
+
+                default:
+                    return base.CreateSettingsSubsectionFor(handler);
+            }
+        }
+
        private class AndroidBatteryInfo : BatteryInfo
        {
-            public override double ChargeLevel => Battery.ChargeLevel;
+            public override double? ChargeLevel => Battery.ChargeLevel;

-            public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
+            public override bool OnBattery => Battery.PowerSource == BatteryPowerSource.Battery;
        }
    }
 }
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using Android;
 using Android.App;

@@ -26,6 +26,8 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
  </PropertyGroup>
  <ItemGroup>
+    <Compile Include="AndroidJoystickSettings.cs" />
+    <Compile Include="AndroidMouseSettings.cs" />
    <Compile Include="GameplayScreenRotationLocker.cs" />
    <Compile Include="OsuGameActivity.cs" />
    <Compile Include="OsuGameAndroid.cs" />
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
@@ -19,16 +20,19 @@ using LogLevel = osu.Framework.Logging.LogLevel;

 namespace osu.Desktop
 {
-    internal class DiscordRichPresence : Component
+    internal partial class DiscordRichPresence : Component
    {
        private const string client_id = "367827983903490050";

-        private DiscordRpcClient client;
+        private DiscordRpcClient client = null!;

        [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;

-        private IBindable<APIUser> user;
+        private IBindable<APIUser> user = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;

        private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
        private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
@@ -41,7 +45,7 @@ namespace osu.Desktop
        };

        [BackgroundDependencyLoader]
-        private void load(IAPIProvider provider, OsuConfigManager config)
+        private void load(OsuConfigManager config)
        {
            client = new DiscordRpcClient(client_id)
            {
@@ -51,13 +55,14 @@ namespace osu.Desktop
            client.OnReady += onReady;

            // safety measure for now, until we performance test / improve backoff for failed connections.
-            client.OnConnectionFailed += (_, __) => client.Deinitialize();
+            client.OnConnectionFailed += (_, _) => client.Deinitialize();

            client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);

            config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);

-            (user = provider.LocalUser.GetBoundCopy()).BindValueChanged(u =>
+            user = api.LocalUser.GetBoundCopy();
+            user.BindValueChanged(u =>
            {
                status.UnbindBindings();
                status.BindTo(u.NewValue.Status);
@@ -95,6 +100,22 @@ namespace osu.Desktop
            {
                presence.State = truncate(activity.Value.Status);
                presence.Details = truncate(getDetails(activity.Value));
+
+                if (getBeatmap(activity.Value) is IBeatmapInfo beatmap && beatmap.OnlineID > 0)
+                {
+                    presence.Buttons = new[]
+                    {
+                        new Button
+                        {
+                            Label = "View beatmap",
+                            Url = $@"{api.WebsiteRootUrl}/beatmapsets/{beatmap.BeatmapSet?.OnlineID}#{ruleset.Value.ShortName}/{beatmap.OnlineID}"
+                        }
+                    };
+                }
+                else
+                {
+                    presence.Buttons = null;
+                }
            }
            else
            {
@@ -106,7 +127,12 @@ namespace osu.Desktop
            if (privacyMode.Value == DiscordRichPresenceMode.Limited)
                presence.Assets.LargeImageText = string.Empty;
            else
-                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
+            {
+                if (user.Value.RulesetsStatistics != null && user.Value.RulesetsStatistics.TryGetValue(ruleset.Value.ShortName, out UserStatistics? statistics))
+                    presence.Assets.LargeImageText = $"{user.Value.Username}" + (statistics.GlobalRank > 0 ? $" (rank #{statistics.GlobalRank:N0})" : string.Empty);
+                else
+                    presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
+            }

            // update ruleset
            presence.Assets.SmallImageKey = ruleset.Value.IsLegacyRuleset() ? $"mode_{ruleset.Value.OnlineID}" : "mode_custom";
@@ -136,15 +162,29 @@ namespace osu.Desktop
            });
        }

+        private IBeatmapInfo? getBeatmap(UserActivity activity)
+        {
+            switch (activity)
+            {
+                case UserActivity.InGame game:
+                    return game.BeatmapInfo;
+
+                case UserActivity.Editing edit:
+                    return edit.BeatmapInfo;
+            }
+
+            return null;
+        }
+
        private string getDetails(UserActivity activity)
        {
            switch (activity)
            {
                case UserActivity.InGame game:
-                    return game.BeatmapInfo.ToString();
+                    return game.BeatmapInfo.ToString() ?? string.Empty;

                case UserActivity.Editing edit:
-                    return edit.BeatmapInfo.ToString();
+                    return edit.BeatmapInfo.ToString() ?? string.Empty;

                case UserActivity.InLobby lobby:
                    return privacyMode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
@@ -11,7 +11,7 @@ namespace osu.Desktop.LegacyIpc
    /// </remarks>
    public class LegacyIpcDifficultyCalculationRequest
    {
-        public string BeatmapFile { get; set; }
+        public string BeatmapFile { get; set; } = string.Empty;
        public int RulesetId { get; set; }
        public int Mods { get; set; }
    }
@@ -37,17 +37,20 @@ namespace osu.Desktop.LegacyIpc
        public new object Value
        {
            get => base.Value;
-            set => base.Value = new Data
-            {
-                MessageType = value.GetType().Name,
-                MessageData = value
-            };
+            set => base.Value = new Data(value.GetType().Name, value);
        }

        public class Data
        {
-            public string MessageType { get; set; }
-            public object MessageData { get; set; }
+            public string MessageType { get; }
+
+            public object MessageData { get; }
+
+            public Data(string messageType, object messageData)
+            {
+                MessageType = messageType;
+                MessageData = messageData;
+            }
        }
    }
 }
@@ -15,8 +15,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;

-#nullable enable
-
 namespace osu.Desktop.LegacyIpc
 {
    /// <summary>
@@ -20,23 +20,28 @@ using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
 using osu.Game.IO;
+using osu.Game.IPC;
+using osu.Game.Utils;
+using SDL2;

 namespace osu.Desktop
 {
-    internal class OsuGameDesktop : OsuGame
+    internal partial class OsuGameDesktop : OsuGame
    {
-        public OsuGameDesktop(string[] args = null)
+        private OsuSchemeLinkIPCChannel? osuSchemeLinkIPCChannel;
+
+        public OsuGameDesktop(string[]? args = null)
            : base(args)
        {
        }

-        public override StableStorage GetStorageForStableInstall()
+        public override StableStorage? GetStorageForStableInstall()
        {
            try
            {
                if (Host is DesktopGameHost desktopHost)
                {
-                    string stablePath = getStableInstallPath();
+                    string? stablePath = getStableInstallPath();
                    if (!string.IsNullOrEmpty(stablePath))
                        return new StableStorage(stablePath, desktopHost);
                }
@@ -49,11 +54,11 @@ namespace osu.Desktop
            return null;
        }

-        private string getStableInstallPath()
+        private string? getStableInstallPath()
        {
            static bool checkExists(string p) => Directory.Exists(Path.Combine(p, "Songs")) || File.Exists(Path.Combine(p, "osu!.cfg"));

-            string stableInstallPath;
+            string? stableInstallPath;

            if (OperatingSystem.IsWindows())
            {
@@ -81,15 +86,15 @@ namespace osu.Desktop
        }

        [SupportedOSPlatform("windows")]
-        private string getStableInstallPathFromRegistry()
+        private string? getStableInstallPathFromRegistry()
        {
-            using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+            using (RegistryKey? key = Registry.ClassesRoot.OpenSubKey("osu"))
                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
        }

        protected override UpdateManager CreateUpdateManager()
        {
-            string packageManaged = Environment.GetEnvironmentVariable("OSU_EXTERNAL_UPDATE_PROVIDER");
+            string? packageManaged = Environment.GetEnvironmentVariable("OSU_EXTERNAL_UPDATE_PROVIDER");

            if (!string.IsNullOrEmpty(packageManaged))
                return new NoActionUpdateManager();
@@ -116,24 +121,29 @@ namespace osu.Desktop
                LoadComponentAsync(new GameplayWinKeyBlocker(), Add);

            LoadComponentAsync(new ElevatedPrivilegesChecker(), Add);
+
+            osuSchemeLinkIPCChannel = new OsuSchemeLinkIPCChannel(Host, this);
        }

        public override void SetHost(GameHost host)
        {
            base.SetHost(host);

-            var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
-
            var desktopWindow = (SDL2DesktopWindow)host.Window;

+            var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
+            if (iconStream != null)
+                desktopWindow.SetIconFromStream(iconStream);
+
            desktopWindow.CursorState |= CursorState.Hidden;
-            desktopWindow.SetIconFromStream(iconStream);
            desktopWindow.Title = Name;
            desktopWindow.DragDrop += f => fileDrop(new[] { f });
        }

+        protected override BatteryInfo CreateBatteryInfo() => new SDL2BatteryInfo();
+
        private readonly List<string> importableFiles = new List<string>();
-        private ScheduledDelegate importSchedule;
+        private ScheduledDelegate? importSchedule;

        private void fileDrop(string[] filePaths)
        {
@@ -166,5 +176,29 @@ namespace osu.Desktop
                Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
            }
        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            osuSchemeLinkIPCChannel?.Dispose();
+        }
+
+        private class SDL2BatteryInfo : BatteryInfo
+        {
+            public override double? ChargeLevel
+            {
+                get
+                {
+                    SDL.SDL_GetPowerInfo(out _, out int percentage);
+
+                    if (percentage == -1)
+                        return null;
+
+                    return percentage / 100.0;
+                }
+            }
+
+            public override bool OnBattery => SDL.SDL_GetPowerInfo(out _, out _) == SDL.SDL_PowerState.SDL_POWERSTATE_ON_BATTERY;
+        }
    }
 }
@@ -4,31 +4,55 @@
 using System;
 using System.IO;
 using System.Runtime.Versioning;
-using System.Threading;
-using System.Threading.Tasks;
 using osu.Desktop.LegacyIpc;
 using osu.Framework;
 using osu.Framework.Development;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Game;
 using osu.Game.IPC;
 using osu.Game.Tournament;
+using SDL2;
 using Squirrel;

 namespace osu.Desktop
 {
    public static class Program
    {
+#if DEBUG
+        private const string base_game_name = @"osu-development";
+#else
        private const string base_game_name = @"osu";
+#endif

-        private static LegacyTcpIpcProvider legacyIpc;
+        private static LegacyTcpIpcProvider? legacyIpc;

        [STAThread]
        public static void Main(string[] args)
        {
            // run Squirrel first, as the app may exit after these run
            if (OperatingSystem.IsWindows())
+            {
+                var windowsVersion = Environment.OSVersion.Version;
+
+                // While .NET 6 still supports Windows 7 and above, we are limited by realm currently, as they choose to only support 8.1 and higher.
+                // See https://www.mongodb.com/docs/realm/sdk/dotnet/#supported-platforms
+                if (windowsVersion.Major < 6 || (windowsVersion.Major == 6 && windowsVersion.Minor <= 2))
+                {
+                    // If users running in compatibility mode becomes more of a common thing, we may want to provide better guidance or even consider
+                    // disabling it ourselves.
+                    // We could also better detect compatibility mode if required:
+                    // https://stackoverflow.com/questions/10744651/how-i-can-detect-if-my-application-is-running-under-compatibility-mode#comment58183249_10744730
+                    SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR,
+                        "Your operating system is too old to run osu!",
+                        "This version of osu! requires at least Windows 8.1 to run.\n"
+                        + "Please upgrade your operating system or consider using an older version of osu!.\n\n"
+                        + "If you are running a newer version of windows, please check you don't have \"Compatibility mode\" turned on for osu!", IntPtr.Zero);
+                    return;
+                }
+
                setupSquirrel();
+            }

            // Back up the cwd before DesktopGameHost changes it
            string cwd = Environment.CurrentDirectory;
@@ -63,23 +87,10 @@ namespace osu.Desktop

            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { BindIPC = true }))
            {
-                host.ExceptionThrown += handleException;
-
                if (!host.IsPrimaryInstance)
                {
-                    if (args.Length > 0 && args[0].Contains('.')) // easy way to check for a file import in args
-                    {
-                        var importer = new ArchiveImportIPCChannel(host);
-
-                        foreach (string file in args)
-                        {
-                            Console.WriteLine(@"Importing {0}", file);
-                            if (!importer.ImportAsync(Path.GetFullPath(file, cwd)).Wait(3000))
-                                throw new TimeoutException(@"IPC took too long to send");
-                        }
-
+                    if (trySendIPCMessage(host, cwd, args))
                        return;
-                    }

                    // we want to allow multiple instances to be started when in debug.
                    if (!DebugUtils.IsDebugBuild)
@@ -110,39 +121,57 @@ namespace osu.Desktop
            }
        }

+        private static bool trySendIPCMessage(IIpcHost host, string cwd, string[] args)
+        {
+            if (args.Length == 1 && args[0].StartsWith(OsuGameBase.OSU_PROTOCOL, StringComparison.Ordinal))
+            {
+                var osuSchemeLinkHandler = new OsuSchemeLinkIPCChannel(host);
+                if (!osuSchemeLinkHandler.HandleLinkAsync(args[0]).Wait(3000))
+                    throw new IPCTimeoutException(osuSchemeLinkHandler.GetType());
+
+                return true;
+            }
+
+            if (args.Length > 0 && args[0].Contains('.')) // easy way to check for a file import in args
+            {
+                var importer = new ArchiveImportIPCChannel(host);
+
+                foreach (string file in args)
+                {
+                    Console.WriteLine(@"Importing {0}", file);
+                    if (!importer.ImportAsync(Path.GetFullPath(file, cwd)).Wait(3000))
+                        throw new IPCTimeoutException(importer.GetType());
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
        [SupportedOSPlatform("windows")]
        private static void setupSquirrel()
        {
-            SquirrelAwareApp.HandleEvents(onInitialInstall: (version, tools) =>
+            SquirrelAwareApp.HandleEvents(onInitialInstall: (_, tools) =>
            {
                tools.CreateShortcutForThisExe();
                tools.CreateUninstallerRegistryEntry();
-            }, onAppUninstall: (version, tools) =>
+            }, onAppUpdate: (_, tools) =>
+            {
+                tools.CreateUninstallerRegistryEntry();
+            }, onAppUninstall: (_, tools) =>
            {
                tools.RemoveShortcutForThisExe();
                tools.RemoveUninstallerRegistryEntry();
-            }, onEveryRun: (version, tools, firstRun) =>
+            }, onEveryRun: (_, _, _) =>
            {
-                tools.SetProcessAppUserModelId();
+                // While setting the `ProcessAppUserModelId` fixes duplicate icons/shortcuts on the taskbar, it currently
+                // causes the right-click context menu to function incorrectly.
+                //
+                // This may turn out to be non-required after an alternative solution is implemented.
+                // see https://github.com/clowd/Clowd.Squirrel/issues/24
+                // tools.SetProcessAppUserModelId();
            });
        }
-
-        private static int allowableExceptions = DebugUtils.IsDebugBuild ? 0 : 1;
-
-        /// <summary>
-        /// Allow a maximum of one unhandled exception, per second of execution.
-        /// </summary>
-        /// <param name="arg"></param>
-        private static bool handleException(Exception arg)
-        {
-            bool continueExecution = Interlocked.Decrement(ref allowableExceptions) >= 0;
-
-            Logger.Log($"Unhandled exception has been {(continueExecution ? $"allowed with {allowableExceptions} more allowable exceptions" : "denied")} .");
-
-            // restore the stock of allowable exceptions after a short delay.
-            Task.Delay(1000).ContinueWith(_ => Interlocked.Increment(ref allowableExceptions));
-
-            return continueExecution;
-        }
    }
 }
@@ -16,10 +16,10 @@ namespace osu.Desktop.Security
    /// <summary>
    /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
    /// </summary>
-    public class ElevatedPrivilegesChecker : Component
+    public partial class ElevatedPrivilegesChecker : Component
    {
        [Resolved]
-        private NotificationOverlay notifications { get; set; }
+        private INotificationOverlay notifications { get; set; } = null!;

        private bool elevated;

@@ -63,7 +63,7 @@ namespace osu.Desktop.Security
            return false;
        }

-        private class ElevatedPrivilegesNotification : SimpleNotification
+        private partial class ElevatedPrivilegesNotification : SimpleNotification
        {
            public override bool IsImportant => true;

@@ -76,7 +76,7 @@ namespace osu.Desktop.Security
            private void load(OsuColour colours)
            {
                Icon = FontAwesome.Solid.ShieldAlt;
-                IconBackground.Colour = colours.YellowDark;
+                IconContent.Colour = colours.YellowDark;
            }
        }
    }
@@ -5,29 +5,24 @@ using System;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
 using osu.Game;
-using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
-using osuTK;
-using osuTK.Graphics;
 using Squirrel;
 using Squirrel.SimpleSplat;
+using LogLevel = Squirrel.SimpleSplat.LogLevel;
+using UpdateManager = osu.Game.Updater.UpdateManager;

 namespace osu.Desktop.Updater
 {
    [SupportedOSPlatform("windows")]
-    public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
+    public partial class SquirrelUpdateManager : UpdateManager
    {
-        private UpdateManager updateManager;
-        private NotificationOverlay notificationOverlay;
+        private Squirrel.UpdateManager? updateManager;
+        private INotificationOverlay notificationOverlay = null!;

-        public Task PrepareUpdateAsync() => UpdateManager.RestartAppWhenExited();
+        public Task PrepareUpdateAsync() => Squirrel.UpdateManager.RestartAppWhenExited();

        private static readonly Logger logger = Logger.GetLogger("updater");

@@ -38,22 +33,25 @@ namespace osu.Desktop.Updater

        private readonly SquirrelLogger squirrelLogger = new SquirrelLogger();

+        [Resolved]
+        private OsuGameBase game { get; set; } = null!;
+
        [BackgroundDependencyLoader]
-        private void load(NotificationOverlay notification)
+        private void load(INotificationOverlay notifications)
        {
-            notificationOverlay = notification;
+            notificationOverlay = notifications;

            SquirrelLocator.CurrentMutable.Register(() => squirrelLogger, typeof(ILogger));
        }

        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync().ConfigureAwait(false);

-        private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
+        private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification? notification = null)
        {
            // should we schedule a retry on completion of this check?
            bool scheduleRecheck = true;

-            const string github_token = null; // TODO: populate.
+            const string? github_token = null; // TODO: populate.

            try
            {
@@ -66,7 +64,14 @@ namespace osu.Desktop.Updater
                    if (updatePending)
                    {
                        // the user may have dismissed the completion notice, so show it again.
-                        notificationOverlay.Post(new UpdateCompleteNotification(this));
+                        notificationOverlay.Post(new UpdateApplicationCompleteNotification
+                        {
+                            Activated = () =>
+                            {
+                                restartToApplyUpdate();
+                                return true;
+                            },
+                        });
                        return true;
                    }

@@ -78,19 +83,21 @@ namespace osu.Desktop.Updater

                if (notification == null)
                {
-                    notification = new UpdateProgressNotification(this) { State = ProgressNotificationState.Active };
+                    notification = new UpdateProgressNotification
+                    {
+                        CompletionClickAction = restartToApplyUpdate,
+                    };
+
                    Schedule(() => notificationOverlay.Post(notification));
                }

-                notification.Progress = 0;
-                notification.Text = @"Downloading update...";
+                notification.StartDownload();

                try
                {
                    await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f).ConfigureAwait(false);

-                    notification.Progress = 0;
-                    notification.Text = @"Installing update...";
+                    notification.StartInstall();

                    await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f).ConfigureAwait(false);

@@ -110,9 +117,7 @@ namespace osu.Desktop.Updater
                    else
                    {
                        // In the case of an error, a separate notification will be displayed.
-                        notification.State = ProgressNotificationState.Cancelled;
-                        notification.Close();
-
+                        notification.FailDownload();
                        Logger.Error(e, @"update failed!");
                    }
                }
@@ -134,84 +139,24 @@ namespace osu.Desktop.Updater
            return true;
        }

+        private bool restartToApplyUpdate()
+        {
+            PrepareUpdateAsync()
+                .ContinueWith(_ => Schedule(() => game.AttemptExit()));
+            return true;
+        }
+
        protected override void Dispose(bool isDisposing)
        {
            base.Dispose(isDisposing);
            updateManager?.Dispose();
        }

-        private class UpdateCompleteNotification : ProgressCompletionNotification
-        {
-            [Resolved]
-            private OsuGame game { get; set; }
-
-            public UpdateCompleteNotification(SquirrelUpdateManager updateManager)
-            {
-                Text = @"Update ready to install. Click to restart!";
-
-                Activated = () =>
-                {
-                    updateManager.PrepareUpdateAsync()
-                                 .ContinueWith(_ => updateManager.Schedule(() => game?.GracefullyExit()));
-                    return true;
-                };
-            }
-        }
-
-        private class UpdateProgressNotification : ProgressNotification
-        {
-            private readonly SquirrelUpdateManager updateManager;
-
-            public UpdateProgressNotification(SquirrelUpdateManager updateManager)
-            {
-                this.updateManager = updateManager;
-            }
-
-            protected override Notification CreateCompletionNotification()
-            {
-                return new UpdateCompleteNotification(updateManager);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                IconContent.AddRange(new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Icon = FontAwesome.Solid.Upload,
-                        Colour = Color4.White,
-                        Size = new Vector2(20),
-                    }
-                });
-            }
-
-            public override void Close()
-            {
-                // cancelling updates is not currently supported by the underlying updater.
-                // only allow dismissing for now.
-
-                switch (State)
-                {
-                    case ProgressNotificationState.Cancelled:
-                        base.Close();
-                        break;
-                }
-            }
-        }
-
        private class SquirrelLogger : ILogger, IDisposable
        {
-            public Squirrel.SimpleSplat.LogLevel Level { get; set; } = Squirrel.SimpleSplat.LogLevel.Info;
+            public LogLevel Level { get; set; } = LogLevel.Info;

-            public void Write(string message, Squirrel.SimpleSplat.LogLevel logLevel)
+            public void Write(string message, LogLevel logLevel)
            {
                if (logLevel < Level)
                    return;
@@ -10,14 +10,14 @@ using osu.Game.Screens.Play;

 namespace osu.Desktop.Windows
 {
-    public class GameplayWinKeyBlocker : Component
+    public partial class GameplayWinKeyBlocker : Component
    {
-        private Bindable<bool> disableWinKey;
-        private IBindable<bool> localUserPlaying;
-        private IBindable<bool> isActive;
+        private Bindable<bool> disableWinKey = null!;
+        private IBindable<bool> localUserPlaying = null!;
+        private IBindable<bool> isActive = null!;

        [Resolved]
-        private GameHost host { get; set; }
+        private GameHost host { get; set; } = null!;

        [BackgroundDependencyLoader]
        private void load(ILocalUserPlayInfo localUserInfo, OsuConfigManager config)
@@ -19,7 +19,7 @@ namespace osu.Desktop.Windows
        private const int wm_syskeyup = 261;

        //Resharper disable once NotAccessedField.Local
-        private static LowLevelKeyboardProcDelegate keyboardHookDelegate; // keeping a reference alive for the GC
+        private static LowLevelKeyboardProcDelegate? keyboardHookDelegate; // keeping a reference alive for the GC
        private static IntPtr keyHook;

        [StructLayout(LayoutKind.Explicit)]
@@ -24,15 +24,10 @@
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Clowd.Squirrel" Version="2.8.28-pre" />
+    <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
    <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.14">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
+    <PackageReference Include="DiscordRichPresence" Version="1.1.1.14" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
@@ -18,5 +18,6 @@
      <file src="**.exe" target="lib\net45\" exclude="**vshost**"/>
      <file src="**.dll" target="lib\net45\"/>
      <file src="**.config" target="lib\net45\"/>
+      <file src="**.json" target="lib\net45\"/>
    </files>
 </package>
@@ -0,0 +1,166 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using BenchmarkDotNet.Attributes;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Benchmarks
+{
+    public class BenchmarkHitObject : BenchmarkTest
+    {
+        [Params(1, 100, 1000)]
+        public int Count { get; set; }
+
+        [Params(false, true)]
+        public bool WithBindableAccess { get; set; }
+
+        [Benchmark]
+        public HitCircle[] OsuCircle()
+        {
+            var circles = new HitCircle[Count];
+
+            for (int i = 0; i < Count; i++)
+            {
+                circles[i] = new HitCircle();
+
+                if (WithBindableAccess)
+                {
+                    _ = circles[i].PositionBindable;
+                    _ = circles[i].ScaleBindable;
+                    _ = circles[i].ComboIndexBindable;
+                    _ = circles[i].ComboOffsetBindable;
+                    _ = circles[i].StackHeightBindable;
+                    _ = circles[i].LastInComboBindable;
+                    _ = circles[i].ComboIndexWithOffsetsBindable;
+                    _ = circles[i].IndexInCurrentComboBindable;
+                    _ = circles[i].SamplesBindable;
+                    _ = circles[i].StartTimeBindable;
+                }
+                else
+                {
+                    _ = circles[i].Position;
+                    _ = circles[i].Scale;
+                    _ = circles[i].ComboIndex;
+                    _ = circles[i].ComboOffset;
+                    _ = circles[i].StackHeight;
+                    _ = circles[i].LastInCombo;
+                    _ = circles[i].ComboIndexWithOffsets;
+                    _ = circles[i].IndexInCurrentCombo;
+                    _ = circles[i].Samples;
+                    _ = circles[i].StartTime;
+                    _ = circles[i].Position;
+                    _ = circles[i].Scale;
+                    _ = circles[i].ComboIndex;
+                    _ = circles[i].ComboOffset;
+                    _ = circles[i].StackHeight;
+                    _ = circles[i].LastInCombo;
+                    _ = circles[i].ComboIndexWithOffsets;
+                    _ = circles[i].IndexInCurrentCombo;
+                    _ = circles[i].Samples;
+                    _ = circles[i].StartTime;
+                }
+            }
+
+            return circles;
+        }
+
+        [Benchmark]
+        public Hit[] TaikoHit()
+        {
+            var hits = new Hit[Count];
+
+            for (int i = 0; i < Count; i++)
+            {
+                hits[i] = new Hit();
+
+                if (WithBindableAccess)
+                {
+                    _ = hits[i].TypeBindable;
+                    _ = hits[i].IsStrongBindable;
+                    _ = hits[i].SamplesBindable;
+                    _ = hits[i].StartTimeBindable;
+                }
+                else
+                {
+                    _ = hits[i].Type;
+                    _ = hits[i].IsStrong;
+                    _ = hits[i].Samples;
+                    _ = hits[i].StartTime;
+                }
+            }
+
+            return hits;
+        }
+
+        [Benchmark]
+        public Fruit[] CatchFruit()
+        {
+            var fruit = new Fruit[Count];
+
+            for (int i = 0; i < Count; i++)
+            {
+                fruit[i] = new Fruit();
+
+                if (WithBindableAccess)
+                {
+                    _ = fruit[i].OriginalXBindable;
+                    _ = fruit[i].XOffsetBindable;
+                    _ = fruit[i].ScaleBindable;
+                    _ = fruit[i].ComboIndexBindable;
+                    _ = fruit[i].HyperDashBindable;
+                    _ = fruit[i].LastInComboBindable;
+                    _ = fruit[i].ComboIndexWithOffsetsBindable;
+                    _ = fruit[i].IndexInCurrentComboBindable;
+                    _ = fruit[i].IndexInBeatmapBindable;
+                    _ = fruit[i].SamplesBindable;
+                    _ = fruit[i].StartTimeBindable;
+                }
+                else
+                {
+                    _ = fruit[i].OriginalX;
+                    _ = fruit[i].XOffset;
+                    _ = fruit[i].Scale;
+                    _ = fruit[i].ComboIndex;
+                    _ = fruit[i].HyperDash;
+                    _ = fruit[i].LastInCombo;
+                    _ = fruit[i].ComboIndexWithOffsets;
+                    _ = fruit[i].IndexInCurrentCombo;
+                    _ = fruit[i].IndexInBeatmap;
+                    _ = fruit[i].Samples;
+                    _ = fruit[i].StartTime;
+                }
+            }
+
+            return fruit;
+        }
+
+        [Benchmark]
+        public Note[] ManiaNote()
+        {
+            var notes = new Note[Count];
+
+            for (int i = 0; i < Count; i++)
+            {
+                notes[i] = new Note();
+
+                if (WithBindableAccess)
+                {
+                    _ = notes[i].ColumnBindable;
+                    _ = notes[i].SamplesBindable;
+                    _ = notes[i].StartTimeBindable;
+                }
+                else
+                {
+                    _ = notes[i].Column;
+                    _ = notes[i].Samples;
+                    _ = notes[i].StartTime;
+                }
+            }
+
+            return notes;
+        }
+    }
+}
@@ -9,7 +9,7 @@ namespace osu.Game.Benchmarks
 {
    public class BenchmarkMod : BenchmarkTest
    {
-        private OsuModDoubleTime mod;
+        private OsuModDoubleTime mod = null!;

        [Params(1, 10, 100)]
        public int Times { get; set; }
@@ -15,9 +15,9 @@ namespace osu.Game.Benchmarks
 {
    public class BenchmarkRealmReads : BenchmarkTest
    {
-        private TemporaryNativeStorage storage;
-        private RealmAccess realm;
-        private UpdateThread updateThread;
+        private TemporaryNativeStorage storage = null!;
+        private RealmAccess realm = null!;
+        private UpdateThread updateThread = null!;

        [Params(1, 100, 1000)]
        public int ReadsPerFetch { get; set; }
@@ -29,7 +29,7 @@ namespace osu.Game.Benchmarks

            realm = new RealmAccess(storage, OsuGameBase.CLIENT_DATABASE_FILENAME);

-            realm.Run(r =>
+            realm.Run(_ =>
            {
                realm.Write(c => c.Add(TestResources.CreateTestBeatmapSetInfo(rulesets: new[] { new OsuRuleset().RulesetInfo })));
            });
@@ -74,7 +74,7 @@ namespace osu.Game.Benchmarks
                }
            });

-            done.Wait();
+            done.Wait(60000);
        }

        [Benchmark]
@@ -113,7 +113,7 @@ namespace osu.Game.Benchmarks
                }
            });

-            done.Wait();
+            done.Wait(60000);
        }

        [Benchmark]
@@ -133,9 +133,9 @@ namespace osu.Game.Benchmarks
        [GlobalCleanup]
        public void Cleanup()
        {
-            realm?.Dispose();
-            storage?.Dispose();
-            updateThread?.Exit();
+            realm.Dispose();
+            storage.Dispose();
+            updateThread.Exit();
        }
    }
 }
@@ -11,9 +11,9 @@ namespace osu.Game.Benchmarks
 {
    public class BenchmarkRuleset : BenchmarkTest
    {
-        private OsuRuleset ruleset;
-        private APIMod apiModDoubleTime;
-        private APIMod apiModDifficultyAdjust;
+        private OsuRuleset ruleset = null!;
+        private APIMod apiModDoubleTime = null!;
+        private APIMod apiModDifficultyAdjust = null!;

        public override void SetUp()
        {
@@ -7,9 +7,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Include="nunit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
  </ItemGroup>

  <ItemGroup>
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using Android.App;
 using osu.Framework.Android;
 using osu.Game.Tests;
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using Foundation;
 using osu.Framework.iOS;
 using osu.Game.Tests;
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using osu.Framework.iOS;
 using UIKit;

@@ -37,6 +37,8 @@
 	</array>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 </dict>
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps.Legacy;
@@ -22,21 +24,24 @@ namespace osu.Game.Rulesets.Catch.Tests
            new object[] { LegacyMods.DoubleTime, new[] { typeof(CatchModDoubleTime) } },
            new object[] { LegacyMods.Relax, new[] { typeof(CatchModRelax) } },
            new object[] { LegacyMods.HalfTime, new[] { typeof(CatchModHalfTime) } },
-            new object[] { LegacyMods.Nightcore, new[] { typeof(CatchModNightcore) } },
            new object[] { LegacyMods.Flashlight, new[] { typeof(CatchModFlashlight) } },
            new object[] { LegacyMods.Autoplay, new[] { typeof(CatchModAutoplay) } },
-            new object[] { LegacyMods.Perfect, new[] { typeof(CatchModPerfect) } },
-            new object[] { LegacyMods.Cinema, new[] { typeof(CatchModCinema) } },
            new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(CatchModHardRock), typeof(CatchModDoubleTime) } }
        };

+        [TestCaseSource(nameof(catch_mod_mapping))]
+        [TestCase(LegacyMods.Cinema, new[] { typeof(CatchModCinema) })]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(CatchModCinema) })]
+        [TestCase(LegacyMods.Nightcore, new[] { typeof(CatchModNightcore) })]
+        [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(CatchModNightcore) })]
+        [TestCase(LegacyMods.Perfect, new[] { typeof(CatchModPerfect) })]
+        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(CatchModPerfect) })]
+        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
+
        [TestCaseSource(nameof(catch_mod_mapping))]
        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(CatchModCinema) })]
        [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(CatchModNightcore) })]
        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(CatchModPerfect) })]
-        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
-
-        [TestCaseSource(nameof(catch_mod_mapping))]
        public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);

        protected override Ruleset CreateRuleset() => new CatchRuleset();
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets.Catch.Skinning;
@@ -1,11 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using osu.Game.Tests.Visual;

 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public abstract class CatchSkinnableTestScene : SkinnableTestScene
+    public abstract partial class CatchSkinnableTestScene : SkinnableTestScene
    {
        protected override Ruleset CreateRulesetForSkinProvider() => new CatchRuleset();
    }
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,7 +16,7 @@ using osu.Game.Tests.Visual;

 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public class CatchEditorTestSceneContainer : Container
+    public partial class CatchEditorTestSceneContainer : Container
    {
        [Cached(typeof(Playfield))]
        public readonly ScrollingPlayfield Playfield;
@@ -55,7 +57,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            };
        }

-        private class TestCatchPlayfield : CatchEditorPlayfield
+        private partial class TestCatchPlayfield : CatchEditorPlayfield
        {
            public TestCatchPlayfield()
                : base(new BeatmapDifficulty { CircleSize = 0 })
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
@@ -19,7 +21,7 @@ using osuTK.Input;

 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public abstract class CatchPlacementBlueprintTestScene : PlacementBlueprintTestScene
+    public abstract partial class CatchPlacementBlueprintTestScene : PlacementBlueprintTestScene
    {
        protected const double TIME_SNAP = 100;

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.

+#nullable disable
+
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,7 +17,7 @@ using osuTK;

 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public abstract class CatchSelectionBlueprintTestScene : SelectionBlueprintTestScene
+    public abstract partial class CatchSelectionBlueprintTestScene : SelectionBlueprintTestScene
    {
        protected ScrollingHitObjectContainer HitObjectContainer => contentContainer.Playfield.HitObjectContainer;

@@ -29,13 +31,14 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor

        protected CatchSelectionBlueprintTestScene()
        {
-            EditorBeatmap = new EditorBeatmap(new CatchBeatmap
+            var catchBeatmap = new CatchBeatmap
            {
                BeatmapInfo =
                {
                    Ruleset = new CatchRuleset().RulesetInfo,
                }
-            }) { Difficulty = { CircleSize = 0 } };
+            };
+            EditorBeatmap = new EditorBeatmap(catchBeatmap) { Difficulty = { CircleSize = 0 } };
            EditorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint
            {
                BeatLength = 100
@@ -59,7 +62,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            InputManager.MoveMouseTo(pos);
        });

-        private class EditorBeatmapDependencyContainer : Container
+        private partial class EditorBeatmapDependencyContainer : Container
        {
            [Cached]
            private readonly EditorClock editorClock;
@@ -67,10 +70,17 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
            [Cached]
            private readonly BindableBeatDivisor beatDivisor;

+            protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+
            public EditorBeatmapDependencyContainer(IBeatmap beatmap, BindableBeatDivisor beatDivisor)
            {
-                editorClock = new EditorClock(beatmap, beatDivisor);
                this.beatDivisor = beatDivisor;
+
+                InternalChildren = new Drawable[]
+                {
+                    editorClock = new EditorClock(beatmap, beatDivisor),
+                    Content,
+                };
            }
        }
    }
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor.Checks
    [TestFixture]
    public class TestCheckBananaShowerGap
    {
-        private CheckBananaShowerGap check;
+        private CheckBananaShowerGap check = null!;

        [SetUp]
        public void Setup()
--- a/Show More
+++ b/Show More