diff --git a/Directory.Build.targets b/Directory.Build.targets
index bf82e737396..590c775c2bf 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -10,19 +10,6 @@
     </ItemGroup>
   </Target>
 
-  <!--
-    Determines if a project is a test project by checking the TestProject property and returning an item with the full path to the project file and its test type.
-  -->
-  <Target Name="IsTestProject"
-          Returns="@(TestProject)"
-          Condition="'$(TestProject)' == 'true'">
-    <ItemGroup>
-      <TestProject Include="$(MSBuildProjectFullPath)"
-                   TestType="$(TestProjectType)"
-                   ProjectName="$(MSBuildProjectName)" />
-    </ItemGroup>
-  </Target>
-
   <!--
     Determines if a project supports a specified target framework.  This target first calls GetProjectTargetFrameworks to get a list of target frameworks that the project supports, then filters the list down to the specified target framework.
     If the specified framework is supported, the target returns an item with the full path to the project file, otherwise it returns nothing which will signal that the project does not support that target framework.
diff --git a/Directory.Solution.targets b/Directory.Solution.targets
deleted file mode 100644
index d5c0f6f2499..00000000000
--- a/Directory.Solution.targets
+++ /dev/null
@@ -1,287 +0,0 @@
-<!--
-  Specifies build logic when building a solution file.
--->
-<Project>
-  <PropertyGroup>
-    <!--
-      Set some default property values unless otherwise specified.
-    -->
-    <VSTestNoLogo Condition="'$(VSTestNoLogo)' == ''">true</VSTestNoLogo>
-    <VSTestVerbosity Condition="'$(SYSTEM_DEBUG)' == 'true'">detailed</VSTestVerbosity>
-    <VSTestVerbosity Condition="'$(VSTestVerbosity)' == ''">quiet</VSTestVerbosity>
-    <VSTestSetting Condition="'$(VSTestSetting)' == ''">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'build', 'xunit.runsettings'))</VSTestSetting>
-    <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'TestResults'))</VSTestResultsDirectory>
-
-    <!--
-      Build tests for all supported target frameworks by default, otherwise build tests for just the specified target framework.
-    -->
-    <BuildTestsDependsOn Condition="'$(TargetFramework)' == ''">BuildTestsForAllTargetFrameworks</BuildTestsDependsOn>
-    <BuildTestsDependsOn Condition="'$(TargetFramework)' != ''">BuildTestsForSingleTargetFramework</BuildTestsDependsOn>
-    
-    <!--
-      If a user does not specify a target framework, run tests for all frameworks one-by-one, otherwise run tests for that framework only.
-    -->
-    <VSTestDependsOn Condition="'$(TargetFramework)' == ''">VSTestAllTargetFrameworks</VSTestDependsOn>
-    <VSTestDependsOn Condition="'$(TargetFramework)' != ''">VSTestSingleTargetFramework</VSTestDependsOn>
-  </PropertyGroup>
-
-  <!--
-    Defines a target which is run when a user executes 'dotnet test'.  This target runs tests for all frameworks or a single target framework depending on whether or not the user specified the framework at the command-line.
-  -->
-  <Target Name="VSTest" DependsOnTargets="$(VSTestDependsOn)" />
-
-  <!--
-    Defines a target which builds only test projects when executing 'dotnet test'.
-  -->
-  <Target Name="BuildTests"
-          Condition="'$(VSTestNoBuild)' != 'true'"
-          DependsOnTargets="$(BuildTestsDependsOn)" />
-
-  <!--
-    Gets a list of all test projects in the solution and categorizes them by test type (Unit or Functional).  By default, only the Unit test projects are returned.  To get Functional test projects, set the TestType property to 'Functional' via -Property:TestType=Functional.
-  -->
-  <Target Name="GetTestProjects">
-    <PropertyGroup>
-      <TestType Condition="'$(TestType)' == ''">Unit</TestType>
-    </PropertyGroup>
-
-    <!--
-      Run the IsTestProject target on each project reference to determine what type of test project it is.
-    -->
-    <MSBuild Projects="@(ProjectReference)"
-             BuildInParallel="true"
-             Targets="IsTestProject"
-             RemoveProperties="TargetFramework">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="_TestProject" />
-    </MSBuild>
-
-    <MSBuild Projects="@(_TestProject)"
-         Targets="DoesProjectSupportTargetFramework"
-         Condition="'$(TargetFramework)' != ''"
-         BuildInParallel="$(BuildInParallel)"
-         RemoveProperties="TargetFramework"
-         Properties="ProjectTargetFramework=$(TargetFramework)">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="_TestProjectForFramework" />
-    </MSBuild>
-
-    <ItemGroup>
-      <!--
-        Add only the specified test type to the TestProject item group.
-      -->
-      <TestProject Include="@(_TestProject->WithMetadataValue('TestType', '$(TestType)'))" Condition="'$(TargetFramework)' == ''" />
-      <TestProject Include="@(_TestProjectForFramework->WithMetadataValue('TestType', '$(TestType)'))" Condition="'$(TargetFramework)' != ''" />
-    </ItemGroup>
-    
-    <ItemGroup Condition="'$(TestProjectName)' != ''">
-        <_FilteredTestProject Include="@(TestProject)" Condition="'%(TestProject.ProjectName)' == '$(TestProjectName)'" />
-    </ItemGroup>
-    
-    <Error Text="The specified test project '$(TestProjectName)' was not found.  Possible projects are &quot;@(TestProject->'%(ProjectName)', ', ')&quot;"
-           Condition="'$(TestProjectName)' != '' And @(_FilteredTestProject->Count()) == 0" />
-
-    <ItemGroup Condition="'$(TestProjectName)' != ''">
-      <TestProject Remove="@(TestProject)" />
-      <TestProject Include="@(_FilteredTestProject)" />
-    </ItemGroup>
-
-    <!--
-      Log an error if no test projects were found with the specified TestType.
-    -->
-    <Error Text="Invalid TestType value '$(TestType)'.  Valid values are 'Unit', 'Functional'."
-           Condition="@(TestProject->Count()) == 0" />
-  </Target>
-
-  <!--
-    Builds all test projects in the solution for all target frameworks.
-  -->
-  <Target Name="BuildTestsForAllTargetFrameworks"
-          DependsOnTargets="GetTestProjects"
-          Condition="'$(VSTestNoBuild)' != 'true'">
-    <Message Text="Building test projects for all frameworks (specify --no-build to skip building projects)"
-             Importance="High" />
-    
-    <MSBuild Projects="@(TestProject)"
-             BuildInParallel="true"
-             Targets="Build"
-             RemoveProperties="TargetFramework"
-             Properties="BuildingSolutionFile=true; CurrentSolutionConfigurationContents=$(CurrentSolutionConfigurationContents); SolutionDir=$(SolutionDir); SolutionExt=$(SolutionExt); SolutionFileName=$(SolutionFileName); SolutionName=$(SolutionName); SolutionPath=$(SolutionPath)" />
-  </Target>
-
-  <!--
-    Builds test projects in the solution for a single target framework.
-  -->
-  <Target Name="BuildTestsForSingleTargetFramework"
-          DependsOnTargets="GetTestProjects"
-          Condition="'$(VSTestNoBuild)' != 'true'">
-    <Message Text="Building test projects for framework '$(TargetFramework)' (specify --no-build to skip building projects)"
-             Importance="High" />
-
-    <MSBuild Projects="@(TestProject)"
-         Targets="DoesProjectSupportTargetFramework"
-         BuildInParallel="$(BuildInParallel)"
-         RemoveProperties="TargetFramework"
-         Properties="ProjectTargetFramework=$(TargetFramework)">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="TestProjectForFramework" />
-    </MSBuild>
-
-    <MSBuild Projects="@(TestProjectForFramework)"
-             BuildInParallel="true"
-             Targets="Build"
-             Properties="BuildingSolutionFile=true; CurrentSolutionConfigurationContents=$(CurrentSolutionConfigurationContents); SolutionDir=$(SolutionDir); SolutionExt=$(SolutionExt); SolutionFileName=$(SolutionFileName); SolutionName=$(SolutionName); SolutionPath=$(SolutionPath)" />
-  </Target>
-
-  <!--
-    Gets a list of all supported target frameworks and schedule a test run for each framework.
-  -->
-  <Target Name="VSTestAllTargetFrameworks"
-          DependsOnTargets="GetTestProjects;BuildTests">
-    <!--
-      Gets a list of all supported target frameworks for each test project.
-    -->
-    <MSBuild Projects="@(TestProject)"
-             Targets="GetProjectTargetFrameworks"
-             BuildInParallel="$(BuildInParallel)"
-             RemoveProperties="TargetFramework">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="ProjectTargetFramework" />
-    </MSBuild>
-
-    <!--
-      Calls the VSTestSingleTargetFramework target for each target framework using MSBuild batching.
-    -->
-    <MSBuild Projects="$(SolutionPath)"
-             BuildInParallel="false"
-             Targets="VSTestSingleTargetFramework"
-             ContinueOnError="ErrorAndContinue"
-             Properties="TargetFramework=%(ProjectTargetFramework.Identity);Platform=$(Platform);Configuration=$(Configuration)" />
-  </Target>
-
-  <!--
-    Runs tests for a single target framework.
-  -->
-  <Target Name="VSTestSingleTargetFramework"
-          DependsOnTargets="GetTestProjects;BuildTests">
-    <Message Text="Running $(TestType.ToLower()) tests for framework '$(TargetFramework)'..."
-             Importance="High" />
-
-    <!--
-      Gets a list of all projects that supported the specified framework.
-    -->
-    <MSBuild Projects="@(TestProject)"
-             Targets="DoesProjectSupportTargetFramework"
-             BuildInParallel="$(BuildInParallel)"
-             RemoveProperties="TargetFramework"
-             Properties="ProjectTargetFramework=$(TargetFramework)">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="TestProjectForFramework" />
-    </MSBuild>
-
-    <!--
-      Gets a list of all supported target frameworks for each test project if no projects support the specified framework.
-    -->
-    <MSBuild Projects="@(TestProject)"
-             Targets="GetProjectTargetFrameworks"
-             BuildInParallel="$(BuildInParallel)"
-             RemoveProperties="TargetFramework"
-             Condition="@(TestProjectForFramework->Count()) == 0">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="ProjectTargetFramework" />
-    </MSBuild>
-
-    <!--
-      Logs an error if no projects support the specified framework and shows what target framworks are supported.
-    -->
-    <Error Text="There are no tests that target '$(TargetFramework)', available target frameworks are '@(ProjectTargetFramework->Distinct(), '%27, %27')'"
-           Condition="@(TestProjectForFramework->Count()) == 0" />
-
-    <!--
-      Gets the full path to the test assembly for each test project.
-    -->
-    <MSBuild Projects="@(TestProjectForFramework)"
-             BuildInParallel="true"
-             Targets="GetTargetPath"
-             Properties="Platform=$(Platform);Configuration=$(Configuration);BuildingSolutionFile=true;CurrentSolutionConfigurationContents=$(CurrentSolutionConfigurationContents);SolutionDir=$(SolutionDir);SolutionExt=$(SolutionExt);SolutionFileName=$(SolutionFileName);SolutionName=$(SolutionName);SolutionPath=$(SolutionPath)">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="TestAssembly" />
-    </MSBuild>
-
-    <Message Text="Only running tests from a single test project: @(TestProject)"
-             Importance="High"
-             Condition="'$(TestProjectName)' != ''" />
-
-    <ItemGroup>
-      <!--
-        Adds the console logger with verbosity and then adds any specified from the command-line.
-      -->
-      <VSTestLogger Include="console%3Bverbosity=$(VSTestVerbosity);$(VSTestLogger)" />
-      <TestAssembly Remove="@(TestAssembly)" Condition="'$(TestAssembly)' != '' And '%(TestAssembly.Identity)' != '$(TestAssembly)'" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <VSTestCommand Include="dotnet test" />
-      <VSTestCommand Include="@(TestAssembly->'&quot;%(Identity)&quot;', ' ')" />
-      <VSTestCommand Include="--nologo" Condition="'$(VSTestNoLogo)' == 'true'" />
-      <VSTestCommand Include="--settings &quot;$(VSTestSetting)&quot;" Condition="'$(VSTestSetting)' != ''" />
-      <VSTestCommand Include="--ResultsDirectory &quot;$(VSTestResultsDirectory)&quot;" Condition="'$(VSTestResultsDirectory)' != ''" />
-      <VSTestCommand Include="--diag &quot;$(BinlogDirectory)vstest.diag.log&quot; " Condition="'$(BinlogDirectory)' != ''" />
-    </ItemGroup>
-
-    <!--
-      Runs the tests via 'dotnet test'.
-    -->
-    <Exec Command="@(VSTestCommand->'%(Identity)', ' ') --logger @(VSTestLogger->Distinct()->'&quot;%(Identity)&quot;', ' --logger ')"
-          IgnoreStandardErrorWarningFormat="true"
-          IgnoreExitCode="true"
-          LogStandardErrorAsError="false">
-      <Output TaskParameter="ExitCode"
-              PropertyName="VSTestExitCode" />
-    </Exec>
-
-    <Error Text="$(TestType) test run failed for framework '$(TargetFramework)'."
-           Condition="'$(VSTestExitCode)' != '0'" />
-    
-    <Message Text="Finished $(TestType.ToLower()) tests for '$(TargetFramework)'"
-             Importance="High" />
-  </Target>
-
-  <!--
-    Trims down the list of projects when running 'dotnet test' to only include test projects.
-  -->
-  <Target Name="_SetRestoreGraphEntryPointsToTestProjects"
-          BeforeTargets="_LoadRestoreGraphEntryPoints"
-          DependsOnTargets="GetTestProjects"
-          Condition="'$(VSTestSessionCorrelationId)' != '' Or '$(TestType)' != ''">
-    <MSBuild Projects="@(TestProject)"
-         Targets="DoesProjectSupportTargetFramework"
-         BuildInParallel="$(BuildInParallel)"
-         RemoveProperties="TargetFramework"
-         Properties="ProjectTargetFramework=$(TargetFramework)"
-         Condition="'$(TargetFramework)' != ''">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="TestProjectForFramework" />
-    </MSBuild>
-
-    <ItemGroup>
-      <RestoreGraphProjectInputItems Include="@(TestProjectForFramework)"
-                                     Condition="@(TestProjectForFramework->Count()) != 0"/>
-      <RestoreGraphProjectInputItems Include="@(TestProject)"
-                                     Condition="@(TestProjectForFramework->Count()) == 0"/>
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Trims down the list of projects to build when running 'dotnet test' to only include test projects.
-  -->
-  <Target Name="_SetBuildProjectReferencesToTestProjects"
-          BeforeTargets="Build"
-          DependsOnTargets="GetTestProjects"
-          Condition="'$(TestType)' != ''">
-    <ItemGroup>
-      <ProjectReference Remove="@(ProjectReference)" />
-      <ProjectReference Include="@(TestProject)" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/build/common.targets b/build/common.targets
index de49b5a403d..d6e1f4fb771 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -102,6 +102,31 @@
     <Message Text="Tested project $(MSBuildProjectName)" Importance="high"  />
   </Target>
 
+  <!-- Add ability to run tests via "msbuild /t:Test" -->
+  <Sdk Name="Microsoft.Build.RunVSTest" />
+  <PropertyGroup>
+    <!-- Workaround for https://github.com/microsoft/MSBuildSdks/issues/564 -->
+    <RunVSTest Condition="'$(IsCrossTargetingBuild)' == 'true'">false</RunVSTest>
+
+    <!-- Only run tests for the requested test type -->
+    <RunVSTest Condition="'$(TestType)' != '' AND '$(TestType)' != '$(TestProjectType)'">false</RunVSTest>
+
+    <!--
+      RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,
+      but some of the CI scenarios don't define %VSINSTALLDIR%, so be explicit about where to look for vstest.
+      Note: $(VsInstallRoot) is a built-in MSBuild property, so should always be defined.
+    -->
+    <VSTestToolPath Condition="'$(VSTestToolPath)' == ''">$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
+
+    <VSTestNoLogo Condition="'$(VSTestNoLogo)' == ''">true</VSTestNoLogo>
+    <VSTestVerbosity Condition="'$(SYSTEM_DEBUG)' == 'true'">detailed</VSTestVerbosity>
+    <VSTestVerbosity Condition="'$(VSTestVerbosity)' == ''">quiet</VSTestVerbosity>
+    <VSTestSetting Condition="'$(VSTestSetting)' == ''">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'build', 'xunit.runsettings'))</VSTestSetting>
+    <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'TestResults'))</VSTestResultsDirectory>
+    <VSTestLogger>trx;$(VSTestLogger)</VSTestLogger>
+    <VSTestLogger>console%3Bverbosity=$(VSTestVerbosity);$(VSTestLogger)</VSTestLogger>
+  </PropertyGroup>
+
   <!--
     ============================================================
     PackProjects
