Fix analyzer messages not localized (#4434)

microsoft · Dec 23, 2024 · 2564c52 · 2564c52
1 parent d0e61e2
commit 2564c52
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 5 deletions.
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
@@ -24,7 +24,7 @@ function Confirm-NugetPackages {
         "MSTest.TestFramework"                  = 148;
         "MSTest.TestAdapter"                    = 74;
         "MSTest"                                = 6;
-        "MSTest.Analyzers"                      = 10;
+        "MSTest.Analyzers"                      = 50;
     }
 
     $packageDirectory = Resolve-Path "$PSScriptRoot/../artifacts/packages/$configuration"

diff --git a/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj b/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj
@@ -34,10 +34,14 @@
 
   <Target Name="_AddAnalyzersToOutput">
     <ItemGroup>
-      <!-- Analyzer works for both C# and VB.NET -->
-      <TfmSpecificPackageFile Include="$(OutputPath)\MSTest.Analyzers.dll" PackagePath="analyzers/dotnet" />
-      <!-- This code fix is C# specific -->
+      <TfmSpecificPackageFile Include="$(OutputPath)\MSTest.Analyzers.dll" PackagePath="analyzers/dotnet/cs" />
       <TfmSpecificPackageFile Include="$(OutputPath)\MSTest.Analyzers.CodeFixes.dll" PackagePath="analyzers/dotnet/cs" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\**\MSTest.Analyzers.resources.dll" PackagePath="analyzers/dotnet/cs/" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\**\MSTest.Analyzers.CodeFixes.resources.dll" PackagePath="analyzers/dotnet/cs/" />
+
+      <!-- NOTE: Currently, code fixes are C# only. -->
+      <TfmSpecificPackageFile Include="$(OutputPath)\MSTest.Analyzers.dll" PackagePath="analyzers/dotnet/vb" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\**\MSTest.Analyzers.resources.dll" PackagePath="analyzers/dotnet/vb/" />
     </ItemGroup>
   </Target>
 

diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AnalyzersTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AnalyzersTests.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Testing.Platform.Acceptance.IntegrationTests;
+using Microsoft.Testing.Platform.Acceptance.IntegrationTests.Helpers;
+
+namespace MSTest.Acceptance.IntegrationTests;
+
+[TestClass]
+public sealed class AnalyzersTests : AcceptanceTestBase<NopAssetFixture>
+{
+    [TestMethod]
+    public async Task AnalyzerMessagesShouldBeLocalized()
+    {
+        string code = """
+#file Analyzers.csproj
+<Project Sdk="MSTest.Sdk/$MSTestVersion$">
+
+  <PropertyGroup>
+    <TargetFrameworks>$TargetFrameworks$</TargetFrameworks>
+    <RunAnalyzers>true</RunAnalyzers>
+  </PropertyGroup>
+
+</Project>
+
+#file UnitTest1.cs
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[TestClass]
+public class UnitTest1
+{
+    [DataRow(0)]
+    public void TestMethod()
+    {
+    }
+}
+""".PatchTargetFrameworks(TargetFrameworks.NetCurrent)
+    .PatchCodeWithReplace("$MSTestVersion$", MSTestVersion);
+
+        using TestAsset testAsset = await TestAsset.GenerateAssetAsync("Analyzers", code);
+        DotnetMuxerResult result = await DotnetCli.RunAsync($"build {testAsset.TargetAssetPath}", AcceptanceFixture.NuGetGlobalPackagesFolder.Path, environmentVariables: new()
+        {
+            ["DOTNET_CLI_UI_LANGUAGE"] = "it-IT",
+            ["PreferredUILang"] = "it-IT",
+            ["VSLang"] = "1040",
+        }, warnAsError: false);
+        result.AssertOutputContains("DataRow deve essere impostato solo su un metodo di test");
+    }
+}
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs
@@ -80,7 +80,11 @@ public static async Task<DotnetMuxerResult> RunAsync(
                     }
                 }
 
-                environmentVariables.Add(key!, entry.Value!.ToString()!);
+                // We use TryAdd to let tests "overwrite" existing environment variables.
+                // Consider that the given dictionary has "TESTINGPLATFORM_UI_LANGUAGE" as a key.
+                // And also Environment.GetEnvironmentVariables() is returning TESTINGPLATFORM_UI_LANGUAGE.
+                // In that case, we do a "TryAdd" which effectively means the value from the original dictionary wins.
+                environmentVariables.TryAdd(key!, entry.Value!.ToString()!);
             }
 
             if (disableTelemetry)