diff --git a/TestFx.sln b/TestFx.sln
index b2dc827434..183aebcedf 100644
--- a/TestFx.sln
+++ b/TestFx.sln
@@ -184,6 +184,8 @@ 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
@@ -193,6 +195,7 @@ Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Adapter\PlatformServices.Shared\PlatformServices.Shared.projitems*{2177c273-ae07-43b3-b87a-443e47a23c5a}*SharedItemsImports = 13
 		src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13
+		src\TestFramework\Extension.Shared\Extension.Shared.projitems*{23b9d9a2-4aee-47e6-97b5-060df21539fb}*SharedItemsImports = 5
 		src\TestFramework\Extension.Shared\Extension.Shared.projitems*{df131865-84ee-4540-8112-e88acebdea09}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1170,6 +1173,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
@@ -1234,6 +1261,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
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5f895d71b8..fc52a8e666 100644
--- a/azure-pipelines.yml
+++ b/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
diff --git a/scripts/Build.ps1 b/scripts/Build.ps1
index 1e83bcd096..2f6aa55ed4 100644
--- a/scripts/Build.ps1
+++ b/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
 
@@ -286,9 +290,8 @@ function Create-NugetPackages {
       $version = $version + "-" + $versionSuffix
     }
 
-    Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version=$version -Properties Version=$version"
-    & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion
-
+    Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version``;Srcroot=$env:TF_SRC_DIR``;Packagesroot=$env:TF_PACKAGES_DIR``;TestPlatformVersion=$TestPlatformVersion``;NOWARN=`"NU5127,NU5128,NU5129`""
+    & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;NOWARN="NU5127,NU5128,NU5129"
     if ($lastExitCode -ne 0) {
       throw "Nuget pack failed with an exit code of '$lastExitCode'."
     }
diff --git a/scripts/build/TestFx.Loc.targets b/scripts/build/TestFx.Loc.targets
index f151887fd7..16b75c229d 100644
--- a/scripts/build/TestFx.Loc.targets
+++ b/scripts/build/TestFx.Loc.targets
@@ -70,7 +70,14 @@
   
   <!-- Localization for documentation files. -->
   <Target Name="CopyLocalizedXmls" BeforeTargets="BeforeBuild" Condition="$(LocDocumentationSubPath) != ''">
-    <Exec Command="xcopy /Y /I /S /E $(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) $(OutDir)" />
+    <PropertyGroup>
+      <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)</_SourcePath>
+    </PropertyGroup>
+    <ItemGroup>
+      <_LocalizedFiles Include="$(_SourcePath)\**\*.*" />
+    </ItemGroup>
+    <Warning Text="Localized documentation doesn't exist: $(LocDocumentationSubPath), $(_SourcePath)" Condition="!Exists('$(_SourcePath)')" />
+    <Copy SourceFiles="@(_LocalizedFiles)" DestinationFiles="@(_LocalizedFiles->'$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)')" Condition="Exists('$(_SourcePath)')" />
   </Target>
 
   <Target Name ="CopyStaticResourcesToOutput">
diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1
index f7b370a602..d63a78aeb9 100644
--- a/scripts/common.lib.ps1
+++ b/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"
 
diff --git a/src/Package/Icon.png b/src/Package/Icon.png
new file mode 100644
index 0000000000..a0f1fdbf4d
Binary files /dev/null and b/src/Package/Icon.png differ
diff --git a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec
index 7e88ac0e99..59a08d4000 100644
--- a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec
+++ b/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>
\ No newline at end of file
diff --git a/src/Package/MSTest.TestAdapter.Enu.nuspec b/src/Package/MSTest.TestAdapter.Enu.nuspec
index 31a8271ee9..b11801ed8a 100644
--- a/src/Package/MSTest.TestAdapter.Enu.nuspec
+++ b/src/Package/MSTest.TestAdapter.Enu.nuspec
@@ -8,16 +8,17 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <description>
-      The adapter to discover and execute MSTest Framework based tests.
+      The adapter to discover and execute MSTest Framework based tests. 
 
-      Supported platforms:
-      - .NET 4.5.0+
-      - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
-      - ASP.NET Core 1.0+ (Visual Studio 2017)
+      Supported platforms: 
+      - .NET 4.5.0+ 
+      - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) 
+      - ASP.NET Core 1.0+ (Visual Studio 2017) 
     </description>
     <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>
 
@@ -35,6 +36,8 @@
       <group targetFramework="net45" />
 
       <group targetFramework="uap10.0" />
+
+      <group targetFramework="net5.0-windows10.0.18362" />
     </dependencies>
   </metadata>
   <files>
@@ -68,5 +71,8 @@
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec
index 827dc74dd8..6f00113747 100644
--- a/src/Package/MSTest.TestAdapter.nuspec
+++ b/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>
 
