Skip to content

Commit edbdfe3

Browse files
ANcpLuaCopilot
ANcpLua
and
Copilot
committed
refactor: reorganize Config into Analyzers, Style, and BannedSymbols subdirectories
- Rename flat Config/*.editorconfig files into Config/Analyzers/ and Config/Style/ - Rename Config/BannedSymbols*.txt into Config/BannedSymbols/ - Update EditorConfigFiles glob to use **/*.editorconfig for subdirectories - Update AdditionalFiles paths for BannedSymbols in Common.targets - Update EmbedBannedSymbolsInBinLog condition to use path-based matching - Update all three .nuspec files with new file paths Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 0fa8bbc commit edbdfe3

16 files changed

+58
-40
lines changed

‎src/ANcpLua.NET.Sdk.Test.nuspec‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,24 @@
4040
<!-- Build/Packaging - Analyzer pack layout -->
4141
<file src="Build/Packaging/AnalyzersPack.targets" target="Build/Packaging/"/>
4242

43-
<!-- Config - EditorConfig and analyzer settings -->
44-
<file src="Config/Analyzers.editorconfig" target="Config/"/>
45-
<file src="Config/Analyzer.ANcpLua.Analyzers.editorconfig" target="Config/"/>
46-
<file src="Config/Analyzer.Meziantou.Analyzer.editorconfig" target="Config/"/>
47-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.Analyzers.editorconfig" target="Config/"/>
48-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.BannedApiAnalyzers.editorconfig" target="Config/"/>
49-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.NetAnalyzers.editorconfig" target="Config/"/>
50-
<file src="Config/CodingStyle.editorconfig" target="Config/"/>
51-
<file src="Config/NamingConvention.editorconfig" target="Config/"/>
52-
<file src="Config/GeneratedFiles.editorconfig" target="Config/"/>
53-
<file src="Config/BannedSymbols.txt" target="Config/"/>
54-
<file src="Config/BannedSymbols.NewtonsoftJson.txt" target="Config/"/>
43+
<!-- Config/Analyzers - Analyzer editorconfig settings -->
44+
<file src="Config/Analyzers/Global.editorconfig" target="Config/Analyzers/"/>
45+
<file src="Config/Analyzers/ANcpLua.editorconfig" target="Config/Analyzers/"/>
46+
<file src="Config/Analyzers/Meziantou.editorconfig" target="Config/Analyzers/"/>
47+
<file src="Config/Analyzers/Roslyn.editorconfig" target="Config/Analyzers/"/>
48+
<file src="Config/Analyzers/BannedApis.editorconfig" target="Config/Analyzers/"/>
49+
<file src="Config/Analyzers/NetAnalyzers.editorconfig" target="Config/Analyzers/"/>
50+
51+
<!-- Config/Style - Code style editorconfig settings -->
52+
<file src="Config/Style/CodingStyle.editorconfig" target="Config/Style/"/>
53+
<file src="Config/Style/NamingConvention.editorconfig" target="Config/Style/"/>
54+
<file src="Config/Style/GeneratedFiles.editorconfig" target="Config/Style/"/>
55+
56+
<!-- Config/BannedSymbols - Banned API symbol lists -->
57+
<file src="Config/BannedSymbols/Default.txt" target="Config/BannedSymbols/"/>
58+
<file src="Config/BannedSymbols/NewtonsoftJson.txt" target="Config/BannedSymbols/"/>
59+
60+
<!-- Config root -->
5561
<file src="Config/default.runsettings" target="Config/"/>
5662

5763
<file src="../LICENSE.txt" target=""/>

‎src/ANcpLua.NET.Sdk.Web.nuspec‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,24 @@
4040
<!-- Build/Packaging - Analyzer pack layout -->
4141
<file src="Build/Packaging/AnalyzersPack.targets" target="Build/Packaging/"/>
4242

