diff --git a/scripts/Build.ps1 b/scripts/Build.ps1
index cd230e3fd5..c0ed726018 100644
--- a/scripts/Build.ps1
+++ b/scripts/Build.ps1
@@ -234,6 +234,8 @@ function Invoke-MSBuild([string]$solution, $buildTarget = $Target, $hasVsixExten
                 "-p:IsLocalizedBuild=$TFB_IsLocalizedBuild",
                 "-p:UpdateXlf=$TFB_UpdateXlf",
                 "-p:BuildVersion=$TFB_BuildVersion",
+                "-p:BranchName=`"$TPB_BRANCH`"",
+                "-p:CommitHash=$TPB_COMMIT",
                 "-restore:$restore",
                 "`"$solutionPath`"",
                 "-bl:`"$binLog`"",
@@ -304,8 +306,8 @@ function Create-NugetPackages {
     $SystemPrivateUriVersion = Get-PackageVersion -PackageName "SystemPrivateUriVersion"
     $SystemXmlReaderWriterVersion = Get-PackageVersion -PackageName "SystemXmlReaderWriterVersion"
 
-    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``;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion``;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion``;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion``;SystemPrivateUriVersion=$SystemPrivateUriVersion``;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion``;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion``;NOWARN=`"NU5127,NU5128,NU5129`"``;BranchName=$TPB_BRANCH``;CommitId=$TPB_COMMIT"
-    & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion`;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion`;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion`;SystemPrivateUriVersion=$SystemPrivateUriVersion`;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion`;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion`;NOWARN="NU5127,NU5128,NU5129"`;BranchName=$TPB_BRANCH`;CommitId=$TPB_COMMIT
+    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``;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion``;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion``;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion``;SystemPrivateUriVersion=$SystemPrivateUriVersion``;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion``;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion``;NOWARN=`"NU5127,NU5128,NU5129`"``;BranchName=$TPB_BRANCH``;CommitHash=$TPB_COMMIT"
+    & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;MicrosoftNETCoreUniversalWindowsPlatformVersion=$MicrosoftNETCoreUniversalWindowsPlatformVersion`;SystemNetWebSocketsClientVersion=$SystemNetWebSocketsClientVersion`;SystemTextRegularExpressionsVersion=$SystemTextRegularExpressionsVersion`;SystemPrivateUriVersion=$SystemPrivateUriVersion`;SystemXmlReaderWriterVersion=$SystemXmlReaderWriterVersion`;SystemNetNameResolutionVersion=$SystemNetNameResolutionVersion`;NOWARN="NU5127,NU5128,NU5129"`;BranchName=$TPB_BRANCH`;CommitHash=$TPB_COMMIT
     if ($lastExitCode -ne 0) {
       throw "Nuget pack failed with an exit code of '$lastExitCode'."
     }
diff --git a/scripts/build/TestFx.props b/scripts/build/TestFx.props
index 4645f57dc4..b27db8a451 100644
--- a/scripts/build/TestFx.props
+++ b/scripts/build/TestFx.props
@@ -8,6 +8,12 @@
     <IsTest Condition=" '$(IsTest)' == '' ">false</IsTest>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <BranchName Condition=" '$(BranchName)' == '' ">BRANCHNAME</BranchName>
+    <CommitHash Condition=" '$(CommitHash)' == '' ">COMMITHASH</CommitHash>
+    <CommitId>$(CommitHash.SubString(0, 8))</CommitId>
+  </PropertyGroup>
+
   <Import Project="$(RepoRoot)eng\Versions.props" />
   <Import Project="$(RepoRoot)scripts\build\TestFx.Sign.props" Condition=" '$(TestFxSigningPropsImported)' != 'true' " />
 
@@ -21,6 +27,12 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
+  <!-- WARNING remove this when SDK-style project conversion is being done. -->
+  <PropertyGroup>
+    <CompileDependsOn>GenerateAssemblyInfoFile;$(CompileDependsOn)</CompileDependsOn>
+  </PropertyGroup>
+  <!-- / WARNING remove this when SDK-style project conversion is being done. -->
+
   <!-- Code analysis settings -->
   <PropertyGroup>
     <RunCodeAnalysis>false</RunCodeAnalysis>
diff --git a/scripts/build/TestFx.targets b/scripts/build/TestFx.targets
index 7446d5cf71..ca4c821ab1 100644
--- a/scripts/build/TestFx.targets
+++ b/scripts/build/TestFx.targets
@@ -14,7 +14,6 @@
     <Analyzer Include="$(NuGetPackageRoot)\StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="$(NuGetPackageRoot)\StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
-
   
   <!-- WARNING remove this when SDK-style project conversion is being done. -->
   <!-- 
@@ -36,40 +35,58 @@
   <PropertyGroup>
     <TFBuildNumber Condition=" '$(TFBuildNumber)' == '' ">0.1</TFBuildNumber>
     <MajorVersion>14.0</MajorVersion>
+    <GeneratedAssemblyInfoFile Condition="'$(GeneratedAssemblyInfoFile)' ==''">$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyInfo.cs</GeneratedAssemblyInfoFile>
+    <Company>Microsoft Corporation</Company>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <AssemblyVersion>$(MajorVersion).0.0</AssemblyVersion>
     <BuildVersion Condition=" '$(BuildVersion)' == '' ">$(MajorVersion).$(TFBuildNumber)</BuildVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <GeneratedAssemblyInfoFile Condition="'$(GeneratedAssemblyInfoFile)' ==''">$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyInfo.cs</GeneratedAssemblyInfoFile>
+    <FileVersion Condition=" '$(FileVersion)' == '' ">$(BuildVersion)</FileVersion>
+    <InformationalVersion>$(BuildVersion)+$(CommitId)</InformationalVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <AssemblyVersionAttribute Include="System.Reflection.AssemblyVersionAttribute">
+    <!-- Not including branch name assemblies for now. -->
+    <!-- <AssemblyMetadata Include="Branch" Value="$(BranchName)" /> -->
+    <AssemblyMetadata Include="Commit" Value="$(CommitHash)" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(GenerateAssemblyInfo)' == 'false' ">
+    <AssemblyAttribute Include="System.Reflection.AssemblyCompanyAttribute" Condition="'$(Company)' != '' and '$(GenerateAssemblyCompanyAttribute)' == 'true'">
+      <_Parameter1>$(Company)</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyCopyrightAttribute" Condition="'$(Copyright)' != '' and '$(GenerateAssemblyCopyrightAttribute)' == 'true'">
+      <_Parameter1>$(Copyright)</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyVersionAttribute" Condition="'$(AssemblyVersion)' != ''">
       <_Parameter1>$(AssemblyVersion)</_Parameter1>
-    </AssemblyVersionAttribute>
-    <AssemblyVersionAttribute Include="System.Reflection.AssemblyFileVersionAttribute">
-      <_Parameter1>$(BuildVersion)</_Parameter1>
-    </AssemblyVersionAttribute>
-    <AssemblyVersionAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute">
-      <_Parameter1>$(BuildVersion)</_Parameter1>
-    </AssemblyVersionAttribute>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyFileVersionAttribute" Condition="'$(FileVersion)' != ''">
+      <_Parameter1>$(FileVersion)</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute" Condition="'$(InformationalVersion)' != ''">
+      <_Parameter1>$(InformationalVersion)</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(GenerateRepositoryUrlAttribute)' != 'true'" >
+      <_Parameter1>RepositoryUrl</_Parameter1>
+      <_Parameter2 Condition="'$(RepositoryUrl)' != ''">$(RepositoryUrl)</_Parameter2>
+      <_Parameter2 Condition="'$(RepositoryUrl)' == ''">$(PrivateRepositoryUrl)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadata" Condition="'$(GenerateAssemblyMetadataAttributes)' != 'true'">
+        <_Parameter1>%(AssemblyMetadata.Identity)</_Parameter1>
+        <_Parameter2>%(AssemblyMetadata.Value)</_Parameter2>
+    </AssemblyAttribute>
   </ItemGroup>
 
-  <Target Name="GenerateAssemblyInfoFile">
+  <Target Name="GenerateAssemblyInfoFile" Condition=" '$(GenerateAssemblyInfo)' == 'false' ">
     <ItemGroup>
       <!-- Ensure the generated assemblyinfo file is not already part of the Compile sources, as a workaround for https://github.com/dotnet/sdk/issues/114 -->
       <Compile Remove="$(GeneratedAssemblyInfoFile)" />
     </ItemGroup>
 
-    <WriteCodeFragment AssemblyAttributes="@(AssemblyVersionAttribute)" Language="C#" OutputFile="$(GeneratedAssemblyInfoFile)" Condition=" '$(SkipAppendingVersion)' != 'true' ">
+    <WriteCodeFragment AssemblyAttributes="@(AssemblyVersionAttribute)" Language="C#" OutputFile="$(GeneratedAssemblyInfoFile)">
       <Output TaskParameter="OutputFile" ItemName="Compile" />
       <Output TaskParameter="OutputFile" ItemName="FileWrites" />
     </WriteCodeFragment>
   </Target>
-
-  <PropertyGroup>
-    <CompileDependsOn>GenerateAssemblyInfoFile;$(CompileDependsOn)</CompileDependsOn>
-  </PropertyGroup>
   <!-- / WARNING remove this when SDK-style project conversion is being done. -->
 </Project>
diff --git a/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumerator.cs b/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumerator.cs
index edad22c1c3..884be4ef31 100644
--- a/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumerator.cs
+++ b/src/Adapter/MSTest.CoreAdapter/Discovery/AssemblyEnumerator.cs
@@ -211,7 +211,8 @@ private IEnumerable<UnitTestElement> DiscoverTestsInType(string assemblyFileName
             try
             {
                 typeFullName = type.FullName;
-                var unitTestCases = this.GetTypeEnumerator(type, assemblyFileName, discoverInternals).Enumerate(out var warningsFromTypeEnumerator);
+                var testTypeEnumerator = this.GetTypeEnumerator(type, assemblyFileName, discoverInternals);
+                var unitTestCases = testTypeEnumerator.Enumerate(out var warningsFromTypeEnumerator);
                 var typeIgnored = ReflectHelper.IsAttributeDefined(type, typeof(UTF.IgnoreAttribute), false);
 
                 if (warningsFromTypeEnumerator != null)
diff --git a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
index 2481508d9f..c54a329d3d 100644
--- a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
+++ b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
@@ -18,7 +18,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestMethod.cs b/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestMethod.cs
index e8e998d462..ce8989f4a0 100644
--- a/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestMethod.cs
+++ b/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestMethod.cs
@@ -47,8 +47,10 @@ public TestMethod(string name, string fullClassName, string assemblyName, bool i
             this.IsAsync = isAsync;
 
             var hierarchy = new string[HierarchyConstants.Levels.TotalLevelCount];
+            hierarchy[HierarchyConstants.Levels.ContainerIndex] = null;
             hierarchy[HierarchyConstants.Levels.NamespaceIndex] = fullClassName;
             hierarchy[HierarchyConstants.Levels.ClassIndex] = name;
+            hierarchy[HierarchyConstants.Levels.TestGroupIndex] = name;
 
             this.hierarchy = new ReadOnlyCollection<string>(hierarchy);
         }
@@ -62,6 +64,8 @@ internal TestMethod(MethodBase method, string name, string fullClassName, string
             }
 
             ManagedNameHelper.GetManagedName(method, out var managedType, out var managedMethod, out var hierarchyValues);
+            hierarchyValues[HierarchyConstants.Levels.ContainerIndex] = null; // This one will be set by test windows to current test project name.
+
             this.ManagedTypeName = managedType;
             this.ManagedMethodName = managedMethod;
             this.hierarchy = new ReadOnlyCollection<string>(hierarchyValues);
diff --git a/src/Adapter/MSTest.CoreAdapter/ObjectModel/UnitTestElement.cs b/src/Adapter/MSTest.CoreAdapter/ObjectModel/UnitTestElement.cs
index c1b38dacd5..d2af64c1f9 100644
--- a/src/Adapter/MSTest.CoreAdapter/ObjectModel/UnitTestElement.cs
+++ b/src/Adapter/MSTest.CoreAdapter/ObjectModel/UnitTestElement.cs
@@ -229,25 +229,26 @@ internal TestCase ToTestCase()
             {
             }
 
-            var idProvider = new TestIdProvider();
-            idProvider.AppendString(testCase.ExecutorUri?.ToString());
-            idProvider.AppendString(fileName);
-            if (this.TestMethod.HasManagedMethodAndTypeProperties)
-            {
-                idProvider.AppendString(this.TestMethod.ManagedTypeName);
-                idProvider.AppendString(this.TestMethod.ManagedMethodName);
-            }
-            else
-            {
-                idProvider.AppendString(testCase.FullyQualifiedName);
-            }
-
-            if (this.TestMethod.DataType != DynamicDataType.None)
-            {
-                idProvider.AppendString(testCase.DisplayName);
-            }
-
-            testCase.Id = idProvider.GetId();
+            // This code is disabled for compatibility. 
+            // var idProvider = new TestIdProvider();
+            // idProvider.AppendString(testCase.ExecutorUri?.ToString());
+            // idProvider.AppendString(fileName);
+            // if (this.TestMethod.HasManagedMethodAndTypeProperties)
+            // {
+            //     idProvider.AppendString(this.TestMethod.ManagedTypeName);
+            //     idProvider.AppendString(this.TestMethod.ManagedMethodName);
+            // }
+            // else
+            // {
+            //     idProvider.AppendString(testCase.FullyQualifiedName);
+            // }
+            // 
+            // if (this.TestMethod.DataType != DynamicDataType.None)
+            // {
+            //     idProvider.AppendString(testCase.DisplayName);
+            // }
+            // 
+            // testCase.Id = idProvider.GetId();
 
             return testCase;
         }
diff --git a/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj b/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
index 8518f60dd6..f93a75b193 100644
--- a/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
+++ b/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
@@ -18,7 +18,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/Adapter/PlatformServices.Desktop/Properties/AssemblyInfo.cs b/src/Adapter/PlatformServices.Desktop/Properties/AssemblyInfo.cs
index 58ba052de6..0569f36ab8 100644
--- a/src/Adapter/PlatformServices.Desktop/Properties/AssemblyInfo.cs
+++ b/src/Adapter/PlatformServices.Desktop/Properties/AssemblyInfo.cs
@@ -6,39 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("PlatformServices.Desktop")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Corporation")]
-[assembly: AssemblyProduct("PlatformServices.Desktop")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("b0fce474-14bc-449a-91ea-a433342c0d63")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-// This is set by GlobalAssemblyInfo which is auto-generated due to import of TestPlatform.NonRazzle.targets
-// [assembly: AssemblyVersion("1.0.0.0")]
-// [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: TypeForwardedTo(typeof(SerializableAttribute))]
 [assembly: TypeForwardedTo(typeof(MarshalByRefObject))]
diff --git a/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj b/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
index 40568fc290..2d9c448128 100644
--- a/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
+++ b/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
@@ -18,7 +18,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
index 036ddbb3ce..72748a6f96 100644
--- a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
+++ b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
@@ -8,7 +8,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
 
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
diff --git a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
index 19fc5fa6f4..1d8c60300e 100644
--- a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
+++ b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
@@ -18,7 +18,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj b/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
index 4884394e6a..ad70158a7a 100644
--- a/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
+++ b/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
@@ -30,7 +30,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
index a04f181e5d..786d71f57a 100644
--- a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
+++ b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
@@ -13,7 +13,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
 
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
diff --git a/src/Adapter/PlatformServices.WinUI/Properties/AssemblyInfo.cs b/src/Adapter/PlatformServices.WinUI/Properties/AssemblyInfo.cs
index 81824e9394..1dcc95ee87 100644
--- a/src/Adapter/PlatformServices.WinUI/Properties/AssemblyInfo.cs
+++ b/src/Adapter/PlatformServices.WinUI/Properties/AssemblyInfo.cs
@@ -7,11 +7,6 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 [assembly: ComVisible(false)]
 
 [assembly: TypeForwardedTo(typeof(SerializableAttribute))]
diff --git a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec
index 3c8e03634d..70311651b1 100644
--- a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec
+++ b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec
@@ -19,7 +19,7 @@
     <repository type="git"
                 url="https://github.com/microsoft/testfx"
                 branch="$BranchName$"
-                commit="$CommitId$" />
+                commit="$CommitHash$" />
   </metadata>
   <files>
     <!--DotNet-->
diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec
index eaa7483c54..406097fc2a 100644
--- a/src/Package/MSTest.TestAdapter.nuspec
+++ b/src/Package/MSTest.TestAdapter.nuspec
@@ -27,7 +27,7 @@
     <repository type="git"
                 url="https://github.com/microsoft/testfx"
                 branch="$BranchName$"
-                commit="$CommitId$" />
+                commit="$CommitHash$" />
 
     <dependencies>
       <group targetFramework="netcoreapp1.0">
diff --git a/src/Package/MSTest.TestAdapter.symbols.nuspec b/src/Package/MSTest.TestAdapter.symbols.nuspec
index 40fe1f6e35..dde6e2c9ad 100644
--- a/src/Package/MSTest.TestAdapter.symbols.nuspec
+++ b/src/Package/MSTest.TestAdapter.symbols.nuspec
@@ -27,7 +27,7 @@
     <repository type="git"
                 url="https://github.com/microsoft/testfx"
                 branch="$BranchName$"
-                commit="$CommitId$" />
+                commit="$CommitHash$" />
 
     <dependencies>
       <group targetFramework="netcoreapp1.0">
diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec
index 89a8087487..3cc00c5786 100644
--- a/src/Package/MSTest.TestFramework.nuspec
+++ b/src/Package/MSTest.TestFramework.nuspec
@@ -30,7 +30,7 @@
     <repository type="git"
                 url="https://github.com/microsoft/testfx"
                 branch="$BranchName$"
-                commit="$CommitId$" />
+                commit="$CommitHash$" />
 
     <dependencies>
       <group targetFramework="netstandard1.4">
diff --git a/src/Package/MSTest.TestFramework.symbols.nuspec b/src/Package/MSTest.TestFramework.symbols.nuspec
index a45c452d57..376ff5f7f2 100644
--- a/src/Package/MSTest.TestFramework.symbols.nuspec
+++ b/src/Package/MSTest.TestFramework.symbols.nuspec
@@ -29,7 +29,7 @@
     <repository type="git"
                 url="https://github.com/microsoft/testfx"
                 branch="$BranchName$"
-                commit="$CommitId$" />
+                commit="$CommitHash$" />
 
     <dependencies>
       <group targetFramework="netstandard1.4">
diff --git a/src/Package/MSTest.nuspec b/src/Package/MSTest.nuspec
index fc0b60e519..ac1e76c004 100644
--- a/src/Package/MSTest.nuspec
+++ b/src/Package/MSTest.nuspec
@@ -27,7 +27,7 @@
     <repository type="git" 
                 url="https://github.com/microsoft/testfx" 
                 branch="$BranchName$" 
-                commit="$CommitId$" />
+                commit="$CommitHash$" />
 
     <dependencies>
       <group targetFramework="netcoreapp1.0">
diff --git a/src/TestFramework/Extension.Core/Extension.Core.csproj b/src/TestFramework/Extension.Core/Extension.Core.csproj
index 09831ff87d..6ac2aaa74c 100644
--- a/src/TestFramework/Extension.Core/Extension.Core.csproj
+++ b/src/TestFramework/Extension.Core/Extension.Core.csproj
@@ -18,7 +18,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj b/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
index 633d14175f..ace913de5f 100644
--- a/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
+++ b/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
@@ -18,7 +18,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/TestFramework/Extension.UWP/Extension.UWP.csproj b/src/TestFramework/Extension.UWP/Extension.UWP.csproj
index 717f8afe1e..5bd9bd0fde 100644
--- a/src/TestFramework/Extension.UWP/Extension.UWP.csproj
+++ b/src/TestFramework/Extension.UWP/Extension.UWP.csproj
@@ -30,7 +30,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
index 7803699c1d..a9701fdd10 100644
--- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
+++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
@@ -6,7 +6,6 @@
     <Product>Extension.WinUI</Product>
     <AssemblyTitle>Extension.WinUI</AssemblyTitle>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <SkipAppendingVersion>true</SkipAppendingVersion> <!-- TODO: remove after full arcade transition -->
 
     <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
     <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
diff --git a/src/TestFramework/MSTest.Core/MSTest.Core.csproj b/src/TestFramework/MSTest.Core/MSTest.Core.csproj
index 93cc25aece..9d9acf5936 100644
--- a/src/TestFramework/MSTest.Core/MSTest.Core.csproj
+++ b/src/TestFramework/MSTest.Core/MSTest.Core.csproj
@@ -18,7 +18,6 @@
 
   <!-- Remove after ARCADE transition -->
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
   <!-- / Remove after ARCADE transition -->
diff --git a/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj b/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
index 34c2093c6b..7d6cb2677c 100644
--- a/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
+++ b/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
@@ -5,7 +5,6 @@
 
     <IsPackable>false</IsPackable>
     <NoWarn>1685</NoWarn>
-    <SkipAppendingVersion>true</SkipAppendingVersion>
     <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
   </PropertyGroup>
 
@@ -32,7 +31,7 @@
     </Reference>
 
     <Reference Include="Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices">
-      <HintPath>$(ArtifactsBinDir)PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll</HintPath>
+      <HintPath>$(ArtifactsBinDir)PlatformServices.Desktop\$(TargetFramework)\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll</HintPath>
     </Reference>
     
     <Reference Include="Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface">
@@ -44,7 +43,7 @@
     </Reference>
     
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions">
-      <HintPath>$(ArtifactsBinDir)Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>$(ArtifactsBinDir)Extension.Desktop\$(TargetFramework)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
deleted file mode 100644
index a134be39b3..0000000000
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="11.0.0.0-12.0.0.0" newVersion="15.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
-  </startup>
-</configuration>
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
index 1d6c803117..9c4faf3565 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
@@ -1,36 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net462</TargetFrameworks>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <LangVersion>Latest</LangVersion>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ProjectGuid>{599833DC-EC5A-40CA-B5CF-DEF719548EEF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MSTestAdapter.PlatformServices.Desktop.UnitTests</RootNamespace>
     <AssemblyName>MSTestAdapter.PlatformServices.Desktop.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
-    <VSToolsPath Condition=" '$(VSToolsPath)' == '' ">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <DefineConstants>TRACE;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+
+  <!-- Remove after ARCADE transition -->
+  <PropertyGroup>
+    <ShouldEnableStyleCop>false</ShouldEnableStyleCop>
+  </PropertyGroup>
+  <!-- / Remove after ARCADE transition -->
+
+  <PropertyGroup>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+    <Prefer32Bit Condition=" '$(Platform)' != 'AnyCPU' ">true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess Condition=" '$(Platform)' != 'AnyCPU' ">false</UseVSHostingProcess>
   </PropertyGroup>
 
   <ItemGroup>
@@ -67,12 +74,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkVersion)" />
+    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" PrivateAssets="all">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -115,30 +120,10 @@
     <Compile Include="..\PlatformServices.Shared.Unit.Tests\netstandard1.3\ns13ThreadSafeStringWriterTests.cs">
       <Link>Services\ns13ThreadSafeStringWriterTests.cs</Link>
     </Compile>
-    <Compile Include="AssemblyResolverTests.cs" />
-    <Compile Include="Deployment\AssemblyLoadWorkerTests.cs" />
-    <Compile Include="Services\DesktopReflectionOperationsTests.cs" />
-    <Compile Include="Services\DesktopThreadOperationsTests.cs" />
-    <Compile Include="Services\DesktopTestDataSourceTests.cs" />
-    <Compile Include="Services\DesktopTestContextImplTests.cs" />
-    <Compile Include="Services\DesktopTestDeploymentTests.cs" />
-    <Compile Include="Services\DesktopTestSourceHostTests.cs" />
-    <Compile Include="Services\DesktopTestSourceTests.cs" />
-    <Compile Include="Utilities\AppDomainUtilitiesTests.cs" />
-    <Compile Include="Services\DesktopFileOperationsTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities\DesktopDeploymentUtilityTests.cs" />
-    <Compile Include="Utilities\DesktopReflectionUtilityTests.cs" />
-    <Compile Include="Utilities\VSInstallationUtilitiesTests.cs" />
-    <Compile Include="Utilities\XmlUtilitiesTests.cs" />
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
+
     <Content Include="DataTestSourceFile.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Properties/AssemblyInfo.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Properties/AssemblyInfo.cs
index dfd3a5dea9..f7d021d63d 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Properties/AssemblyInfo.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Properties/AssemblyInfo.cs
@@ -10,37 +10,4 @@
 [assembly: ReflectionUtilityTests.DummyAAttribute("a1")]
 [assembly: ReflectionUtilityTests.DummyAAttribute("a2")]
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("PlatformServices.Desktop.Unit.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PlatformServices.Desktop.Unit.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("599833dc-ec5a-40ca-b5cf-def719548eef")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-// This is set by GlobalAssemblyInfo which is auto-generated due to import of TestPlatform.NonRazzle.targets
-// [assembly: AssemblyVersion("1.0.0.0")]
-// [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
index 2cbf3b1ac1..b83be687f5 100644
--- a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
@@ -8,7 +8,6 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <NoWarn>CS1685</NoWarn>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <SkipAppendingVersion>true</SkipAppendingVersion> <!-- TODO: remove after full arcade transition -->
   </PropertyGroup>
 
   <ItemGroup>