diff --git a/eng/pipelines/pr.job.yml b/eng/pipelines/pr.job.yml
index d78f46d317a..6804042d1be 100644
--- a/eng/pipelines/pr.job.yml
+++ b/eng/pipelines/pr.job.yml
@@ -72,31 +72,38 @@ jobs:
 
   - ${{ if eq(parameters.osName, 'Windows') }}:
     - task: MSBuild@1
-      displayName: Restore and Build $(TestType) Test Projects
+      displayName: Restore $(TestType) Test Projects
       inputs:
         solution: NuGet.sln
         msbuildArchitecture: x64
-        msbuildArguments: --binarylogger:"$(BinlogDirectory)01-RestoreAndBuild.binlog"
+        msbuildArguments: -t:Restore --binarylogger:"$(BinlogDirectory)01-Restore.binlog"
   - ${{ else }}:
     - task: DotNetCoreCLI@2
-      displayName: Restore and Build $(TestType) Test Projects
+      displayName: Restore $(TestType) Test Projects
       inputs:
-        command: build
-        arguments: --binarylogger:"$(BinlogDirectory)01-RestoreAndBuild.binlog"
+        command: custom
+        custom: restore
+        arguments: --binarylogger:"$(BinlogDirectory)01-Restore.binlog"
 
-  - task: DotNetCoreCLI@2
-    displayName: Run $(TestType) Tests 
-    condition: succeeded()
-    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-    env:
-      VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: 1000
-    inputs:
-      command: test
-      arguments: --no-restore --restore:false --no-build --framework $(TestTargetFramework) --binarylogger:"$(BinlogDirectory)02-RunTests.binlog"
-      ${{ if ne(parameters.testProjectName, '') }}:
-        testRunTitle: ${{ parameters.osName }} $(TestType) Tests for $(TestProjectName) ($(TestTargetFramework))
-      ${{ else }}:
-        testRunTitle: ${{ parameters.osName }} $(TestType) Tests ($(TestTargetFramework))
+  - ${{ if eq(parameters.osName, 'Windows') }}:
+    - task: MSBuild@1
+      displayName: Build and Test $(TestType) Test Projects
+      condition: succeeded()
+      timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      inputs:
+        solution: NuGet.sln
+        msbuildArchitecture: x64
+        msbuildArguments: --restore:false -graph -t:Build;Test -p:VSTestFramework=$(TestTargetFramework) --binarylogger:"$(BinlogDirectory)02-BuildAndTest.binlog"
+  - ${{ else }}:
+    - task: DotNetCoreCLI@2
+      displayName: Build and Test $(TestType) Test Projects
+      condition: succeeded()
+      timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      env:
+        VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: 1000
+      inputs:
+        command: build
+        arguments: --no-restore --restore:false -graph -t:Build;Test -p:VSTestFramework=$(TestTargetFramework) --binarylogger:"$(BinlogDirectory)02-BuildAndTest.binlog"
 
   - ${{ if eq(parameters.osName, 'Windows') }}:
     - script: taskkill /im dotnet.exe /f
diff --git a/global.json b/global.json
index 39de10966f0..f90410b9d14 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,7 @@
     "allowPrerelease": true
   },
   "msbuild-sdks": {
-    "Microsoft.Build.NoTargets": "3.7.0"
+    "Microsoft.Build.NoTargets": "3.7.0",
+    "Microsoft.Build.RunVSTest": "1.0.319"
   }
 }