diff --git a/scripts/build/TestFx.Versions.targets b/scripts/build/TestFx.Versions.targets
index 7a7cf40eb3..01450ada3a 100644
--- a/scripts/build/TestFx.Versions.targets
+++ b/scripts/build/TestFx.Versions.targets
@@ -1,7 +1,7 @@
- 16.9.0-preview-20201123-04
+ 16.9.0-preview-20201214-05
11.0
\ No newline at end of file
diff --git a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
index 7fb134cd0e..cbcad5db36 100644
--- a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
+++ b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
@@ -54,6 +54,7 @@
+
diff --git a/src/Adapter/MSTest.CoreAdapter/Properties/AssemblyInfo.cs b/src/Adapter/MSTest.CoreAdapter/Properties/AssemblyInfo.cs
index ef1590b4a6..58a99d709e 100644
--- a/src/Adapter/MSTest.CoreAdapter/Properties/AssemblyInfo.cs
+++ b/src/Adapter/MSTest.CoreAdapter/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
-[assembly: TypesToLoad(typeof(MSTestDiscoverer), typeof(MSTestExecutor))]
// Version information for an assembly consists of the following four values:
//
diff --git a/src/Adapter/MSTest.CoreAdapter/Properties/TypesToLoadAttribute.cs b/src/Adapter/MSTest.CoreAdapter/Properties/TypesToLoadAttribute.cs
new file mode 100644
index 0000000000..cdcd51a7ec
--- /dev/null
+++ b/src/Adapter/MSTest.CoreAdapter/Properties/TypesToLoadAttribute.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
+
+[assembly: TypesToLoad(typeof(MSTestDiscoverer), typeof(MSTestExecutor))]
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
+{
+ ///
+ /// Custom Attribute to specify the exact types which should be loaded from assembly
+ ///
+ [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+ internal sealed class TypesToLoadAttribute : Attribute
+ {
+ public TypesToLoadAttribute(params Type[] types)
+ {
+ this.Types = types;
+ }
+
+ public Type[] Types { get; }
+ }
+}
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Desktop/packages.config b/src/Adapter/PlatformServices.Desktop/packages.config
index 45aa76f5b2..1d97b0ff21 100644
--- a/src/Adapter/PlatformServices.Desktop/packages.config
+++ b/src/Adapter/PlatformServices.Desktop/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/src/Adapter/PlatformServices.Interface/packages.config b/src/Adapter/PlatformServices.Interface/packages.config
index 91a17d3603..59a01419b3 100644
--- a/src/Adapter/PlatformServices.Interface/packages.config
+++ b/src/Adapter/PlatformServices.Interface/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/src/Adapter/PlatformServices.Portable/packages.config b/src/Adapter/PlatformServices.Portable/packages.config
index 91a17d3603..59a01419b3 100644
--- a/src/Adapter/PlatformServices.Portable/packages.config
+++ b/src/Adapter/PlatformServices.Portable/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
index 9abc69ce65..8413cdbf8c 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/test/E2ETests/Automation.CLI/CLITestBase.cs b/test/E2ETests/Automation.CLI/CLITestBase.cs
index 769ec3b9cf..8af3385602 100644
--- a/test/E2ETests/Automation.CLI/CLITestBase.cs
+++ b/test/E2ETests/Automation.CLI/CLITestBase.cs
@@ -19,7 +19,7 @@ public class CLITestBase
private const string PackagesFolder = "packages";
// This value is automatically updated by "build.ps1" script.
- private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.9.0-preview-20201123-04";
+ private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.9.0-preview-20201214-05";
private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";
private static VsTestConsoleWrapper vsTestConsoleWrapper;
diff --git a/test/E2ETests/Automation.CLI/packages.config b/test/E2ETests/Automation.CLI/packages.config
index ce2e569b5f..90d166bfa8 100644
--- a/test/E2ETests/Automation.CLI/packages.config
+++ b/test/E2ETests/Automation.CLI/packages.config
@@ -1,8 +1,8 @@
-
-
-
+
+
+
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
index dd7f1019b0..d0866384bc 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
index f0bfa4a3b3..90795e81a6 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
index dd7f1019b0..d0866384bc 100644
--- a/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
+++ b/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
index dd2ccb4f40..c0a4c44939 100644
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
+++ b/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
@@ -1,7 +1,7 @@
-
+