TestPlugin cache refactored.

scripts/build.ps1

@@ -249,7 +249,7 @@ function Publish-Package
 
     # Note Note: If there are some dependencies for the logger assemblies, those need to be moved too. 
     # Ideally we should just be publishing the loggers to the Extensions folder.
-    $loggers = @("Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.pdb")
+    $loggers = @("Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb")
     foreach($file in $loggers) {
         Write-Verbose "Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force"
         Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force
@@ -258,8 +258,8 @@ function Publish-Package
         Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force
     }
 
-	# Note Note: If there are some dependencies for the TestHostProvider assemblies, those need to be moved too. 
-    $runtimeproviders = @("Microsoft.TestPlatform.TestHostProvider.dll", "Microsoft.TestPlatform.TestHostProvider.pdb")
+	# Note Note: If there are some dependencies for the TestHostRuntimeProvider assemblies, those need to be moved too. 
+    $runtimeproviders = @("Microsoft.TestPlatform.TestHostRuntimeProvider.dll", "Microsoft.TestPlatform.TestHostRuntimeProvider.pdb")
     foreach($file in $runtimeproviders) {
         Write-Verbose "Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force"
         Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force
@@ -268,7 +268,7 @@ function Publish-Package
         Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force
     }
 
-    # Copy dependency of Microsoft.TestPlatform.TestHostProvider
+    # Copy dependency of Microsoft.TestPlatform.TestHostRuntimeProvider
     $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\9.0.1\lib\net45\Newtonsoft.Json.dll"
     Write-Verbose "Copy-Item $newtonsoft $fullCLRPackageDir -Force"
     Copy-Item $newtonsoft $fullCLRPackageDir -Force

src/Microsoft.TestPlatform.Common/Constants.cs

@@ -54,5 +54,19 @@ public static class TestPlatformConstants
         /// </summary>
         public const string TestLoggerRegexPattern = @".*.TestLogger.dll";
 
+        /// <summary>
+        /// Regex pattern used to find the data collector.
+        /// </summary>
+        public const string DataCollectorRegexPattern = @".*Collector.dll";
+
+        /// <summary>
+        /// Regex pattern used to find the run time provider.
+        /// </summary>
+        public const string RunTimeRegexPattern = @".*RuntimeProvider.dll";
+
+        /// <summary>
+        /// Regex pattern used to find the settings provider.
+        /// </summary>
+        public const string SettingsProviderRegexPattern = @".*SettingsProvider.dll";
     }
 }

src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs

@@ -14,10 +14,10 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
     /// <summary>
     /// Responsible for managing the Test Discoverer extensions which are available.
     /// </summary>
-    internal class TestDiscoveryExtensionManager 
+    internal class TestDiscoveryExtensionManager
     {
         #region Fields
-        
+
         private static TestDiscoveryExtensionManager testDiscoveryExtensionManager;
 
         #endregion
@@ -79,7 +79,8 @@ public static TestDiscoveryExtensionManager Create()
                 IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> testExtensions;
 
                 TestPluginManager.Instance
-                    .GetTestExtensions<ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+                    .GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+                        TestPlatformConstants.TestAdapterRegexPattern,
                         out unfilteredTestExtensions,
                         out testExtensions);
 
@@ -106,7 +107,7 @@ public static TestDiscoveryExtensionManager GetDiscoveryExtensionManager(string
             IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> testExtensions;
 
             TestPluginManager.Instance
-                .GetTestExtensions<ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
+                .GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
                     extensionAssembly,
                     out unfilteredTestExtensions,
                     out testExtensions);

src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExecutorExtensionManager.cs

@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-    
+
     /// <summary>
     /// Manages the the Test Executor extensions.
     /// </summary>
@@ -67,12 +67,13 @@ internal static TestExecutorExtensionManager Create()
                         IEnumerable<LazyExtension<ITestExecutor, ITestExecutorCapabilities>> testExtensions;
 
                         TestPluginManager.Instance
-                            .GetTestExtensions<ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
+                            .GetSpecificTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
+                                TestPlatformConstants.TestAdapterRegexPattern,
                                 out unfilteredTestExtensions,
                                 out testExtensions);
-                        
+
                         testExecutorExtensionManager = new TestExecutorExtensionManager(
-                                                            unfilteredTestExtensions, testExtensions, TestSessionMessageLogger.Instance);
+                            unfilteredTestExtensions, testExtensions, TestSessionMessageLogger.Instance);
                     }
                 }
             }
@@ -95,7 +96,7 @@ internal static TestExecutorExtensionManager GetExecutionExtensionManager(string
             IEnumerable<LazyExtension<ITestExecutor, ITestExecutorCapabilities>> testExtensions;
 
             TestPluginManager.Instance
-                .GetTestExtensions<ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
+                .GetTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
                     extensionAssembly,
                     out unfilteredTestExtensions,
                     out testExtensions);