Skip to content

Commit 6ef7d2d

Browse files
committed
Put globalconfig into seperated folder and reference explicitly
1 parent 648fb69 commit 6ef7d2d

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

Diff for: .globalconfig renamed to CodeAnalysis/osu-framework.globalconfig

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# .NET Code Style
22
# IDE styles reference: https://docs.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/
3+
is_global = true
34

45
# IDE0001: Simplify names
56
dotnet_diagnostic.IDE0001.severity = warning

Diff for: Directory.Build.props

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<ItemGroup Label="Code Analysis">
2727
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3" PrivateAssets="All" />
2828
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
29+
<!-- Rider compatibility: .globalconfig needs to be explicitly referenced instead of using the global file name. -->
30+
<GlobalAnalyzerConfigFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\osu-framework.globalconfig" />
2931
</ItemGroup>
3032
<PropertyGroup Label="Code Analysis">
3133
<AnalysisMode>Default</AnalysisMode>

Diff for: osu-framework.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ EndProject
2828
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D29A2153-C171-457E-A147-720976BA430F}"
2929
ProjectSection(SolutionItems) = preProject
3030
.editorconfig = .editorconfig
31-
.globalconfig = .globalconfig
3231
Directory.Build.props = Directory.Build.props
3332
.config\dotnet-tools.json = .config\dotnet-tools.json
3433
global.json = global.json
@@ -73,6 +72,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.SourceGenerat
7372
EndProject
7473
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeAnalysis", "CodeAnalysis", "{50334A1F-990D-45FA-A1FE-C92F1994D97B}"
7574
ProjectSection(SolutionItems) = preProject
75+
CodeAnalysis\osu-framework.globalconfig = CodeAnalysis\osu-framework.globalconfig
7676
CodeAnalysis\BannedSymbols.txt = CodeAnalysis\BannedSymbols.txt
7777
EndProjectSection
7878
EndProject

0 commit comments

Comments
 (0)