@@ -35,6 +36,8 @@
       <group targetFramework="net45" />
 
       <group targetFramework="uap10.0" />
+
+      <group targetFramework="net5.0-windows10.0.18362" />
     </dependencies>
   </metadata>
   <files>
@@ -73,5 +76,8 @@
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/Package/MSTest.TestAdapter.symbols.nuspec b/src/Package/MSTest.TestAdapter.symbols.nuspec
index b134110919..697c607c1b 100644
--- a/src/Package/MSTest.TestAdapter.symbols.nuspec
+++ b/src/Package/MSTest.TestAdapter.symbols.nuspec
@@ -8,16 +8,17 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <description>
-  The adapter to discover and execute MSTest Framework based tests. 
+      The adapter to discover and execute MSTest Framework based tests. 
 
-  Supported platforms: 
-   - .NET 4.5.0+ 
-   - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) 
-   - ASP.NET Core 1.0+ (Visual Studio 2017) 
+      Supported platforms: 
+      - .NET 4.5.0+ 
+      - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) 
+      - ASP.NET Core 1.0+ (Visual Studio 2017) 
     </description>
     <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>
@@ -25,6 +26,17 @@
         <dependency id="NETStandard.Library" version="1.6.1" />
         <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
       </group>
+      
+      <group targetFramework="netstandard1.5">
+        <dependency id="NETStandard.Library" version="1.6.1" />
+        <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
+      </group>
+
+      <group targetFramework="net45" />
+
+      <group targetFramework="uap10.0" />
+
+      <group targetFramework="net5.0-windows10.0.18362" />
     </dependencies>
   </metadata>
   <files>
@@ -35,19 +47,24 @@
     <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\_common\" />
 
     <!-- netcoreapp1.0 -->
-    <file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netcoreapp1.0\" />
+    <file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netcoreapp1.0\MSTest.TestAdapter.symbols.props" />
     <file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp1.0\" />
+    <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netcoreapp1.0\" />
+
+    <!-- netstandard1.5 -->
+    <file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netstandard1.5\MSTest.TestAdapter.symbols.props" />
+    <file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard1.5\" />
     <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netstandard1.5\" />
 
     <!-- uap10.0 -->
-    <file src="Build\Universal\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.props" />
-    <file src="Build\Universal\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.targets" />
+    <file src="Build\Universal\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.symbols.props" />
+    <file src="Build\Universal\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.symbols.targets" />
     <file src="PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\uap10.0\" />
     <file src="Microsoft.TestPlatform.AdapterUtilities\uap10.0\" target="build\uap10.0\" />
 
     <!-- net45 -->
-    <file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net45\MSTest.TestAdapter.props" />
-    <file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.targets" />
+    <file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net45\MSTest.TestAdapter.symbols.props" />
+    <file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.symbols.targets" />
     <file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net45\" />
 
     <!-- Symbols -->
@@ -62,6 +79,9 @@
     <!-- uap10.0 -->
     <file src="PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\uap10.0\" />
 
+    <!-- netstandard1.5 -->
+    <file src="PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\netstandard1.5\" />
+
     <!-- Source code -->
     <file src="$srcroot$\**\*.cs" target="src" />
 
@@ -73,5 +93,8 @@
     <!-- LICENSE -->
     <!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
     <file src="LICENS*" target="" />
+
+    <!-- Icon -->
+    <file src="Icon.png" target="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec
index 14e997a251..ea3bc49682 100644
--- a/src/Package/MSTest.TestFramework.enu.nuspec
+++ b/src/Package/MSTest.TestFramework.enu.nuspec
@@ -9,20 +9,21 @@
     <owners>Microsoft</owners>
     <summary>This is MSTest V2, the evolution of Microsoft's Test Framework.</summary>
     <description>
-  This is MSTest V2, the evolution of Microsoft's Test Framework.
+      This is MSTest V2, the evolution of Microsoft's Test Framework.
 
-  Supported platforms:
-  - .NET 4.5.0+
-  - .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+)
-  - ASP.NET Core 1.0+
+      Supported platforms:
+      - .NET 4.5.0+
+      - .NET Core 1.0+ (Universal Windows Apps 10+)
+      - ASP.NET Core 1.0+
 
-  To discover and execute tests install MSTest.TestAdapter. 
+      To discover and execute tests install MSTest.TestAdapter. 
 
-  To discover and execute tests for project.json based projects install dotnet-test-mstest.
+      To discover and execute tests for project.json based projects install dotnet-test-mstest.
     </description>
     <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>
\ No newline at end of file
+</package>
diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec
index be034ab1a2..d7698b58f9 100644
--- a/src/Package/MSTest.TestFramework.nuspec
+++ b/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,36 +36,48 @@
       <group targetFramework="net45" />
 
       <group targetFramework="uap10.0" />
+
+      <group targetFramework="net5.0-windows10.0.18362.0" />
     </dependencies>
   </metadata>
   <files>
     <!-- netstandard1.0 -->
-    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\netstandard1.0" />
-    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\netstandard1.0" />
-    <file src="Extension.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\netstandard1.0" />
-    <file src="Extension.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\netstandard1.0" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\netstandard1.0\" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\netstandard1.0\" />
+    <file src="Extension.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\netstandard1.0\" />
+    <file src="Extension.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\netstandard1.0\" />
     <file src="MSTest.Core\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\netstandard1.0\" />
     <file src="Extension.Core\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\netstandard1.0\" />
 
     <!-- net45 -->
-    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net45" />
-    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net45" />
-    <file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net45" />
-    <file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net45" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net45\" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net45\" />
+    <file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net45\" />
+    <file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net45\" />
     <file src="MSTest.Core\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net45\" />
     <file src="Extension.Desktop\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net45\" />
 
-
     <!-- uap10.0 -->
-    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\uap10.0" />
-    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\uap10.0" />
-    <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" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\uap10.0\" />
+    <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\uap10.0\" />
+    <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\" />
     <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\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" 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>
\ No newline at end of file
+</package>
diff --git a/src/Package/MSTest.TestFramework.symbols.nuspec b/src/Package/MSTest.TestFramework.symbols.nuspec
index f394319e7c..86d6927aac 100644
--- a/src/Package/MSTest.TestFramework.symbols.nuspec
+++ b/src/Package/MSTest.TestFramework.symbols.nuspec
@@ -8,22 +8,36 @@
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <description>
-  This is MSTest V2, the evolution of Microsoft's Test Framework.
+      This is MSTest V2, the evolution of Microsoft's Test Framework.
 
-  Supported platforms:
-  - .NET 4.5.0+
-  - .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+)
-  - ASP.NET Core 1.0+
+      Supported platforms:
+      - .NET 4.5.0+
+      - .NET Core 1.0+ (Universal Windows Apps 10+)
+      - ASP.NET Core 1.0+
 
-  To discover and execute tests install MSTest.TestAdapter. 
+      To discover and execute tests install MSTest.TestAdapter. 
 
-  To discover and execute tests for project.json based projects install dotnet-test-mstest.
+      To discover and execute tests for project.json based projects install dotnet-test-mstest.
     </description>
     <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>
+   
+    <dependencies>
+      <group targetFramework="netstandard1.0">
+        <dependency id="NETStandard.Library" version="1.6.1" />
+        <dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
+      </group>
+
+      <group targetFramework="net45" />
+
+      <group targetFramework="uap10.0" />
+
+      <group targetFramework="net5.0-windows10.0.18362.0" />
+    </dependencies>
   </metadata>
   <files>
 
@@ -35,7 +49,7 @@
     <!-- Symbols -->
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="lib\netstandard1.0\" />
     <file src="Extension.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="lib\netstandard1.0" />
-  
+
     <!-- net45 -->
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net45\" />
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net45\" />
@@ -46,21 +60,34 @@
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="lib\net45\" />
     <file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" target="lib\net45\" />
 
-    <!-- UWP -->
+    <!-- uap10.0 -->
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\uap10.0\" />
     <file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\uap10.0\" />
     <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\" />
-    
+
     <!-- Symbols -->
     <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>
