From a3745af3add28f898c25922f6ac5cb5419e614c9 Mon Sep 17 00:00:00 2001
From: Donnie Goodson <49205731+donnie-msft@users.noreply.github.com>
Date: Wed, 27 Nov 2024 15:20:33 -0800
Subject: [PATCH] Copy signed assemblies to the localize artifacts folder
 (#6170)

---
 build/loc.proj                                | 26 ++++++++++++++-----
 .../templates/Build_and_UnitTest.yml          |  7 +++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/build/loc.proj b/build/loc.proj
index 63984cfe186..8668f14d404 100644
--- a/build/loc.proj
+++ b/build/loc.proj
@@ -89,21 +89,35 @@
   </Target>
 
   <!-- Prepares localization artifact -->
-  <Target Name="CopyBinariesToLocalizationArtifacts" AfterTargets="Localize">
+  <Target Name="CopyLocalizationArtifacts" AfterTargets="Localize">
     <ItemGroup>
-      <_EnglishBinaries Include="@(FilesToLocalize)">
-        <DestinationPath>$(ArtifactsDirectory)\localizationArtifacts\artifacts\$([MSBuild]::MakeRelative($(ArtifactsDirectory), %(FilesToLocalize.RootDir)%(FilesToLocalize.Directory)))\%(FilesToLocalize.Filename)%(FilesToLocalize.Extension)</DestinationPath>
-      </_EnglishBinaries>
       <_LocalizeFolder Include="$(ArtifactsDirectory)localize\**\*" Exclude="$(ArtifactsDirectory)localize\ResponseFiles\**\*" />
       <_LocalizeFiles Include="@(_LocalizeFolder)">
         <DestinationPath>$(ArtifactsDirectory)\localizationArtifacts\artifacts\$([MSBuild]::MakeRelative($(ArtifactsDirectory), %(_LocalizeFolder.Identity)))</DestinationPath>
       </_LocalizeFiles>
-      <!-- Second Localize run creates appropiate LocProject.json -->
+      <!-- Second Localize run creates appropriate LocProject.json -->
       <_LocalizeFiles Include="$(ArtifactsDirectory)localize\ResponseFiles\*.loc.002\ENU\LocProject.json">
         <DestinationPath>$(ArtifactsDirectory)\localizationArtifacts\ENU\LocProject.json</DestinationPath>
       </_LocalizeFiles>
     </ItemGroup>
-    <Copy SourceFiles="@(_EnglishBinaries)" DestinationFiles="@(_EnglishBinaries->'%(DestinationPath)')" />
     <Copy SourceFiles="@(_LocalizeFiles)" DestinationFiles="@(_LocalizeFiles->'%(DestinationPath)')" />
   </Target>
+
+  <!-- Copy binaries to the localization artifacts folder -->
+   <Target Name="CopyBinariesToLocalizationArtifacts">
+    <MSBuild
+      Projects="@(SolutionProjectsWithoutVSIX)"
+      Properties="BuildProjectReferences=false;"
+      Targets="GetLocalizationInputs">
+      <Output
+          TaskParameter="TargetOutputs"
+          ItemName="FilesToLocalize" />
+    </MSBuild>
+    <ItemGroup>
+      <_EnglishBinaries Include="@(FilesToLocalize)">
+        <DestinationPath>$(ArtifactsDirectory)\localizationArtifacts\artifacts\$([MSBuild]::MakeRelative($(ArtifactsDirectory), %(FilesToLocalize.RootDir)%(FilesToLocalize.Directory)))\%(FilesToLocalize.Filename)%(FilesToLocalize.Extension)</DestinationPath>
+      </_EnglishBinaries>
+    </ItemGroup>
+    <Copy SourceFiles="@(_EnglishBinaries)" DestinationFiles="@(_EnglishBinaries->'%(DestinationPath)')" />
+  </Target>
 </Project>
diff --git a/eng/pipelines/templates/Build_and_UnitTest.yml b/eng/pipelines/templates/Build_and_UnitTest.yml
index 0c1e833b3cc..192fb331736 100644
--- a/eng/pipelines/templates/Build_and_UnitTest.yml
+++ b/eng/pipelines/templates/Build_and_UnitTest.yml
@@ -179,6 +179,13 @@ steps:
     configuration: "$(BuildConfiguration)"
     msbuildArguments: "/restore /binarylogger:$(Build.StagingDirectory)\\binlog\\09.SignAssemblies.binlog"
 
+- task: MSBuild@1
+  displayName: "Copy signed assemblies to localize artifacts folder"
+  inputs:
+    solution: "build\\loc.proj"
+    configuration: "$(BuildConfiguration)"
+    msbuildArguments: "/restore /t:CopyBinariesToLocalizationArtifacts /binarylogger:$(Build.StagingDirectory)\\binlog\\09.LocalizeFolderAssemblies.binlog"
+
 - task: MSBuild@1
   displayName: "Pack Nupkgs"
   inputs: