Skip to content

Commit bb0e8c0

Browse files
committed
Use ResxSourceGenerator for resource generation
1 parent 4d9b3e3 commit bb0e8c0

22 files changed

Lines changed: 1673 additions & 7291 deletions

StyleCop.Analyzers/Directory.Build.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,13 @@
5050
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0" PrivateAssets="all" />
5151
</ItemGroup>
5252

53+
<ItemGroup>
54+
<PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.3.3-beta1.21202.3" PrivateAssets="all" />
55+
</ItemGroup>
56+
5357
<!-- C# Compiler -->
5458
<ItemGroup>
55-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0" PrivateAssets="all" />
59+
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.9.0" PrivateAssets="all" />
5660
</ItemGroup>
5761

5862
<!-- Public API -->

StyleCop.Analyzers/Directory.Build.targets

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33

4+
<PropertyGroup>
5+
<SkipAddAllResxFilesAsAdditionalFiles>true</SkipAddAllResxFilesAsAdditionalFiles>
6+
</PropertyGroup>
7+
48
<ItemGroup>
5-
<!-- Enable code generation for resource files -->
9+
<!-- Enable code generation for resource files. -->
610
<CodeGenerationEmbeddedResource Include="@(EmbeddedResource)" Exclude="**\*.??-??.resx" />
7-
<EmbeddedResource Update="@(CodeGenerationEmbeddedResource)" Generator="ResXFileCodeGenerator" />
11+
<AdditionalFiles Include="@(CodeGenerationEmbeddedResource)" GenerateSource="true" />
12+
13+
<NonCodeGenerationEmbeddedResource Include="@(EmbeddedResource)" Exclude="@(CodeGenerationEmbeddedResource)" />
14+
<AdditionalFiles Include="@(NonCodeGenerationEmbeddedResource)" GenerateSource="false" />
815
</ItemGroup>
916

10-
<!-- Special handling for embedded resources and generated files to show as nested in Solution Explorer -->
17+
<!-- Special handling for embedded resources to show as nested in Solution Explorer -->
1118
<ItemGroup>
12-
<!-- Update designer files for *.resx files -->
13-
<Compile Update="@(CodeGenerationEmbeddedResource->'%(RecursiveDir)%(Filename).Designer.cs')" DependentUpon="$([System.IO.Path]::ChangeExtension($([System.IO.Path]::GetFileNameWithoutExtension(%(Identity))), '.resx'))" />
14-
1519
<!-- Localized embedded resources are just dependent on the parent RESX -->
1620
<EmbeddedResource Update="**\*.??-??.resx" DependentUpon="$([System.IO.Path]::ChangeExtension($([System.IO.Path]::GetFileNameWithoutExtension(%(Identity))), '.resx'))" />
1721
</ItemGroup>

0 commit comments

Comments
 (0)