43-
<!-- Config - EditorConfig and analyzer settings -->
44-
<file src="Config/Analyzers.editorconfig" target="Config/"/>
45-
<file src="Config/Analyzer.ANcpLua.Analyzers.editorconfig" target="Config/"/>
46-
<file src="Config/Analyzer.Meziantou.Analyzer.editorconfig" target="Config/"/>
47-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.Analyzers.editorconfig" target="Config/"/>
48-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.BannedApiAnalyzers.editorconfig" target="Config/"/>
49-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.NetAnalyzers.editorconfig" target="Config/"/>
50-
<file src="Config/CodingStyle.editorconfig" target="Config/"/>
51-
<file src="Config/NamingConvention.editorconfig" target="Config/"/>
52-
<file src="Config/GeneratedFiles.editorconfig" target="Config/"/>
53-
<file src="Config/BannedSymbols.txt" target="Config/"/>
54-
<file src="Config/BannedSymbols.NewtonsoftJson.txt" target="Config/"/>
43+
<!-- Config/Analyzers - Analyzer editorconfig settings -->
44+
<file src="Config/Analyzers/Global.editorconfig" target="Config/Analyzers/"/>
45+
<file src="Config/Analyzers/ANcpLua.editorconfig" target="Config/Analyzers/"/>
46+
<file src="Config/Analyzers/Meziantou.editorconfig" target="Config/Analyzers/"/>
47+
<file src="Config/Analyzers/Roslyn.editorconfig" target="Config/Analyzers/"/>
48+
<file src="Config/Analyzers/BannedApis.editorconfig" target="Config/Analyzers/"/>
49+
<file src="Config/Analyzers/NetAnalyzers.editorconfig" target="Config/Analyzers/"/>
50+
51+
<!-- Config/Style - Code style editorconfig settings -->
52+
<file src="Config/Style/CodingStyle.editorconfig" target="Config/Style/"/>
53+
<file src="Config/Style/NamingConvention.editorconfig" target="Config/Style/"/>
54+
<file src="Config/Style/GeneratedFiles.editorconfig" target="Config/Style/"/>
55+
56+
<!-- Config/BannedSymbols - Banned API symbol lists -->
57+
<file src="Config/BannedSymbols/Default.txt" target="Config/BannedSymbols/"/>
58+
<file src="Config/BannedSymbols/NewtonsoftJson.txt" target="Config/BannedSymbols/"/>
59+
60+
<!-- Config root -->
5561
<file src="Config/default.runsettings" target="Config/"/>
5662

5763
<file src="../LICENSE.txt" target=""/>

‎src/ANcpLua.NET.Sdk.nuspec‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,24 @@
4040
<!-- Build/Packaging - Analyzer pack layout -->
4141
<file src="Build/Packaging/AnalyzersPack.targets" target="Build/Packaging/"/>
4242

43-
<!-- Config - EditorConfig and analyzer settings -->
44-
<file src="Config/Analyzers.editorconfig" target="Config/"/>
45-
<file src="Config/Analyzer.ANcpLua.Analyzers.editorconfig" target="Config/"/>
46-
<file src="Config/Analyzer.Meziantou.Analyzer.editorconfig" target="Config/"/>
47-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.Analyzers.editorconfig" target="Config/"/>
48-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.BannedApiAnalyzers.editorconfig" target="Config/"/>
49-
<file src="Config/Analyzer.Microsoft.CodeAnalysis.NetAnalyzers.editorconfig" target="Config/"/>
50-
<file src="Config/CodingStyle.editorconfig" target="Config/"/>
51-
<file src="Config/NamingConvention.editorconfig" target="Config/"/>
52-
<file src="Config/GeneratedFiles.editorconfig" target="Config/"/>
53-
<file src="Config/BannedSymbols.txt" target="Config/"/>
54-
<file src="Config/BannedSymbols.NewtonsoftJson.txt" target="Config/"/>
43+
<!-- Config/Analyzers - Analyzer editorconfig settings -->
44+
<file src="Config/Analyzers/Global.editorconfig" target="Config/Analyzers/"/>
45+
<file src="Config/Analyzers/ANcpLua.editorconfig" target="Config/Analyzers/"/>
46+
<file src="Config/Analyzers/Meziantou.editorconfig" target="Config/Analyzers/"/>
47+
<file src="Config/Analyzers/Roslyn.editorconfig" target="Config/Analyzers/"/>
48+
<file src="Config/Analyzers/BannedApis.editorconfig" target="Config/Analyzers/"/>
49+
<file src="Config/Analyzers/NetAnalyzers.editorconfig" target="Config/Analyzers/"/>
50+
51+
<!-- Config/Style - Code style editorconfig settings -->
52+
<file src="Config/Style/CodingStyle.editorconfig" target="Config/Style/"/>
53+
<file src="Config/Style/NamingConvention.editorconfig" target="Config/Style/"/>
54+
<file src="Config/Style/GeneratedFiles.editorconfig" target="Config/Style/"/>
55+
56+
<!-- Config/BannedSymbols - Banned API symbol lists -->
57+
<file src="Config/BannedSymbols/Default.txt" target="Config/BannedSymbols/"/>
58+
<file src="Config/BannedSymbols/NewtonsoftJson.txt" target="Config/BannedSymbols/"/>
59+
60+
<!-- Config root -->
5561
<file src="Config/default.runsettings" target="Config/"/>
5662

5763
<file src="../LICENSE.txt" target=""/>

‎src/Build/Common/Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116

117117
<ItemGroup>
118118
<!-- Add all editorconfig files (hidden from Solution Explorer via InProject) -->
119-
<EditorConfigFiles Include="$(MSBuildThisFileDirectory)../../Config/*.editorconfig" InProject="false"/>
119+
<EditorConfigFiles Include="$(MSBuildThisFileDirectory)../../Config/**/*.editorconfig" InProject="false"/>
120120
</ItemGroup>
121121

122122
</Project>

‎src/Build/Common/Common.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@
231231
<!-- SDK-injected analyzer packages are now handled via GlobalPackages.props -->
232232

233233
<ItemGroup>
234-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)../../Config/BannedSymbols.txt" Condition="'$(IncludeDefaultBannedSymbols)' != 'false'" InProject="false"/>
235-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)../../Config/BannedSymbols.NewtonsoftJson.txt" Condition="'$(BannedNewtonsoftJsonSymbols)' != 'false'" InProject="false"/>
234+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)../../Config/BannedSymbols/Default.txt" Condition="'$(IncludeDefaultBannedSymbols)' != 'false'" InProject="false"/>
235+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)../../Config/BannedSymbols/NewtonsoftJson.txt" Condition="'$(BannedNewtonsoftJsonSymbols)' != 'false'" InProject="false"/>
236236
</ItemGroup>
237237

238238
<ItemGroup Condition="'$(Language)' == 'C#' AND ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
@@ -243,7 +243,7 @@
243243

244244
<Target Name="EmbedBannedSymbolsInBinLog" AfterTargets="CoreCompile">
245245
<ItemGroup>
246-
<EmbedInBinlog Include="@(AdditionalFiles)" Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Filename)%(Extension)', '^BannedSymbols(\..+)?\.txt$'))"/>
246+
<EmbedInBinlog Include="@(AdditionalFiles)" Condition="$([System.String]::new('%(FullPath)').Contains('BannedSymbols')) AND '%(Extension)' == '.txt'"/>
247247
</ItemGroup>
248248
</Target>
249249

src/Config/Analyzer.ANcpLua.Analyzers.editorconfig renamed to src/Config/Analyzers/ANcpLua.editorconfig

File renamed without changes.

src/Config/Analyzer.Microsoft.CodeAnalysis.BannedApiAnalyzers.editorconfig renamed to src/Config/Analyzers/BannedApis.editorconfig

File renamed without changes.

src/Config/Analyzers.editorconfig renamed to src/Config/Analyzers/Global.editorconfig

File renamed without changes.

src/Config/Analyzer.Meziantou.Analyzer.editorconfig renamed to src/Config/Analyzers/Meziantou.editorconfig

File renamed without changes.

src/Config/Analyzer.Microsoft.CodeAnalysis.NetAnalyzers.editorconfig renamed to src/Config/Analyzers/NetAnalyzers.editorconfig

File renamed without changes.

0 commit comments

Comments
 (0)