Merge branch 'master' into gh-actions

InspectCode.ps1

@@ -0,0 +1,11 @@
+dotnet tool restore
+
+# Temporarily disabled until the tool is upgraded to 5.0.
+  # The version specified in .config/dotnet-tools.json (3.1.37601) won't run on .NET hosts >=5.0.7.
+  # - cmd: dotnet format --dry-run --check
+
+dotnet CodeFileSanity
+dotnet jb inspectcode "osu.Desktop.slnf" --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
+dotnet nvika parsereport "inspectcodereport.xml" --treatwarningsaserrors
+
+exit $LASTEXITCODE

InspectCode.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+dotnet tool restore
+dotnet CodeFileSanity
+dotnet jb inspectcode "osu.Desktop.slnf" --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
+dotnet nvika parsereport "inspectcodereport.xml" --treatwarningsaserrors

appveyor.yml

@@ -20,15 +20,7 @@ build:
   publish_nuget: true
 
 after_build:
-  - cmd: dotnet tool restore
-
-  # Temporarily disabled until the tool is upgraded to 5.0.
-  # The version specified in .config/dotnet-tools.json (3.1.37601) won't run on .NET hosts >=5.0.7.
-  # - cmd: dotnet format --dry-run --check
-
-  - cmd: dotnet CodeFileSanity
-  - cmd: dotnet jb inspectcode "osu.Desktop.slnf" --output="temp/inspectcodereport.xml" --caches-home="temp/inspectcode" --verbosity=WARN
-  - cmd: dotnet nvika parsereport "temp/inspectcodereport.xml" --treatwarningsaserrors
+  - ps: .\InspectCode.ps1
 
 test:
   assemblies:

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

@@ -113,7 +113,6 @@ namespace osu.Game.Tests.Collections.IO
                         await importCollectionsFromStream(osu, ms);
                     }
 
-                    Assert.That(host.UpdateThread.Running, Is.True);
                     Assert.That(exceptionThrown, Is.False);
                     Assert.That(osu.CollectionManager.Collections.Count, Is.EqualTo(0));
                 }