From 41f8c3c48e6bd7c9654d1b6a03a89cf7808daaab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Tue, 15 Oct 2024 16:48:14 +0200
Subject: [PATCH] Fix localization of test adapter messages (#3867)

---
 .../build/net/MSTest.TestAdapter.targets      | 14 +++++++-------
 .../MSTest.TestAdapter.targets                | 16 +++++++++++-----
 .../build/uwp/MSTest.TestAdapter.targets      | 19 ++++++++++---------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets
index 05548ac62e..f3ef87d399 100644
--- a/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets
+++ b/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets
@@ -73,18 +73,18 @@
 
   <!-- Copy resources over to $(TargetDir) if this is a localized build. -->
   <Target Name="CopyMSTestV2Resources" BeforeTargets="PrepareForBuild" Condition=" '$(EnableMSTestV2CopyResources)' == 'true' " DependsOnTargets="GetMSTestV2CultureHierarchy">
-    <PropertyGroup>
-      <CurrentUICultureHierarchy>%(CurrentUICultureHierarchy.Identity)</CurrentUICultureHierarchy>
-    </PropertyGroup>
 
+    <!-- Expand the UICulture hierarchy to items, such as cs-CZ, cs, and attach the culture metadata to the item. -->
     <ItemGroup>
-      <MSTestV2Files Include="$(MSBuildThisFileDirectory)..\_localization\*.dll" />
+      <MSTestV2Files Include="$(MSBuildThisFileDirectory)..\_localization\%(CurrentUICultureHierarchy.Identity)\*.dll">
+        <UICulture>%(CurrentUICultureHierarchy.Identity)</UICulture>
+      </MSTestV2Files>
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="@(MSTestV2Files->'%(RootDir)%(Directory)$(CurrentUICultureHierarchy)\%(FileName).resources.dll')"
-               Condition="Exists('%(RootDir)%(Directory)$(CurrentUICultureHierarchy)\%(FileName).resources.dll')">
-        <Link>$(CurrentUICultureHierarchy)\%(FileName).resources.dll</Link>
+      <!-- Add the localization file as content so it gets copied from nuget to bin folder. -->
+      <Content Include="@(MSTestV2Files->'%(FullPath)')">
+        <Link>%(MSTestV2Files.UICulture)\%(FileName).dll</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <BaseAssemblyFullPath>%(FullPath)</BaseAssemblyFullPath>
         <Visible>False</Visible>
diff --git a/src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets
index 106ac5a5da..64fb79bf30 100644
--- a/src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets
+++ b/src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets
@@ -66,14 +66,20 @@
 
   <!-- Copy resources over to $(TargetDir) if this is a localized build. -->
   <Target Name="CopyMSTestV2Resources" BeforeTargets="PrepareForBuild" Condition=" '$(EnableMSTestV2CopyResources)' == 'true' " DependsOnTargets="GetMSTestV2CultureHierarchy">
+
+    <!-- Expand the UICulture hierarchy to items, such as cs-CZ, cs, and attach the culture metadata to the item. -->
     <ItemGroup>
-      <MSTestV2ResourceFiles Include="$(MSBuildThisFileDirectory)..\_localization\%(CurrentUICultureHierarchy.Identity)\*resources.dll">
-        <CultureString>%(CurrentUICultureHierarchy.Identity)</CultureString>
-      </MSTestV2ResourceFiles>
+      <MSTestV2Files Include="$(MSBuildThisFileDirectory)..\_localization\%(CurrentUICultureHierarchy.Identity)\*.dll">
+        <UICulture>%(CurrentUICultureHierarchy.Identity)</UICulture>
+      </MSTestV2Files>
+    </ItemGroup>
 
-      <Content Include="@(MSTestV2ResourceFiles)" Condition=" @(MSTestV2ResourceFiles) != '' ">
-        <Link>%(MSTestV2ResourceFiles.CultureString)\%(Filename)%(Extension)</Link>
+    <ItemGroup>
+      <!-- Add the localization file as content so it gets copied from nuget to bin folder. -->
+      <Content Include="@(MSTestV2Files->'%(FullPath)')">
+        <Link>%(MSTestV2Files.UICulture)\%(FileName).dll</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <BaseAssemblyFullPath>%(FullPath)</BaseAssemblyFullPath>
         <Visible>False</Visible>
       </Content>
     </ItemGroup>
diff --git a/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets
index d8baf21f26..c33b561416 100644
--- a/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets
+++ b/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets
@@ -29,19 +29,20 @@
   <!-- Copy resources over to $(TargetDir) if this is a localized build. -->
   <Target Name="CopyMSTestV2Resources" BeforeTargets="PrepareForBuild" Condition=" '$(EnableMSTestV2CopyResources)' == 'true' " DependsOnTargets="GetMSTestV2CultureHierarchy">
 
-    <PropertyGroup>
-      <CurrentUICultureHierarchy>%(CurrentUICultureHierarchy.Identity)</CurrentUICultureHierarchy>
-    </PropertyGroup>
-
+    <!-- Expand the UICulture hierarchy to items, such as cs-CZ, cs, and attach the culture metadata to the item. -->
     <ItemGroup>
-      <MSTestV2Files Include="$(MSBuildThisFileDirectory)../_localization/Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" />
-      <MSTestV2Files Include="$(MSBuildThisFileDirectory)*.dll" />
+      <MSTestV2Files Include="$(MSBuildThisFileDirectory)..\_localization\%(CurrentUICultureHierarchy.Identity)\*.dll">
+        <UICulture>%(CurrentUICultureHierarchy.Identity)</UICulture>
+      </MSTestV2Files>
+      <MSTestV2Files Include="$(MSBuildThisFileDirectory)*.dll">
+        <UICulture>%(CurrentUICultureHierarchy.Identity)</UICulture>
+      </MSTestV2Files>
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="@(MSTestV2Files->'%(RootDir)%(Directory)$(CurrentUICultureHierarchy)\%(FileName).resources.dll')"
-               Condition="Exists('%(RootDir)%(Directory)$(CurrentUICultureHierarchy)\%(FileName).resources.dll')">
-        <Link>$(CurrentUICultureHierarchy)\%(FileName).resources.dll</Link>
+      <!-- Add the localization file as content so it gets copied from nuget to bin folder. -->
+      <Content Include="@(MSTestV2Files->'%(FullPath)')">
+        <Link>%(MSTestV2Files.UICulture)\%(FileName).dll</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <BaseAssemblyFullPath>%(FullPath)</BaseAssemblyFullPath>
         <Visible>False</Visible>