Merge branch 'main' into feature/codeql

pipeline-foundation · Oct 10, 2024 · 6ef5614 · 6ef5614
2 parents 03cf302 + ba273e1
commit 6ef5614
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
@@ -19,7 +19,7 @@ function Verify-Nuget-Packages {
     $expectedNumOfFiles = @{
         "Microsoft.CodeCoverage"                      = 59;
         "Microsoft.NET.Test.Sdk"                      = 15;
-        "Microsoft.TestPlatform"                      = 608;
+        "Microsoft.TestPlatform"                      = 609;
         "Microsoft.TestPlatform.Build"                = 20;
         "Microsoft.TestPlatform.CLI"                  = 471;
         "Microsoft.TestPlatform.Extensions.TrxLogger" = 34;

diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -284,6 +284,7 @@
     <file src="net472\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\arm64\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Cpp\arm64\dbghelp.dll" />
     <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll" />
     <file src="net472\Microsoft.Internal.Dia\x64\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x64\msdia140.dll.manifest" />
+    <file src="net472\CodeCoverage\arm64\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\arm64\msdia140.dll" />
     <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll" />
     <file src="net472\Microsoft.Internal.Dia\x86\msdia140.dll.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\TestImpact\ComComponents\x86\msdia140.dll.manifest" />
     <file src="net472\Microsoft.VisualStudio.QualityTools.DataCollectors\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\V1\Microsoft.VisualStudio.QualityTools.Plugins.CodeCoverage.dll" />

diff --git a/src/vstest.console/Internal/MSBuildLogger.cs b/src/vstest.console/Internal/MSBuildLogger.cs
@@ -78,7 +78,15 @@ private void TestMessageHandler(object? sender, TestRunMessageEventArgs e)
                 SendMessage($"output-info", e.Message);
                 break;
             case TestMessageLevel.Warning:
-                SendMessage($"output-warning", e.Message);
+                // Downgrade xUnit skip warning to info, otherwise any skipped test will report warning, which is often upgraded to error.
+                if (e.Message.EndsWith("[SKIP]"))
+                {
+                    SendMessage($"output-info", e.Message);
+                }
+                else
+                {
+                    SendMessage($"output-warning", e.Message);
+                }
                 break;
             case TestMessageLevel.Error:
                 SendMessage($"output-error", e.Message);