From 5f302e1c557da5c399fdb271874a2bd120a2285f Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Thu, 30 Mar 2023 07:00:26 -0500
Subject: [PATCH] Fix the addition of resx files

* Add resx files to AdditionalFiles before generating global configuration files
* Preserve item metadata when adding resx files to AdditionalFiles
---
 src/Tools/GenerateDocumentationAndConfigFiles/Program.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs b/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
index b8999fd63c..c7116c5757 100644
--- a/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
+++ b/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
@@ -1629,10 +1629,10 @@ static string GetPackageSpecificContents(string packageName)
                 {
                     CodeAnalysisAnalyzersPackageName => @"
   <!-- Target to add all 'EmbeddedResource' files with '.resx' extension as analyzer additional files -->
-  <Target Name=""AddAllResxFilesAsAdditionalFiles"" BeforeTargets=""CoreCompile"" Condition=""'@(EmbeddedResource)' != '' AND '$(SkipAddAllResxFilesAsAdditionalFiles)' != 'true'"">
+  <Target Name=""AddAllResxFilesAsAdditionalFiles"" BeforeTargets=""GenerateMSBuildEditorConfigFileCore;CoreCompile"" Condition=""'@(EmbeddedResource)' != '' AND '$(SkipAddAllResxFilesAsAdditionalFiles)' != 'true'"">
     <ItemGroup>
       <EmbeddedResourceWithResxExtension Include=""@(EmbeddedResource)"" Condition=""'%(Extension)' == '.resx'"" />
-      <AdditionalFiles Include=""%(EmbeddedResourceWithResxExtension.Identity)"" />
+      <AdditionalFiles Include=""@(EmbeddedResourceWithResxExtension)"" />
     </ItemGroup>
   </Target>