Merge branch 'master' into fix-resharper-ci

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-framework.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-framework.Desktop.slnf" --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
+dotnet nvika parsereport "inspectcodereport.xml" --treatwarningsaserrors

README.md

@@ -31,7 +31,7 @@ Build configurations for the recommended IDEs (listed above) are included. You s
 
 ### Code analysis
 
-Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternatively, you can install resharper or use rider to get inline support in your IDE of choice.
+Code analysis can be run with `powershell ./InspectCode.ps1` or `InspectCode.sh`.
 
 ## Contributing
 

osu.Framework/Testing/DynamicClassCompiler.cs

@@ -45,8 +45,6 @@ public void SetRecompilationTarget(T target)
 
         public void Start()
         {
-            var di = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory);
-
             if (Debugger.IsAttached)
             {
                 referenceBuilder = new EmptyTypeReferenceBuilder();
@@ -55,6 +53,17 @@ public void Start()
                 return;
             }
 
+            var di = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory);
+            var basePath = getSolutionPath(di);
+
+            if (!Directory.Exists(basePath))
+            {
+                referenceBuilder = new EmptyTypeReferenceBuilder();
+
+                Logger.Log("Dynamic compilation disabled (no solution file found).");
+                return;
+            }
+
 #if NET5_0
             referenceBuilder = new RoslynTypeReferenceBuilder();
 #else
@@ -65,12 +74,7 @@ public void Start()
             {
                 Logger.Log("Initialising dynamic compilation...");
 
-                var basePath = getSolutionPath(di);
-
-                if (!Directory.Exists(basePath))
-                    return;
-
-                await referenceBuilder.Initialise(Directory.GetFiles(getSolutionPath(di), "*.sln").First()).ConfigureAwait(false);
+                await referenceBuilder.Initialise(Directory.GetFiles(basePath, "*.sln").First()).ConfigureAwait(false);
 
                 foreach (var dir in Directory.GetDirectories(basePath))
                 {