From 68e400dd0c8d4839bab9a2265f9c699fcc8d1b27 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Thu, 5 Dec 2024 18:00:42 +0800
Subject: [PATCH] Put globalconfig into seperated folder and reference
 explicitly

---
 .globalconfig => CodeAnalysis/osu.globalconfig | 1 +
 Directory.Build.props                          | 2 ++
 osu.sln                                        | 7 ++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 rename .globalconfig => CodeAnalysis/osu.globalconfig (99%)

diff --git a/.globalconfig b/CodeAnalysis/osu.globalconfig
similarity index 99%
rename from .globalconfig
rename to CodeAnalysis/osu.globalconfig
index ca7b86c778..247a825033 100644
--- a/.globalconfig
+++ b/CodeAnalysis/osu.globalconfig
@@ -1,5 +1,6 @@
 # .NET Code Style
 # IDE styles reference: https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/
+is_global = true
 
 # IDE0001: Simplify names
 dotnet_diagnostic.IDE0001.severity = warning
diff --git a/Directory.Build.props b/Directory.Build.props
index 0ab41d27a0..3acb86ee0c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,6 +18,8 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
+    <!-- Rider compatibility: .globalconfig needs to be explicitly referenced instead of using the global file name. -->
+    <GlobalAnalyzerConfigFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\osu.globalconfig" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <AnalysisMode>Default</AnalysisMode>
diff --git a/osu.sln b/osu.sln
index 2d9a4e86d0..63da18c23e 100644
--- a/osu.sln
+++ b/osu.sln
@@ -56,7 +56,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{10DF8F12-50FD-45D8-8A38-17BA764BF54D}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		.globalconfig = .globalconfig
 		Directory.Build.props = Directory.Build.props
 		osu.Android.props = osu.Android.props
 		osu.iOS.props = osu.iOS.props
@@ -95,6 +94,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{1743BF7C-E6AE-4A06-BAD9-166D62894303}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeAnalysis", "CodeAnalysis", "{FB156649-D457-4D1A-969C-D3A23FD31513}"
+	ProjectSection(SolutionItems) = preProject
+		CodeAnalysis\BannedSymbols.txt = CodeAnalysis\BannedSymbols.txt
+		CodeAnalysis\osu.globalconfig = CodeAnalysis\osu.globalconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU