diff --git a/Directory.Build.props b/Directory.Build.props
index 0b999b18d37db..1be78d8e4ea4d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -88,6 +88,9 @@
 
     <!-- Resource naming bug: https://github.com/microsoft/msbuild/issues/4740 -->
     <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
+
+    <!-- Enable NuGet static graph evaluation to optimize incremental restore: https://github.com/dotnet/sdk/pull/10794 -->
+    <!-- <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation> -->
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md
index e1ede65ea60b9..5ab9a76c1573f 100644
--- a/docs/coding-guidelines/project-guidelines.md
+++ b/docs/coding-guidelines/project-guidelines.md
@@ -10,9 +10,9 @@ once before you can iterate and work on a given library project.
  - Netstandard Library - Copy to `bin\ref\netstandard2.0`
  - NetFx targeting pack - Copy to `bin\ref\net472`
 - Build targeting pack
- - Build src\ref.builds which builds all references assembly projects. For reference assembly project information see [ref](#ref)
+ - Build src\libraries\ref.proj which builds all references assembly projects. For reference assembly project information see [ref](#ref)
 - Build product
- - Build src\src.builds which builds all the source library projects. For source library project information see [src](#src).
+ - Build src\libraries\src.proj which builds all the source library projects. For source library project information see [src](#src).
 - Sign product
  - Build src\sign.proj
 
diff --git a/eng/Analyzers.props b/eng/Analyzers.props
index 534d38a5546ca..034bb1b8e49c6 100644
--- a/eng/Analyzers.props
+++ b/eng/Analyzers.props
@@ -1,6 +1,8 @@
 <Project>
   <PropertyGroup>
     <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleset>
+    <!-- Disable analyzers in sourcebuild -->
+    <EnableAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</EnableAnalyzers>
   </PropertyGroup>
   <ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
diff --git a/eng/Build.props b/eng/Build.props
index 95f52b37593d4..8827b98cd3642 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -15,6 +15,7 @@
       https://github.com/dotnet/arcade/issues/388
   -->
 
+  <!-- Import to have access to properties/items used both during the Arcade phase and in the repo. -->
   <Import Project="$(MSBuildThisFileDirectory)Configurations.props" />
   <Import Project="$(MSBuildThisFileDirectory)Subsets.props" />
 
@@ -76,8 +77,12 @@
     </ItemGroup>
 
     <MSBuild Projects="@(RepoTaskProjects)"
-             Properties="Configuration=Debug;Platform=AnyCPU"
-             Targets="Restore;Build"/>
+             Properties="Configuration=Debug;Platform=AnyCPU;__BuildPhase=Restore"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(RepoTaskProjects)"
+             Properties="Configuration=Debug;Platform=AnyCPU;__BuildPhase=Build"
+             Targets="Build" />
 
     <WriteLinesToFile File="$(RepoTasksOutputFile)"
                       Lines="$(RepoTasksOutputFile)"
diff --git a/eng/Configurations.props b/eng/Configurations.props
index 12fe0471490d0..2a6f427b15b85 100644
--- a/eng/Configurations.props
+++ b/eng/Configurations.props
@@ -1,4 +1,24 @@
 <Project>
+  <!--
+    This file contains properties and items which are used in both the Arcade
+    steps and in the repository.
+  -->
+
+  <PropertyGroup>
+    <LibrariesProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries'))</LibrariesProjectRoot>
+    <CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr'))</CoreClrProjectRoot>
+    <MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono'))</MonoProjectRoot>
+    <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>
+    <RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local'))</RepoToolsLocalDir>
+    <RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks'))</RepoTasksDir>
+    <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
+    <XmlDocDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))</XmlDocDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release'">true</EnableNgenOptimization>
+  </PropertyGroup>
+
   <!-- Honor the generic RuntimeConfiguration property. -->
   <PropertyGroup>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(Configuration)</RuntimeConfiguration>
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 6939ee71af00b..90346437faa14 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -47,15 +47,6 @@
       artifacts to the test layout, then running the test subset.
   -->
 
-  <PropertyGroup>
-    <LibrariesProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries'))</LibrariesProjectRoot>
-    <CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr'))</CoreClrProjectRoot>
-    <MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono'))</MonoProjectRoot>
-    <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>
-    <RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local'))</RepoToolsLocalDir>
-    <RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks'))</RepoTasksDir>
-  </PropertyGroup>
-
   <PropertyGroup>
     <DefaultSubsetCategories>libraries-installer-coreclr-mono</DefaultSubsetCategories>
     <DefaultInstallerSubsets>corehost-managed-depproj-pkgproj-bundle-installers-test</DefaultInstallerSubsets>
diff --git a/eng/Tools.props b/eng/Tools.props
index 4c399288ad250..999758d5f8f94 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -1,39 +1,13 @@
 <Project>
-  <PropertyGroup>
-    <MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors>
-    <EnableAnalyzers>true</EnableAnalyzers>
-  </PropertyGroup>
+  <!-- Import to have access to properties/items used both during the Arcade phase and in the repo. -->
+  <Import Project="$(MSBuildThisFileDirectory)Configurations.props" />
 
-  <!-- We need to import this props file which contains PackageReferences to analyzers so that
-       analyzer build assets are imported via the Tools generated props and targets -->
-  <Import Project="$(RepositoryEngineeringDir)Analyzers.props" Condition="Exists('$(RepositoryEngineeringDir)Analyzers.props') and '$(DotNetBuildFromSource)' != 'true'" />
-
-  <!-- source-built packages -->
   <ItemGroup>
-    <!-- arcade -->
-    <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
-
-    <!-- coreclr -->
-    <!-- Download the package in the initial arcade restore step to work around race conditions when restoring an msbuild SDK. -->
-    <PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" />
-
-    <!-- roslyn -->
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-
-    <!-- mono -->
-    <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" GeneratePathProperty="true" />
-  </ItemGroup>
-
-  <!-- excluded from offline portion of source build -->
-  <ItemGroup Condition="'$(DotNetBuildOffline)' != 'true'">
-    <!-- arcade -->
-    <PackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiVersion)" />
   </ItemGroup>
 
   <!-- excluded from source build -->
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e2b20bc565a85..6174024211e1d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -38,13 +38,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20153.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20156.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20153.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20155.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
+      <Sha>bc4fa8e7149769db4efd466f160417a32b11f0bf</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20153.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index e7bd40414e24d..eadba34548364 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,10 +19,6 @@
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
     <UsingToolIbcOptimization>true</UsingToolIbcOptimization>
     <UsingToolXliff>false</UsingToolXliff>
-    <!-- Paths used during restore -->
-    <EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release'">true</EnableNgenOptimization>
-    <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
-    <XmlDocDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))</XmlDocDir>
     <!-- Blob storage container that has the "Latest" channel to publish to. -->
     <ContainerName>dotnet</ContainerName>
     <ChecksumContainerName>$(ContainerName)</ChecksumContainerName>
