Merge branch 'master' into fix-overlay-header-tab-item-localisable-string

CodeAnalysis/BannedSymbols.txt

@@ -16,3 +16,6 @@ M:Realms.CollectionExtensions.SubscribeForNotifications`1(System.Linq.IQueryable
 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.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.

Directory.Build.props

@@ -1,7 +1,7 @@
 <!-- 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>

Gemfile.lock

@@ -8,20 +8,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.570.0)
+    aws-partitions (1.601.0)
-    aws-sdk-core (3.130.0)
+    aws-sdk-core (3.131.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
+      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.55.0)
+    aws-sdk-kms (1.57.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
+    aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -36,7 +36,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.2.3)
-    excon (0.92.1)
+    excon (0.92.3)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -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)
+    faraday-multipart (1.0.4)
-      multipart-post (>= 1.2, < 3)
+      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.206.2)
       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-androidpublisher_v3 (0.23.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.6, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-core (0.6.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -121,19 +121,19 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.10.0)
+    google-apis-iamcredentials_v1 (0.12.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.6, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
+    google-apis-playcustomapp_v1 (0.9.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.6, < 2.a)
-    google-apis-storage_v1 (0.11.0)
+    google-apis-storage_v1 (0.16.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.6, < 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-storage (1.36.2)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
@@ -141,7 +141,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.2)
+    googleauth (1.2.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -149,12 +149,12 @@ 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)
+    json (2.6.2)
-    jwt (2.3.0)
+    jwt (2.4.1)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
@@ -169,10 +169,10 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     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)

osu.Android.props

@@ -51,8 +51,8 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.618.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.628.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.621.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.629.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. -->

osu.Desktop/DiscordRichPresence.cs

@@ -57,7 +57,7 @@ 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);
 

osu.Desktop/Program.cs

@@ -129,18 +129,18 @@ namespace osu.Desktop
         [SupportedOSPlatform("windows")]
         private static void setupSquirrel()
         {
-            SquirrelAwareApp.HandleEvents(onInitialInstall: (version, tools) =>
+            SquirrelAwareApp.HandleEvents(onInitialInstall: (_, tools) =>
             {
                 tools.CreateShortcutForThisExe();
                 tools.CreateUninstallerRegistryEntry();
-            }, onAppUpdate: (version, tools) =>
+            }, onAppUpdate: (_, tools) =>
             {
                 tools.CreateUninstallerRegistryEntry();
-            }, onAppUninstall: (version, tools) =>
+            }, onAppUninstall: (_, tools) =>
             {
                 tools.RemoveShortcutForThisExe();
                 tools.RemoveUninstallerRegistryEntry();
-            }, onEveryRun: (version, tools, firstRun) =>
+            }, onEveryRun: (_, _, _) =>
             {
                 // While setting the `ProcessAppUserModelId` fixes duplicate icons/shortcuts on the taskbar, it currently
                 // causes the right-click context menu to function incorrectly.

osu.Game.Benchmarks/BenchmarkRealmReads.cs

@@ -31,7 +31,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 })));
             });
@@ -76,7 +76,7 @@ namespace osu.Game.Benchmarks
                 }
             });
 
-            done.Wait();
+            done.Wait(60000);
         }
 
         [Benchmark]
@@ -115,7 +115,7 @@ namespace osu.Game.Benchmarks
                 }
             });
 
-            done.Wait();
+            done.Wait(60000);
         }
 
         [Benchmark]

osu.Game.Rulesets.Catch.Tests/CatchLegacyModConversionTest.cs

@@ -24,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();

osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs

@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 new JuiceStreamPathVertex(20, -5)
             }));
 
-            removeCount = path.RemoveVertices((_, i) => true);
+            removeCount = path.RemoveVertices((_, _) => true);
             Assert.That(removeCount, Is.EqualTo(1));
             Assert.That(path.Vertices, Is.EqualTo(new[]
             {

osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 AddStep("change component scale", () => Player.ChildrenOfType<LegacyScoreCounter>().First().Scale = new Vector2(2f));
                 AddStep("update target", () => Player.ChildrenOfType<SkinnableTargetContainer>().ForEach(LegacySkin.UpdateDrawableTarget));
                 AddStep("exit player", () => Player.Exit());
-                CreateTest(null);
+                CreateTest();
             }
 
             AddAssert("legacy HUD combo counter hidden", () =>

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 hyperDashCount = 0;
 
                 // this needs to be done within the frame stable context due to how quickly hyperdash state changes occur.
-                Player.DrawableRuleset.FrameStableComponents.OnUpdate += d =>
+                Player.DrawableRuleset.FrameStableComponents.OnUpdate += _ =>
                 {
                     var catcher = Player.ChildrenOfType<Catcher>().FirstOrDefault();
 

osu.Game.Rulesets.Catch/CatchSkinComponent.cs

@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Catch
 
         protected override string RulesetPrefix => "catch"; // todo: use CatchRuleset.SHORT_NAME;
 
-        protected override string ComponentName => Component.ToString().ToLower();
+        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 }

osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyAttributes.cs

@@ -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.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
@@ -31,9 +30,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
         }
 
-        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values)
+        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
-            base.FromDatabaseAttributes(values);
+            base.FromDatabaseAttributes(values, onlineInfo);
 
             StarRating = values[ATTRIB_ID_AIM];
             ApproachRate = values[ATTRIB_ID_APPROACH_RATE];

osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs

@@ -135,15 +135,15 @@ namespace osu.Game.Rulesets.Catch.Edit
         {
             switch (BlueprintContainer.CurrentTool)
             {
-                case SelectTool _:
+                case SelectTool:
                     if (EditorBeatmap.SelectedHitObjects.Count == 0)
                         return null;
 
                     double minTime = EditorBeatmap.SelectedHitObjects.Min(hitObject => hitObject.StartTime);
                     return getLastSnappableHitObject(minTime);
 
-                case FruitCompositionTool _:
+                case FruitCompositionTool:
-                case JuiceStreamCompositionTool _:
+                case JuiceStreamCompositionTool:
                     if (!CursorInPlacementArea)
                         return null;
 

osu.Game.Rulesets.Catch/Edit/CatchHitObjectUtils.cs

@@ -42,10 +42,10 @@ namespace osu.Game.Rulesets.Catch.Edit
                 case Droplet droplet:
                     return droplet is TinyDroplet ? PositionRange.EMPTY : new PositionRange(droplet.OriginalX);
 
-                case JuiceStream _:
+                case JuiceStream:
                     return GetPositionRange(hitObject.NestedHitObjects);
 
-                case BananaShower _:
+                case BananaShower:
                     // A banana shower occupies the whole screen width.
                     return new PositionRange(0, CatchPlayfield.WIDTH);
 

osu.Game.Rulesets.Catch/Edit/CatchSelectionHandler.cs

@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Catch.Edit
         {
             switch (hitObject)
             {
-                case BananaShower _:
+                case BananaShower:
                     return false;
 
                 case JuiceStream juiceStream:

osu.Game.Rulesets.Catch/UI/Catcher.cs

@@ -389,13 +389,13 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             switch (source)
             {
-                case Fruit _:
+                case Fruit:
                     return caughtFruitPool.Get();
 
-                case Banana _:
+                case Banana:
                     return caughtBananaPool.Get();
 
-                case Droplet _:
+                case Droplet:
                     return caughtDropletPool.Get();
 
                 default:

osu.Game.Rulesets.Mania.Tests/ManiaLegacyModConversionTest.cs

@@ -23,10 +23,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             new object[] { LegacyMods.SuddenDeath, new[] { typeof(ManiaModSuddenDeath) } },
             new object[] { LegacyMods.DoubleTime, new[] { typeof(ManiaModDoubleTime) } },
             new object[] { LegacyMods.HalfTime, new[] { typeof(ManiaModHalfTime) } },
-            new object[] { LegacyMods.Nightcore, new[] { typeof(ManiaModNightcore) } },
             new object[] { LegacyMods.Flashlight, new[] { typeof(ManiaModFlashlight) } },
             new object[] { LegacyMods.Autoplay, new[] { typeof(ManiaModAutoplay) } },
-            new object[] { LegacyMods.Perfect, new[] { typeof(ManiaModPerfect) } },
             new object[] { LegacyMods.Key4, new[] { typeof(ManiaModKey4) } },
             new object[] { LegacyMods.Key5, new[] { typeof(ManiaModKey5) } },
             new object[] { LegacyMods.Key6, new[] { typeof(ManiaModKey6) } },
@@ -34,7 +32,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             new object[] { LegacyMods.Key8, new[] { typeof(ManiaModKey8) } },
             new object[] { LegacyMods.FadeIn, new[] { typeof(ManiaModFadeIn) } },
             new object[] { LegacyMods.Random, new[] { typeof(ManiaModRandom) } },
-            new object[] { LegacyMods.Cinema, new[] { typeof(ManiaModCinema) } },
             new object[] { LegacyMods.Key9, new[] { typeof(ManiaModKey9) } },
             new object[] { LegacyMods.KeyCoop, new[] { typeof(ManiaModDualStages) } },
             new object[] { LegacyMods.Key1, new[] { typeof(ManiaModKey1) } },
@@ -45,12 +42,18 @@ namespace osu.Game.Rulesets.Mania.Tests
         };
 
         [TestCaseSource(nameof(mania_mod_mapping))]
+        [TestCase(LegacyMods.Cinema, new[] { typeof(ManiaModCinema) })]
         [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(ManiaModCinema) })]
+        [TestCase(LegacyMods.Nightcore, new[] { typeof(ManiaModNightcore) })]
         [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(ManiaModNightcore) })]
+        [TestCase(LegacyMods.Perfect, new[] { typeof(ManiaModPerfect) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(ManiaModPerfect) })]
         public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
         [TestCaseSource(nameof(mania_mod_mapping))]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(ManiaModCinema) })]
+        [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(ManiaModNightcore) })]
+        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(ManiaModPerfect) })]
         public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);
 
         protected override Ruleset CreateRuleset() => new ManiaRuleset();

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs

@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
             switch (original)
             {
-                case IHasDistance _:
+                case IHasDistance:
                 {
                     var generator = new DistanceObjectPatternGenerator(Random, original, beatmap, lastPattern, originalBeatmap);
                     conversion = generator;

osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyAttributes.cs

@@ -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.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
@@ -20,12 +19,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         [JsonProperty("great_hit_window")]
         public double GreatHitWindow { get; set; }
 
-        /// <summary>
-        /// The score multiplier applied via score-reducing mods.
-        /// </summary>
-        [JsonProperty("score_multiplier")]
-        public double ScoreMultiplier { get; set; }
-
         public override IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
         {
             foreach (var v in base.ToDatabaseAttributes())
@@ -34,17 +27,15 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
             yield return (ATTRIB_ID_DIFFICULTY, StarRating);
             yield return (ATTRIB_ID_GREAT_HIT_WINDOW, GreatHitWindow);
-            yield return (ATTRIB_ID_SCORE_MULTIPLIER, ScoreMultiplier);
         }
 
-        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values)
+        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
-            base.FromDatabaseAttributes(values);
+            base.FromDatabaseAttributes(values, onlineInfo);
 
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
             StarRating = values[ATTRIB_ID_DIFFICULTY];
             GreatHitWindow = values[ATTRIB_ID_GREAT_HIT_WINDOW];
-            ScoreMultiplier = values[ATTRIB_ID_SCORE_MULTIPLIER];
         }
     }
 }

osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs

@@ -53,7 +53,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 // In osu-stable mania, rate-adjustment mods don't affect the hit window.
                 // This is done the way it is to introduce fractional differences in order to match osu-stable for the time being.
                 GreatHitWindow = Math.Ceiling((int)(getHitWindow300(mods) * clockRate) / clockRate),
-                ScoreMultiplier = getScoreMultiplier(mods),
                 MaxCombo = beatmap.HitObjects.Sum(maxComboForObject)
             };
         }
@@ -147,32 +146,5 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 return value;
             }
         }
-
-        private double getScoreMultiplier(Mod[] mods)
-        {
-            double scoreMultiplier = 1;
-
-            foreach (var m in mods)
-            {
-                switch (m)
-                {
-                    case ManiaModNoFail _:
-                    case ManiaModEasy _:
-                    case ManiaModHalfTime _:
-                        scoreMultiplier *= 0.5;
-                        break;
-                }
-            }
-
-            var maniaBeatmap = (ManiaBeatmap)Beatmap;
-            int diff = maniaBeatmap.TotalColumns - maniaBeatmap.OriginalTotalColumns;
-
-            if (diff > 0)
-                scoreMultiplier *= 0.9;
-            else if (diff < 0)
-                scoreMultiplier *= 0.9 + 0.04 * diff;
-
-            return scoreMultiplier;
-        }
     }
 }

osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceAttributes.cs

@@ -14,19 +14,12 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         [JsonProperty("difficulty")]
         public double Difficulty { get; set; }
 
-        [JsonProperty("accuracy")]
-        public double Accuracy { get; set; }
-
-        [JsonProperty("scaled_score")]
-        public double ScaledScore { get; set; }
-
         public override IEnumerable<PerformanceDisplayAttribute> GetAttributesForDisplay()
         {
             foreach (var attribute in base.GetAttributesForDisplay())
                 yield return attribute;
 
             yield return new PerformanceDisplayAttribute(nameof(Difficulty), "Difficulty", Difficulty);
-            yield return new PerformanceDisplayAttribute(nameof(Accuracy), "Accuracy", Accuracy);
         }
     }
 }

osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs

@@ -15,15 +15,13 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 {
     public class ManiaPerformanceCalculator : PerformanceCalculator
     {
-        // Score after being scaled by non-difficulty-increasing mods
-        private double scaledScore;
-
         private int countPerfect;
         private int countGreat;
         private int countGood;
         private int countOk;
         private int countMeh;
         private int countMiss;
+        private double scoreAccuracy;
 
         public ManiaPerformanceCalculator()
             : base(new ManiaRuleset())
@@ -34,82 +32,47 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         {
             var maniaAttributes = (ManiaDifficultyAttributes)attributes;
 
-            scaledScore = score.TotalScore;
             countPerfect = score.Statistics.GetValueOrDefault(HitResult.Perfect);
             countGreat = score.Statistics.GetValueOrDefault(HitResult.Great);
             countGood = score.Statistics.GetValueOrDefault(HitResult.Good);
             countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
             countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
             countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
-
+            scoreAccuracy = customAccuracy;
-            if (maniaAttributes.ScoreMultiplier > 0)
-            {
-                // Scale score up, so it's comparable to other keymods
-                scaledScore *= 1.0 / maniaAttributes.ScoreMultiplier;
-            }
 
             // Arbitrary initial value for scaling pp in order to standardize distributions across game modes.
             // The specific number has no intrinsic meaning and can be adjusted as needed.
-            double multiplier = 0.8;
+            double multiplier = 8.0;
 
             if (score.Mods.Any(m => m is ModNoFail))
-                multiplier *= 0.9;
+                multiplier *= 0.75;
             if (score.Mods.Any(m => m is ModEasy))
                 multiplier *= 0.5;
 
             double difficultyValue = computeDifficultyValue(maniaAttributes);
-            double accValue = computeAccuracyValue(difficultyValue, maniaAttributes);
+            double totalValue = difficultyValue * multiplier;
-            double totalValue =
-                Math.Pow(
-                    Math.Pow(difficultyValue, 1.1) +
-                    Math.Pow(accValue, 1.1), 1.0 / 1.1
-                ) * multiplier;
 
             return new ManiaPerformanceAttributes
             {
                 Difficulty = difficultyValue,
-                Accuracy = accValue,
-                ScaledScore = scaledScore,
                 Total = totalValue
             };
         }
 
         private double computeDifficultyValue(ManiaDifficultyAttributes attributes)
         {
-            double difficultyValue = Math.Pow(5 * Math.Max(1, attributes.StarRating / 0.2) - 4.0, 2.2) / 135.0;
+            double difficultyValue = Math.Pow(Math.Max(attributes.StarRating - 0.15, 0.05), 2.2) // Star rating to pp curve
-
+                                     * Math.Max(0, 5 * scoreAccuracy - 4) // From 80% accuracy, 1/20th of total pp is awarded per additional 1% accuracy
-            difficultyValue *= 1.0 + 0.1 * Math.Min(1.0, totalHits / 1500.0);
+                                     * (1 + 0.1 * Math.Min(1, totalHits / 1500)); // Length bonus, capped at 1500 notes
-
-            if (scaledScore <= 500000)
-                difficultyValue = 0;
-            else if (scaledScore <= 600000)
-                difficultyValue *= (scaledScore - 500000) / 100000 * 0.3;
-            else if (scaledScore <= 700000)
-                difficultyValue *= 0.3 + (scaledScore - 600000) / 100000 * 0.25;
-            else if (scaledScore <= 800000)
-                difficultyValue *= 0.55 + (scaledScore - 700000) / 100000 * 0.20;
-            else if (scaledScore <= 900000)
-                difficultyValue *= 0.75 + (scaledScore - 800000) / 100000 * 0.15;
-            else
-                difficultyValue *= 0.90 + (scaledScore - 900000) / 100000 * 0.1;
 
             return difficultyValue;
         }
 
-        private double computeAccuracyValue(double difficultyValue, ManiaDifficultyAttributes attributes)
-        {
-            if (attributes.GreatHitWindow <= 0)
-                return 0;
-
-            // Lots of arbitrary values from testing.
-            // Considering to use derivation from perfect accuracy in a probabilistic manner - assume normal distribution
-            double accuracyValue = Math.Max(0.0, 0.2 - (attributes.GreatHitWindow - 34) * 0.006667)
-                                   * difficultyValue
-                                   * Math.Pow(Math.Max(0.0, scaledScore - 960000) / 40000, 1.1);
-
-            return accuracyValue;
-        }
-
         private double totalHits => countPerfect + countOk + countGreat + countGood + countMeh + countMiss;
+
+        /// <summary>
+        /// Accuracy used to weight judgements independently from the score's actual accuracy.
+        /// </summary>
+        private double customAccuracy => (countPerfect * 320 + countGreat * 300 + countGood * 200 + countOk * 100 + countMeh * 50) / (totalHits * 320);
     }
 }

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -146,56 +146,56 @@ namespace osu.Game.Rulesets.Mania
             {
                 switch (mod)
                 {
-                    case ManiaModKey1 _:
+                    case ManiaModKey1:
                         value |= LegacyMods.Key1;
                         break;
 
-                    case ManiaModKey2 _:
+                    case ManiaModKey2:
                         value |= LegacyMods.Key2;
                         break;
 
-                    case ManiaModKey3 _:
+                    case ManiaModKey3:
                         value |= LegacyMods.Key3;
                         break;
 
-                    case ManiaModKey4 _:
+                    case ManiaModKey4:
                         value |= LegacyMods.Key4;
                         break;
 
-                    case ManiaModKey5 _:
+                    case ManiaModKey5:
                         value |= LegacyMods.Key5;
                         break;
 
-                    case ManiaModKey6 _:
+                    case ManiaModKey6:
                         value |= LegacyMods.Key6;
                         break;
 
-                    case ManiaModKey7 _:
+                    case ManiaModKey7:
                         value |= LegacyMods.Key7;
                         break;
 
-                    case ManiaModKey8 _:
+                    case ManiaModKey8:
                         value |= LegacyMods.Key8;
                         break;
 
-                    case ManiaModKey9 _:
+                    case ManiaModKey9:
                         value |= LegacyMods.Key9;
                         break;
 
-                    case ManiaModDualStages _:
+                    case ManiaModDualStages:
                         value |= LegacyMods.KeyCoop;
                         break;
 
-                    case ManiaModFadeIn _:
+                    case ManiaModFadeIn:
                         value |= LegacyMods.FadeIn;
                         value &= ~LegacyMods.Hidden; // this is toggled on in the base call due to inheritance, but we don't want that.
                         break;
 
-                    case ManiaModMirror _:
+                    case ManiaModMirror:
                         value |= LegacyMods.Mirror;
                         break;
 
-                    case ManiaModRandom _:
+                    case ManiaModRandom:
                         value |= LegacyMods.Random;
                         break;
                 }

osu.Game.Rulesets.Mania/ManiaSkinComponent.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mania
 
         protected override string RulesetPrefix => ManiaRuleset.SHORT_NAME;
 
-        protected override string ComponentName => Component.ToString().ToLower();
+        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 
     public enum ManiaSkinComponents

osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             var rng = new Random((int)Seed.Value);
 
             int availableColumns = ((ManiaBeatmap)beatmap).TotalColumns;
-            var shuffledColumns = Enumerable.Range(0, availableColumns).OrderBy(item => rng.Next()).ToList();
+            var shuffledColumns = Enumerable.Range(0, availableColumns).OrderBy(_ => rng.Next()).ToList();
 
             beatmap.HitObjects.OfType<ManiaHitObject>().ForEach(h => h.Column = shuffledColumns[h.Column]);
         }

osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs

@@ -57,11 +57,11 @@ namespace osu.Game.Rulesets.Mania.Replays
                 {
                     switch (point)
                     {
-                        case HitPoint _:
+                        case HitPoint:
                             actions.Add(columnActions[point.Column]);
                             break;
 
-                        case ReleasePoint _:
+                        case ReleasePoint:
                             actions.Remove(columnActions[point.Column]);
                             break;
                     }

osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs

@@ -10,7 +10,6 @@ using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit;
@@ -41,10 +40,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
-        private bool editorComponentsReady => editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
-                                              && editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true
-                                              && editor?.ChildrenOfType<Playfield>().FirstOrDefault()?.IsLoaded == true;
-
         [TestCase(true)]
         [TestCase(false)]
         public void TestVelocityChangeSavesCorrectly(bool adjustVelocity)
@@ -52,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             double? velocity = null;
 
             AddStep("enter editor", () => Game.ScreenStack.Push(new EditorLoader()));
-            AddUntilStep("wait for editor load", () => editorComponentsReady);
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
 
             AddStep("seek to first control point", () => editorClock.Seek(editorBeatmap.ControlPointInfo.TimingPoints.First().Time));
             AddStep("enter slider placement mode", () => InputManager.Key(Key.Number3));
@@ -91,7 +86,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("exit", () => InputManager.Key(Key.Escape));
 
             AddStep("enter editor (again)", () => Game.ScreenStack.Push(new EditorLoader()));
-            AddUntilStep("wait for editor load", () => editorComponentsReady);
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
 
             AddStep("seek to slider", () => editorClock.Seek(slider.StartTime));
             AddAssert("slider has correct velocity", () => slider.Velocity == velocity);

osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs

@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 skin.Setup(s => s.GetTexture(It.IsAny<string>())).CallBase();
 
                 skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
-                    .Returns((string componentName, WrapMode _, WrapMode __) => new Texture(1, 1) { AssetName = componentName });
+                    .Returns((string componentName, WrapMode _, WrapMode _) => new Texture(1, 1) { AssetName = componentName });
 
                 Child = new DependencyProvidingContainer
                 {

osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs

@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                         lastResult = null;
 
                         spinner = nextSpinner;
-                        spinner.OnNewResult += (o, result) => lastResult = result;
+                        spinner.OnNewResult += (_, result) => lastResult = result;
                     }
 
                     return lastResult?.Type == HitResult.Great;
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                             return false;
 
                         spinner = nextSpinner;
-                        spinner.OnNewResult += (o, result) => results.Add(result);
+                        spinner.OnNewResult += (_, result) => results.Add(result);
 
                         results.Clear();
                     }

osu.Game.Rulesets.Osu.Tests/OsuLegacyModConversionTest.cs

@@ -25,24 +25,27 @@ namespace osu.Game.Rulesets.Osu.Tests
             new object[] { LegacyMods.DoubleTime, new[] { typeof(OsuModDoubleTime) } },
             new object[] { LegacyMods.Relax, new[] { typeof(OsuModRelax) } },
             new object[] { LegacyMods.HalfTime, new[] { typeof(OsuModHalfTime) } },
-            new object[] { LegacyMods.Nightcore, new[] { typeof(OsuModNightcore) } },
             new object[] { LegacyMods.Flashlight, new[] { typeof(OsuModFlashlight) } },
             new object[] { LegacyMods.Autoplay, new[] { typeof(OsuModAutoplay) } },
             new object[] { LegacyMods.SpunOut, new[] { typeof(OsuModSpunOut) } },
             new object[] { LegacyMods.Autopilot, new[] { typeof(OsuModAutopilot) } },
-            new object[] { LegacyMods.Perfect, new[] { typeof(OsuModPerfect) } },
-            new object[] { LegacyMods.Cinema, new[] { typeof(OsuModCinema) } },
             new object[] { LegacyMods.Target, new[] { typeof(OsuModTarget) } },
             new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(OsuModHardRock), typeof(OsuModDoubleTime) } }
         };
 
         [TestCaseSource(nameof(osu_mod_mapping))]
+        [TestCase(LegacyMods.Cinema, new[] { typeof(OsuModCinema) })]
         [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(OsuModCinema) })]
+        [TestCase(LegacyMods.Nightcore, new[] { typeof(OsuModNightcore) })]
         [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(OsuModNightcore) })]
+        [TestCase(LegacyMods.Perfect, new[] { typeof(OsuModPerfect) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(OsuModPerfect) })]
         public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
 
         [TestCaseSource(nameof(osu_mod_mapping))]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(OsuModCinema) })]
+        [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(OsuModNightcore) })]
+        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(OsuModPerfect) })]
         public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();

osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs

@@ -0,0 +1,120 @@
+// 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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [HeadlessTest]
+    public class TestSceneSliderFollowCircleInput : RateAdjustedBeatmapTestScene
+    {
+        private List<JudgementResult>? judgementResults;
+        private ScoreAccessibleReplayPlayer? currentPlayer;
+
+        [Test]
+        public void TestMaximumDistanceTrackingWithoutMovement(
+            [Values(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)]
+            float circleSize,
+            [Values(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)]
+            double velocity)
+        {
+            const double time_slider_start = 1000;
+
+            float circleRadius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (circleSize - 5) / 5) / 2;
+            float followCircleRadius = circleRadius * 1.2f;
+
+            performTest(new Beatmap<OsuHitObject>
+            {
+                HitObjects =
+                {
+                    new Slider
+                    {
+                        StartTime = time_slider_start,
+                        Position = new Vector2(0, 0),
+                        DifficultyControlPoint = new DifficultyControlPoint { SliderVelocity = velocity },
+                        Path = new SliderPath(PathType.Linear, new[]
+                        {
+                            Vector2.Zero,
+                            new Vector2(followCircleRadius, 0),
+                        }, followCircleRadius),
+                    },
+                },
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = circleSize,
+                        SliderTickRate = 1
+                    },
+                    Ruleset = new OsuRuleset().RulesetInfo
+                },
+            }, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = new Vector2(-circleRadius + 1, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
+            });
+
+            AddAssert("Tracking kept", assertMaxJudge);
+        }
+
+        private bool assertMaxJudge() => judgementResults?.Any() == true && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
+
+        private void performTest(Beatmap<OsuHitObject> beatmap, List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(beatmap);
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults?.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults = new List<JudgementResult>();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddUntilStep("Wait for completion", () => currentPlayer?.ScoreProcessor.HasCompleted.Value == true);
+        }
+
+        private class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
+        }
+    }
+}

osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs

@@ -66,10 +66,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             drawableSlider = null;
         });
 
-        [SetUpSteps]
+        protected override bool HasCustomSteps => true;
-        public override void SetUpSteps()
-        {
-        }
 
         [TestCase(0)]
         [TestCase(1)]
@@ -77,7 +74,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestSnakingEnabled(int sliderIndex)
         {
             AddStep("enable autoplay", () => autoplay = true);
-            base.SetUpSteps();
+            CreateTest();
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
 
             retrieveSlider(sliderIndex);
@@ -101,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestSnakingDisabled(int sliderIndex)
         {
             AddStep("have autoplay", () => autoplay = true);
-            base.SetUpSteps();
+            CreateTest();
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
 
             retrieveSlider(sliderIndex);
@@ -121,8 +118,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("enable autoplay", () => autoplay = true);
             setSnaking(true);
-            base.SetUpSteps();
+            CreateTest();
-
             // repeat might have a chance to update its position depending on where in the frame its hit,
             // so some leniency is allowed here instead of checking strict equality
             addCheckPositionChangeSteps(() => 16600, getSliderRepeat, positionAlmostSame);
@@ -133,15 +129,14 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("disable autoplay", () => autoplay = false);
             setSnaking(true);
-            base.SetUpSteps();
+            CreateTest();
-
             addCheckPositionChangeSteps(() => 16600, getSliderRepeat, positionDecreased);
         }
 
         private void retrieveSlider(int index)
         {
             AddStep("retrieve slider at index", () => slider = (Slider)beatmap.HitObjects[index]);
-            addSeekStep(() => slider);
+            addSeekStep(() => slider.StartTime);
             AddUntilStep("retrieve drawable slider", () =>
                 (drawableSlider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == slider)) != null);
         }
@@ -161,7 +156,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             => addCheckPositionChangeSteps(timeAtRepeat(startTime, repeatIndex), positionAtRepeat(repeatIndex), positionRemainsSame);
 
         private Func<double> timeAtRepeat(Func<double> startTime, int repeatIndex) => () => startTime() + 100 + duration_of_span * repeatIndex;
-        private Func<Vector2> positionAtRepeat(int repeatIndex) => repeatIndex % 2 == 0 ? (Func<Vector2>)getSliderStart : getSliderEnd;
+        private Func<Vector2> positionAtRepeat(int repeatIndex) => repeatIndex % 2 == 0 ? getSliderStart : getSliderEnd;
 
         private List<Vector2> getSliderCurve() => ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
         private Vector2 getSliderStart() => getSliderCurve().First();
@@ -205,16 +200,10 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
         }
 
-        private void addSeekStep(Func<Slider> slider)
+        private void addSeekStep(Func<double> getTime)
         {
-            AddStep("seek to slider", () => Player.GameplayClockContainer.Seek(slider().StartTime));
+            AddStep("seek to time", () => Player.GameplayClockContainer.Seek(getTime()));
-            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(slider().StartTime, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
+            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(getTime(), Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
-        }
-
-        private void addSeekStep(Func<double> time)
-        {
-            AddStep("seek to time", () => Player.GameplayClockContainer.Seek(time()));
-            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time(), Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
         }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap { HitObjects = createHitObjects() };

osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs

@@ -1,12 +1,11 @@
 // 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.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 
@@ -26,6 +25,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         [JsonProperty("speed_difficulty")]
         public double SpeedDifficulty { get; set; }
 
+        /// <summary>
+        /// The number of clickable objects weighted by difficulty.
+        /// Related to <see cref="SpeedDifficulty"/>
+        /// </summary>
+        [JsonProperty("speed_note_count")]
+        public double SpeedNoteCount { get; set; }
+
         /// <summary>
         /// The difficulty corresponding to the flashlight skill.
         /// </summary>
@@ -94,11 +100,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 yield return (ATTRIB_ID_FLASHLIGHT, FlashlightDifficulty);
 
             yield return (ATTRIB_ID_SLIDER_FACTOR, SliderFactor);
+            yield return (ATTRIB_ID_SPEED_NOTE_COUNT, SpeedNoteCount);
         }
 
-        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values)
+        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
-            base.FromDatabaseAttributes(values);
+            base.FromDatabaseAttributes(values, onlineInfo);
 
             AimDifficulty = values[ATTRIB_ID_AIM];
             SpeedDifficulty = values[ATTRIB_ID_SPEED];
@@ -108,6 +115,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             StarRating = values[ATTRIB_ID_DIFFICULTY];
             FlashlightDifficulty = values.GetValueOrDefault(ATTRIB_ID_FLASHLIGHT);
             SliderFactor = values[ATTRIB_ID_SLIDER_FACTOR];
+            SpeedNoteCount = values[ATTRIB_ID_SPEED_NOTE_COUNT];
+
+            DrainRate = onlineInfo.DrainRate;
+            HitCircleCount = onlineInfo.CircleCount;
+            SliderCount = onlineInfo.SliderCount;
+            SpinnerCount = onlineInfo.SpinnerCount;
         }
 
         #region Newtonsoft.Json implicit ShouldSerialize() methods

osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs

@@ -38,6 +38,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier;
             double aimRatingNoSliders = Math.Sqrt(skills[1].DifficultyValue()) * difficulty_multiplier;
             double speedRating = Math.Sqrt(skills[2].DifficultyValue()) * difficulty_multiplier;
+            double speedNotes = ((Speed)skills[2]).RelevantNoteCount();
             double flashlightRating = Math.Sqrt(skills[3].DifficultyValue()) * difficulty_multiplier;
 
             double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
@@ -75,6 +76,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 Mods = mods,
                 AimDifficulty = aimRating,
                 SpeedDifficulty = speedRating,
+                SpeedNoteCount = speedNotes,
                 FlashlightDifficulty = flashlightRating,
                 SliderFactor = sliderFactor,
                 ApproachRate = preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5,

osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs

@@ -163,8 +163,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 speedValue *= 1.0 + 0.04 * (12.0 - attributes.ApproachRate);
             }
 
+            // Calculate accuracy assuming the worst case scenario
+            double relevantTotalDiff = totalHits - attributes.SpeedNoteCount;
+            double relevantCountGreat = Math.Max(0, countGreat - relevantTotalDiff);
+            double relevantCountOk = Math.Max(0, countOk - Math.Max(0, relevantTotalDiff - countGreat));
+            double relevantCountMeh = Math.Max(0, countMeh - Math.Max(0, relevantTotalDiff - countGreat - countOk));
+            double relevantAccuracy = attributes.SpeedNoteCount == 0 ? 0 : (relevantCountGreat * 6.0 + relevantCountOk * 2.0 + relevantCountMeh) / (attributes.SpeedNoteCount * 6.0);
+
             // Scale the speed value with accuracy and OD.
-            speedValue *= (0.95 + Math.Pow(attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(attributes.OverallDifficulty, 8)) / 2);
+            speedValue *= (0.95 + Math.Pow(attributes.OverallDifficulty, 2) / 750) * Math.Pow((accuracy + relevantAccuracy) / 2.0, (14.5 - Math.Max(attributes.OverallDifficulty, 8)) / 2);
 
             // Scale the speed value with # of 50s to punish doubletapping.
             speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);

osu.Game.Rulesets.Osu/Difficulty/Skills/Flashlight.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Evaluators;
 using osu.Game.Rulesets.Osu.Mods;
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// <summary>
     /// Represents the skill required to memorise and hit every object in a map with the Flashlight mod enabled.
     /// </summary>
-    public class Flashlight : OsuStrainSkill
+    public class Flashlight : StrainSkill
     {
         private readonly bool hasHiddenMod;
 
@@ -27,7 +28,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 
         private double skillMultiplier => 0.05;
         private double strainDecayBase => 0.15;
-        protected override double DecayWeight => 1.0;
 
         private double currentStrain;
 
@@ -42,5 +42,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 
             return currentStrain;
         }
+
+        public override double DifficultyValue() => GetCurrentStrainPeaks().Sum() * OsuStrainSkill.DEFAULT_DIFFICULTY_MULTIPLIER;
     }
 }

osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs

@@ -14,6 +14,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 {
     public abstract class OsuStrainSkill : StrainSkill
     {
+        /// <summary>
+        /// The default multiplier applied by <see cref="OsuStrainSkill"/> to the final difficulty value after all other calculations.
+        /// May be overridden via <see cref="DifficultyMultiplier"/>.
+        /// </summary>
+        public const double DEFAULT_DIFFICULTY_MULTIPLIER = 1.06;
+
         /// <summary>
         /// The number of sections with the highest strains, which the peak strain reductions will apply to.
         /// This is done in order to decrease their impact on the overall difficulty of the map for this skill.
@@ -28,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         /// <summary>
         /// The final multiplier to be applied to <see cref="DifficultyValue"/> after all other calculations.
         /// </summary>
-        protected virtual double DifficultyMultiplier => 1.06;
+        protected virtual double DifficultyMultiplier => DEFAULT_DIFFICULTY_MULTIPLIER;
 
         protected OsuStrainSkill(Mod[] mods)
             : base(mods)

osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs

@@ -8,6 +8,8 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Evaluators;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 {
@@ -26,6 +28,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         protected override double DifficultyMultiplier => 1.04;
         private readonly double greatWindow;
 
+        private readonly List<double> objectStrains = new List<double>();
+
         public Speed(Mod[] mods, double hitWindowGreat)
             : base(mods)
         {
@@ -43,7 +47,24 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 
             currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current, greatWindow);
 
-            return currentStrain * currentRhythm;
+            double totalStrain = currentStrain * currentRhythm;
+
+            objectStrains.Add(totalStrain);
+
+            return totalStrain;
+        }
+
+        public double RelevantNoteCount()
+        {
+            if (objectStrains.Count == 0)
+                return 0;
+
+            double maxStrain = objectStrains.Max();
+
+            if (maxStrain == 0)
+                return 0;
+
+            return objectStrains.Aggregate((total, next) => total + (1.0 / (1.0 + Math.Exp(-(next / maxStrain * 12.0 - 6.0)))));
         }
     }
 }

osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs

@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             });
 
             selectedHitObjects = EditorBeatmap.SelectedHitObjects.GetBoundCopy();
-            selectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();
+            selectedHitObjects.CollectionChanged += (_, _) => updateDistanceSnapGrid();
 
             placementObject = EditorBeatmap.PlacementObject.GetBoundCopy();
             placementObject.ValueChanged += _ => updateDistanceSnapGrid();
@@ -204,7 +204,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             switch (BlueprintContainer.CurrentTool)
             {
-                case SelectTool _:
+                case SelectTool:
                     if (!EditorBeatmap.SelectedHitObjects.Any())
                         return;
 

osu.Game.Rulesets.Osu/Mods/OsuModApproachDifferent.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableHitObject(DrawableHitObject drawable)
         {
-            drawable.ApplyCustomUpdateState += (drawableObject, state) =>
+            drawable.ApplyCustomUpdateState += (drawableObject, _) =>
             {
                 if (!(drawableObject is DrawableHitCircle drawableHitCircle)) return;
 

osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs

@@ -30,9 +30,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("Apply classic note lock", "Applies note lock to the full hit window.")]
         public Bindable<bool> ClassicNoteLock { get; } = new BindableBool(true);
 
-        [SettingSource("Use fixed slider follow circle hit area", "Makes the slider follow circle track its final size at all times.")]
-        public Bindable<bool> FixedFollowCircleHitArea { get; } = new BindableBool(true);
-
         [SettingSource("Always play a slider's tail sample", "Always plays a slider's tail sample regardless of whether it was hit or not.")]
         public Bindable<bool> AlwaysPlayTailSample { get; } = new BindableBool(true);
 
@@ -62,10 +59,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             switch (obj)
             {
-                case DrawableSlider slider:
-                    slider.Ball.InputTracksVisualSize = !FixedFollowCircleHitArea.Value;
-                    break;
-
                 case DrawableSliderHead head:
                     head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     break;

osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs

@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             switch (drawableObject)
             {
-                case DrawableSliderTail _:
+                case DrawableSliderTail:
                     using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         drawableObject.FadeOut(fadeDuration);
 
@@ -165,14 +165,14 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 switch (hitObject)
                 {
-                    case Slider _:
+                    case Slider:
                         return (fadeOutStartTime, longFadeDuration);
 
-                    case SliderTick _:
+                    case SliderTick:
                         double tickFadeOutDuration = Math.Min(hitObject.TimePreempt - DrawableSliderTick.ANIM_DURATION, 1000);
                         return (hitObject.StartTime - tickFadeOutDuration, tickFadeOutDuration);
 
-                    case Spinner _:
+                    case Spinner:
                         return (fadeOutStartTime + longFadeDuration, fadeOutDuration);
 
                     default:

osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs

@@ -44,13 +44,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             // apply grow effect
             switch (drawable)
             {
-                case DrawableSliderHead _:
+                case DrawableSliderHead:
-                case DrawableSliderTail _:
+                case DrawableSliderTail:
                     // special cases we should *not* be scaling.
                     break;
 
-                case DrawableSlider _:
+                case DrawableSlider:
-                case DrawableHitCircle _:
+                case DrawableHitCircle:
                 {
                     using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
                         drawable.ScaleTo(StartScale.Value).Then().ScaleTo(EndScale, h.TimePreempt, Easing.OutSine);

osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs

@@ -374,7 +374,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             int i = 0;
             double currentTime = timingPoint.Time;
 
-            while (!definitelyBigger(currentTime, mapEndTime) && controlPointInfo.TimingPointAt(currentTime) == timingPoint)
+            while (!definitelyBigger(currentTime, mapEndTime) && ReferenceEquals(controlPointInfo.TimingPointAt(currentTime), timingPoint))
             {
                 beats.Add(Math.Floor(currentTime));
                 i++;

osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs

@@ -34,10 +34,10 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             switch (drawable)
             {
-                case DrawableSliderHead _:
+                case DrawableSliderHead:
-                case DrawableSliderTail _:
+                case DrawableSliderTail:
-                case DrawableSliderTick _:
+                case DrawableSliderTick:
-                case DrawableSliderRepeat _:
+                case DrawableSliderRepeat:
                     return;
 
                 default:

osu.Game.Rulesets.Osu/Objects/Slider.cs

@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public Slider()
         {
-            SamplesBindable.CollectionChanged += (_, __) => UpdateNestedSamples();
+            SamplesBindable.CollectionChanged += (_, _) => UpdateNestedSamples();
             Path.Version.ValueChanged += _ => updateNestedPositions();
         }
 

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -120,19 +120,19 @@ namespace osu.Game.Rulesets.Osu
             {
                 switch (mod)
                 {
-                    case OsuModAutopilot _:
+                    case OsuModAutopilot:
                         value |= LegacyMods.Autopilot;
                         break;
 
-                    case OsuModSpunOut _:
+                    case OsuModSpunOut:
                         value |= LegacyMods.SpunOut;
                         break;
 
-                    case OsuModTarget _:
+                    case OsuModTarget:
                         value |= LegacyMods.Target;
                         break;
 
-                    case OsuModTouchDevice _:
+                    case OsuModTouchDevice:
                         value |= LegacyMods.TouchDevice;
                         break;
                 }

osu.Game.Rulesets.Osu/OsuSkinComponent.cs

@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Osu
 
         protected override string RulesetPrefix => OsuRuleset.SHORT_NAME;
 
-        protected override string ComponentName => Component.ToString().ToLower();
+        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 }

osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs

@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                     hitWindows = slider.TailCircle.HitWindows;
                     break;
 
-                case Spinner _:
+                case Spinner:
                     hitWindows = defaultHitWindows;
                     break;
             }

osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs

@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
         {
             switch (hitObject)
             {
-                case HitCircle _:
+                case HitCircle:
                     return new OsuHitCircleJudgementResult(hitObject, judgement);
 
                 default:

osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs

@@ -34,13 +34,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             set => ball.Colour = value;
         }
 
-        /// <summary>
-        /// Whether to track accurately to the visual size of this <see cref="SliderBall"/>.
-        /// If <c>false</c>, tracking will be performed at the final scale at all times.
-        /// </summary>
-        public bool InputTracksVisualSize = true;
-
         private readonly Drawable followCircle;
+        private readonly Drawable fullSizeFollowCircle;
         private readonly DrawableSlider drawableSlider;
         private readonly Drawable ball;
 
@@ -62,6 +57,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                     Alpha = 0,
                     Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderFollowCircle), _ => new DefaultFollowCircle()),
                 },
+                fullSizeFollowCircle = new CircularContainer
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true
+                },
                 ball = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBall), _ => new DefaultSliderBall())
                 {
                     Anchor = Anchor.Centre,
@@ -104,14 +106,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
                 tracking = value;
 
-                if (InputTracksVisualSize)
+                fullSizeFollowCircle.Scale = new Vector2(tracking ? 2.4f : 1f);
-                    followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
-                else
-                {
-                    // We need to always be tracking the final size, at both endpoints. For now, this is achieved by removing the scale duration.
-                    followCircle.ScaleTo(tracking ? 2.4f : 1f);
-                }
 
+                followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
                 followCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
         }
@@ -170,7 +167,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 // in valid time range
                 Time.Current >= drawableSlider.HitObject.StartTime && Time.Current < drawableSlider.HitObject.EndTime &&
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && followCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                lastScreenSpaceMousePosition.HasValue && fullSizeFollowCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
 

osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs

@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                     break;
 
-                case DrawableSpinnerBonusTick _:
+                case DrawableSpinnerBonusTick:
                     if (state == ArmedState.Hit)
                         glow.FlashColour(Color4.White, 200);
 

osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
                 switch (obj)
                 {
-                    case DrawableSpinner _:
+                    case DrawableSpinner:
                         continue;
 
                     case DrawableSlider slider:

osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.UI
             // note: `Slider`'s `ProxiedLayer` is added when its nested `DrawableHitCircle` is loaded.
             switch (drawable)
             {
-                case DrawableSpinner _:
+                case DrawableSpinner:
                     spinnerProxies.Add(drawable.CreateProxy());
                     break;
 

osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils_Reposition.cs

@@ -88,11 +88,11 @@ namespace osu.Game.Rulesets.Osu.Utils
 
                 switch (hitObject)
                 {
-                    case HitCircle _:
+                    case HitCircle:
                         shift = clampHitCircleToPlayfield(current);
                         break;
 
-                    case Slider _:
+                    case Slider:
                         shift = clampSliderToPlayfield(current);
                         break;
                 }

osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs

@@ -144,7 +144,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Swell(), new TaikoSwellJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Clear);
-            AddUntilStep($"state reverts to {expectedStateAfterClear.ToString().ToLower()}", () => allMascotsIn(expectedStateAfterClear));
+            AddUntilStep($"state reverts to {expectedStateAfterClear.ToString().ToLowerInvariant()}", () => allMascotsIn(expectedStateAfterClear));
         }
 
         private void setBeatmap(bool kiai = false)
@@ -195,7 +195,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         {
             TaikoMascotAnimationState[] mascotStates = null;
 
-            AddStep($"{judgementResult.Type.ToString().ToLower()} result for {judgementResult.Judgement.GetType().Name.Humanize(LetterCasing.LowerCase)}",
+            AddStep($"{judgementResult.Type.ToString().ToLowerInvariant()} result for {judgementResult.Judgement.GetType().Name.Humanize(LetterCasing.LowerCase)}",
                 () =>
                 {
                     applyNewResult(judgementResult);
@@ -204,7 +204,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     Schedule(() => mascotStates = animatedMascots.Select(mascot => mascot.State.Value).ToArray());
                 });
 
-            AddAssert($"state is {expectedState.ToString().ToLower()}", () => mascotStates.All(state => state == expectedState));
+            AddAssert($"state is {expectedState.ToString().ToLowerInvariant()}", () => mascotStates.All(state => state == expectedState));
         }
 
         private void applyNewResult(JudgementResult judgementResult)

osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs

@@ -24,22 +24,25 @@ namespace osu.Game.Rulesets.Taiko.Tests
             new object[] { LegacyMods.DoubleTime, new[] { typeof(TaikoModDoubleTime) } },
             new object[] { LegacyMods.Relax, new[] { typeof(TaikoModRelax) } },
             new object[] { LegacyMods.HalfTime, new[] { typeof(TaikoModHalfTime) } },
-            new object[] { LegacyMods.Nightcore, new[] { typeof(TaikoModNightcore) } },
             new object[] { LegacyMods.Flashlight, new[] { typeof(TaikoModFlashlight) } },
             new object[] { LegacyMods.Autoplay, new[] { typeof(TaikoModAutoplay) } },
-            new object[] { LegacyMods.Perfect, new[] { typeof(TaikoModPerfect) } },
             new object[] { LegacyMods.Random, new[] { typeof(TaikoModRandom) } },
-            new object[] { LegacyMods.Cinema, new[] { typeof(TaikoModCinema) } },
             new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) } }
         };
 
+        [TestCaseSource(nameof(taiko_mod_mapping))]
+        [TestCase(LegacyMods.Cinema, new[] { typeof(TaikoModCinema) })]
+        [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(TaikoModCinema) })]
+        [TestCase(LegacyMods.Nightcore, new[] { typeof(TaikoModNightcore) })]
+        [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(TaikoModNightcore) })]
+        [TestCase(LegacyMods.Perfect, new[] { typeof(TaikoModPerfect) })]
+        [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(TaikoModPerfect) })]
+        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
+
         [TestCaseSource(nameof(taiko_mod_mapping))]
         [TestCase(LegacyMods.Cinema | LegacyMods.Autoplay, new[] { typeof(TaikoModCinema) })]
         [TestCase(LegacyMods.Nightcore | LegacyMods.DoubleTime, new[] { typeof(TaikoModNightcore) })]
         [TestCase(LegacyMods.Perfect | LegacyMods.SuddenDeath, new[] { typeof(TaikoModPerfect) })]
-        public new void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods) => base.TestFromLegacy(legacyMods, expectedMods);
-
-        [TestCaseSource(nameof(taiko_mod_mapping))]
         public new void TestToLegacy(LegacyMods legacyMods, Type[] givenMods) => base.TestToLegacy(legacyMods, givenMods);
 
         protected override Ruleset CreateRuleset() => new TaikoRuleset();

osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs

@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             AddStep("Setup judgements", () =>
             {
                 judged = false;
-                Player.ScoreProcessor.NewJudgement += b => judged = true;
+                Player.ScoreProcessor.NewJudgement += _ => judged = true;
             });
             AddUntilStep("swell judged", () => judged);
             AddAssert("failed", () => Player.GameplayState.HasFailed);

osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs

@@ -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.
 
-#nullable disable
-
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
@@ -57,9 +56,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             yield return (ATTRIB_ID_GREAT_HIT_WINDOW, GreatHitWindow);
         }
 
-        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values)
+        public override void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
-            base.FromDatabaseAttributes(values);
+            base.FromDatabaseAttributes(values, onlineInfo);
 
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
             StarRating = values[ATTRIB_ID_DIFFICULTY];

osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs

@@ -48,8 +48,8 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             switch (hitObject)
             {
-                case DrawableDrumRollTick _:
+                case DrawableDrumRollTick:
-                case DrawableHit _:
+                case DrawableHit:
                     double preempt = drawableRuleset.TimeRange.Value / drawableRuleset.ControlPointAt(hitObject.HitObject.StartTime).Multiplier;
                     double start = hitObject.HitObject.StartTime - preempt * fade_out_start_time;
                     double duration = preempt * fade_out_duration;

osu.Game.Rulesets.Taiko/Objects/Hit.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
                 DisplayColour.Value = Type == HitType.Centre ? COLOUR_CENTRE : COLOUR_RIM;
             });
 
-            SamplesBindable.BindCollectionChanged((_, __) => updateTypeFromSamples());
+            SamplesBindable.BindCollectionChanged((_, _) => updateTypeFromSamples());
         }
 
         private void updateTypeFromSamples()

osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs

@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
         protected TaikoStrongableHitObject()
         {
             IsStrongBindable.BindValueChanged(_ => updateSamplesFromType());
-            SamplesBindable.BindCollectionChanged((_, __) => updateTypeFromSamples());
+            SamplesBindable.BindCollectionChanged((_, _) => updateTypeFromSamples());
         }
 
         private void updateTypeFromSamples()

osu.Game.Rulesets.Taiko/TaikoSkinComponent.cs

@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Taiko
 
         protected override string RulesetPrefix => TaikoRuleset.SHORT_NAME;
 
-        protected override string ComponentName => Component.ToString().ToLower();
+        protected override string ComponentName => Component.ToString().ToLowerInvariant();
     }
 }

osu.Game.Rulesets.Taiko/UI/TaikoMascotAnimation.cs

@@ -139,10 +139,10 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private static Texture getAnimationFrame(ISkin skin, TaikoMascotAnimationState state, int frameIndex)
         {
-            var texture = skin.GetTexture($"pippidon{state.ToString().ToLower()}{frameIndex}");
+            var texture = skin.GetTexture($"pippidon{state.ToString().ToLowerInvariant()}{frameIndex}");
 
             if (frameIndex == 0 && texture == null)
-                texture = skin.GetTexture($"pippidon{state.ToString().ToLower()}");
+                texture = skin.GetTexture($"pippidon{state.ToString().ToLowerInvariant()}");
 
             return texture;
         }

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -245,7 +245,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barLinePlayfield.Add(barLine);
                     break;
 
-                case DrawableTaikoHitObject _:
+                case DrawableTaikoHitObject:
                     base.Add(h);
                     break;
 
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                 case DrawableBarLine barLine:
                     return barLinePlayfield.Remove(barLine);
 
-                case DrawableTaikoHitObject _:
+                case DrawableTaikoHitObject:
                     return base.Remove(h);
 
                 default:
@@ -280,12 +280,12 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             switch (result.Judgement)
             {
-                case TaikoStrongJudgement _:
+                case TaikoStrongJudgement:
                     if (result.IsHit)
                         hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).ParentHitObject)?.VisualiseSecondHit(result);
                     break;
 
-                case TaikoDrumRollTickJudgement _:
+                case TaikoDrumRollTickJudgement:
                     if (!result.IsHit)
                         break;
 

osu.Game.Tests/Beatmaps/TestSceneBeatmapDifficultyCache.cs

@@ -157,7 +157,7 @@ namespace osu.Game.Tests.Beatmaps
         [TestCase(8.3, DifficultyRating.ExpertPlus)]
         public void TestDifficultyRatingMapping(double starRating, DifficultyRating expectedBracket)
         {
-            var actualBracket = BeatmapDifficultyCache.GetDifficultyRating(starRating);
+            var actualBracket = StarDifficulty.GetDifficultyRating(starRating);
 
             Assert.AreEqual(expectedBracket, actualBracket);
         }

osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs

@@ -99,7 +99,7 @@ namespace osu.Game.Tests.Collections.IO
         public async Task TestImportMalformedDatabase()
         {
             bool exceptionThrown = false;
-            UnhandledExceptionEventHandler setException = (_, __) => exceptionThrown = true;
+            UnhandledExceptionEventHandler setException = (_, _) => exceptionThrown = true;
 
             using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
             {

osu.Game.Tests/Database/BeatmapImporterTests.cs

@@ -607,6 +607,12 @@ namespace osu.Game.Tests.Database
                 using (var outStream = File.Open(brokenTempFilename, FileMode.CreateNew))
                 using (var zip = ZipArchive.Open(brokenOsz))
                 {
+                    foreach (var entry in zip.Entries.ToArray())
+                    {
+                        if (entry.Key.EndsWith(".osu", StringComparison.InvariantCulture))
+                            zip.RemoveEntry(entry);
+                    }
+
                     zip.AddEntry("broken.osu", brokenOsu, false);
                     zip.SaveTo(outStream, CompressionType.Deflate);
                 }
@@ -627,7 +633,7 @@ namespace osu.Game.Tests.Database
 
                 checkSingleReferencedFileCount(realm.Realm, 18);
 
-                Assert.AreEqual(1, loggedExceptionCount);
+                Assert.AreEqual(0, loggedExceptionCount);
 
                 File.Delete(brokenTempFilename);
             });

osu.Game.Tests/Database/GeneralUsageTests.cs

@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Database
 {
@@ -33,6 +36,85 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestAsyncWriteAsync()
+        {
+            RunTestWithRealmAsync(async (realm, _) =>
+            {
+                await realm.WriteAsync(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
+
+                realm.Run(r => r.Refresh());
+
+                Assert.That(realm.Run(r => r.All<BeatmapSetInfo>().Count()), Is.EqualTo(1));
+            });
+        }
+
+        [Test]
+        public void TestAsyncWriteWhileBlocking()
+        {
+            RunTestWithRealm((realm, _) =>
+            {
+                Task writeTask;
+
+                using (realm.BlockAllOperations())
+                {
+                    writeTask = realm.WriteAsync(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
+                    Thread.Sleep(100);
+                    Assert.That(writeTask.IsCompleted, Is.False);
+                }
+
+                writeTask.WaitSafely();
+
+                realm.Run(r => r.Refresh());
+                Assert.That(realm.Run(r => r.All<BeatmapSetInfo>().Count()), Is.EqualTo(1));
+            });
+        }
+
+        [Test]
+        public void TestAsyncWrite()
+        {
+            RunTestWithRealm((realm, _) =>
+            {
+                realm.WriteAsync(r => r.Add(TestResources.CreateTestBeatmapSetInfo())).WaitSafely();
+
+                realm.Run(r => r.Refresh());
+
+                Assert.That(realm.Run(r => r.All<BeatmapSetInfo>().Count()), Is.EqualTo(1));
+            });
+        }
+
+        [Test]
+        public void TestAsyncWriteAfterDisposal()
+        {
+            RunTestWithRealm((realm, _) =>
+            {
+                realm.Dispose();
+                Assert.ThrowsAsync<ObjectDisposedException>(() => realm.WriteAsync(r => r.Add(TestResources.CreateTestBeatmapSetInfo())));
+            });
+        }
+
+        [Test]
+        public void TestAsyncWriteBeforeDisposal()
+        {
+            ManualResetEventSlim resetEvent = new ManualResetEventSlim();
+
+            RunTestWithRealm((realm, _) =>
+            {
+                var writeTask = realm.WriteAsync(r =>
+                {
+                    // ensure that disposal blocks for our execution
+                    Assert.That(resetEvent.Wait(100), Is.False);
+
+                    r.Add(TestResources.CreateTestBeatmapSetInfo());
+                });
+
+                realm.Dispose();
+                resetEvent.Set();
+
+                writeTask.WaitSafely();
+            });
+        }
+
         /// <summary>
         /// Test to ensure that a `CreateContext` call nested inside a subscription doesn't cause any deadlocks
         /// due to context fetching semaphores.
@@ -46,7 +128,7 @@ namespace osu.Game.Tests.Database
 
                 realm.RegisterCustomSubscription(r =>
                 {
-                    var subscription = r.All<BeatmapInfo>().QueryAsyncWithNotifications((sender, changes, error) =>
+                    var subscription = r.All<BeatmapInfo>().QueryAsyncWithNotifications((_, _, _) =>
                     {
                         realm.Run(_ =>
                         {
@@ -79,11 +161,11 @@ namespace osu.Game.Tests.Database
                     {
                         hasThreadedUsage.Set();
 
-                        stopThreadedUsage.Wait();
+                        stopThreadedUsage.Wait(60000);
                     });
                 }, TaskCreationOptions.LongRunning | TaskCreationOptions.HideScheduler);
 
-                hasThreadedUsage.Wait();
+                hasThreadedUsage.Wait(60000);
 
                 Assert.Throws<TimeoutException>(() =>
                 {

osu.Game.Tests/Database/RealmLiveTests.cs

@@ -91,6 +91,25 @@ namespace osu.Game.Tests.Database
             Assert.IsFalse(liveBeatmap.PerformRead(l => l.Hidden));
         }
 
+        [Test]
+        public void TestTransactionRolledBackOnException()
+        {
+            RunTestWithRealm((realm, _) =>
+            {
+                var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
+
+                realm.Run(r => r.Write(_ => r.Add(beatmap)));
+
+                var liveBeatmap = beatmap.ToLive(realm);
+
+                Assert.Throws<InvalidOperationException>(() => liveBeatmap.PerformWrite(l => throw new InvalidOperationException()));
+                Assert.IsFalse(liveBeatmap.PerformRead(l => l.Hidden));
+
+                liveBeatmap.PerformWrite(l => l.Hidden = true);
+                Assert.IsTrue(liveBeatmap.PerformRead(l => l.Hidden));
+            });
+        }
+
         [Test]
         public void TestScopedReadWithoutContext()
         {
@@ -189,7 +208,7 @@ namespace osu.Game.Tests.Database
                     });
 
                     // Can't be used, even from within a valid context.
-                    realm.Run(threadContext =>
+                    realm.Run(_ =>
                     {
                         Assert.Throws<InvalidOperationException>(() =>
                         {

osu.Game.Tests/Database/RealmSubscriptionRegistrationTests.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
@@ -84,11 +83,7 @@ namespace osu.Game.Tests.Database
 
                 realm.Run(r => r.Refresh());
 
-                // Without forcing the write onto its own thread, realm will internally run the operation synchronously, which can cause a deadlock with `WaitSafely`.
+                realm.WriteAsync(r => r.Add(TestResources.CreateTestBeatmapSetInfo())).WaitSafely();
-                Task.Run(async () =>
-                {
-                    await realm.WriteAsync(r => r.Add(TestResources.CreateTestBeatmapSetInfo()));
-                }).WaitSafely();
 
                 realm.Run(r => r.Refresh());
 

osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs

@@ -192,7 +192,7 @@ namespace osu.Game.Tests.Gameplay
             AddStep("apply perfect hit result", () => processor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new Judgement()) { Type = HitResult.Perfect }));
             AddAssert("not failed", () => !processor.HasFailed);
 
-            AddStep($"apply {resultApplied.ToString().ToLower()} hit result", () => processor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new Judgement()) { Type = resultApplied }));
+            AddStep($"apply {resultApplied.ToString().ToLowerInvariant()} hit result", () => processor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new Judgement()) { Type = resultApplied }));
             AddAssert("failed", () => processor.HasFailed);
         }
 

osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs

@@ -44,8 +44,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestCustomDirectory()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
@@ -63,7 +62,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
                 }
             }
         }
@@ -71,8 +69,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestSubDirectoryLookup()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
@@ -97,7 +94,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
                 }
             }
         }
@@ -105,8 +101,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigration()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 try
@@ -173,7 +168,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
                 }
             }
         }
@@ -181,9 +175,8 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationBetweenTwoTargets()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-            string customPath2 = prepareCustomPath();
+            using (prepareCustomPath(out string customPath2))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 try
@@ -205,8 +198,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
-                    cleanupPath(customPath2);
                 }
             }
         }
@@ -214,8 +205,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationToSameTargetFails()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 try
@@ -228,7 +218,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
                 }
             }
         }
@@ -236,9 +225,8 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationFailsOnExistingData()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-            string customPath2 = prepareCustomPath();
+            using (prepareCustomPath(out string customPath2))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 try
@@ -254,7 +242,7 @@ namespace osu.Game.Tests.NonVisual
                     Assert.That(File.Exists(Path.Combine(customPath, OsuGameBase.CLIENT_DATABASE_FILENAME)));
 
                     Directory.CreateDirectory(customPath2);
-                    File.Copy(Path.Combine(customPath, OsuGameBase.CLIENT_DATABASE_FILENAME), Path.Combine(customPath2, OsuGameBase.CLIENT_DATABASE_FILENAME));
+                    File.WriteAllText(Path.Combine(customPath2, OsuGameBase.CLIENT_DATABASE_FILENAME), "I am a text");
 
                     // Fails because file already exists.
                     Assert.Throws<ArgumentException>(() => osu.Migrate(customPath2));
@@ -267,8 +255,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
-                    cleanupPath(customPath2);
                 }
             }
         }
@@ -276,8 +262,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationToNestedTargetFails()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 try
@@ -298,7 +283,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
                 }
             }
         }
@@ -306,8 +290,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationToSeeminglyNestedTarget()
         {
-            string customPath = prepareCustomPath();
+            using (prepareCustomPath(out string customPath))
-
             using (var host = new CustomTestHeadlessGameHost())
             {
                 try
@@ -328,7 +311,6 @@ namespace osu.Game.Tests.NonVisual
                 finally
                 {
                     host.Exit();
-                    cleanupPath(customPath);
                 }
             }
         }
@@ -343,14 +325,17 @@ namespace osu.Game.Tests.NonVisual
             return path;
         }
 
-        private static string prepareCustomPath() => Path.Combine(TestRunHeadlessGameHost.TemporaryTestDirectory, $"custom-path-{Guid.NewGuid()}");
+        private static IDisposable prepareCustomPath(out string path)
+        {
+            path = Path.Combine(TestRunHeadlessGameHost.TemporaryTestDirectory, $"custom-path-{Guid.NewGuid()}");
+            return new InvokeOnDisposal<string>(path, cleanupPath);
+        }
 
         private static void cleanupPath(string path)
         {
             try
             {
-                if (Directory.Exists(path))
+                if (Directory.Exists(path)) Directory.Delete(path, true);
-                    Directory.Delete(path, true);
             }
             catch
             {

osu.Game.Tests/NonVisual/FirstAvailableHitWindowsTest.cs

@@ -83,14 +83,14 @@ namespace osu.Game.Tests.NonVisual
 
             public override event Action<JudgementResult> NewResult
             {
-                add => throw new InvalidOperationException();
+                add => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
-                remove => throw new InvalidOperationException();
+                remove => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
             }
 
             public override event Action<JudgementResult> RevertResult
             {
-                add => throw new InvalidOperationException();
+                add => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
-                remove => throw new InvalidOperationException();
+                remove => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
             }
 
             public override Playfield Playfield { get; }

osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs

@@ -364,12 +364,12 @@ namespace osu.Game.Tests.NonVisual
 
         private void confirmCurrentFrame(int? frame)
         {
-            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : (double?)null, handler.CurrentFrame?.Time, "Unexpected current frame");
+            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : null, handler.CurrentFrame?.Time, "Unexpected current frame");
         }
 
         private void confirmNextFrame(int? frame)
         {
-            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : (double?)null, handler.NextFrame?.Time, "Unexpected next frame");
+            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : null, handler.NextFrame?.Time, "Unexpected next frame");
         }
 
         private class TestReplayFrame : ReplayFrame

osu.Game.Tests/NonVisual/Skinning/LegacySkinTextureFallbackTest.cs

@@ -157,7 +157,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
             {
                 // use an incrementing width to allow assertion matching on correct textures as they turn from uploads into actual textures.
                 int width = 1;
-                Textures = fileNames.ToDictionary(fileName => fileName, fileName => new TextureUpload(new Image<Rgba32>(width, width++)));
+                Textures = fileNames.ToDictionary(fileName => fileName, _ => new TextureUpload(new Image<Rgba32>(width, width++)));
             }
 
             public TextureUpload Get(string name) => Textures.GetValueOrDefault(name);

osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs

@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Skins
         {
             AddStep($"Set beatmap skin enabled to {allowBeatmapLookups}", () => config.SetValue(OsuSetting.BeatmapSkins, allowBeatmapLookups));
 
-            ISkin expected() => allowBeatmapLookups ? (ISkin)beatmapSource : userSource;
+            ISkin expected() => allowBeatmapLookups ? beatmapSource : userSource;
 
             AddAssert("Check lookup is from correct source", () => requester.FindProvider(s => s.GetDrawableComponent(new TestSkinComponent()) != null) == expected());
         }

osu.Game.Tests/Utils/NamingUtilsTest.cs

@@ -1,8 +1,6 @@
 // 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.Linq;
 using NUnit.Framework;
 using osu.Game.Utils;

osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs

@@ -36,8 +36,6 @@ namespace osu.Game.Tests.Visual.Editing
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 
-        protected override bool EditorComponentsReady => Editor.ChildrenOfType<SetupScreen>().SingleOrDefault()?.IsLoaded == true;
-
         protected override bool IsolateSavingFromDatabase => false;
 
         [Resolved]
@@ -95,18 +93,23 @@ namespace osu.Game.Tests.Visual.Editing
                 string extractedFolder = $"{temp}_extracted";
                 Directory.CreateDirectory(extractedFolder);
 
-                using (var zip = ZipArchive.Open(temp))
+                try
-                    zip.WriteToDirectory(extractedFolder);
+                {
+                    using (var zip = ZipArchive.Open(temp))
+                        zip.WriteToDirectory(extractedFolder);
 
-                bool success = setup.ChildrenOfType<ResourcesSection>().First().ChangeAudioTrack(new FileInfo(Path.Combine(extractedFolder, "03. Renatus - Soleily 192kbps.mp3")));
+                    bool success = setup.ChildrenOfType<ResourcesSection>().First().ChangeAudioTrack(new FileInfo(Path.Combine(extractedFolder, "03. Renatus - Soleily 192kbps.mp3")));
 
-                File.Delete(temp);
+                    // ensure audio file is copied to beatmap as "audio.mp3" rather than original filename.
-                Directory.Delete(extractedFolder, true);
+                    Assert.That(Beatmap.Value.Metadata.AudioFile == "audio.mp3");
 
-                // ensure audio file is copied to beatmap as "audio.mp3" rather than original filename.
+                    return success;
-                Assert.That(Beatmap.Value.Metadata.AudioFile == "audio.mp3");
+                }
-
+                finally
-                return success;
+                {
+                    File.Delete(temp);
+                    Directory.Delete(extractedFolder, true);
+                }
             });
 
             AddAssert("track length changed", () => Beatmap.Value.Track.Length > 60000);

osu.Game.Tests/Visual/Editing/TestSceneEditorNavigation.cs

@@ -6,17 +6,14 @@ using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
@@ -38,15 +35,18 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("switch ruleset", () => Game.Ruleset.Value = new ManiaRuleset().RulesetInfo);
 
             AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
-            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.IsLoaded);
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
-            AddStep("test gameplay", () =>
+            AddStep("test gameplay", () => ((Editor)Game.ScreenStack.CurrentScreen).TestGameplay());
+
+            AddUntilStep("wait for player", () =>
             {
-                var testGameplayButton = this.ChildrenOfType<TestGameplayButton>().Single();
+                // notifications may fire at almost any inopportune time and cause annoying test failures.
-                InputManager.MoveMouseTo(testGameplayButton);
+                // relentlessly attempt to dismiss any and all interfering overlays, which includes notifications.
-                InputManager.Click(MouseButton.Left);
+                // this is theoretically not foolproof, but it's the best that can be done here.
+                Game.CloseAllOverlays();
+                return Game.ScreenStack.CurrentScreen is EditorPlayer editorPlayer && editorPlayer.IsLoaded;
             });
 
-            AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen is EditorPlayer editorPlayer && editorPlayer.IsLoaded);
             AddAssert("current ruleset is osu!", () => Game.Ruleset.Value.Equals(new OsuRuleset().RulesetInfo));
 
             AddStep("exit to song select", () => Game.PerformFromScreen(_ => { }, typeof(PlaySongSelect).Yield()));

osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs

@@ -117,8 +117,8 @@ namespace osu.Game.Tests.Visual.Editing
 
             // After placement these must be non-default as defaults are read-only.
             AddAssert("Placed object has non-default control points", () =>
-                EditorBeatmap.HitObjects[0].SampleControlPoint != SampleControlPoint.DEFAULT &&
+                !ReferenceEquals(EditorBeatmap.HitObjects[0].SampleControlPoint, SampleControlPoint.DEFAULT) &&
-                EditorBeatmap.HitObjects[0].DifficultyControlPoint != DifficultyControlPoint.DEFAULT);
+                !ReferenceEquals(EditorBeatmap.HitObjects[0].DifficultyControlPoint, DifficultyControlPoint.DEFAULT));
 
             ReloadEditorToSameBeatmap();
 
@@ -126,8 +126,8 @@ namespace osu.Game.Tests.Visual.Editing
 
             // After placement these must be non-default as defaults are read-only.
             AddAssert("Placed object still has non-default control points", () =>
-                EditorBeatmap.HitObjects[0].SampleControlPoint != SampleControlPoint.DEFAULT &&
+                !ReferenceEquals(EditorBeatmap.HitObjects[0].SampleControlPoint, SampleControlPoint.DEFAULT) &&
-                EditorBeatmap.HitObjects[0].DifficultyControlPoint != DifficultyControlPoint.DEFAULT);
+                !ReferenceEquals(EditorBeatmap.HitObjects[0].DifficultyControlPoint, DifficultyControlPoint.DEFAULT));
         }
 
         [Test]

osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs

@@ -6,10 +6,10 @@
 using System.ComponentModel;
 using System.Linq;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps.Timing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Break;
@@ -31,19 +31,20 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override void AddCheckSteps()
         {
+            // It doesn't matter which ruleset is used - this beatmap is only used for reference.
+            var beatmap = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+
             AddUntilStep("score above zero", () => Player.ScoreProcessor.TotalScore.Value > 0);
             AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
-            seekToBreak(0);
+
+            seekTo(beatmap.Beatmap.Breaks[0].StartTime);
             AddAssert("keys not counting", () => !Player.HUDOverlay.KeyCounter.IsCounting);
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
+
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
 
-            seekToBreak(0);
+            seekTo(beatmap.Beatmap.HitObjects[^1].GetEndTime());
-            seekToBreak(1);
-
-            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
-
             AddUntilStep("results displayed", () => getResultsScreen()?.IsLoaded == true);
 
             AddAssert("score has combo", () => getResultsScreen().Score.Combo > 100);
@@ -58,12 +59,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             ResultsScreen getResultsScreen() => Stack.CurrentScreen as ResultsScreen;
         }
 
-        private void seekToBreak(int breakIndex)
+        private void seekTo(double time)
         {
-            AddStep($"seek to break {breakIndex}", () => Player.GameplayClockContainer.Seek(destBreak().StartTime));
+            AddStep($"seek to {time}", () => Player.GameplayClockContainer.Seek(time));
-            AddUntilStep("wait for seek to complete", () => Player.DrawableRuleset.FrameStableClock.CurrentTime >= destBreak().StartTime);
 
-            BreakPeriod destBreak() => Beatmap.Value.Beatmap.Breaks.ElementAt(breakIndex);
+            // Prevent test timeouts by seeking in 10 second increments.
+            for (double t = 0; t < time; t += 10000)
+            {
+                double expectedTime = t;
+                AddUntilStep($"current time >= {t}", () => Player.DrawableRuleset.FrameStableClock.CurrentTime >= expectedTime);
+            }
+
+            AddUntilStep("wait for seek to complete", () => Player.DrawableRuleset.FrameStableClock.CurrentTime >= time);
         }
     }
 }

osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs

@@ -322,8 +322,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 switch (h)
                 {
-                    case TestPooledHitObject _:
+                    case TestPooledHitObject:
-                    case TestPooledParentHitObject _:
+                    case TestPooledParentHitObject:
                         return null;
 
                     case TestParentHitObject p:

osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs

@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                HealthProcessor.FailConditions += (_, __) => true;
+                HealthProcessor.FailConditions += (_, _) => true;
             }
 
             private double lastFrequency = double.MaxValue;

osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs

@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                HealthProcessor.FailConditions += (_, __) => true;
+                HealthProcessor.FailConditions += (_, _) => true;
             }
         }
     }

osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs

@@ -273,14 +273,14 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public override event Action<JudgementResult> NewResult
             {
-                add => throw new InvalidOperationException();
+                add => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
-                remove => throw new InvalidOperationException();
+                remove => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
             }
 
             public override event Action<JudgementResult> RevertResult
             {
-                add => throw new InvalidOperationException();
+                add => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
-                remove => throw new InvalidOperationException();
+                remove => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
             }
 
             public override Playfield Playfield { get; }

osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleEditor()
         {
-            AddToggleStep("toggle editor visibility", visible => skinEditor.ToggleVisibility());
+            AddToggleStep("toggle editor visibility", _ => skinEditor.ToggleVisibility());
         }
 
         [Test]

osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs

@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Child = new SkinProvidingContainer(secondarySource)
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Child = consumer = new SkinConsumer("test", name => new NamedBox("Default Implementation"))
+                        Child = consumer = new SkinConsumer("test", _ => new NamedBox("Default Implementation"))
                     }
                 };
             });
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
             });
 
-            AddStep("add permissive", () => target.Add(consumer = new SkinConsumer("test", name => new NamedBox("Default Implementation"))));
+            AddStep("add permissive", () => target.Add(consumer = new SkinConsumer("test", _ => new NamedBox("Default Implementation"))));
             AddAssert("consumer using override source", () => consumer.Drawable is SecondarySourceBox);
             AddAssert("skinchanged only called once", () => consumer.SkinChangedCount == 1);
         }
@@ -155,7 +155,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
             });
 
-            AddStep("add permissive", () => target.Add(consumer = new SkinConsumer("test", name => new NamedBox("Default Implementation"))));
+            AddStep("add permissive", () => target.Add(consumer = new SkinConsumer("test", _ => new NamedBox("Default Implementation"))));
             AddAssert("consumer using override source", () => consumer.Drawable is SecondarySourceBox);
             AddStep("disable", () => target.Disable());
             AddAssert("consumer using base source", () => consumer.Drawable is BaseSourceBox);

osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs

@@ -167,11 +167,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("start failing sends", () =>
             {
                 spectatorClient.ShouldFailSendingFrames = true;
-                framesReceivedSoFar = replay.Frames.Count;
                 frameSendAttemptsSoFar = spectatorClient.FrameSendAttempts;
             });
 
-            AddUntilStep("wait for send attempts", () => spectatorClient.FrameSendAttempts > frameSendAttemptsSoFar + 5);
+            AddUntilStep("wait for next send attempt", () =>
+            {
+                framesReceivedSoFar = replay.Frames.Count;
+                return spectatorClient.FrameSendAttempts > frameSendAttemptsSoFar + 1;
+            });
+
+            AddUntilStep("wait for more send attempts", () => spectatorClient.FrameSendAttempts > frameSendAttemptsSoFar + 10);
             AddAssert("frames did not increase", () => framesReceivedSoFar == replay.Frames.Count);
 
             AddStep("stop failing sends", () => spectatorClient.ShouldFailSendingFrames = false);

osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs

@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void createPlayerTest()
         {
-            CreateTest(null);
+            CreateTest();
 
             AddAssert("storyboard loaded", () => Player.Beatmap.Value.Storyboard != null);
             waitUntilStoryboardSamplesPlay();

osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs

@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             base.SetUpSteps();
             AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
             AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
-            AddStep("reset fail conditions", () => currentFailConditions = (_, __) => false);
+            AddStep("reset fail conditions", () => currentFailConditions = (_, _) => false);
             AddStep("set storyboard duration to 2s", () => currentStoryboardDuration = 2000);
             AddStep("set ShowResults = true", () => showResults = true);
         }
@@ -52,17 +52,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardSkipOutro()
         {
-            CreateTest(null);
+            AddStep("set storyboard duration to long", () => currentStoryboardDuration = 200000);
+            CreateTest();
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("skip outro", () => InputManager.Key(osuTK.Input.Key.Space));
-            AddAssert("player is no longer current screen", () => !Player.IsCurrentScreen());
+            AddUntilStep("player is no longer current screen", () => !Player.IsCurrentScreen());
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
         [Test]
         public void TestStoryboardNoSkipOutro()
         {
-            CreateTest(null);
+            CreateTest();
             AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
@@ -70,7 +71,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardExitDuringOutroStillExits()
         {
-            CreateTest(null);
+            CreateTest();
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
             AddAssert("player exited", () => !Player.IsCurrentScreen() && Player.GetChildScreen() == null);
@@ -80,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(true)]
         public void TestStoryboardToggle(bool enabledAtBeginning)
         {
-            CreateTest(null);
+            CreateTest();
             AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
             AddStep("toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
@@ -91,7 +92,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             CreateTest(() =>
             {
-                AddStep("fail on first judgement", () => currentFailConditions = (_, __) => true);
+                AddStep("fail on first judgement", () => currentFailConditions = (_, _) => true);
 
                 // Fail occurs at 164ms with the provided beatmap.
                 // Fail animation runs for 2.5s realtime but the gameplay time change is *variable* due to the frequency transform being applied, so we need a bit of lenience.
@@ -129,7 +130,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             SkipOverlay.FadeContainer fadeContainer() => Player.ChildrenOfType<SkipOverlay.FadeContainer>().First();
 
-            CreateTest(null);
+            CreateTest();
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddUntilStep("skip overlay content becomes visible", () => fadeContainer().State == Visibility.Visible);
 
@@ -143,7 +144,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestPerformExitNoOutro()
         {
-            CreateTest(null);
+            CreateTest();
             AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());

osu.Game.Tests/Visual/Multiplayer/MultiplayerGameplayLeaderboardTestScene.cs

@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             // To emulate `MultiplayerClient.CurrentMatchPlayingUserIds` we need a bindable list of *only IDs*.
             // This tracks the list of users 1:1.
-            MultiplayerUsers.BindCollectionChanged((c, e) =>
+            MultiplayerUsers.BindCollectionChanged((_, e) =>
             {
                 switch (e.Action)
                 {

osu.Game.Tests/Visual/Multiplayer/TestSceneAllPlayersQueueMode.cs

@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.Play;
@@ -139,6 +140,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.Select.SongSelect) != null);
             AddUntilStep("wait for loaded", () => songSelect.AsNonNull().BeatmapSetsLoaded);
+            AddUntilStep("wait for ongoing operation to complete", () => !(CurrentScreen as OnlinePlayScreen).ChildrenOfType<OngoingOperationTracker>().Single().InProgress.Value);
 
             if (ruleset != null)
                 AddStep($"set {ruleset.Name} ruleset", () => songSelect.AsNonNull().Ruleset.Value = ruleset);

osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableLoungeRoom.cs

@@ -42,11 +42,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             var mockLounge = new Mock<LoungeSubScreen>();
             mockLounge
                 .Setup(l => l.Join(It.IsAny<Room>(), It.IsAny<string>(), It.IsAny<Action<Room>>(), It.IsAny<Action<string>>()))
-                .Callback<Room, string, Action<Room>, Action<string>>((a, b, c, d) =>
+                .Callback<Room, string, Action<Room>, Action<string>>((_, _, _, d) =>
                 {
                     Task.Run(() =>
                     {
-                        allowResponseCallback.Wait();
+                        allowResponseCallback.Wait(10000);
                         allowResponseCallback.Reset();
                         Schedule(() => d?.Invoke("Incorrect password"));
                     });

osu.Game.Tests/Visual/Multiplayer/TestSceneHostOnlyQueueMode.cs

@@ -104,6 +104,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for song select", () => CurrentSubScreen is Screens.Select.SongSelect select && select.BeatmapSetsLoaded);
 
             BeatmapInfo otherBeatmap = null;
+            AddUntilStep("wait for ongoing operation to complete", () => !(CurrentScreen as OnlinePlayScreen).ChildrenOfType<OngoingOperationTracker>().Single().InProgress.Value);
             AddStep("select other beatmap", () => ((Screens.Select.SongSelect)CurrentSubScreen).FinaliseSelection(otherBeatmap = beatmap()));
 
             AddUntilStep("wait for return to match", () => CurrentSubScreen is MultiplayerMatchSubScreen);
@@ -119,6 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
 
             AddUntilStep("wait for song select", () => CurrentSubScreen is Screens.Select.SongSelect select && select.BeatmapSetsLoaded);
+            AddUntilStep("wait for ongoing operation to complete", () => !(CurrentScreen as OnlinePlayScreen).ChildrenOfType<OngoingOperationTracker>().Single().InProgress.Value);
             AddStep("select other beatmap", () => ((Screens.Select.SongSelect)CurrentSubScreen).FinaliseSelection(beatmap()));
             AddUntilStep("wait for return to match", () => CurrentSubScreen is MultiplayerMatchSubScreen);
         }

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs

@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                          setRoomCountdown(countdownStart.Duration);
                                          break;
 
-                                     case StopCountdownRequest _:
+                                     case StopCountdownRequest:
                                          multiplayerRoom.Countdown = null;
                                          raiseRoomUpdated();
                                          break;

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs

@@ -107,7 +107,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("change ruleset", () => Ruleset.Value = new TaikoRuleset().RulesetInfo);
             AddStep("select beatmap",
                 () => songSelect.Carousel.SelectBeatmap(selectedBeatmap = beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == new TaikoRuleset().LegacyID)));
+
             AddUntilStep("wait for selection", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
+            AddUntilStep("wait for ongoing operation to complete", () => !OnlinePlayDependencies.OngoingOperationTracker.InProgress.Value);
+
             AddStep("set mods", () => SelectedMods.Value = new[] { new TaikoModDoubleTime() });
 
             AddStep("confirm selection", () => songSelect.FinaliseSelection());

osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs

@@ -39,8 +39,8 @@ namespace osu.Game.Tests.Visual.Online
         private TestChatOverlay chatOverlay;
         private ChannelManager channelManager;
 
-        private APIUser testUser;
+        private readonly APIUser testUser = new APIUser { Username = "test user", Id = 5071479 };
-        private Channel testPMChannel;
+
         private Channel[] testChannels;
 
         private Channel testChannel1 => testChannels[0];
@@ -52,8 +52,6 @@ namespace osu.Game.Tests.Visual.Online
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            testUser = new APIUser { Username = "test user", Id = 5071479 };
-            testPMChannel = new Channel(testUser);
             testChannels = Enumerable.Range(1, 10).Select(createPublicChannel).ToArray();
 
             Child = new DependencyProvidingContainer
@@ -80,6 +78,14 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     switch (req)
                     {
+                        case CreateChannelRequest createRequest:
+                            createRequest.TriggerSuccess(new APIChatChannel
+                            {
+                                ChannelID = ((int)createRequest.Channel.Id),
+                                RecentMessages = new List<Message>()
+                            });
+                            return true;
+
                         case GetUpdatesRequest getUpdates:
                             getUpdates.TriggerFailure(new WebException());
                             return true;
@@ -181,7 +187,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("Show overlay", () => chatOverlay.Show());
             AddAssert("Listing is visible", () => listingIsVisible);
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
             waitForChannel1Visible();
         }
@@ -203,12 +209,11 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestChannelCloseButton()
         {
+            var testPMChannel = new Channel(testUser);
+
             AddStep("Show overlay", () => chatOverlay.Show());
-            AddStep("Join PM and public channels", () =>
+            joinTestChannel(0);
-            {
+            joinChannel(testPMChannel);
-                channelManager.JoinChannel(testChannel1);
-                channelManager.JoinChannel(testPMChannel);
-            });
             AddStep("Select PM channel", () => clickDrawable(getChannelListItem(testPMChannel)));
             AddStep("Click close button", () =>
             {
@@ -229,7 +234,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestChatCommand()
         {
             AddStep("Show overlay", () => chatOverlay.Show());
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
             AddStep("Open chat with user", () => channelManager.PostCommand($"chat {testUser.Username}"));
             AddAssert("PM channel is selected", () =>
@@ -248,14 +253,16 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestMultiplayerChannelIsNotShown()
         {
-            Channel multiplayerChannel = null;
+            Channel multiplayerChannel;
 
             AddStep("Show overlay", () => chatOverlay.Show());
-            AddStep("Join multiplayer channel", () => channelManager.JoinChannel(multiplayerChannel = new Channel(new APIUser())
+
+            joinChannel(multiplayerChannel = new Channel(new APIUser())
             {
                 Name = "#mp_1",
                 Type = ChannelType.Multiplayer,
-            }));
+            });
+
             AddAssert("Channel is joined", () => channelManager.JoinedChannels.Contains(multiplayerChannel));
             AddUntilStep("Channel not present in listing", () => !chatOverlay.ChildrenOfType<ChannelListingItem>()
                                                                              .Where(item => item.IsPresent)
@@ -269,7 +276,7 @@ namespace osu.Game.Tests.Visual.Online
             Message message = null;
 
             AddStep("Show overlay", () => chatOverlay.Show());
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
             AddStep("Send message in channel 1", () =>
             {
@@ -291,8 +298,8 @@ namespace osu.Game.Tests.Visual.Online
             Message message = null;
 
             AddStep("Show overlay", () => chatOverlay.Show());
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
-            AddStep("Join channel 2", () => channelManager.JoinChannel(testChannel2));
+            joinTestChannel(1);
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
             AddStep("Send message in channel 2", () =>
             {
@@ -314,8 +321,8 @@ namespace osu.Game.Tests.Visual.Online
             Message message = null;
 
             AddStep("Show overlay", () => chatOverlay.Show());
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
-            AddStep("Join channel 2", () => channelManager.JoinChannel(testChannel2));
+            joinTestChannel(1);
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
             AddStep("Send message in channel 2", () =>
             {
@@ -337,7 +344,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             Message message = null;
 
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
             AddStep("Send message in channel 1", () =>
             {
                 testChannel1.AddNewMessages(message = new Message
@@ -357,7 +364,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             Message message = null;
 
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
             AddStep("Send message in channel 1", () =>
             {
                 testChannel1.AddNewMessages(message = new Message
@@ -378,7 +385,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("Show overlay", () => chatOverlay.Show());
             AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox);
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
             waitForChannel1Visible();
             AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox);
@@ -404,11 +411,11 @@ namespace osu.Game.Tests.Visual.Online
                 chatOverlay.Show();
                 chatOverlay.SlowLoading = true;
             });
-            AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1));
+            joinTestChannel(0);
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
             AddUntilStep("Channel 1 loading", () => !channelIsVisible && chatOverlay.GetSlowLoadingChannel(testChannel1).LoadState == LoadState.Loading);
 
-            AddStep("Join channel 2", () => channelManager.JoinChannel(testChannel2));
+            joinTestChannel(1);
             AddStep("Select channel 2", () => clickDrawable(getChannelListItem(testChannel2)));
             AddUntilStep("Channel 2 loading", () => !channelIsVisible && chatOverlay.GetSlowLoadingChannel(testChannel2).LoadState == LoadState.Loading);
 
@@ -461,19 +468,17 @@ namespace osu.Game.Tests.Visual.Online
             Channel pmChannel1 = createPrivateChannel();
             Channel pmChannel2 = createPrivateChannel();
 
-            AddStep("Show overlay with channels", () =>
+            joinTestChannel(0);
-            {
+            joinTestChannel(1);
-                channelManager.JoinChannel(testChannel1);
+            joinChannel(pmChannel1);
-                channelManager.JoinChannel(testChannel2);
+            joinChannel(pmChannel2);
-                channelManager.JoinChannel(pmChannel1);
+            joinChannel(announceChannel);
-                channelManager.JoinChannel(pmChannel2);
+
-                channelManager.JoinChannel(announceChannel);
+            AddStep("Show overlay", () => chatOverlay.Show());
-                chatOverlay.Show();
-            });
 
             AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
-
             waitForChannel1Visible();
+
             AddStep("Press document next keys", () => InputManager.Keys(PlatformAction.DocumentNext));
             waitForChannel2Visible();
 
@@ -490,6 +495,18 @@ namespace osu.Game.Tests.Visual.Online
             waitForChannel1Visible();
         }
 
+        private void joinTestChannel(int i)
+        {
+            AddStep($"Join test channel {i}", () => channelManager.JoinChannel(testChannels[i]));
+            AddUntilStep("wait for join completed", () => testChannels[i].Joined.Value);
+        }
+
+        private void joinChannel(Channel channel)
+        {
+            AddStep($"Join channel {channel}", () => channelManager.JoinChannel(channel));
+            AddUntilStep("wait for join completed", () => channel.Joined.Value);
+        }
+
         private void waitForChannel1Visible() =>
             AddUntilStep("Channel 1 is visible", () => channelIsVisible && currentDrawableChannel?.Channel == testChannel1);
 
@@ -549,7 +566,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private Channel createPrivateChannel()
         {
-            int id = RNG.Next(0, 10000);
+            int id = RNG.Next(0, DummyAPIAccess.DUMMY_USER_ID - 1);
             return new Channel(new APIUser
             {
                 Id = id,
@@ -559,7 +576,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private Channel createAnnounceChannel()
         {
-            int id = RNG.Next(0, 10000);
+            int id = RNG.Next(0, DummyAPIAccess.DUMMY_USER_ID - 1);
             return new Channel
             {
                 Name = $"Announce {id}",

osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs

@@ -219,7 +219,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 base.LoadComplete();
 
-                Metadata.BindValueChanged(metadata =>
+                Metadata.BindValueChanged(_ =>
                 {
                     foreach (var b in this.ChildrenOfType<YearButton>())
                         b.Action = () => YearChanged?.Invoke(b.Year);