From 634c8220f9593460dfc3d5fe451386aa31907886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Tue, 6 Jun 2023 11:51:15 +0200
Subject: [PATCH] [rel/17.6] Exclude also known resource dlls

---
 .../TestPlatformHelpers/TestRequestManager.cs  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
index 7573928d13..759e9e26c7 100644
--- a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
+++ b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
@@ -1473,7 +1473,6 @@ private static List<string> GetSources(TestRunRequestPayload testRunRequestPaylo
 
 internal static class KnownPlatformSourceFilter
 {
-
     // Running tests on AzureDevops, many projects use the default filter
     // which includes all *test*.dll, this includes many of the TestPlatform dlls,
     // which we cannot run, and don't want to attempt to run.
@@ -1481,15 +1480,22 @@ internal static class KnownPlatformSourceFilter
     // so we skip the most used adapters here as well.
     private static readonly HashSet<string> KnownPlatformSources = new(new string[]
     {
+        "Microsoft.TestPlatform.AdapterUtilities.dll",
+        "Microsoft.TestPlatform.AdapterUtilities.resources.dll",
         "Microsoft.TestPlatform.CommunicationUtilities.dll",
+        "Microsoft.TestPlatform.CommunicationUtilities.resources.dll",
         "Microsoft.TestPlatform.CoreUtilities.dll",
+        "Microsoft.TestPlatform.CoreUtilities.resources.dll",
         "Microsoft.TestPlatform.CrossPlatEngine.dll",
+        "Microsoft.TestPlatform.CrossPlatEngine.resources.dll",
         "Microsoft.TestPlatform.PlatformAbstractions.dll",
         "Microsoft.TestPlatform.Utilities.dll",
+        "Microsoft.TestPlatform.Utilities.resources.dll",
         "Microsoft.VisualStudio.TestPlatform.Common.dll",
+        "Microsoft.VisualStudio.TestPlatform.Common.resources.dll",
         "Microsoft.VisualStudio.TestPlatform.ObjectModel.dll",
+        "Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll",
         "testhost.dll",
-        "Microsoft.TestPlatform.AdapterUtilities.dll",
 
         // NUnit
         "NUnit3.TestAdapter.dll",
@@ -1499,11 +1505,15 @@ internal static class KnownPlatformSourceFilter
         "xunit.runner.visualstudio.dotnetcore.testadapter.dll",
 
         // MSTest
+        "Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll",
+        "Microsoft.VisualStudio.TestPlatform.TestFramework.dll",
+        "Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll",
+        // For MSTest up to v3
         "Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll",
+        "Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.resources.dll",
         "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll",
         "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll",
-        "Microsoft.VisualStudio.TestPlatform.TestFramework.dll",
-        "Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll",
+        "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources.dll",
     }, StringComparer.OrdinalIgnoreCase);