@@ -60,7 +56,7 @@
     <!-- Arcade dependencies -->
     <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20153.1</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20153.1</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20153.1</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20156.4</MicrosoftDotNetCodeAnalysisVersion>
     <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20153.1</MicrosoftDotNetGenAPIVersion>
     <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20153.1</MicrosoftDotNetGenFacadesVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20153.1</MicrosoftDotNetXUnitExtensionsVersion>
diff --git a/eng/codeAnalysis.targets b/eng/codeAnalysis.targets
deleted file mode 100644
index de4eb79cd35db..0000000000000
--- a/eng/codeAnalysis.targets
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project>
-  <Import Condition="Exists($(AnalyzerPropsFile)) and '$(EnableAnalyzers)' == 'true'" Project="$(AnalyzerPropsFile)" />
-
-  <!-- This target is executed when building a project and EnableAnalyzers property is set to true. 
-  It will populate the Analyzer item that is passed to the compiler with the analyzers restored
-  as package references in Tools.props. Those analyzers will be saved in a props file -> artifacts\toolset\Common\Tools.Analyzers.props.
-  So in order to add a new analyzer just need to add a package reference in Tools.props to the package containing it.
-  *
-  This target also provides filtering for specific type of projects through to Items.
-  - <AnalyzersToInclude> will include only the specified analyzers and will ignore the others that where restored.
-  - <AnalyzersToExclude> will exclude the specified analyzers from the restored analyzers, but will preserve the others.
-  **The values in these Items are the name of the analyzers' dll.
-  **These to Items are mutually exclusive, so only 1 should be set at a time.
-  Example of usage:
-  <AnalyzersToInclude Condition="$(IsTestProject)" Include="Xunit.Analyzers" /> will only include Xunit analyzers.
-  <AnalyzersToExclude Condition="$(IsSourceProject)" Include="Xunit.Analyzers" /> will include all analyzers but Xunit analyzer. -->
-
-  <Target Name="CalculateAnalyzersForBuildTime">
-    <ItemGroup>
-      <Analyzer Include="@(ResolvedAnalyzer)" />
-    </ItemGroup>
-
-    <Warning Text="AnalyzersToExclude and AnalyzersToInclude shouldn't be set together, they are mutually exclusive." Condition="'@(AnalyzersToExclude)' != '' and '@(AnalyzersToInclude)' != ''" />
-
-    <ItemGroup Condition="'@(AnalyzersToExclude)' != '' or '@(AnalyzersToInclude)' != ''">
-      <_AnalyzersToFileName Include="@(Analyzer -> '%(FileName)')">
-        <OriginalIdentity>%(Identity)</OriginalIdentity>
-      </_AnalyzersToFileName>
-    </ItemGroup>
-
-    <ItemGroup Condition="'@(AnalyzersToExclude)' != ''">
-      <_AnalyzersToRemove Include="@(_AnalyzersToFileName)" Condition="'@(AnalyzersToExclude)' == '@(_AnalyzersToFileName)' and '%(Identity)' != ''" />
-      <Analyzer Remove="@(_AnalyzersToRemove -> '%(OriginalIdentity)')" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'@(AnalyzersToInclude)' != ''">
-      <_AnalyzersToRemove Include="@(_AnalyzersToFileName)" Exclude="@(AnalyzersToInclude)" />
-      <_missingAnalyzersToInclude Include="@(AnalyzersToInclude)" Exclude="@(_AnalyzersToFileName)" />
-      <Analyzer Remove="@(_AnalyzersToRemove -> '%(OriginalIdentity)')" />
-    </ItemGroup>
-
-    <Error Text="Couldn't find analyzer to include with values: @(_missingAnalyzersToInclude)" Condition="'@(_missingAnalyzersToInclude)' != '' and '@(_missingAnalyzersToInclude)' != 'None'" />
-  </Target>
-
-  <PropertyGroup Condition="'$(EnableAnalyzers)' == 'true'">
-  	<ResolveReferencesDependsOn>
-  	  $(ResolveReferencesDependsOn);
-  	  CalculateAnalyzersForBuildTime;
-  	</ResolveReferencesDependsOn>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/docker/build-docker-sdk.ps1 b/eng/docker/build-docker-sdk.ps1
index 76c1ce7b41407..af1943a0d49dc 100755
--- a/eng/docker/build-docker-sdk.ps1
+++ b/eng/docker/build-docker-sdk.ps1
@@ -18,8 +18,7 @@ if ($buildWindowsContainers)
   # Due to size concerns, we don't currently do docker builds on windows.
   # Build on the host machine, then simply copy artifacts to the target docker image.
   # This should result in significantly lower build times, for now.
