From 535a6c9d68357f4cb8ff5081d81b0221ba5910fb Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Fri, 22 Apr 2022 01:25:58 +0800
Subject: [PATCH] Remove dotnet format from CI

---
 .config/dotnet-tools.json | 6 ------
 .github/workflows/ci.yml  | 4 ----
 InspectCode.ps1           | 4 ----
 build/build.cake          | 6 ------
 4 files changed, 20 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 7a1ce4842..3415edf3b 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -8,12 +8,6 @@
         "dotnet-cake"
       ]
     },
-    "dotnet-format": {
-      "version": "3.1.37601",
-      "commands": [
-        "dotnet-format"
-      ]
-    },
     "jetbrains.resharper.globaltools": {
       "version": "2022.1.0-eap10",
       "commands": [
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 402f868ab..9955aee14 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,10 +46,6 @@ jobs:
           done <<< $(dotnet codefilesanity)
           exit $exit_code
 
-      # Temporarily disabled due to test failures, but it won't work anyway until the tool is upgraded.
-      # - name: .NET Format (Dry Run)
-      #   run: dotnet format --dry-run --check
-
       - name: InspectCode
         run: dotnet jb inspectcode $(pwd)/osu-framework.Desktop.slnf --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
 
diff --git a/InspectCode.ps1 b/InspectCode.ps1
index e893e1704..5ccd19165 100644
--- a/InspectCode.ps1
+++ b/InspectCode.ps1
@@ -1,9 +1,5 @@
 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" --no-build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
 dotnet nvika parsereport "inspectcodereport.xml" --treatwarningsaserrors
diff --git a/build/build.cake b/build/build.cake
index 50e4be1be..e2be12349 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -123,11 +123,6 @@ Task("CodeFileSanity")
         });
     });
 
-// 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.
-// Task("DotnetFormat")
-//    .Does(() => DotNetCoreTool(sln.FullPath, "format", "--dry-run --check"));
-
 Task("PackFramework")
     .Does(() => {
         DotNetCorePack(frameworkProject.FullPath, new DotNetCorePackSettings{
@@ -224,7 +219,6 @@ Task("Build")
     .IsDependentOn("Clean")
     .IsDependentOn("DetermineAppveyorBuildProperties")
     .IsDependentOn("CodeFileSanity")
-    //.IsDependentOn("DotnetFormat") <- To be uncommented after fixing the task.
     .IsDependentOn("InspectCode")
     .IsDependentOn("Test")
     .IsDependentOn("DetermineAppveyorDeployProperties")