Added basic WinUI3 support.

TestFx.sln

@@ -182,13 +182,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimeoutTestProjectNetCore",
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpTestProject", "test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj", "{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extension.WinUI", "src\TestFramework\Extension.WinUI\Extension.WinUI.csproj", "{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{D11C6664-1C4E-48F0-AA92-7F5BADC6F82C}"
 	ProjectSection(SolutionItems) = preProject
 		src\Adapter\Build\NetCore\MSTest.TestAdapter.props = src\Adapter\Build\NetCore\MSTest.TestAdapter.props
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\TestFramework\Extension.Shared\Extension.Shared.projitems*{23b9d9a2-4aee-47e6-97b5-060df21539fb}*SharedItemsImports = 5
 		src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13
 		src\TestFramework\Extension.Shared\Extension.Shared.projitems*{df131865-84ee-4540-8112-e88acebdea09}*SharedItemsImports = 4
 	EndGlobalSection
@@ -1167,6 +1170,30 @@ Global
 		{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x64.Build.0 = Release|Any CPU
 		{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x86.ActiveCfg = Release|Any CPU
 		{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x86.Build.0 = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|ARM.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x64.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x86.Build.0 = Debug|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|ARM.Build.0 = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x64.ActiveCfg = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x64.Build.0 = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x86.ActiveCfg = Release|Any CPU
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1230,6 +1257,7 @@ Global
 		{26F0B8EF-92D4-4A23-ACB4-D1B662F0EEBE} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
 		{ED27A844-6870-4FE6-8FEF-3ABDD1ED6564} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
 		{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
+		{23B9D9A2-4AEE-47E6-97B5-060DF21539FB} = {E48AC786-E150-4F41-9A16-32F02E4493D8}
 		{D11C6664-1C4E-48F0-AA92-7F5BADC6F82C} = {CA01DAF5-8D9D-496E-9AD3-94BB7FBB2D34}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

azure-pipelines.yml

@@ -4,16 +4,16 @@
 jobs:
 - job: Windows
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   variables:
     buildConfiguration: 'Release'
 
   steps:
 
   - task: NuGetToolInstaller@0
-    displayName: 'Pull in NuGet 4.9.2'
+    displayName: 'Pull in NuGet 5.8.1'
     inputs:
-      versionSpec: 4.9.2
+      versionSpec: 5.8.1
 
   - powershell: |
       reg DELETE "HKLM\Software\Microsoft\StrongName\Verification" /f

scripts/Build.ps1

@@ -253,6 +253,8 @@ function Create-NugetPackages {
   $packageOutDir = Join-Path $stagingDir "MSTestPackages"
   $tfSrcPackageDir = Join-Path $env:TF_SRC_DIR "Package"
 
+  "" > "$stagingDir\_._"
+
   # Copy over the nuspecs to the staging directory
   if ($TFB_Official) {
     $nuspecFiles = @("MSTest.TestAdapter.nuspec", "MSTest.TestAdapter.symbols.nuspec", "MSTest.TestFramework.nuspec", "MSTest.TestFramework.symbols.nuspec", "MSTest.Internal.TestFx.Documentation.nuspec")
@@ -264,6 +266,8 @@ function Create-NugetPackages {
   foreach ($file in $nuspecFiles) {
     Copy-Item $tfSrcPackageDir\$file $stagingDir -Force
   }
+
+  Copy-Item (Join-Path $tfSrcPackageDir "Icon.png") $stagingDir -Force
 
   Copy-Item -Path "$($env:TF_PACKAGES_DIR)\microsoft.testplatform.adapterutilities\$TestPlatformVersion\lib" -Destination "$($stagingDir)\Microsoft.TestPlatform.AdapterUtilities" -Recurse -Force
 

scripts/common.lib.ps1

@@ -7,7 +7,7 @@
 # Global Variables
 #
 $global:msbuildVersion = "15.0"
-$global:nugetVersion = "4.9.4"
+$global:nugetVersion = "5.8.1"
 $global:vswhereVersion = "2.0.2"
 $global:nugetUrl = "https://dist.nuget.org/win-x86-commandline/v$nugetVersion/NuGet.exe"
 

src/Package/MSTest.Internal.TestFx.Documentation.nuspec

@@ -12,6 +12,7 @@
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework MSTestV2</tags>
   </metadata>
@@ -21,9 +22,13 @@
     <file src="Extension.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\Core" />
     <file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\Desktop" />
     <file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\UWP" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\WinUI" />
 
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
 </package>

src/Package/MSTest.TestAdapter.Enu.nuspec

@@ -18,6 +18,7 @@
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
 
@@ -68,5 +69,13 @@
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
+
+    <!-- Ignores -->
+    <file src="_._" target="lib/netcoreapp1.0" />
+    <file src="_._" target="lib/net45" />
+    <file src="_._" target="lib/uap10.0" />
   </files>
 </package>

src/Package/MSTest.TestAdapter.nuspec

@@ -18,6 +18,7 @@
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
 
@@ -72,5 +73,8 @@
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
 </package>

src/Package/MSTest.TestAdapter.symbols.nuspec

@@ -18,6 +18,7 @@
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
   <dependencies>
@@ -107,5 +108,8 @@
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
 </package>

src/Package/MSTest.TestFramework.enu.nuspec

@@ -23,6 +23,7 @@
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework </tags>
 
@@ -35,6 +36,8 @@
       <group targetFramework="net45" />
 
       <group targetFramework="uap10.0" />
+
+      <group targetFramework="net5.0-windows10.0.18362.0" />
     </dependencies>
   </metadata>
   <files>
@@ -56,8 +59,17 @@
     <file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\uap10.0" />
     <file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\uap10.0" />
 
+    <!-- WinUI -->
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net5.0-windows10.0.18362.0" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net5.0-windows10.0.18362.0" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0" />
+
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
-</package>
+</package>

src/Package/MSTest.TestFramework.nuspec

@@ -23,6 +23,7 @@
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework </tags>
 
@@ -35,6 +36,8 @@
       <group targetFramework="net45" />
 
       <group targetFramework="uap10.0" />
+
+      <group targetFramework="net5.0-windows10.0.18362.0" />
     </dependencies>
   </metadata>
   <files>
@@ -63,8 +66,45 @@
     <file src="MSTest.Core\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\uap10.0\" />
     <file src="Extension.UWP\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\uap10.0\" />
 
+    <!-- WinUI -->
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net5.0-windows10.0.18362.0" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net5.0-windows10.0.18362.0" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0" />
+
+    <file src="MSTest.Core\zh-Hans\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\zh-Hans" />
+    <file src="MSTest.Core\zh-Hant\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\zh-Hant" />
+    <file src="MSTest.Core\cs\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\cs" />
+    <file src="MSTest.Core\de\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\de" />
+    <file src="MSTest.Core\es\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\es" />
+    <file src="MSTest.Core\fr\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\fr" />
+    <file src="MSTest.Core\it\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\it" />
+    <file src="MSTest.Core\ja\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\ja" />
+    <file src="MSTest.Core\ko\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\ko" />
+    <file src="MSTest.Core\pl\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\pl" />
+    <file src="MSTest.Core\pt-BR\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\pt" />
+    <file src="MSTest.Core\ru\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\ru" />
+    <file src="MSTest.Core\tr\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\tr" />
+
+    <file src="Extension.WinUI\zh-Hans\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\zh-Hans" />
+    <file src="Extension.WinUI\zh-Hant\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\zh-Hant" />
+    <file src="Extension.WinUI\cs\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\cs" />
+    <file src="Extension.WinUI\de\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\de" />
+    <file src="Extension.WinUI\es\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\es" />
+    <file src="Extension.WinUI\fr\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\fr" />
+    <file src="Extension.WinUI\it\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\it" />
+    <file src="Extension.WinUI\ja\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\ja" />
+    <file src="Extension.WinUI\ko\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\ko" />
+    <file src="Extension.WinUI\pl\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\pl" />
+    <file src="Extension.WinUI\pt-BR\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\pt" />
+    <file src="Extension.WinUI\ru\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\ru" />
+    <file src="Extension.WinUI\tr\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\tr" />
+
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
-</package>
+</package>

src/Package/MSTest.TestFramework.symbols.nuspec

@@ -22,6 +22,7 @@
     <projectUrl>https://github.com/microsoft/testfx</projectUrl>
     <license type="file">LICENSE</license>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <icon>Icon.png</icon>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <tags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework </tags>
   </metadata>
@@ -56,11 +57,24 @@
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="lib\uap10.0\" />
     <file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="lib\uap10.0\" />
 
+    <!-- WinUI -->
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net5.0-windows10.0.18362.0\" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net5.0-windows10.0.18362.0\" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\" />
+
+    <!-- Symbols -->
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="lib\net5.0-windows10.0.18362.0\" />
+    <file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="lib\net5.0-windows10.0.18362.0\" />
+
     <!-- Source code -->
     <file src="$srcroot$\**\*.cs" target="src" />
 
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
 </package>

src/TestFramework/Extension.Shared/TestContext.cs

@@ -3,11 +3,11 @@
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting
 {
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Threading;
+    using global::System;
+    using global::System.Collections;
+    using global::System.Collections.Generic;
+    using global::System.Globalization;
+    using global::System.Threading;
 
     /// <summary>
     /// TestContext class. This class should be fully abstract and not contain any

src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestTools.UnitTesting
 {
-    using System;
+    using global::System;
 
     /// <summary>
     /// Used to specify deployment item (file or directory) for per-test deployment.