-  & "$REPO_ROOT_DIR/coreclr.cmd" -c Release
-  & "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration -runtimeConfiguration release
+  & "$REPO_ROOT_DIR/build.cmd" -ci -subsetcategory coreclr-libraries -runtimeconfiguration release -c $configuration
   
   # Dockerize the build artifacts
   docker build --tag $imageName `
diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile
index efba4fb7c309d..fce6381e71028 100644
--- a/eng/docker/libraries-sdk.linux.Dockerfile
+++ b/eng/docker/libraries-sdk.linux.Dockerfile
@@ -8,8 +8,7 @@ WORKDIR /repo
 COPY . .
 
 ARG CONFIGURATION=Release
-RUN ./src/coreclr/build.sh -release -skiptests -clang9 && \
-    ./libraries.sh -c $CONFIGURATION -runtimeconfiguration release
+RUN ./build.sh -ci -subsetcategory coreclr-libraries -runtimeconfiguration release -c $CONFIGURATION
 
 FROM $SDK_BASE_IMAGE as target
 
diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml
index 4cf1c7ded3827..017ca39dbb0cc 100644
--- a/eng/pipelines/libraries/enterprise/linux.yml
+++ b/eng/pipelines/libraries/enterprise/linux.yml
@@ -26,7 +26,7 @@ variables:
   - name: enterpriseTestsSetup
     value: $(sourcesRoot)/Common/tests/System/Net/EnterpriseTests/setup
   - name: containerRunTestsCommand
-    value: /repo/.dotnet/dotnet build /t:test --no-restore
+    value: /repo/.dotnet/dotnet build /t:test
   - name: containerLibrariesRoot
     value: /repo/src/libraries
 
@@ -50,7 +50,7 @@ steps:
   displayName: Test linuxclient connection to web server
 
 - bash: |
-    docker exec linuxclient bash -c '/repo/src/coreclr/build.sh -release -skipnuget -clang9 && /repo/libraries.sh /p:CoreCLRConfiguration=Release'
+    docker exec linuxclient bash -c '/repo/build.sh -subsetcategory coreclr-libraries -runtimeconfiguration release -ci'
   displayName: Build product sources
 
 - bash: |
diff --git a/src/libraries/restore/harvestPackages/harvestPackages.depproj b/eng/restore/harvestPackages.targets
similarity index 54%
rename from src/libraries/restore/harvestPackages/harvestPackages.depproj
rename to eng/restore/harvestPackages.targets
index 2ae20ecda6e67..d6f6f98019f1c 100644
--- a/src/libraries/restore/harvestPackages/harvestPackages.depproj
+++ b/eng/restore/harvestPackages.targets
@@ -1,15 +1,14 @@
-<Project InitialTargets="AddPackageDownload" Sdk="Microsoft.NET.Sdk">
+<Project InitialTargets="AddPackageDownload">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <PackagingTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\</PackagingTaskAssembly>
+    <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'core'">$(PackagingTaskAssembly)netcoreapp2.1\</PackagingTaskAssembly>
+    <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'core'">$(PackagingTaskAssembly)net472\</PackagingTaskAssembly>
+    <PackagingTaskAssembly>$(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll</PackagingTaskAssembly>
   </PropertyGroup>
 
-  <Import Project="$(PkgDir)baseline/baseline.props" />
-
-  <!-- only restore this project during the build, don't copy any of it's packages
-       The sole purpose of this project is to download packages that can be examined
-       for harvesting binaries & support. -->
-  <Target Name="Build" DependsOnTargets="RestorePackages" />
+  <Import Project="$(LibrariesProjectRoot)pkg\baseline\baseline.props" />
 
+  <UsingTask TaskName="GetLastStablePackage" AssemblyFile="$(PackagingTaskAssembly)"/>
   <Target Name="AddPackageDownload">
     <ItemGroup>
       <_AllPkgProjs Include="$(LibrariesProjectRoot)*\pkg\**\*.pkgproj" />
@@ -20,10 +19,10 @@
     </ItemGroup>
 
     <GetLastStablePackage
-        LatestPackages="@(_AllPkgProjsToPackageIdentity)"
-        PackageIndexes="$(PackageIndexFile)"
-        DoNotAllowVersionsFromSameRelease="true">
-        <Output TaskParameter="LastStablePackages" ItemName="_PackageDownload" />
+      LatestPackages="@(_AllPkgProjsToPackageIdentity)"
+      PackageIndexes="$(PackageIndexFile)"
+      DoNotAllowVersionsFromSameRelease="true">
+      <Output TaskParameter="LastStablePackages" ItemName="_PackageDownload" />
     </GetLastStablePackage>
 
     <!-- Allow to override package download and versions in case there is already a PackageDownload set -->
@@ -40,5 +39,4 @@
       </PackageDownload>
     </ItemGroup>
   </Target>
-
 </Project>
\ No newline at end of file
diff --git a/eng/restore/repoRestore.props b/eng/restore/repoRestore.props
index 204c23d1de0b9..3d6a393519d7f 100644
--- a/eng/restore/repoRestore.props
+++ b/eng/restore/repoRestore.props
@@ -28,4 +28,4 @@
     <ComputeNETCoreBuildOutputFiles>false</ComputeNETCoreBuildOutputFiles>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets
index d99f198e1a5fb..a430b67fee1ff 100644
--- a/eng/restore/repoRestore.targets
+++ b/eng/restore/repoRestore.targets
@@ -4,8 +4,6 @@
     <RestoreProjectStyle Condition="'$(MSBuildProjectExtension)' != '.depproj'">Unknown</RestoreProjectStyle>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)codeAnalysis.targets" />
-
   <PropertyGroup>
     <!-- Nuget will normally disable all generated imports as part of a restore to avoid 
          non-determinism where first restore changes a subsequent restore,
diff --git a/global.json b/global.json
index b92f7803faf03..cd9ec82380b6f 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20153.1",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20156.4",
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20153.1",
     "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20153.1",
     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20153.1",
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 4ff8a6be97797..37c82ea5a46e8 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -119,12 +119,6 @@
     <IsShipping Condition="'$(IsTestProject)' == 'true'">false</IsShipping>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <EnableProjectRestore Condition="'$(IsTestProject)' == 'true'">true</EnableProjectRestore>
-  </PropertyGroup>
-
-  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
-
   <!-- Common repo directories -->
   <PropertyGroup>
     <!-- Need to try and keep the same logic as the native builds as we need this for packaging -->
@@ -146,6 +140,14 @@
     <ApiCompatExcludeAttributeList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt</ApiCompatExcludeAttributeList>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.ApiCompat" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="$(MicrosoftDotNetApiCompatVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.GenAPI" Condition="'$(DotNetBuildOffline)' != 'true'" Version="$(MicrosoftDotNetGenApiVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" GeneratePathProperty="true" />
+  </ItemGroup>
+
   <PropertyGroup>
     <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
     <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
@@ -170,6 +172,7 @@
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(TargetOS)' == 'Windows_NT'">win-x64</ToolRuntimeRID>
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(TargetOS)' != 'Windows_NT' and $(_buildingInOSX)">osx-x64</ToolRuntimeRID>
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(TargetOS)' != 'Windows_NT' and !$(_buildingInOSX)">linux-x64</ToolRuntimeRID>
+    <MicrosoftNetCoreIlasmPackageRuntimeId>$(ToolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
 
     <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
     <_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl'">linux</_portableOS>
@@ -268,10 +271,10 @@
     <Features>strict;nullablePublicOnly</Features>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <!-- We decided to keep this disabled by default to see some history of way have a look at https://github.com/dotnet/corefx/issues/3140 -->
+    <!-- We decided to keep this disabled by default: https://github.com/dotnet/runtime/issues/15152 -->
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <GenFacadesIgnoreBuildAndRevisionMismatch>true</GenFacadesIgnoreBuildAndRevisionMismatch>
-    <EnableAnalyzers Condition="'$(EnableProjectRestore)' == 'true' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' != '.ilproj'">true</EnableAnalyzers>
+    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' != '.ilproj'">true</EnableAnalyzers>
   </PropertyGroup>
 
   <!-- Set up some common paths -->
@@ -296,7 +299,6 @@
     <NetStandard20RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.0'))</NetStandard20RefPath>
     <NetStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.1'))</NetStandard21RefPath>
     <NetFxRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetFrameworkCurrent)'))</NetFxRefPath>
-    <ILAsmToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsToolsetDir)', 'ilasm'))</ILAsmToolPath>
 
     <!-- Helix properties -->
     <OSPlatformConfig>$(TargetOS).$(Platform).$(Configuration)</OSPlatformConfig>
@@ -335,6 +337,12 @@
   <!-- Import it at the end of the props file to override the OutputPath for reference assemblies and use common directory props -->
   <Import Project="$(RepositoryEngineeringDir)referenceAssemblies.props" />
 
+  <PropertyGroup>
+    <EnableProjectRestore Condition="'$(IsSourceProject)' == 'true' or '$(IsReferenceAssembly)' == 'true' or '$(IsTestProject)' == 'true'">true</EnableProjectRestore>
+  </PropertyGroup>
+
+  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
+
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 659009ab0dbe2..f019b5bd21a6a 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -113,7 +113,6 @@
 
   <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" />
   <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" />
-
   <Import Project="$(RepositoryEngineeringDir)referenceFromRuntime.targets" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" />
   <Import Project="$(RepositoryEngineeringDir)notSupported.SourceBuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
index 436ecca9fbe2d..e8774341649ca 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
@@ -18,6 +18,8 @@
     <RootNamespace />
     <!-- Disable this as it seems to break windows builds for now. -->
     <DocumentationFile />
+    <!-- No plans to fix the analyzer issues. -->
+    <EnableAnalyzers>false</EnableAnalyzers>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
diff --git a/src/libraries/System.Net.Http/src/PInvokeAnalyzerExceptionList.analyzerdata b/src/libraries/System.Net.Http/src/PinvokeAnalyzerExceptionList.analyzerdata
similarity index 100%
rename from src/libraries/System.Net.Http/src/PInvokeAnalyzerExceptionList.analyzerdata
rename to src/libraries/System.Net.Http/src/PinvokeAnalyzerExceptionList.analyzerdata
diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index 08655bbddfe08..ee65f5e9eff93 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -18,13 +18,13 @@
     <Compile Include="System.Runtime.WindowsRuntime.Manual.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 60f7f32e4794b..147afba607288 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -15,18 +15,6 @@
     <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_WindowsRuntime</GeneratePlatformNotSupportedAssemblyMessage>
     <GeneratePlatformNotSupportedAssemblyWithGlobalPrefix>true</GeneratePlatformNotSupportedAssemblyWithGlobalPrefix>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
-    <ReferenceFromRuntime Include="System.Private.CoreLib" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Windows" />
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
-    <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
-    <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
-    <ProjectReference Include="..\..\System.Runtime.InteropServices.WindowsRuntime\src\System.Runtime.InteropServices.WindowsRuntime.csproj" />
-    <ProjectReference Include="..\..\System.ObjectModel\src\System.ObjectModel.csproj" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System\IO\StreamOperationAsyncResult.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\MarshalingHelpers.cs" />
@@ -94,12 +82,24 @@
       <Link>Common\System\HexConverter.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+    <ReferenceFromRuntime Include="System.Private.CoreLib" />
+    <Reference Include="mscorlib" />
+    <Reference Include="Windows" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
+    <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
+    <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
+    <ProjectReference Include="..\..\System.Runtime.InteropServices.WindowsRuntime\src\System.Runtime.InteropServices.WindowsRuntime.csproj" />
+    <ProjectReference Include="..\..\System.ObjectModel\src\System.ObjectModel.csproj" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
     <Reference Include="System.Runtime" />
     <Reference Include="System.IO" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Resources.ResourceManager" />
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj b/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
index dab72ed0560b0..8633fffda010c 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
@@ -18,6 +18,6 @@
     <Compile Include="Windows\UI\ColorTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Windows" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 8da5cf9b63eb6..0e00e66aea450 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -11,21 +11,32 @@
     <BuildDependsOn Condition="'$(BuildManaged)' == 'true' and '$(BuildTests)' != 'only'">$(BuildDependsOn);BuildManaged</BuildDependsOn>
     <BuildDependsOn Condition="'$(BuildPackages)' == 'true' and '$(BuildTests)' != 'only'">$(BuildDependsOn);Pack</BuildDependsOn>
     <BuildDependsOn Condition="'$(BuildTests)' != ''">$(BuildDependsOn);BuildTests</BuildDependsOn>
+
+    <RestoreAll Condition="'$(RestoreAll)' == '' and '$(ContinuousIntegrationBuild)' == 'true'">true</RestoreAll>
   </PropertyGroup>
 
   <Import Project="Directory.Build.targets" />
 
   <Target Name="Restore" DependsOnTargets="GenerateRuntimeOSPropsFile">
     <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)restore\dirs.proj" Build="true" />
+      <_RestoreBuildProjects Include="$(MSBuildThisFileDirectory)restore\dirs.proj" />
+      <_RestoreProjects Include="@(_RestoreBuildProjects)" />
     </ItemGroup>
-    
-    <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Build="false" />
+
+    <ItemGroup Condition="'$(RestoreAll)' == 'true'">
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj"  />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)packages.proj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_RestoreProjects)" Targets="Restore" Properties="$(ProjectProperties)" />
-    <MSBuild Projects="@(_RestoreProjects)" Condition="'%(Build)' != 'false'" Properties="$(ProjectProperties)" />
+    <MSBuild Projects="@(_RestoreProjects)"
+             Targets="Restore"
+             Properties="__BuildPhase=Restore"
+             BuildInParallel="true" />
+
+    <MSBuild Projects="@(_RestoreBuildProjects)"
+             Properties="__BuildPhase=Build"
+             Targets="Build" />
   </Target>
 
   <Target Name="BuildNative">
@@ -33,7 +44,7 @@
       <_BuildNativeProjects Include="$(MSBuildThisFileDirectory)Native\build-native.proj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_BuildNativeProjects)" Properties="$(ProjectProperties)" />
+    <MSBuild Projects="@(_BuildNativeProjects)" />
   </Target>
 
   <Target Name="BuildManaged">
@@ -41,7 +52,15 @@
       <_BuildMangedProjects Include="$(MSBuildThisFileDirectory)dirs.proj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_BuildMangedProjects)" Properties="$(ProjectProperties)" />
+    <!-- Only restore if there was no upfront restore. -->
+    <MSBuild Projects="@(_BuildMangedProjects)"
+             Condition="'$(RestoreAll)' != 'true'"
+             Properties="__BuildPhase=Restore"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(_BuildMangedProjects)"
+             Properties="__BuildPhase=Build"
+             Targets="Build" />
   </Target>
 
   <Target Name="BuildTests">
@@ -49,9 +68,15 @@
       <_TestProjects Include="$(MSBuildThisFileDirectory)tests.proj" />
     </ItemGroup>
 
+    <!-- Only restore if there was no upfront restore. -->
     <MSBuild Projects="@(_TestProjects)"
-             Targets="Build"
-             Properties="$(ProjectProperties)" />
+             Condition="'$(RestoreAll)' != 'true'"
+             Properties="__BuildPhase=Restore"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(_TestProjects)"             
+             Properties="__BuildPhase=Build"
+             Targets="Build" />
   </Target>
 
   <Target Name="Test">
@@ -60,16 +85,23 @@
     </ItemGroup>
 
     <MSBuild Projects="@(_TestProjects)"
-             Targets="Test"
-             Properties="$(ProjectProperties)" />
+             Targets="Test" />
   </Target>
 
   <Target Name="Pack">
     <ItemGroup>
-      <_PackProjects Include="$(MSBuildThisFileDirectory)packages.builds" />
+      <_PackProjects Include="$(MSBuildThisFileDirectory)packages.proj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_PackProjects)" Properties="$(ProjectProperties)" />
+    <!-- Only restore if there was no upfront restore. -->
+    <MSBuild Projects="@(_PackProjects)"
+             Condition="'$(RestoreAll)' != 'true'"
+             Properties="__BuildPhase=Restore"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(_PackProjects)"
+             Targets="Build"
+             Properties="__BuildPhase=Build" />
   </Target>
 
   <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index 2b9534d5965a8..d03d5892fe792 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -1,26 +1,35 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
-  <!-- required to build the projects in their specified order -->
   <PropertyGroup>
-    <SerializeProjects>true</SerializeProjects>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <Project Include="ref.builds" />
-    <Project Include="shims\generated\*.csproj" />
-    <Project Include="Native\native-binplace.proj" />
-    <Project Include="src.builds" />
-    <Project Include="shims\manual\*.csproj" />
-    <Project Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" />
-    <Project Include="pretest.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true'" />
+    <ProjectReference Include="ref.proj" />
+    <ProjectReference Include="Native\native-binplace.proj" />
+    <ProjectReference Include="src.proj" />
+    <ProjectReference Include="shims\manual\*.csproj" />
+    <ProjectReference Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" />
+    <ProjectReference Include="pretest.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
-    <Project Include="ref.builds" />
-    <Project Include="src.builds" />
+    <ProjectReference Include="ref.proj" />
+    <ProjectReference Include="src.proj" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
-</Project>
\ No newline at end of file
+  <!--
+    Ordering matters! Overwriting the Build target after the Sdk.targets import.
+    BuildInParallel false is required to build the projects in their specified order.
+  -->
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="BuildAllProjects=true"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
+</Project>
diff --git a/src/libraries/packages.builds b/src/libraries/packages.proj
similarity index 71%
rename from src/libraries/packages.builds
rename to src/libraries/packages.proj
index ab33fce628208..9e62eb26d72bf 100644
--- a/src/libraries/packages.builds
+++ b/src/libraries/packages.proj
@@ -1,23 +1,22 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
+  <PropertyGroup>
+    <EnableProjectRestore>true</EnableProjectRestore>
+  </PropertyGroup>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
-  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-    <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);package-$(Configuration)</AdditionalBuildTargetFrameworks>
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+    <AdditionalBuildTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalBuildTargetFrameworks);package-$(Configuration)</AdditionalBuildTargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true'">
-    <Project Include="$(PkgDir)*\*.builds" >
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
-    <Project Include="*\pkg\**\*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true' OR '$(DotNetBuildFromSource)' == 'true'">
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
+    <ProjectReference Include="$(PkgDir)*\*.builds" />
+    <ProjectReference Include="*\pkg\**\*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true'" />
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->
-  <Import Project="$(PkgDir)baseline\baseline.props" />
-
-  <UsingTask TaskName="UpdatePackageIndex" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
+  <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" />
 
   <!--
     Updates the package index to mark all packages we are building that can go stable as stable.
@@ -69,8 +68,6 @@
       Overwrite="true" />
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
-
   <Target Name="SetAzureDevOpsVariableForBuiltPackages"
           Condition="'$(ContinuousIntegrationBuild)' == 'true'"
           AfterTargets="BuildAllProjects">
@@ -80,4 +77,16 @@
 
     <Message Condition="'@(_PackageReports)' != ''" Importance="High" Text="##vso[task.setvariable variable=_librariesBuildProducedPackages]true" />
   </Target>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+
+  <!-- Ordering matters! Overwriting the Build and Test target after the Sdk.targets import. -->
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="BuildAllProjects=true"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
 </Project>
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 317bf140a39af..5b5cb13dd2490 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -2,16 +2,15 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
     <BuildDependsOnTargets>GenerateLaunchSettingsFiles</BuildDependsOnTargets>
     <BuildDependsOnTargets Condition="'$(BinplaceTestSharedFramework)' == 'true'">$(BuildDependsOnTargets);GenerateTestSharedFrameworkDepsFile</BuildDependsOnTargets>
     <BuildDependsOnTargets Condition="'$(PlatformManifestFile)' != ''">$(BuildDependsOnTargets);GenerateFileVersionProps</BuildDependsOnTargets>
-    <TargetFrameworkIdentifier>netcoreapp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>5.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- This is necessary as inside VS project references that aren't part of the sln aren't built. -->
-    <Project Include="$(CommonTestPath)\CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
+    <ProjectReference Include="$(CommonTestPath)CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
   </ItemGroup>
 
   <!-- Microsoft.XmlSerializer.Generator should not be marked as a platform item and be copy-local instead. -->
@@ -58,6 +57,7 @@
       <_TestProjectRootDir>$(LibrariesProjectRoot)</_TestProjectRootDir>
       <_TestProjectRootDir Condition="'$(DirectoryToBuild)'!=''">$(DirectoryToBuild)</_TestProjectRootDir>
     </PropertyGroup>
+
     <ItemGroup>
       <!-- Keep in sync with pattern for test projects in tests.proj -->
       <TestProjects Include="$(_TestProjectRootDir)*\tests\**\*.Tests.csproj" />
@@ -65,7 +65,7 @@
 
     <MSBuild Projects="@(TestProjects)"
              Targets="GenerateLaunchSettingsFile"
-             ContinueOnError="ErrorAndContinue" />
+             ContinueOnError="ErrorAndStop" />
   </Target>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
@@ -73,15 +73,9 @@
   <Target Name="Build"
           Condition="'$(SkipPrepareTest)' != 'true'"
           DependsOnTargets="GenerateLaunchSettingsFiles;GenerateTestSharedFrameworkDepsFile;GenerateFileVersionProps">
-
     <MSBuild Targets="Build"
-             Projects="@(Project)"
-             Properties="TargetFramework=$(BuildTargetFramework);%(Project.AdditionalProperties)"
+             Projects="@(ProjectReference)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
-
-    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
-    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
-
   </Target>
 </Project>
diff --git a/src/libraries/ref.builds b/src/libraries/ref.builds
deleted file mode 100644
index 9bef0a6e4edba..0000000000000
--- a/src/libraries/ref.builds
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project DefaultTargets="Build" >
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
-
-  <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\ref\System.Utf8String.Experimental.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Project Condition="'$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
-    <Project Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\ref\*.*proj" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
-</Project>
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
new file mode 100644
index 0000000000000..99037969eaadb
--- /dev/null
+++ b/src/libraries/ref.proj
@@ -0,0 +1,30 @@
+<Project>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\ref\System.Utf8String.Experimental.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Include="shims\generated\*.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
+    <ProjectReference Include="$(DirectoryToBuild)\ref\*.*proj" />
+  </ItemGroup>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="BuildAllProjects=true"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
+</Project>
diff --git a/src/libraries/restore/analyzers/analyzers.depproj b/src/libraries/restore/analyzers/analyzers.depproj
deleted file mode 100644
index 27fad4d37cff1..0000000000000
--- a/src/libraries/restore/analyzers/analyzers.depproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <EnableBinPlacing>false</EnableBinPlacing>
-    <EnableAnalyzers>true</EnableAnalyzers>
-    <Language>C#</Language>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- 
-      Microsoft.CodeAnalysis.Common shouldn't be referenced directly but is needed by the analyzer depproj restore.
-      TODO: Remove when project restore is enabled for non test projects: https://github.com/dotnet/corefx/issues/41512.
-    -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0-beta2-final" PrivateAssets="all" />
-  </ItemGroup>
-
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SaveItems" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
-
-  <Target Name="GenerateAnalyzersPropsFile"
-          AfterTargets="ResolveLockFileAnalyzers">
-
-    <SaveItems Condition="'@(Analyzer)' != ''"
-               ItemName="ResolvedAnalyzer"
-               Items="@(Analyzer)"
-               File="$(AnalyzerPropsFile)" />
-  </Target>
-</Project>
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index d54794d38db3e..ee2162758d1e6 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,15 +1,14 @@
 <Project>
   <Import Project="Directory.Build.props" />
 
-  <ItemGroup>
-    <Project Condition="'$(DotNetBuildFromSource)' != 'true'" Include="analyzers/analyzers.depproj" />
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
 
-    <!-- Build for all configurations -->
-    <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
+  <ItemGroup>
+    <Project Include="netcoreapp/netcoreapp.depproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
     <Project Include="netstandard/netstandard.depproj" />
     <Project Include="netfx/netfx.depproj" />
-    <Project Include="tools/tools.depproj" />
-    <Project Include="harvestPackages/harvestPackages.depproj" />
     <Project Include="binplacePackages/binplacePackages.depproj" />
   </ItemGroup>
 
diff --git a/src/libraries/restore/tools/tools.depproj b/src/libraries/restore/tools/tools.depproj
deleted file mode 100644
index f2e32a3773b8b..0000000000000
--- a/src/libraries/restore/tools/tools.depproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputPath>$(ILAsmToolPath)</OutputPath>
-    <EnableBinPlacing>false</EnableBinPlacing>
-    <RuntimeIdentifier>$(ToolRuntimeRID)</RuntimeIdentifier>
-    <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.ILAsm">
-      <Version>$(MicrosoftNETCoreILAsmVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.ILDAsm">
-      <Version>$(MicrosoftNETCoreILAsmVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/restore/winrt/winrt.depproj b/src/libraries/restore/winrt/winrt.depproj
deleted file mode 100644
index fb99977c302e5..0000000000000
--- a/src/libraries/restore/winrt/winrt.depproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Windows</AssemblyName>
-    <TargetExt>.winmd</TargetExt>
-    <!-- don't binplace for netstandard since the netstandard ref path is used for API compat and assumed to be 
-         implemented by all frameworks that support it.  Instead require projectreference to this project -->
-    <BinPlaceRef Condition="'$(TargetsNetStandard)' != 'true'">true</BinPlaceRef>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <TargetFrameworks>netcoreapp3.0;$(netcoreappCurrent);netstandard1.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT">
-      <Version>1.0.5</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index a340a3d1a5aec..db4c9fe1d756e 100644
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -1,9 +1,12 @@
-<Project DefaultTargets="Build">
+<Project>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
-  <Import Project="Directory.Build.props" />
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
 
   <PropertyGroup>
-    <ApiCompatTarget>$(BuildTargetFramework)</ApiCompatTarget>
+    <ApiCompatTarget>$(TargetFramework)</ApiCompatTarget>
     <ApiCompatTarget Condition="$(BuildTargetFramework.Contains('netcoreapp'))">netcoreapp</ApiCompatTarget>
     <ApiCompatResponseFile>$(IntermediateOutputPath)/apicompat.rsp</ApiCompatResponseFile>
     <ApiCompatBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.txt</ApiCompatBaselineFile>
@@ -98,11 +101,12 @@
 
   </Target>
 
-  <Target Name="Build" DependsOnTargets="RunApiCompat" />
-  <Target Name="Clean">
+  <Target Name="CleanAdditionalFiles" AfterTargets="Clean">
     <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
   </Target>
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
+  <Target Name="Build" DependsOnTargets="RunApiCompat" />
 </Project>
diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index 790b6126ca80d..768825eb3e775 100644
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -1,4 +1,7 @@
 <Project>
+  <PropertyGroup>
+    <EnableProjectRestore>true</EnableProjectRestore>
+  </PropertyGroup>
   <Import Project="..\Directory.Build.props" />
 
   <Import Project="netfxreference.props" />
diff --git a/src/libraries/src.builds b/src/libraries/src.builds
deleted file mode 100644
index 5903b7fd7a10a..0000000000000
--- a/src/libraries/src.builds
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project DefaultTargets="Build" TreatAsLocalProperty="AdditionalBuildTargetFrameworks">
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
-
-  <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\src\System.Utf8String.Experimental.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <Project Include="$(MSBuildThisFileDirectory)*\src\*.csproj" Exclude="@(ProjectExclusions)" />
-    <Project Include="$(MSBuildThisFileDirectory)*\src\*.ilproj" Exclude="@(ProjectExclusions)" />
-    <Project Include="$(MSBuildThisFileDirectory)*\src\*.vbproj" Exclude="@(ProjectExclusions)" />
-    <!-- Explicitly include the runtime.depproj project here to correctly set up the test host. -->
-    <Project Include="$(MSBuildThisFileDirectory)restore\runtime\runtime.depproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
-    <Project Include="$(DirectoryToBuild)\src\*.*proj" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
-</Project>
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
new file mode 100644
index 0000000000000..d2d0ec88d23df
--- /dev/null
+++ b/src/libraries/src.proj
@@ -0,0 +1,34 @@
+<Project>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\src\System.Utf8String.Experimental.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.csproj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.ilproj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.vbproj" Exclude="@(ProjectExclusions)" />
+    <!-- Explicitly include the runtime.depproj project here to correctly set up the test host. -->
+    <ProjectReference Include="$(MSBuildThisFileDirectory)restore\runtime\runtime.depproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
+    <ProjectReference Include="$(DirectoryToBuild)\src\*.*proj" />
+  </ItemGroup>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="BuildAllProjects=true"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
+</Project>
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index d47a26ac972b8..1a32a6b477c38 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -1,9 +1,9 @@
-<Project InitialTargets="IncludeProjectReferences">
+<Project>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
   <Import Project="$(RepositoryEngineeringDir)coverage.props" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(EnableCoverageSupport)' == 'true'">
@@ -14,22 +14,16 @@
 
   <ItemGroup Condition="'$(BuildAllConfigurations)' != 'true'">
     <!-- We currently only test with C# projects. -->
-    <Project Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\**\*.Tests.csproj" />
-    <Project Condition="'$(SkipTestRestore)' != 'true' and '$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" Exclude="@(ProjectExclusions)" />
-    <Project Condition="'$(SkipTestRestore)' == 'true' and '$(DirectoryToBuild)' == ''" Include="$(CommonTestPath)CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
-    <Project Remove="$(CommonTestPath)System\Net\Prerequisites\**\*.csproj" />
+    <ProjectReference Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\**\*.Tests.csproj" />
+    <ProjectReference Condition="'$(SkipTestRestore)' != 'true' and '$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Condition="'$(SkipTestRestore)' == 'true' and '$(DirectoryToBuild)' == ''" Include="$(CommonTestPath)CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
+    <ProjectReference Remove="$(CommonTestPath)System\Net\Prerequisites\**\*.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BuildAllConfigurations)' == 'true'">
-    <Project Include="$(MSBuildThisFileDirectory)pkg\test\testPackages.proj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)pkg\test\testPackages.proj" />
   </ItemGroup>
 
-  <Target Name="IncludeProjectReferences">
-    <ItemGroup>
-      <ProjectReference Include="@(Project)" />
-    </ItemGroup>
-  </Target>
-
   <Target Name="GenerateCoverageReport"
           Condition="'$(EnableCoverageSupport)' == 'true' and '$(SkipCoverageReport)' != 'true'"
           AfterTargets="TestAllProjects"
@@ -41,16 +35,14 @@
   <Import Project="$(RepositoryEngineeringDir)coverage.targets" Condition="'$(EnableCoverageSupport)' == 'true'" />
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
+  <!-- Ordering matters! Overwriting the Build and Test target after the Sdk.targets import. -->
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
-             Projects="@(Project)"
-             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             Projects="@(ProjectReference)"
+             Properties="BuildAllProjects=true"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
-
-    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
-    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
   </Target>
 
   <Target Name="Test" DependsOnTargets="TestAllProjects" />
@@ -58,13 +50,13 @@
     <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity
          however since the project names are unique it will essentially force each to run in its own batch -->
     <MSBuild Targets="Test"
-             Projects="@(Project)"
+             Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' == 'true' and '%(Identity)' != ''"
              Properties="TestAllProjects=true"
              ContinueOnError="ErrorAndContinue" />
 
     <MSBuild Targets="Test"
-             Projects="@(Project)"
+             Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' != 'true'"
              Properties="TestAllProjects=true"
              BuildInParallel="true"
@@ -73,5 +65,4 @@
     <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
     <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
   </Target>
-
 </Project>