\ No newline at end of file
diff --git a/src/TestFramework/Extension.Shared/TestContext.cs b/src/TestFramework/Extension.Shared/TestContext.cs
index 1db99d2f27..2641369742 100644
--- a/src/TestFramework/Extension.Shared/TestContext.cs
+++ b/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
diff --git a/src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs b/src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs
index 13dbd70a9d..4fa5834e45 100644
--- a/src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs
+++ b/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.
diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
new file mode 100644
index 0000000000..58aa6b4c42
--- /dev/null
+++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions</AssemblyName>
+    <RootNamespace>Microsoft.VisualStudio.TestTools.UnitTesting</RootNamespace>
+    <Company>Microsoft Corporation</Company>
+    <Product>Extension.WinUI</Product>
+    <AssemblyTitle>Extension.WinUI</AssemblyTitle>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    
+    <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
+
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TestFxRoot Condition="$(TestFxRoot) == ''">..\..\..\</TestFxRoot>
+    <FrameworkIdentifier>NetCore</FrameworkIdentifier>
+  </PropertyGroup>
+
+  <Import Project="..\Extension.Shared\Extension.Shared.projitems" Label="Shared" />
+  <Import Project="$(TestFxRoot)scripts\build\TestFx.Settings.targets" />
+  <ItemGroup>
+    <Compile Include="..\Extension.UWP\DeploymentItemAttribute.cs" Link="DeploymentItemAttribute.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MSTest.Core\MSTest.Core.csproj" />
+  </ItemGroup>
+  
+  <PropertyGroup>
+    <DocumentationFile>$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML</DocumentationFile>
+    <LocDocumentationSubPath>Extensions\WinUI</LocDocumentationSubPath>
+  </PropertyGroup>
+  
+  <Import Project="$(TestFxRoot)scripts\build\TestFx.targets" />
+
+</Project>
diff --git a/src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs b/src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs
new file mode 100644
index 0000000000..db1d3002d2
--- /dev/null
+++ b/src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer
+{
+    using global::System;
+    using global::System.Runtime.CompilerServices;
+
+    /// <summary>
+    /// Execute test code in UI thread for Windows store apps.
+    /// </summary>
+    public class UITestMethodAttribute : TestMethodAttribute
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="Microsoft.System.DispatcherQueue"/> that should be used to invoke the UITestMethodAttribute.
+        /// If none is provided, it will try to use the Microsoft.UI.Xaml.Window.Current.DispatcherQueue, which only works on UWP.
+        /// </summary>
+        public static Microsoft.System.DispatcherQueue DispatcherQueue { get; set; }
+
+        /// <summary>
+        /// Executes the test method on the UI Thread.
+        /// </summary>
+        /// <param name="testMethod">
+        /// The test method.
+        /// </param>
+        /// <returns>
+        /// An array of <see cref="TestResult"/> instances.
+        /// </returns>
+        /// Throws <exception cref="NotSupportedException"> when run on an async test method.
+        /// </exception>
+        public override TestResult[] Execute(ITestMethod testMethod)
+        {
+            var attrib = testMethod.GetAttributes<AsyncStateMachineAttribute>(false);
+            if (attrib.Length > 0)
+            {
+                throw new NotSupportedException(FrameworkMessages.AsyncUITestMethodNotSupported);
+            }
+
+            TestResult result = null;
+
+            var dispatcher = DispatcherQueue ?? global::Microsoft.UI.Xaml.Window.Current?.DispatcherQueue;
+            if (dispatcher == null)
+            {
+                throw new InvalidOperationException(FrameworkMessages.AsyncUITestMethodWithNoDispatcherQueue);
+            }
+
+            if (dispatcher.HasThreadAccess)
+            {
+                try
+                {
+                    result = testMethod.Invoke(Array.Empty<object>());
+                }
+                catch (Exception e)
+                {
+                    return new TestResult[] { new TestResult { TestFailureException = e } };
+                }
+            }
+            else
+            {
+                var taskCompletionSource = new global::System.Threading.Tasks.TaskCompletionSource<object>();
+
+                if (!dispatcher.TryEnqueue(System.DispatcherQueuePriority.Normal, () =>
+                    {
+                        try
+                        {
+                            result = testMethod.Invoke(Array.Empty<object>());
+                            taskCompletionSource.SetResult(null);
+                        }
+                        catch (Exception e)
+                        {
+                            result = new TestResult { TestFailureException = e };
+                            taskCompletionSource.SetException(e);
+                        }
+                    }))
+                {
+                    taskCompletionSource.SetResult(null);
+                }
+
+                taskCompletionSource.Task.GetAwaiter().GetResult();
+            }
+
+            return new TestResult[] { result };
+        }
+    }
+}
diff --git a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs
index be4d3d96eb..943a1585d6 100644
--- a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs
+++ b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs
@@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class FrameworkMessages {
@@ -169,6 +169,15 @@ internal static string AsyncUITestMethodNotSupported {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to UITestMethodAttribute.DispatcherQueue should not be null. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization..
+        /// </summary>
+        internal static string AsyncUITestMethodWithNoDispatcherQueue {
+            get {
+                return ResourceManager.GetString("AsyncUITestMethodWithNoDispatcherQueue", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Both collections are empty. {0}.
         /// </summary>
diff --git a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx
index a5c5a370be..0c8cb9ab97 100644
--- a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx
+++ b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx
@@ -277,6 +277,9 @@ Stack Trace: {4}</value>
   <data name="AsyncUITestMethodNotSupported" xml:space="preserve">
     <value>async TestMethod with UITestMethodAttribute are not supported. Either remove async or use TestMethodAttribute.</value>
   </data>
+  <data name="AsyncUITestMethodWithNoDispatcherQueue" xml:space="preserve">
+    <value>UITestMethodAttribute.DispatcherQueue should not be null. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization.</value>
+  </data>
   <data name="DynamicDataIEnumerableNull" xml:space="preserve">
     <value>Property or method {0} on {1} does not return IEnumerable&lt;object[]&gt;.</value>
   </data>