From 8f6e5c475465d826204f5308f4b431c4a52db253 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Thu, 28 Nov 2024 19:14:18 +0800
Subject: [PATCH] Convert legacy ruleset to globalconfig

---
 .globalconfig                                 |  8 +++
 CodeAnalysis/osu.ruleset                      | 58 -------------------
 Directory.Build.props                         |  1 -
 .../CodeAnalysis.tests.globalconfig           |  7 +++
 osu.Game.Tests/osu.Game.Tests.csproj          |  6 +-
 osu.Game.Tests/tests.ruleset                  |  6 --
 osu.sln                                       |  2 +-
 7 files changed, 19 insertions(+), 69 deletions(-)
 delete mode 100644 CodeAnalysis/osu.ruleset
 create mode 100644 osu.Game.Tests/CodeAnalysis.tests.globalconfig
 delete mode 100644 osu.Game.Tests/tests.ruleset

diff --git a/.globalconfig b/.globalconfig
index a4d4707f9b..c5723daed6 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -46,6 +46,14 @@ dotnet_diagnostic.IDE0130.severity = warning
 # IDE1006: Naming style
 dotnet_diagnostic.IDE1006.severity = warning
 
+dotnet_diagnostic.CA1309.severity = warning
+
+# CA2007: Consider calling ConfigureAwait on the awaited task
+dotnet_diagnostic.CA2007.severity = warning
+
+# CA2201: Do not raise reserved exception types
+dotnet_diagnostic.CA2201.severity = warning
+
 #Disable operator overloads requiring alternate named methods
 dotnet_diagnostic.CA2225.severity = none
 
diff --git a/CodeAnalysis/osu.ruleset b/CodeAnalysis/osu.ruleset
deleted file mode 100644
index 6a99e230d1..0000000000
--- a/CodeAnalysis/osu.ruleset
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="osu! Rule Set" Description=" " ToolsVersion="16.0">
-  <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
-    <Rule Id="CA1016" Action="None" />
-    <Rule Id="CA1028" Action="None" />
-    <Rule Id="CA1031" Action="None" />
-    <Rule Id="CA1034" Action="None" />
-    <Rule Id="CA1036" Action="None" />
-    <Rule Id="CA1040" Action="None" />
-    <Rule Id="CA1044" Action="None" />
-    <Rule Id="CA1051" Action="None" />
-    <Rule Id="CA1054" Action="None" />
-    <Rule Id="CA1056" Action="None" />
-    <Rule Id="CA1062" Action="None" />
-    <Rule Id="CA1063" Action="None" />
-    <Rule Id="CA1067" Action="None" />
-    <Rule Id="CA1707" Action="None" />
-    <Rule Id="CA1710" Action="None" />
-    <Rule Id="CA1714" Action="None" />
-    <Rule Id="CA1716" Action="None" />
-    <Rule Id="CA1717" Action="None" />
-    <Rule Id="CA1720" Action="None" />
-    <Rule Id="CA1721" Action="None" />
-    <Rule Id="CA1724" Action="None" />
-    <Rule Id="CA1801" Action="None" />
-    <Rule Id="CA1806" Action="None" />
-    <Rule Id="CA1812" Action="None" />
-    <Rule Id="CA1814" Action="None" />
-    <Rule Id="CA1815" Action="None" />
-    <Rule Id="CA1819" Action="None" />
-    <Rule Id="CA1822" Action="None" />
-    <Rule Id="CA1823" Action="None" />
-    <Rule Id="CA2007" Action="Warning" />
-    <Rule Id="CA2214" Action="None" />
-    <Rule Id="CA2227" Action="None" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.CodeQuality.CSharp.Analyzers" RuleNamespace="Microsoft.CodeQuality.CSharp.Analyzers">
-    <Rule Id="CA1001" Action="None" />
-    <Rule Id="CA1032" Action="None" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.NetCore.Analyzers" RuleNamespace="Microsoft.NetCore.Analyzers">
-    <Rule Id="CA1303" Action="None" />
-    <Rule Id="CA1304" Action="None" />
-    <Rule Id="CA1305" Action="None" />
-    <Rule Id="CA1307" Action="None" />
-    <Rule Id="CA1308" Action="None" />
-    <Rule Id="CA1816" Action="None" />
-    <Rule Id="CA1826" Action="None" />
-    <Rule Id="CA2000" Action="None" />
-    <Rule Id="CA2008" Action="None" />
-    <Rule Id="CA2213" Action="None" />
-    <Rule Id="CA2235" Action="None" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.NetCore.CSharp.Analyzers" RuleNamespace="Microsoft.NetCore.CSharp.Analyzers">
-    <Rule Id="CA1309" Action="Warning" />
-    <Rule Id="CA2201" Action="Warning" />
-  </Rules>
-</RuleSet>
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 5ba12b845b..e7e5e4e831 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -20,7 +20,6 @@
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Label="Documentation">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/osu.Game.Tests/CodeAnalysis.tests.globalconfig b/osu.Game.Tests/CodeAnalysis.tests.globalconfig
new file mode 100644
index 0000000000..3f039736ec
--- /dev/null
+++ b/osu.Game.Tests/CodeAnalysis.tests.globalconfig
@@ -0,0 +1,7 @@
+# Higher global_level has higher priority, the default global_level
+# is 100 for root .globalconfig and 0 for others
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/configuration-files#precedence
+is_global = true
+global_level = 101
+
+dotnet_diagnostic.CA2007.severity = none
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 28a1d4d021..01d2241650 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -12,9 +12,9 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Label="Code Analysis">
-    <CodeAnalysisRuleSet>tests.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+  <ItemGroup Label="Code Analysis">
+    <GlobalAnalyzerConfigFiles Include="CodeAnalysis.tests.globalconfig" />
+  </ItemGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
diff --git a/osu.Game.Tests/tests.ruleset b/osu.Game.Tests/tests.ruleset
deleted file mode 100644
index a0abb781d3..0000000000
--- a/osu.Game.Tests/tests.ruleset
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="osu! Rule Set" Description=" " ToolsVersion="16.0">
-    <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
-        <Rule Id="CA2007" Action="None" />
-    </Rules>
-</RuleSet>
diff --git a/osu.sln b/osu.sln
index 829e43fc65..2d9a4e86d0 100644
--- a/osu.sln
+++ b/osu.sln
@@ -60,7 +60,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		osu.Android.props = osu.Android.props
 		osu.iOS.props = osu.iOS.props
-		CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset
+		global.json = global.json
 		osu.sln.DotSettings = osu.sln.DotSettings
 		osu.TestProject.props = osu.TestProject.props
 	EndProjectSection