diff --git a/Directory.Build.props b/Directory.Build.props
index d7e46d25026af0..fe15e0a9e05e71 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,6 +10,10 @@
   -->
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" />
 
+  <PropertyGroup>
+    <RootDirectoryBuildPropsImported>true</RootDirectoryBuildPropsImported>
+  </PropertyGroup>
+
   <!-- Common paths -->
 
   <!-- Set these properties early enough for libraries as they import the Arcade SDK not early enough.  -->
@@ -39,6 +43,12 @@
     <CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
   </PropertyGroup>
 
+  <!--
+    Get ProjectToBuild and '<subset>ProjectToBuild' items. Using the items lets projects handle
+    $(Subset) automatically when creating project-to-project dependencies.
+  -->
+  <Import Condition="'$(SubsetsPropsImported)' != 'true'" Project="$(RepositoryEngineeringDir)Subsets.props" />
+
   <!-- Packaging properties -->
   <PropertyGroup>
     <!--
@@ -49,6 +59,7 @@
     <RepositoryUrl>git://github.com/dotnet/runtime</RepositoryUrl>
     <ProjectUrl>https://github.com/dotnet/runtime</ProjectUrl>
     <LicenseUrl>https://github.com/dotnet/runtime/blob/master/LICENSE.TXT</LicenseUrl>
+    <RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5180c31001b64c..1344122a8024d4 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,4 @@
 <Project>
-
+  <Import Project="$(RepositoryEngineeringDir)/liveBuilds.targets" Condition="'$(ImportLiveBuildsTargets)' == 'true'" />
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" />
-
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/Subsets.props b/eng/Subsets.props
index d858467901a691..5913897b3c12e4 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -47,8 +47,12 @@
       artifacts to the test layout, then running the test subset.
   -->
 
+  <PropertyGroup>
+    <SubsetsPropsImported>true</SubsetsPropsImported>
+  </PropertyGroup>
+
   <!-- Import only when imported by Arcade's Build.proj as we import Directory.Build.props ourselves. -->
-  <Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(SkipImportArcadeSdkFromRoot)' == 'true'" />
+  <Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(SkipImportArcadeSdkFromRoot)' == 'true' and '$(RootDirectoryBuildPropsImported)' != 'true'" />
 
   <PropertyGroup>
     <DefaultSubsetCategories>libraries-installer-coreclr</DefaultSubsetCategories>
@@ -71,7 +75,7 @@
 
     <!-- Libraries -->
     <SubsetName Include="All" Category="Libraries" Description="The .NET libraries comprising the shared framework." />
-    
+
     <!-- CoreClr -->
     <SubsetName Include="All" Category="CoreClr" Description="The .NET runtime." />
 
@@ -93,12 +97,14 @@
 
   <!-- Libraries sets -->
   <ItemGroup Condition="$(_subsetCategory.Contains('libraries')) and $(_subset.Contains('all'))">
-    <ProjectToBuild Include="$(LibrariesProjectRoot)build.proj" />
+    <LibrariesProjectToBuild Include="$(LibrariesProjectRoot)build.proj" />
+    <ProjectToBuild Include="@(LibrariesProjectToBuild)" />
   </ItemGroup>
 
   <!-- CoreClr sets -->
   <ItemGroup Condition="$(_subsetCategory.Contains('coreclr')) and $(_subset.Contains('all'))">
-    <ProjectToBuild Include="$(CoreClrProjectRoot)coreclr.proj" />
+    <CoreClrProjectToBuild Include="$(CoreClrProjectRoot)coreclr.proj" />
+    <ProjectToBuild Include="@(CoreClrProjectToBuild)" />
   </ItemGroup>
 
   <!-- Installer sets -->
diff --git a/eng/Tools.props b/eng/Tools.props
index a763640c26f89b..4d7d628472d50f 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -12,14 +12,11 @@
     <!-- 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)]" />
 
-    <!-- corefx -->
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
-
     <!-- roslyn -->
     <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 588fd63fb24386..c80da727d0c3c3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,5 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.19563.6">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.NETCore.Targets" Version="5.0.0-alpha.1.19563.6">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="5.0.0-alpha.1.19563.6">
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
@@ -28,10 +20,6 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>cf64918877d98577363bb40d5eafac52beb80a79</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19563.3">
-      <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>2c4fb3250989f014550882f5d165cdc36ebdbd08</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-alpha1.19563.3">
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>2c4fb3250989f014550882f5d165cdc36ebdbd08</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 25eac8a779692d..415780a16decff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -50,12 +50,8 @@
     <MicrosoftDotNetPlatformAbstractionsVersion>3.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
     <!-- CoreClr dependencies -->
     <MicrosoftNETCoreILAsmVersion>5.0.0-alpha1.19563.3</MicrosoftNETCoreILAsmVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19563.3</MicrosoftNETCoreRuntimeCoreCLRVersion>
     <MicrosoftNETSdkILVersion>5.0.0-alpha1.19563.3</MicrosoftNETSdkILVersion>
     <!-- Libraries dependencies -->
-    <MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCorePlatformsVersion>
-    <MicrosoftPrivateCoreFxNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftPrivateCoreFxNETCoreAppVersion>
-    <MicrosoftNETCoreTargetsVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreTargetsVersion>
     <SystemTextJsonVersion>5.0.0-alpha.1.19563.6</SystemTextJsonVersion>
     <SystemTextEncodingsWebVersion>5.0.0-alpha.1.19563.6</SystemTextEncodingsWebVersion>
     <runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
@@ -107,8 +103,6 @@
     <LinuxCoreFxOptimizationDataPackage>optimization.linux-x64.ibc.corefx</LinuxCoreFxOptimizationDataPackage>
     <MicrosoftPrivateIntellisensePackage>microsoft.private.intellisense</MicrosoftPrivateIntellisensePackage>
     <MicrosoftDotNetXUnitConsoleRunnerPackage>Microsoft.DotNet.XUnitConsoleRunner</MicrosoftDotNetXUnitConsoleRunnerPackage>
-    <MicrosoftPrivateCoreFxNETCoreAppPackage>Microsoft.Private.CoreFx.NETCoreApp</MicrosoftPrivateCoreFxNETCoreAppPackage>
-    <MicrosoftNETCorePlatformsPackage>Microsoft.NETCore.Platforms</MicrosoftNETCorePlatformsPackage>
     <MicrosoftNETCoreAppPackage>Microsoft.NETCore.App</MicrosoftNETCoreAppPackage>
     <optimizationIBCCoreCLRPackage>optimization.IBC.CoreCLR</optimizationIBCCoreCLRPackage>
     <optimizationPGOCoreCLRPackage>optimization.PGO.CoreCLR</optimizationPGOCoreCLRPackage>
diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj
deleted file mode 100644
index 7b14fb1d0ca70a..00000000000000
--- a/eng/helixcorefxtests.proj
+++ /dev/null
@@ -1,291 +0,0 @@
-<Project InitialTargets="BuildHelixWorkItems" DefaultTargets="RunInParallelForEachScenario">
-
-  <!-- This project uses the helix SDK, documented at
-       https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk,
-       to send test jobs to helix. -->
-
-  <Import Sdk="Microsoft.DotNet.Helix.Sdk" Project="Sdk.props" Condition=" '$(UsesHelixSdk)' == 'true' " />
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition=" '$(UsesHelixSdk)' != 'true' "/>
-
-  <!-- Import Microsoft.DotNet.Build.Tasks.Feed.targets for `ParseBuildManifest` -->
-  <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
-
-  <!-- This project is copies much logic from helixpublishwitharcade.proj, used to send coreclr tests to Helix. -->
-
-  <!--
-    "RunInParallelForEachScenario" is the "root" target for this Project. It invokes other targets to set up the
-    information needed to submit a job to Helix. It does so by "recursively" invoking this project file with
-    different properties and targets to run, as well as invoking MSBuild on other project files. In particular,
-    it first creates the "correlation payload directory", which is the directory of files used by all Helix
-    submissions. Then, it recursively invokes this Project once per scenario (e.g., normal Pri-1 run, JitStress=2
-    run, JitStressRegs=8 run, etc.), creating a new set of Helix work items for each scenario. For the CoreFX
-    tests, we create one Helix work item for each CoreFX test assembly; there is currently no concept of
-    grouping multiple assemblies into a single Helix work item to, for instance, consolidate multiple short-running
-    assemblies together. (Note that this grouping is done for the CoreCLR tests in helixpublishwitharcade.proj.)
-  -->
-  <Target Name="RunInParallelForEachScenario">
-    <PropertyGroup>
-      <!-- This specifies what properties are needed to be passed down as global properties to a child project. -->
-
-      <_PropertiesToPass>
-        __BuildArch=$(__BuildArch);
-        __BuildOS=$(__BuildOS);
-        __BuildType=$(__BuildType);
-        Creator=$(_Creator);
-        HelixAccessToken=$(_HelixAccessToken);
-        HelixBuild=$(_HelixBuild);
-        HelixSource=$(_HelixSource);
-        HelixTargetQueues=$(_HelixTargetQueues);
-        HelixType=$(_HelixType);
-        PublishTestResults=$(_PublishTestResults);
-        RunCrossGen=$(_RunCrossGen);
-        TimeoutPerTestCollectionInMinutes=$(_TimeoutPerTestCollectionInMinutes)
-      </_PropertiesToPass>
-    </PropertyGroup>
-
-    <Error Condition="'$(_Scenarios)' == ''" Text="_Scenarios not set" />
-
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="PrepareCorrelationPayloadDirectory" Properties="Scenarios=$(_Scenarios)" />
-
-    <ItemGroup>
-      <_Scenarios Include="$(_Scenarios.Split(','))" />
-
-      <!-- MSBuild creates a new instance of the project for each %(_Scenarios.Identity) and can build them in parallel. -->
-      <_ProjectsToBuild Include="$(MSBuildProjectFile)">
-        <AdditionalProperties>$(_PropertiesToPass);Scenario=%(_Scenarios.Identity)</AdditionalProperties>
-      </_ProjectsToBuild>
-    </ItemGroup>
-
-    <PropertyGroup>
-      <_BuildInParallel>false</_BuildInParallel>
-      <_BuildInParallel Condition=" '@(_ProjectsToBuild->Count())' &gt; '1' ">true</_BuildInParallel>
-    </PropertyGroup>
-
-    <!-- Invoke MSBuild on this project file once for each Scenario (because of the "batching" defined in "_ProjectsToBuild").
-         Set "UsesHelixSdk=true" to indicate we want to invoke Helix on this invocation: create the Helix work items and start
-         the jobs. This is done by invoking the "Test" Helix target.
-    -->
-    <MSBuild Projects="@(_ProjectsToBuild)" Targets="Test" BuildInParallel="$(_BuildInParallel)" StopOnFirstFailure="false" Properties="UsesHelixSdk=true" />
-  </Target>
-
-  <!-- Define a set of properties that are input to the Project, and that must be passed down to child processes.
-      (See "_PropertiesToPass" in target "RunInParallelForEachScenario".) If something can be computed, such as
-      properties needed by Helix, they should probably be set in target "BuildHelixWorkItems" instead.
-  -->
-
-  <PropertyGroup>
-    <Creator>$(_Creator)</Creator>
-    <HelixAccessToken>$(_HelixAccessToken)</HelixAccessToken>
-    <HelixBuild>$(_HelixBuild)</HelixBuild>
-    <HelixSource>$(_HelixSource)</HelixSource>
-    <HelixTargetQueues>$(_HelixTargetQueues)</HelixTargetQueues>
-    <HelixType>$(_HelixType)</HelixType>
-
-    <!--
-      TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
-     -->
-    <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
-    <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)artifacts\bin\coreclr</RootBinDir>
-    <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(ProjectDir)artifacts\tests\coreclr\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
-    <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
-
-    <!-- We have a single, universal exclusion file for all CoreFX test exclusions, for CoreFX tests run
-         in the CoreCLR repo. Note in particular that we don't have a unique exclusion file for each test
-         assembly, or for each processor architecture, or for each operating system, or for each stress
-         scenario type. This means that we generally exclude more tests than is strictly necessary for
-         any particular job. However, this mechanism is super simple; we don't need to manage fine-
-         grained exclusions; and there really shouldn't be any (or many) exclusions anyway.
-    -->
-    <CoreFXTestExclusionFile>$(ProjectDir)src\coreclr\tests\CoreFX\CoreFX.issues.rsp</CoreFXTestExclusionFile>
-
-    <TestHostRootPath>$(TestWorkingDir)testhost\</TestHostRootPath>
-    <TestArchiveRuntimeRoot>$(TestWorkingDir)helix\</TestArchiveRuntimeRoot>
-
-    <!-- The VM PDB symbols for Windows live in the same directory as the VM binaries. Set a relative
-         path within TestHostRootPath (root of the correlation payload) that we can use to set the
-         symbol path for the purpose of getting a good stack trace for debug build VM asserts.
-    -->
-    <TestHostPDBPath>shared\$(MicrosoftNETCoreAppPackage)\$(ProductVersion)</TestHostPDBPath>
-
-    <TestAssetBlobFeedUrl>https://dotnetfeed.blob.core.windows.net/dotnet-core</TestAssetBlobFeedUrl>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!--
-      For Windows, we need to use "call", since the command is going to be called from a batch script created by Helix.
-      We "exit /b" at the end of RunTests.cmd. Helix runs some other commands after ours within the batch script,
-      so if we don't use call, then we cause the parent script to exit, and anything after will not be executed.
-      The arguments passed in to the run script in are the runtime directory (-r) and the exclusion response file
-      passed to xunit (rsp-file).
-    -->
-    <HelixCommand Condition="'$(TargetsWindows)' == 'true'">call RunTests.cmd -r %HELIX_CORRELATION_PAYLOAD% --rsp-file %HELIX_CORRELATION_PAYLOAD%\CoreFX.issues.rsp </HelixCommand>
-    <HelixCommand Condition="'$(TargetsWindows)' != 'true'">./RunTests.sh -r $HELIX_CORRELATION_PAYLOAD --rsp-file $HELIX_CORRELATION_PAYLOAD/CoreFX.issues.rsp </HelixCommand>
-  </PropertyGroup>
-
-  <!--
-    Copy the CoreFX test exclusion response file (which is passed to the xunit console runner) to someplace we can
-    access it during the test run. We currently just copy it to the root of the generated .NET Core testhost
-    directory, which we use as the root of the correlation directory.
-  -->
-  <Target Name="CopyRSPFile">
-    <Copy
-      SourceFiles="$(CoreFXTestExclusionFile)"
-      DestinationFolder="$(TestHostRootPath)" />
-
-    <Message Importance="High" Text="Copied $(CoreFXTestExclusionFile) into $(TestHostRootPath)" />
-  </Target>
-
-  <PropertyGroup>
-    <!-- Set the name of the scenario file. Note that this is only used in invocations where $(Scenario) is set. -->
-    <TestEnvFileName Condition=" '$(TargetsWindows)' == 'true' ">SetStressModes_$(Scenario).cmd</TestEnvFileName>
-    <TestEnvFileName Condition=" '$(TargetsWindows)' != 'true' ">SetStressModes_$(Scenario).sh</TestEnvFileName>
-  </PropertyGroup>
-
-  <Target Name="CreateTestEnvFile">
-    <!-- This target creates one __TestEnv file for the single $(Scenario). -->
-
-    <PropertyGroup>
-      <TestEnvFilePath>$(TestHostRootPath)$(TestEnvFileName)</TestEnvFilePath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_ProjectsToBuild Include="$(ProjectDir)src\coreclr\tests\testenvironment.proj">
-        <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
-      </_ProjectsToBuild>
-    </ItemGroup>
-
-    <MSBuild Projects="@(_ProjectsToBuild)" Targets="CreateTestEnvFile" StopOnFirstFailure="true" />
-
-    <Message Importance="High" Text="Created $(TestEnvFilePath) for scenario $(Scenario)" />
-    <Error Condition="!Exists('$(TestEnvFilePath)')" Text="File $(TestEnvFilePath) not found!" />
-  </Target>
-
-  <Target Name="CreateAllScenarioTestEnvFiles">
-    <!-- This target creates one __TestEnv file for each of the scenarios in the $(Scenarios) comma-separated list. -->
-
-    <ItemGroup>
-      <_Scenario Include="$(Scenarios.Split(','))" />
-      <_ProjectsToBuild Include="$(MSBuildProjectFile)">
-        <AdditionalProperties>Scenario=%(_Scenario.Identity)</AdditionalProperties>
-      </_ProjectsToBuild>
-    </ItemGroup>
-
-    <MSBuild Projects="@(_ProjectsToBuild)" Targets="CreateTestEnvFile" StopOnFirstFailure="true" />
-  </Target>
-
-  <!--
-    Collect all the tasks needed to be run once, to prepare the Helix correlation payload directory.
-    This just causes its dependent targets to be run.
-  -->
-  <Target Name="PrepareCorrelationPayloadDirectory"
-          DependsOnTargets="CopyRSPFile;CreateAllScenarioTestEnvFiles" >
-  </Target>
-
-  <!--
-    Parse the test asset manifest at, e.g.,
-        https://dotnetfeed.blob.core.windows.net/dotnet-core/corefx-tests/4.6.0-preview6.19264.9/Linux.arm64/netcoreapp/corefx-test-assets.xml
-    to figure out the tests to run. This manifest is created by the corefx official build, for use in the coreclr repo.
-    
-    This creates a "TestAssetBlobInfos" item group, which is used to create the Helix work items.
-
-    NOTE: we are running this once for each Scenario, meaning we are reading and parsing it once per scenario. Ideally, we would
-    do this once and pass it down to the "BuildHelixWorkItems" task later. That's a little difficult given all the re-invocations
-    of this Project we do. It doesn't seem too expensive anyway.
-  -->
-  <Target Name="GetTestAssetManifest" Condition=" '$(UsesHelixSdk)' == 'true' " >
-    <PropertyGroup>
-      <_TargetGroup>netcoreapp</_TargetGroup>
-      <_AssetManifestPath>$(TestAssetBlobFeedUrl)/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml</_AssetManifestPath>
-    </PropertyGroup>
-
-    <ParseBuildManifest AssetManifestPath="$(_AssetManifestPath)">
-      <Output TaskParameter="BlobInfos" ItemName="TestAssetBlobInfos" />
-    </ParseBuildManifest>
-  </Target>
-
-  <!--
-    The following item and property groups are setting things needed by Helix, to describe the jobs
-    we are creating. Ideally, we would put them inside the "BuildHelixWorkItems" task, which is what
-    we run to create the Helix correlation payload and work item groups. However, the Helix SDK
-    references some of these in "InitialTargets", and we don't have control over the order of
-    InitialTargets running, so we need to make these "global". All the "global" item and property
-    groups will be evaluated before the Helix InitialTargets are run.
-  -->
-
-  <!-- HelixPreCommands is a set of commands run before the work item command. We use it here to inject
-       setting up the per-scenario environment.
-  -->
-
-  <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
-    <HelixPreCommand Include="set __TestEnv=%HELIX_CORRELATION_PAYLOAD%\$(TestEnvFileName)" />
-    <HelixPreCommand Include="type %__TestEnv%" />
-    <HelixPreCommand Include="call %__TestEnv%" />
-    <!-- Display the interesting COMPlus variables that are set in the environment -->
-    <HelixPreCommand Include="set COMPlus" />
-    <!-- Set _NT_SYMBOL_PATH so VM _ASSERTE() asserts can find the symbol files when doing stack walks -->
-    <HelixPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%\$(TestHostPDBPath)" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetsWindows)' != 'true' ">
-    <HelixPreCommand Include="export __TestEnv=$HELIX_CORRELATION_PAYLOAD/$(TestEnvFileName)" />
-    <HelixPreCommand Include="cat $__TestEnv" />
-    <HelixPreCommand Include=". $__TestEnv" /> <!-- Use "." not "source"; some clients appear to run scripts with "sh" not "bash" -->
-    <!-- Display the interesting COMPlus variables that are set in the environment -->
-    <HelixPreCommand Include="printenv | grep COMPlus" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <HelixArchitecture>$(__BuildArch)</HelixArchitecture>
-
-    <HelixConfiguration Condition=" '$(Scenario)' == 'normal' ">$(BuildType)</HelixConfiguration>
-    <HelixConfiguration Condition=" '$(Scenario)' != 'normal' ">$(BuildType)-$(Scenario)</HelixConfiguration>
-
-    <TestRunNamePrefix>CoreFX </TestRunNamePrefix>
-    <TestRunNamePrefix Condition=" '$(Scenario)' == 'normal' ">$(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) @ </TestRunNamePrefix>
-    <TestRunNamePrefix Condition=" '$(Scenario)' != 'normal' ">$(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ </TestRunNamePrefix>
-
-    <!-- REVIEW: it seems like this should be referencing "PublishTestResults" instead (without the underscore) -->
-    <EnableAzurePipelinesReporter>$(_PublishTestResults)</EnableAzurePipelinesReporter>
-    <EnableAzurePipelinesReporter Condition=" '$(EnableAzurePipelinesReporter)' == '' ">false</EnableAzurePipelinesReporter>
-
-    <EnableXUnitReporter>true</EnableXUnitReporter>
-    <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
-    <FailOnWorkItemFailure>true</FailOnWorkItemFailure>
-    <WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
-
-    <!-- Specify the retry policy for Helix jobs -->
-    <!-- REVIEW: currently don't do any retries
-    <MaxRetryCount Condition="'$(MaxRetryCount)' == ''">4</MaxRetryCount>
-    -->
-  </PropertyGroup>
-
-  <!--
-    Create all the Helix data to start a set of jobs. This is invoked once for each Scenario (see
-    target "RunInParallelForEachScenario"). Create a set of work items, one for each CoreFX test assembly.
-    All will have the same Scenario specific command line.  Note that this target is listed in the
-    InitialTargets for this Project. This causes it to be invoked (and the Helix data created,
-    such as the HelixWorkItem item group) before Helix "Test" target is invoked (as a normal target).
-    We conditionalize this (and its dependent targets) with "UsesHelixSdk=true" so they aren't invoked
-    during the other invocations of this Project, such as when "RunInParallelForEachScenario" is run.
-  -->
-  <Target Name="BuildHelixWorkItems" DependsOnTargets="GetTestAssetManifest" Condition=" '$(UsesHelixSdk)' == 'true' " >
-    <Error Condition=" '$(TimeoutPerTestCollectionInMinutes)' == '' " Text="TimeoutPerTestCollectionInMinutes not set" />
-
-    <ItemGroup Condition=" '$(UsesHelixSdk)' == 'true' ">
-      <HelixCorrelationPayload Include="$(TestHostRootPath)" />
-
-      <HelixWorkItem Include="@(TestAssetBlobInfos -> '%(FileName)')">
-        <PayloadUri>$(TestAssetBlobFeedUrl)/%(Identity)</PayloadUri>
-        <Command>$(HelixCommand)</Command>
-        <Timeout>$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</Timeout>
-      </HelixWorkItem>
-    </ItemGroup>
-  </Target>
-
-  <Import Sdk="Microsoft.DotNet.Helix.Sdk" Project="Sdk.targets" Condition=" '$(UsesHelixSdk)' == 'true' " />
-
-</Project>
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
new file mode 100644
index 00000000000000..b3b8688ca20019
--- /dev/null
+++ b/eng/liveBuilds.targets
@@ -0,0 +1,135 @@
+<Project>
+
+  <PropertyGroup>
+    <HostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</HostArch>
+    <CoreCLROSGroup Condition="'$(CoreCLROSGroup)' == ''">$(OSGroup)</CoreCLROSGroup>
+    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(Configuration)</CoreCLRConfiguration>
+    <LibrariesOSGroup Condition="'$(LibrariesOSGroup)' == ''">$(OSGroup)</LibrariesOSGroup>
+    <LibrariesConfiguration Condition="'$(LibrariesConfiguration)' == ''">$(Configuration)</LibrariesConfiguration>
+    <CoreCLRArtifactsPathInTree>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLROSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)'))</CoreCLRArtifactsPathInTree>
+    <LibrariesSharedFrameworkRefArtifactsPathInTree>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)'))</LibrariesSharedFrameworkRefArtifactsPathInTree>
+    <LibrariesOOBRefArtifactsPathInTree>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'oob', '$(LibrariesConfiguration)'))</LibrariesOOBRefArtifactsPathInTree>
+    <LibrariesSharedFrameworkBinArtifactsPathInTree>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesSharedFrameworkBinArtifactsPathInTree>
+    <LibrariesOOBBinArtifactsPathInTree>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'oob', 'runtime', '$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesOOBBinArtifactsPathInTree>
+    <LibrariesNativeArtifactsPathInTree>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))</LibrariesNativeArtifactsPathInTree>
+    <CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$(CoreCLRArtifactsPathInTree)</CoreCLRArtifactsPath>
+    <LibrariesSharedFrameworkRefArtifactsPath Condition="'$(LibrariesSharedFrameworkRefArtifactsPath)' == ''">$(LibrariesSharedFrameworkRefArtifactsPathInTree)</LibrariesSharedFrameworkRefArtifactsPath>
+    <LibrariesOOBRefArtifactsPath Condition="'$(LibrariesOOBRefArtifactsPath)' == ''">$(LibrariesOOBRefArtifactsPathInTree)</LibrariesOOBRefArtifactsPath>
+    <LibrariesSharedFrameworkBinArtifactsPath Condition="'$(LibrariesSharedFrameworkBinArtifactsPath)' == ''">$(LibrariesSharedFrameworkBinArtifactsPathInTree)</LibrariesSharedFrameworkBinArtifactsPath>
+    <LibrariesOOBBinArtifactsPath Condition="'$(LibrariesOOBBinArtifactsPath)' == ''">$(LibrariesOOBBinArtifactsPathInTree)</LibrariesOOBBinArtifactsPath>
+    <LibrariesNativeArtifactsPath Condition="'$(LibrariesNativeArtifactsPath)' == ''">$(LibrariesNativeArtifactsPathInTree)</LibrariesNativeArtifactsPath>
+    <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm64' and '$(HostArch)' != 'arm64'">x64</CoreCLRCrossTargetComponentDirName>
+    <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(HostArch)' != 'arm' and '$(TargetsWindows)' == 'true'">x86</CoreCLRCrossTargetComponentDirName>
+    <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(HostArch)' != 'arm' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName>
+  </PropertyGroup>
+
+  <Target Name="ResolveCoreCLRFilesFromLocalBuild">
+    <PropertyGroup>
+      <BuildCoreCLRDependency Condition="'$(BuildCoreCLRDependency)' == '' and '$(CoreCLRArtifactsPath)' == '$(CoreCLRArtifactsPathInTree)'">true</BuildCoreCLRDependency>
+    </PropertyGroup>
+
+    <MSBuild
+      Condition="'$(BuildCoreCLRDependency)' == 'true'"
+      Projects="@(CoreClrProjectToBuild)"
+      Targets="Build"
+      BuildInParallel="true"
+      Properties="Configuration=$(CoreCLRConfiguration);
+        TargetArchitecture=$(TargetArchitecture);
+        OSGroup=$(CoreCLROSGroup)" />
+
+    <Error Condition="!Exists('$(CoreCLRArtifactsPath)')" Text="The CoreCLR artifacts path does not exist '$(CoreCLRArtifactsPath)'. The CoreCLR subset category must be built before building this project." />
+
+    <PropertyGroup>
+      <CoreCLRArtifactsPath>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)'))</CoreCLRArtifactsPath>
+    </PropertyGroup>
+    <PropertyGroup>
+      <CoreCLRSharedFrameworkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','sharedFramework'))</CoreCLRSharedFrameworkDir>
+      <CoreCLRCrossTargetComponentDir
+        Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''">$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','$(CoreCLRCrossTargetComponentDir)','sharedFramework'))</CoreCLRCrossTargetComponentDir>
+    </PropertyGroup>
+    <ItemGroup>
+      <CoreCLRFiles Include="$(CoreCLRSharedFrameworkDir)*.*" />
+      <CoreCLRCrossTargetFiles Condition="'$(CoreCLRCrossTargetComponentDir)' != ''" Include="$(CoreCLRCrossTargetComponentDir)*.*" />
+      <CoreCLRFiles Include="$(CoreCLRArtifactsPath)Redist/**/*.dll" />
+      <CoreCLRFiles>
+        <IsNative>true</IsNative>
+      </CoreCLRFiles>
+      <CoreCLRFiles Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll" />
+      <CoreCLRFiles
+        Include="
+          $(CoreCLRSharedFrameworkDir)PDB/*.pdb;
+          $(CoreCLRSharedFrameworkDir)PDB/*.dbg;
+          $(CoreCLRSharedFrameworkDir)PDB/*.dwarf" />
+      <CoreCLRFiles
+        Include="$(CoreCLRArtifactsPath)PDB/System.Private.CoreLib.pdb;" />
+      <CoreCLRFiles Condition="Exists('$(CoreCLRArtifactsPath)PDB/System.Private.CoreLib.ni.pdb')"
+        Include="$(CoreCLRArtifactsPath)PDB/System.Private.CoreLib.ni.pdb" />
+      <CoreCLRCrossTargetFiles Condition="'$(CoreCLRCrossTargetComponentDir)' != ''"
+        Include="
+          $(CoreCLRCrossTargetComponentDir)PDB/*.pdb;
+          $(CoreCLRCrossTargetComponentDir)PDB/*.dbg;
+          $(CoreCLRCrossTargetComponentDir)PDB/*.dwarf" />
+
+      <CoreCLRCrossTargetFiles>
+        <TargetPath>runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
+      </CoreCLRCrossTargetFiles>
+    </ItemGroup>
+
+    <Error Condition="'@(CoreCLRFiles)' == ''" Text="The CoreCLR subset category must be built before building this project." />
+  </Target>
+
+  <Target Name="ResolveLibrariesFromLocalBuild">
+    <PropertyGroup Condition="'$(BuildLibrariesDependency)' == ''">
+      <BuildLibrariesDependency Condition="'$(LibrariesSharedFrameworkRefArtifactsPath)' == '$(LibrariesSharedFrameworkRefArtifactsPathInTree)'">true</BuildLibrariesDependency>
+      <BuildLibrariesDependency Condition="'$(LibrariesOOBRefArtifactsPath)' == '$(LibrariesOOBRefArtifactsPathInTree)'">true</BuildLibrariesDependency>
+      <BuildLibrariesDependency Condition="'$(LibrariesSharedFrameworkBinArtifactsPath)' == '$(LibrariesSharedFrameworkBinArtifactsPathInTree)'">true</BuildLibrariesDependency>
+      <BuildLibrariesDependency Condition="'$(LibrariesOOBBinArtifactsPath)' == '$(LibrariesOOBBinArtifactsPathInTree)'">true</BuildLibrariesDependency>
+      <BuildLibrariesDependency Condition="'$(LibrariesNativeArtifactsPath)' == '$(LibrariesNativeArtifactsPathInTree)'">true</BuildLibrariesDependency>
+    </PropertyGroup>
+
+    <MSBuild
+      Condition="'$(BuildLibrariesDependency)' == 'true'"
+      Projects="@(LibrariesProjectToBuild)"
+      Targets="Build"
+      BuildInParallel="true"
+      Properties="
+        ConfigurationGroup=$(LibrariesConfiguration);
+        ArchGroup=$(TargetArchitecture);
+        OSGroup=$(LibrariesOSGroup)" />
+
+
+    <Error Condition="!Exists('$(LibrariesSharedFrameworkRefArtifactsPath)')" Text="The libraries subset category must be built before building this project." />
+    <Error Condition="!Exists('$(LibrariesOOBRefArtifactsPath)')" Text="The libraries subset category must be built before building this project." />
+    <Error Condition="!Exists('$(LibrariesSharedFrameworkBinArtifactsPath)')" Text="The libraries subset category must be built before building this project." />
+    <Error Condition="!Exists('$(LibrariesOOBBinArtifactsPath)')" Text="The libraries subset category must be built before building this project." />
+    <Error Condition="!Exists('$(LibrariesNativeArtifactsPath)')" Text="The libraries subset category must be built before building this project." />
+    <ItemGroup>
+      <LibrariesRefAssemblies Include="$(LibrariesSharedFrameworkRefArtifactsPath)*.dll;$(LibrariesSharedFrameworkRefArtifactsPath)*.pdb" />
+      <LibrariesRefAssemblies Condition="'$(IncludeOOBLibraries)' == 'true'" Include="$(LibrariesOOBRefArtifactsPath)*.dll;$(LibrariesOOBRefArtifactsPath)*.pdb" />
+      <LibrariesRuntimeFiles Include="
+        $(LibrariesSharedFrameworkBinArtifactsPath)*.dll;
+        $(LibrariesSharedFrameworkBinArtifactsPath)*.pdb"
+        IsNative="" />
+      <LibrariesRuntimeFiles Condition="'$(IncludeOOBLibraries)' == 'true'" Include="
+        $(LibrariesOOBBinArtifactsPath)*.dll;
+        $(LibrariesOOBBinArtifactsPath)*.pdb"
+        IsNative="" />
+      <LibrariesRuntimeFiles Include="
+        $(LibrariesNativeArtifactsPath)*.dll;
+        $(LibrariesNativeArtifactsPath)*.dylib;
+        $(LibrariesNativeArtifactsPath)*.so;
+        $(LibrariesNativeArtifactsPath)*.dbg;
+        $(LibrariesNativeArtifactsPath)*.dwarf;
+        $(LibrariesNativeArtifactsPath)*.pdb"
+        IsNative="true" />
+    </ItemGroup>
+
+    <Error Condition="'@(LibrariesRefAssemblies)' == ''" Text="The libraries subset category must be built before building this project." />
+    <Error Condition="'@(LibrariesRuntimeFiles)' == ''" Text="The libraries subset category must be built before building this project." />
+  </Target>
+
+  <PropertyGroup>
+    <LiveRuntimeIdentifierGraphPath>$(RuntimeIdGraphDefinitionFile)</LiveRuntimeIdentifierGraphPath>
+    <RuntimeIdentifierGraphPath Condition="'$(UseLiveRuntimeIdentifierGraph)' == 'true'">$(LiveRuntimeIdentifierGraphPath)</RuntimeIdentifierGraphPath>
+  </PropertyGroup>
+</Project>
diff --git a/eng/packaging.props b/eng/packaging.props
index 2b76c44449ed6f..66d31a8d071043 100644
--- a/eng/packaging.props
+++ b/eng/packaging.props
@@ -3,7 +3,6 @@
     <PackageDescriptionFile>$(PkgDir)descriptions.json</PackageDescriptionFile>
     <PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
-    <RuntimeIdGraphDefinitionFile>$(PkgDir)Microsoft.NETCore.Platforms/runtime.json</RuntimeIdGraphDefinitionFile>
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
     <ProjectUrl Condition="'$(ProjectUrl)' == ''">https://github.com/dotnet/corefx</ProjectUrl>
     <Copyright>$(CopyrightNetFoundation)</Copyright>
@@ -31,7 +30,7 @@
     <SkipGenerationCheck>true</SkipGenerationCheck>
     <SkipIndexCheck>true</SkipIndexCheck>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
     <!-- Don't build referenced projects -->
     <BuildPackageLibraryReferences>false</BuildPackageLibraryReferences>
diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index f126181d88b681..532487b9792eda 100644
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -237,7 +237,7 @@ if not exist "%VSINSTALLDIR%DIA SDK" goto NoDIA
 
 set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0"
 call "%__SourceDir%\pal\tools\gen-buildsys.cmd" "%__ProjectFilesDir%" "%__NativeTestIntermediatesDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
-  
+
 if not !errorlevel! == 0 (
     echo %__ErrMsgPrefix%%__MsgPrefix%Error: failed to generate native component build project!
     exit /b 1
@@ -474,37 +474,6 @@ if errorlevel 1 (
 
 xcopy /s /y /i "%CORE_ROOT_STAGE%" "%CORE_ROOT%"
 
-REM =========================================================================================
-REM ===
-REM === Create the test host necessary for running CoreFX tests.
-REM === The test host includes a dotnet executable, system libraries and CoreCLR assemblies found in CORE_ROOT.
-REM ===
-REM =========================================================================================
-
-echo %__MsgPrefix%Building CoreFX test host
-
-set __BuildLogRootName=Tests_CoreFX_Testhost
-set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
-set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn
-set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err
-set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%"
-set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
-set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
-set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr!
-
-powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\msbuild.ps1" %__ArcadeScriptArgs%^
-  %__ProjectDir%\tests\src\runtest.proj /t:CreateTestHost /nodeReuse:false^
-  /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^
-  /p:UsePartialNGENOptimization=false /maxcpucount^
-  !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %__PriorityArg% %__UnprocessedBuildArgs%
-if errorlevel 1 (
-    echo %__ErrMsgPrefix%%__MsgPrefix%Error: Create Test Host failed. Refer to the build log files for details:
-    echo     %__BuildLog%
-    echo     %__BuildWrn%
-    echo     %__BuildErr%
-    exit /b 1
-)
-
 REM =========================================================================================
 REM ===
 REM === Create test wrappers.
diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index 3f0fc0634b5150..21af3fd3433960 100755
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -132,16 +132,6 @@ generate_layout()
     fi
 }
 
-patch_corefx_libraries()
-{
-    echo "${__MsgPrefix}Patching CORE_ROOT: '${CORE_ROOT}' with CoreFX libaries from enlistment '${__LocalCoreFXPath}"
-
-    patchCoreFXArguments=("-clr_core_root" "${CORE_ROOT}" "-fx_root" "${__LocalCoreFXPath}" "-arch" "${__BuildArch}" "-build_type" "${__BuildType}")
-    scriptPath="$__ProjectDir/tests/scripts"
-    echo "python ${scriptPath}/patch-corefx.py ${patchCoreFXArguments[@]}"
-    $__Python "${scriptPath}/patch-corefx.py" "${patchCoreFXArguments[@]}"
-}
-
 precompile_coreroot_fx()
 {
     local overlayDir=$CORE_ROOT
@@ -231,22 +221,6 @@ function is_skip_crossgen_test {
     return 1
 }
 
-generate_testhost()
-{
-    echo "${__MsgPrefix}Generating test host..."
-
-    export TEST_HOST=$xUnitTestBinBase/testhost
-
-    if [ -d "${TEST_HOST}" ]; then
-        rm -rf $TEST_HOST
-    fi
-
-    mkdir -p $TEST_HOST
-
-    build_MSBuild_projects "Tests_Generate_TestHost" "${__ProjectDir}/tests/src/runtest.proj" "Creating test host" "/t:CreateTestHost"
-}
-
-
 build_Tests()
 {
     echo "${__MsgPrefix}Building Tests..."
@@ -372,10 +346,6 @@ build_Tests()
     if [ $__SkipGenerateLayout != 1 ]; then
         generate_layout
     fi
-
-    if [ ! -z "$__LocalCoreFXPath" ]; then
-        patch_corefx_libraries
-    fi
 }
 
 build_MSBuild_projects()
@@ -574,10 +544,9 @@ usage_list=("-buildtestwrappersonly - only build the test wrappers.")
 usage_list+=("-copynativeonly: Only copy the native test binaries to the managed output. Do not build the native or managed tests.")
 usage_list+=("-crossgen - Precompiles the framework managed assemblies in coreroot.")
 usage_list+=("-generatelayoutonly - only pull down dependencies and build coreroot.")
-usage_list+=("-generatetesthostonly - only pull down dependencies and build coreroot and the CoreFX testhost.")
 usage_list+=("-priority1 - include priority=1 tests in the build.")
 usage_list+=("-runtests - run tests after building them.")
-usage_list+=("-skipgeneratelayout: Do not generate the Core_Root layout or the CoreFX testhost.")
+usage_list+=("-skipgeneratelayout: Do not generate the Core_Root layout.")
 usage_list+=("-skiprestorepackages - skip package restore.")
 
 # Obtain the location of the bash script to figure out where the root of the repo is.
@@ -630,16 +599,6 @@ handle_arguments() {
             __SkipGenerateLayout=1
             ;;
 
-        localcorefxpath)
-            if [ -n "$2" ]; then
-                __LocalCoreFXPath="$2"
-                shift
-            else
-                echo "ERROR: 'localcorefxpath' requires a non-empty option argument"
-                exit 1
-            fi
-            ;;
-
         *)
             __UnprocessedBuildArgs+=("$1")
             ;;
@@ -750,9 +709,6 @@ elif [ ! -z "$__BuildTestWrappersOnly" ]; then
     build_test_wrappers
 else
     generate_layout
-    if [ ! -z "$__GenerateTestHostOnly" ]; then
-        generate_testhost
-    fi
 fi
 
 if [ $? -ne 0 ]; then
diff --git a/src/coreclr/coreclr.proj b/src/coreclr/coreclr.proj
index 13218414dff063..421e049cebb64e 100644
--- a/src/coreclr/coreclr.proj
+++ b/src/coreclr/coreclr.proj
@@ -5,12 +5,12 @@
   <Target Name="Build">
     <ItemGroup>
       <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows))" Include="-skiptests" />
-      <_CoreClrBuildArg Include="-$(Platform)" />
+      <_CoreClrBuildArg Condition="'$(TargetArchitecture)' != ''" Include="-$(TargetArchitecture)" />
       <_CoreClrBuildArg Include="-$(Configuration.ToLower())" />
       <_CoreClrBuildArg Condition="'$(ContinuousIntegrationBuild)' == 'true'" Include="-ci" />
-      <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and ('$(Platform)' == 'x86' or '$(Platform)' == 'x64') and '$(Configuration)' == 'Release'" Include="-enforcepgo" />
+      <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'x64') and '$(Configuration)' == 'Release'" Include="-enforcepgo" />
       <_CoreClrBuildArg Condition="!$([MSBuild]::IsOsPlatform(Windows)) and '$(Configuration)' == 'Release'" Include="-stripsymbols" />
-      <_CoreClrBuildArg Condition="'$(OfficialBuildId)' == ''" Include="-officialbuildid=$(OfficialBuildId)" />
+      <_CoreClrBuildArg Condition="'$(OfficialBuildId)' != ''" Include="-officialbuildid=$(OfficialBuildId)" />
     </ItemGroup>
 
     <PropertyGroup>
diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index ee1a80d71879e8..6336b791dc5801 100644
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -7,7 +7,6 @@
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
     <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
@@ -35,12 +34,6 @@
     <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
       <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
     </DependencyBuildInfo>
-
-    <XmlUpdateStep Include="CoreClr">
-      <Path>$(MSBuildThisFileFullPath)</Path>
-      <ElementName>MicrosoftNETCoreRuntimeCoreCLRPackageVersion</ElementName>
-      <PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
-    </XmlUpdateStep>
   </ItemGroup>
 
   <!-- Override isolated build dependency versions with versions from Repo API. -->
diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props
index 6d16a9848935cd..69365bcd15d35b 100644
--- a/src/coreclr/src/.nuget/packaging.props
+++ b/src/coreclr/src/.nuget/packaging.props
@@ -6,7 +6,6 @@
     <PackageLicenseFile>$(CoreclrDir)/LICENSE.TXT</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(CoreclrDir)/THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
 
-    <RuntimeIdGraphDefinitionFile>$(NuGetPackageRoot)/microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsVersion)/runtime.json</RuntimeIdGraphDefinitionFile>
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
 
     <ProjectUrl>https://dot.net</ProjectUrl>
diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props
index 77c129c9ccedcb..532dacb7e90403 100644
--- a/src/coreclr/tests/Directory.Build.props
+++ b/src/coreclr/tests/Directory.Build.props
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <RunningOnUnix Condition="('$(RunningOnUnix)' == '') And ('$(MSBuildRuntimeType)' == 'Core') And ('$(OS)'!='Windows_NT')">true</RunningOnUnix>
-  </PropertyGroup>  
+  </PropertyGroup>
 
   <!-- Common repo directories -->
   <PropertyGroup>
@@ -51,27 +51,14 @@
     <RestorePackages>false</RestorePackages>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
-    <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile>
-  </PropertyGroup>
-
-  <!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in artifacts/obj -->
-  <Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" />
-
-  <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
-    <VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore>
-    <VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionToRestore>
-    <PackageVersionArg>/p:MicrosoftNETCoreRuntimeCoreCLRPackageVersion=$(VersionToRestore)</PackageVersionArg>
-  </PropertyGroup>
-
   <!-- Which tests shall we build? Default: Priority 0 tests.
     At the command-line, the user can specify /p:CLRTestPriorityToBuild=666 (for example), and
-    all tests with CLRTestPriority 666,..., 1 AND 0 will build. 
-    
+    all tests with CLRTestPriority 666,..., 1 AND 0 will build.
+
     Consequently, specifying CLRTestPriorityToBuild=1 will build all tests with CLRTestPriority 1 and 0.
-    
-    CLRTestPriority = 0 will build only priority 0 cases. 
-  
+
+    CLRTestPriority = 0 will build only priority 0 cases.
+
     In other words, the CLRTestPriority cases of 0 are *essential* testcases. The higher the value,
     the less priority we give them.
    -->
@@ -86,5 +73,5 @@
     <NETCoreAppTestHostFxrPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(TestHostVersion)'))</NETCoreAppTestHostFxrPath>
     <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(TestHostVersion)'))</NETCoreAppTestSharedFrameworkPath>
   </PropertyGroup>
-  
+
 </Project>
diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj
index ee9112a60804f5..091430dc951e0a 100644
--- a/src/coreclr/tests/build.proj
+++ b/src/coreclr/tests/build.proj
@@ -19,12 +19,9 @@
 
   <ItemGroup>
     <RestoreProjects Include="$(MSBuildThisFileDirectory)scripts\scripts.csproj" />
-    <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" />
-    <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" />
     <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" />
     <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" />
     <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj" />
-    <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\CoreFX\CoreFX.csproj" />
     <RestoreProjects Include="$(MSBuildThisFileDirectory)external\external.csproj" />
     <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\ilasm\ilasm.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets
index b32770001c5206..6096501eb5a773 100644
--- a/src/coreclr/tests/publishdependency.targets
+++ b/src/coreclr/tests/publishdependency.targets
@@ -23,18 +23,6 @@
     <CoreRootProjectFiles Include="$(SourceDir)Common\test_runtime\test_runtime.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\obj\project.assets.json"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\obj\project.assets.json"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <CrossGenFiles Include="$(NuGetPackageRoot)\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
-  </ItemGroup>
-
   <PropertyGroup>
     <ProductDestination>$(RootRepoDir)\artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)</ProductDestination>
     <RefDestination>$(ProductDestination)\ref</RefDestination>
diff --git a/src/coreclr/tests/scripts/patch-corefx.py b/src/coreclr/tests/scripts/patch-corefx.py
deleted file mode 100644
index bbc44c1af07737..00000000000000
--- a/src/coreclr/tests/scripts/patch-corefx.py
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/usr/bin/env python3
-#
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-#
-##########################################################################
-##########################################################################
-#
-# Module: patch-corefx.py
-#
-# Notes:
-#
-# Script to overwrite the nuget downloaded corefx libraries with ones 
-# built from a local enlistment.
-#
-##########################################################################
-##########################################################################
-
-import argparse
-import distutils.dir_util
-import os
-import re
-import shutil
-import subprocess
-import sys
-
-##########################################################################
-# Globals
-##########################################################################
-
-testing = False
-
-# This should be factored out of build.sh
-Unix_name_map = {
-    'Linux': 'Linux',
-    'Darwin': 'OSX',
-    'FreeBSD': 'FreeBSD',
-    'OpenBSD': 'OpenBSD',
-    'NetBSD': 'NetBSD',
-    'SunOS': 'SunOS'
-}
-
-Is_windows = (os.name == 'nt')
-
-##########################################################################
-# Delete protocol
-##########################################################################
-
-def del_rw(action, name, exc):
-    os.chmod(name, 0o651)
-    os.remove(name)
-
-##########################################################################
-# Argument Parser
-##########################################################################
-
-description = 'Tool to patch CoreFx tests on the CoreCLR repo'
-
-parser = argparse.ArgumentParser(description=description)
-
-parser.add_argument('-arch', dest='arch', default='x64')
-parser.add_argument('-build_type', dest='build_type', default='Debug')
-parser.add_argument('-clr_core_root', dest='clr_core_root', default=None)
-parser.add_argument('-fx_root', dest='fx_root', default=None)
-
-
-##########################################################################
-# Helper Functions
-##########################################################################
-
-def validate_args(args):
-    """ Validate all of the arguments parsed.
-    Args:
-        args (argparser.ArgumentParser): Args parsed by the argument parser.
-    Returns:
-        (arch, build_type, clr_core_root, fx_root,)
-            (str, str, str, str)
-    Notes:
-    If the arguments are valid then return them all in a tuple. If not, raise
-    an exception stating x argument is incorrect.
-    """
-
-    arch = args.arch
-    build_type = args.build_type
-    clr_core_root = args.clr_core_root
-    fx_root = args.fx_root
-
-    def validate_arg(arg, check):
-        """ Validate an individual arg
-        Args:
-           arg (str|bool): argument to be validated
-           check (lambda: x-> bool): test that returns either True or False
-                                   : based on whether the check passes.
-
-        Returns:
-           is_valid (bool): Is the argument valid?
-        """
-
-        helper = lambda item: item is not None and check(item)
-
-        if not helper(arg):
-            raise Exception('Argument: %s is not valid.' % (arg))
-
-    valid_archs = ['x86', 'x64', 'arm', 'arm64']
-    valid_build_types = ['Debug', 'Checked', 'Release']
-
-    arch = next((a for a in valid_archs if a.lower() == arch.lower()), arch)
-    build_type = next((b for b in valid_build_types if b.lower() == build_type.lower()), build_type)
-
-    validate_arg(arch, lambda item: item in valid_archs)
-    validate_arg(build_type, lambda item: item in valid_build_types)
-
-    if clr_core_root is None:
-        raise Exception('No clr_core_root argument provided')
-    else:
-        clr_core_root = os.path.normpath(clr_core_root)
-        validate_arg(clr_core_root, lambda item: os.path.isdir(clr_core_root))
-
-    if fx_root is None:
-        raise Exception('No fx_root argument provided')
-    else:
-        fx_root = os.path.normpath(fx_root)
-
-    args = (arch, build_type, clr_core_root, fx_root)
-
-    log('Configuration:')
-    log(' arch: %s' % arch)
-    log(' build_type: %s' % build_type)
-    log(' clr_core_root: %s' % clr_core_root)
-    log(' fx_root: %s' % fx_root)
-
-    return args
-
-def log(message):
-    """ Print logging information
-    Args:
-        message (str): message to be printed
-    """
-
-    print('[%s]: %s' % (sys.argv[0], message))
-
-def test_log(message):
-    """ Print logging information only if testing mode is enabled
-    Args:
-        message (str): message to be printed
-    """
-    if testing:
-        print('[%s]: %s' % (sys.argv[0], message))
-
-def copy_files(source_dir, target_dir):
-    """ Copy any files in the source_dir to the target_dir.
-        The copy is not recursive.
-        The directories must already exist.
-    Args:
-        source_dir (str): source directory path
-        target_dir (str): target directory path
-    Returns:
-        Nothing
-    """
-
-    global testing
-    assert os.path.isdir(source_dir)
-    assert testing or os.path.isdir(target_dir)
-
-    for source_filename in os.listdir(source_dir):
-        source_pathname = os.path.join(source_dir, source_filename)
-        if os.path.isfile(source_pathname):
-            target_pathname = os.path.join(target_dir, source_filename)
-            log('Copy: %s => %s' % (source_pathname, target_pathname))
-            if not testing:
-                shutil.copy2(source_pathname, target_pathname)
-
-def patch_coreclr_root(core_root, fx_bin):
-    """ Walk through the fx bin and patch corefx dlls to the core root.
-    Args:
-        core_root       (str):       the core root path
-        fx_bin          (str):       the runtime folder from a corefx build
-    Returns:
-        nothing
-    """
-    test_log('Patching coreclr core_root')
-
-    forbidden_names = ['coreclr.dll', 
-                       'system.private.corelib.dll',
-                       'r2rdump.dll',
-                       'runincontext.dll',
-                       'mscordaccore.dll',
-                       'linuxnonjit.dll',
-                       'protononjit.dll',
-                       'mscordbi.dll',
-                       'clrjit.dll',
-                       'dbgshim.dll',
-                       'coreshim.dll',
-                       'clrgc.dll',
-                       'superpmi-shim-counter.dll',
-                       'clretwrc.dll',
-                       'superpmi-shim-collector.dll',
-                       'superpmi-shim-simple.dll',
-                       'jitinterface.dll',
-                       'mscorrc.debug.dll',
-                       'mscorrc.dll',
-                       'sos.dll']
-
-    test_log('forbidden_names = %s' % forbidden_names)
-
-    for file in os.listdir(fx_bin):
-        test_log('considering file %s' % file)
-
-        filename = os.path.basename(file)
-        comparename = filename.lower()
-        if (    comparename.endswith('.dll') and  
-                comparename not in forbidden_names and
-                not comparename.startswith('api-ms-core')   ):
-            source_pathname = os.path.join(fx_bin, filename)
-            target_pathname = os.path.join(core_root, filename)
-
-            test_log ('copying file %s to file %s' % (source_pathname, target_pathname))
-
-            shutil.copy2(source_pathname, target_pathname)
-
-##########################################################################
-# Main
-##########################################################################
-
-def main(args):
-    """
-        The way this script decides what to patch is by looking at the core
-        root for a list of dlls, then filtering out any ones built by coreclr.
-        This leaves us with a list of non-coreclr build dlls. Now we can use
-        that list to go through the corefx repo and any ones that also exist
-        in the corefx bin folder are copied over.
-    """
-
-    log('Patching CoreFX binaries from local enlistment.')
-
-    arch, build_type, clr_core_root, fx_root = validate_args(args)
-
-    clr_os = 'Windows_NT' if Is_windows else Unix_name_map[os.uname()[0]]
-
-    if not os.path.exists(clr_core_root):
-        raise Exception('Core root path %s does not exist.' % (core_root))
-
-    fx_bin = os.path.join(fx_root,
-                          'artifacts',
-                          'bin',
-                          'runtime',
-                          'netcoreapp-%s-%s-%s' % (clr_os, build_type, arch))
-
-    if not os.path.exists(fx_bin):
-        raise Exception('CoreFX bin path %s does not exist.' % (core_root))
-
-    patch_coreclr_root(clr_core_root, fx_bin)
-
-
-##########################################################################
-# setup for Main
-##########################################################################
-
-if __name__ == '__main__':
-    Args = parser.parse_args(sys.argv[1:])
-
-    main(Args)
diff --git a/src/coreclr/tests/src/Common/CoreFX/CoreFX.csproj b/src/coreclr/tests/src/Common/CoreFX/CoreFX.csproj
deleted file mode 100644
index 36dccb97ada493..00000000000000
--- a/src/coreclr/tests/src/Common/CoreFX/CoreFX.csproj
+++ /dev/null
@@ -1,150 +0,0 @@
-<Project>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-      <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
-      <Language>C#</Language>
-      <TargetFramework>netcoreapp3.0</TargetFramework>
-      <CLRTestKind>SharedLibrary</CLRTestKind>
-      <IsTestProject>false</IsTestProject>
-      <MicrosoftDiagnosticsRuntimePackageVersion>1.0.5</MicrosoftDiagnosticsRuntimePackageVersion>
-      <OutputType>Library</OutputType>
-      <SelfContained>true</SelfContained>
-      <ProjectDepsFileName>Microsoft.NETCore.App.deps.json</ProjectDepsFileName>
-      <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-      <IncludeMainProjectInDepsFile>false</IncludeMainProjectInDepsFile>
-      <NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
-      <NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
-      <GenerateDependencyFile>true</GenerateDependencyFile>
-      <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
-  </PropertyGroup>
-
-  <!-- Switch RuntimeIdentifier according to currently targeted OSGroup -->
-  <PropertyGroup>
-    <RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-$(Platform)</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-$(Platform)</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-$(Platform)</RuntimeIdentifier>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Microsoft.Private.CoreFx.OOB is a meta-package that contains references to most of what we need -->
-    <PackageReference Include="Microsoft.Private.CoreFx.OOB" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
-
-    <!-- dotnet.exe -->
-    <PackageReference Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreAppVersion)" />
-
-    <!-- hostfxr.dll -->
-    <PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreAppVersion)" />
-
-    <!-- hostpolicy.dll -->
-    <PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreAppVersion)" />
-
-    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
-    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
-    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
-    <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
-  </ItemGroup>
-
-  <!-- Target SetupTestingHost needs to run after "AfterResolveReferences" so @(ReferenceCopyLocalPaths) is
-       set up, and before "BeforeCompile" because @(ReferenceCopyLocalPaths) is cleared out during the
-       compile phase.
-  -->
-
-  <Target Name="SetupTestingHost" DependsOnTargets="ResolveAssemblyReferences">
-
-    <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="Publish"
-             Properties="RuntimeIdentifier=$(RuntimeIdentifier);PublishDir=$(NETCoreAppTestSharedFrameworkPath)" />
-
-    <Error Condition="'$(CORE_ROOT)' == ''"
-           Text="CORE_ROOT variable is not set." />
-
-    <PropertyGroup Condition="'$(OSGroup)'=='Windows_NT'">
-      <HostFxrFileName>hostfxr</HostFxrFileName>
-      <HostFxrFileExtension>dll</HostFxrFileExtension>
-      <DotnetExecutableName>dotnet.exe</DotnetExecutableName>
-      <HostPolicyFileName>hostpolicy</HostPolicyFileName>
-      <HostPolicyExtension>dll</HostPolicyExtension>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(OSGroup)'!='Windows_NT'">
-      <HostFxrFileName>libhostfxr</HostFxrFileName>
-      <HostFxrFileExtension Condition="'$(OSGroup)' == 'Linux' Or '$(OSGroup)' == 'FreeBSD'">so</HostFxrFileExtension>
-      <HostFxrFileExtension Condition="$(OSGroup) =='OSX'">dylib</HostFxrFileExtension>
-      <HostPolicyFileName>libhostpolicy</HostPolicyFileName>
-      <HostPolicyExtension>$(HostFxrFileExtension)</HostPolicyExtension>
-      <DotnetExecutableName>dotnet</DotnetExecutableName>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- Workaround for packages on which Microsoft.NetCoreApp expresses a dependency
-           The <PackageToInclude> element doesn't allow a version to be specified and we end up with clashing assembly versions in Core_Root
-      -->
-      <!--
-      <NetCoreAppPackagedAssemblies Include="System.Text.Encoding.CodePages.dll"/>
-      -->
-
-      <!-- Use xunit dependencies defined in CoreFX.depproj instead of conflicting versions from test dependencies. -->
-      <TestDependenciesToExclude Include="$(CORE_ROOT)\**\xunit*"/>
-
-      <!-- Exclude subdirectories that contain cross-architecture (possibly cross-bitness) crossgen/JIT -->
-      <TestDependenciesToExclude Include="$(CORE_ROOT)\**\x64\*"/>
-
-      <!-- Don't include all the nuget files -->
-      <TestDependenciesToExclude Include="$(CORE_ROOT)\.nuget\**\*"/>
-
-      <!-- Don't include internal crossgen2 dependencies -->
-      <TestDependenciesToExclude Include="$(CORE_ROOT)\crossgen2\**\*"/>
-
-      <CoreCLRBinariesToExclude Include="@(NetCoreAppPackagedAssemblies);@(TestDependenciesToExclude -> '%(Identity)')" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <!-- REVIEW: do we need to copy recursively (and flatten the structure into a single destination folder)? Can we just copy
-           the top level? Or, should we preserve the hierarchy?
-      -->
-      <CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" Exclude="$(CORE_ROOT)\**\@(CoreCLRBinariesToExclude -> '%(Identity)' )" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <HostFxFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == '$(HostFxrFileName)'" />
-      <DotnetExe Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == 'dotnet'" />
-      <HostPolicyFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == '$(HostPolicyFileName)'" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(HostFxFile)"
-          DestinationFolder="$(NETCoreAppTestHostFxrPath)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="true" />
-
-    <Copy SourceFiles="@(HostPolicyFile)"
-          DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="true" />
-
-    <Copy SourceFiles="@(DotnetExe)"
-          DestinationFolder="$(TestHostRootPath)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="true"  />
-
-    <Copy SourceFiles="@(CoreCLRBinaries)"
-          DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
-          SkipUnchangedFiles="true" />
-
-    <Exec Command="chmod +x $(TestHostRootPath)%(DotnetExe.Filename)%(DotnetExe.Extension)" Condition="'$(OSGroup)' != 'Windows_NT'"/>
-  </Target>
-
-  <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
-  </PropertyGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <Target Name="CoreCompile">
-    <ItemGroup>
-      <IntermediateAssembly Remove="@(IntermediateAssembly)" />
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/src/coreclr/tests/src/Common/Directory.Build.targets b/src/coreclr/tests/src/Common/Directory.Build.targets
index b613ab63368d3d..e589c1e48323af 100644
--- a/src/coreclr/tests/src/Common/Directory.Build.targets
+++ b/src/coreclr/tests/src/Common/Directory.Build.targets
@@ -11,20 +11,20 @@
           DependsOnTargets="ResolveAssemblyReferences">
 
     <ItemGroup>
-      <RunTimeDependecyExclude Include="$(CORE_ROOT)\**\*.*"  />
-      <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName)%(Extension)')" />
-      <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).ni%(Extension)')" />
-      <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).pdb')" />
+      <RunTimeDependencyExclude Include="$(CORE_ROOT)\**\*.*"  />
+      <RunTimeDependencyExcludeFiles Include="@(RunTimeDependencyExclude -> '%(FileName)%(Extension)')" />
+      <RunTimeDependencyExcludeFiles Include="@(RunTimeDependencyExclude -> '%(FileName).ni%(Extension)')" />
+      <RunTimeDependencyExcludeFiles Include="@(RunTimeDependencyExclude -> '%(FileName).pdb')" />
       <AllResolvedRuntimeDependencies Include="@(RuntimeCopyLocalItems -> '%(FileName)%(Extension)');@(NativeCopyLocalItems -> '%(FileName)%(Extension)')">
         <File>%(Identity)</File>
       </AllResolvedRuntimeDependencies>
-      <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)"  Exclude="@(RunTimeDependecyExcludeFiles)"/>
-      <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')"  />
-      <RunTimeDependecyCopyLocal Include="$(TargetingPackPath)/*" />
+      <RunTimeDependencyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)"  Exclude="@(RunTimeDependencyExcludeFiles)"/>
+      <RunTimeDependencyCopyLocal Include="@(RunTimeDependencyCopyLocalFile -> '%(File)')"  />
+      <RunTimeDependencyCopyLocal Include="$(TargetingPackPath)/*" />
     </ItemGroup>
 
     <Copy
-      SourceFiles="@(RunTimeDependecyCopyLocal)"
+      SourceFiles="@(RunTimeDependencyCopyLocal)"
       DestinationFolder="$(CORE_ROOT)"
       SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
       OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
diff --git a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
deleted file mode 100644
index dcd564e19d8e79..00000000000000
--- a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <CLRTestKind>BuildOnly</CLRTestKind>
-    <IsTestProject>false</IsTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.ILAsm">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.ILDAsm">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.Jit">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.TestHost">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-  <Target Name="Build"
-     DependsOnTargets="ResolveReferences" />
-</Project>
diff --git a/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj
deleted file mode 100644
index 3721bc537195d7..00000000000000
--- a/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <CLRTestKind>BuildOnly</CLRTestKind>
-    <IsTestProject>false</IsTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.TargetingPack.Private.CoreCLR">
-      <Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
-  </PropertyGroup>
-
-  <!-- This project depends on properties pulled in by Directory.Build.targets in the test/src directory,
-       which isn't usually imported for the tests/src/Common
-       projects. -->
-  <Import Project="$(SourceDir)\Directory.Build.targets" />
-  <Target Name="Build"
-     DependsOnTargets="ResolveReferences" />
-</Project>
diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
index af83abd53df7b5..fe1d0ccf86d9b9 100644
--- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -7,15 +7,11 @@
     <DisableRarCache>true</DisableRarCache>
     <DisablePackageAssetsCache>true</DisablePackageAssetsCache>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
+    <TargetArchitecture>$(BuildArch)</TargetArchitecture>
+    <BuildCoreCLRDependency>false</BuildCoreCLRDependency>
+    <BuildLibrariesDependency>false</BuildLibrariesDependency>
+    <IncludeOOBLibraries>true</IncludeOOBLibraries>
   </PropertyGroup>
-  <ItemGroup Condition="'$(__SkipFXRestore)' != 'true'" >
-    <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)"/>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
-    <PackageReference Include="System.Security.Permissions" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
-    <PackageReference Include="System.Diagnostics.EventLog" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
-    <PackageReference Include="System.Drawing.Common" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
-    <PackageReference Include="System.Runtime.Intrinsics.Experimental" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Diagnostics.Tools.RuntimeClient" Version="$(MicrosoftDiagnosticsToolsRuntimeClientVersion)" />
   </ItemGroup>
@@ -25,4 +21,11 @@
     <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 
+  <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
+
+  <Target Name="AddLibrariesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" DependsOnTargets="ResolveLibrariesFromLocalBuild">
+    <ItemGroup>
+      <RuntimeCopyLocalItems Include="@(LibrariesRuntimeFiles)" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
index dbf6db252a49d7..abf800e5f2d4ec 100644
--- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
@@ -9,15 +9,20 @@
     <NoWarn>$(NoWarn);NU1603</NoWarn>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <UseLiveRuntimeIdentifierGraph>true</UseLiveRuntimeIdentifierGraph>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" NoWarn="NU1701" />
-    <PackageReference Include="Microsoft.DotNet.CoreCLR.TestDependencies" Version="1.0.0-prerelease" NoWarn="NU1701" />
     <PackageReference Include="jit-dasm" Version="0.0.1.4"  NoWarn="NU1701" />
     <PackageReference Include="cijobs" Version="0.0.1.2" NoWarn="NU1701"  />
     <PackageReference Include="jit-analyze" Version="0.0.1.1" NoWarn="NU1701"  />
   </ItemGroup>
 
+  <Target Name="AddUcrtFilesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" Condition="'$(BuildOS)' == 'Windows_NT'">
+    <ItemGroup>
+      <NativeCopyLocalItems Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
 
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets
index 275d70b85fd767..e85c13f9dce8aa 100644
--- a/src/coreclr/tests/src/Directory.Build.targets
+++ b/src/coreclr/tests/src/Directory.Build.targets
@@ -44,8 +44,8 @@
       </PropertyGroup>
     </When>
   </Choose>
-  
-  <PropertyGroup> 
+
+  <PropertyGroup>
     <_CLRTestNeedsProjectToRun>false</_CLRTestNeedsProjectToRun>
     <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun>
   </PropertyGroup>
@@ -80,10 +80,10 @@
     <_CopyNativeProjectBinaries Condition="'$(_WillCLRTestProjectBuild)' != 'true'">false</_CopyNativeProjectBinaries>
     <_CopyNativeProjectBinaries Condition="'$(_CopyNativeProjectBinaries)' == ''">true</_CopyNativeProjectBinaries>
   </PropertyGroup>
-    
+
   <!-- if we have determined that there is nothing to build, overwrite the build targets so that nothing happens -->
   <Import Project="nobuild.targets" Condition="'$(_WillCLRTestProjectBuild)' == 'false'" />
- 
+
   <!-- RunOnly projects have a special build for dependent projects -->
   <Import Project="runonly.targets" Condition="'$(CLRTestKind)' == 'RunOnly'" />
 
@@ -105,7 +105,7 @@
   </PropertyGroup>
 
   <Import Project="CLRTest.Execute.targets" />
-  <Target Name="CreateExecuteScript" 
+  <Target Name="CreateExecuteScript"
           AfterTargets="Build"
           Condition="'$(GenerateRunScript)' != 'false' And ('$(_WillCLRTestProjectBuild)' == 'true')"
           DependsOnTargets="GenerateExecutionScriptsInternal" />
@@ -199,6 +199,12 @@
   <Target Name="UpdateReferenceItems"
           BeforeTargets="BeforeResolveReferences"
   >
+   <MSBuild Projects="$(MSBuildProjectFullPath)"
+            Targets="GetLiveRefAssemblies"
+            Condition="'$(ReferenceSystemPrivateCoreLib)' != 'true'">
+    <Output TaskParameter="TargetOutputs" ItemName="Reference" />
+   </MSBuild>
+
     <ItemGroup>
       <Reference Include="$(TargetingPackPath)/*.dll" >
         <Private>false</Private>
@@ -207,6 +213,13 @@
 
   </Target>
 
+  <Target Name="GetLiveRefAssemblies" Returns="@(LibrariesRefAssembliesDlls)"
+          DependsOnTargets="ResolveLibrariesFromLocalBuild">
+    <ItemGroup>
+      <LibrariesRefAssembliesDlls Include="@(LibrariesRefAssemblies)" Condition="'%(Extension)' == '.dll'" Private="false" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="AfterBuild">
      <Copy SourceFiles="$(AssemblyName).reflect.xml"
            DestinationFolder="$(OutputPath)"
@@ -221,9 +234,18 @@
     <ProjectAssetsFile></ProjectAssetsFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true' and '$(UsingMicrosoftNETSdk)' == 'true'">
+  <PropertyGroup Condition="'$(UsingMicrosoftNETSdk)' == 'true'">
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <BuildCoreCLRDependency>false</BuildCoreCLRDependency>
+    <BuildLibrariesDependency>false</BuildLibrariesDependency>
+    <IncludeOOBLibraries>true</IncludeOOBLibraries>
+    <TargetArchitecture>$(BuildArch)</TargetArchitecture>
+  </PropertyGroup>
+
+  <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets"/>
+
   <Import Project="../../clr.featuredefines.props" />
 </Project>
diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
index c8ac76c7ac1245..0c7d448ed4fe84 100644
--- a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
@@ -24,8 +24,5 @@
   <ItemGroup>
     <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
     <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-    <PackageReference Include="System.Drawing.Common">
-      <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
-    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj
index c545e1c16140ec..b6dfdfa8f5f5d3 100644
--- a/src/coreclr/tests/src/dirs.proj
+++ b/src/coreclr/tests/src/dirs.proj
@@ -8,9 +8,7 @@
       <DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" />
       <DisabledProjects Include="Common\test_runtime\test_runtime.csproj" />
       <DisabledProjects Include="Common\test_dependencies\test_dependencies.csproj" />
-      <DisabledProjects Include="Common\CoreFX\TestFileSetup\CoreFX.TestUtils.TestFileSetup.csproj" />      
-      <DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" />
-      <DisabledProjects Include="Common\targeting_pack_ref\targeting_pack_ref.csproj" />
+      <DisabledProjects Include="Common\CoreFX\TestFileSetup\CoreFX.TestUtils.TestFileSetup.csproj" />
       <DisabledProjects Include="Common\PerfHarness\PerfHarness.csproj" />
       <DisabledProjects Include="Common\stress_dependencies\stress_dependencies.csproj" />
       <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" />
@@ -18,7 +16,6 @@
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
       <DisabledProjects Include="reflection\GenericAttribute\GenericAttributeTests.csproj" />
-      <DisabledProjects Include="Common\CoreFX\CoreFX.csproj" />
       <DisabledProjects Include="Common\ilasm\ilasm.ilproj" />
     </ItemGroup>
 
@@ -125,7 +122,7 @@
   </Target>
 
   <Import Project="..\dir.traversal.targets" />
-  
+
   <!-- Override clean from dir.traversal.targets and just remove the full BinDir -->
   <Target Name="Clean">
     <RemoveDir Directories="$(BinDir)" />
diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj
index 60b711b12de38c..935a05c77e5f89 100644
--- a/src/coreclr/tests/src/runtest.proj
+++ b/src/coreclr/tests/src/runtest.proj
@@ -354,38 +354,15 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
     </ItemGroup>
   </Target>
 
-  <!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in artifacts/obj -->
-  <Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" />
-
-  <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
-    <VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore>
-    <VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionToRestore>
-    <DesiredPackageVersionArg>$(VersionToRestore)</DesiredPackageVersionArg>
-  </PropertyGroup>
-
   <Import Project="$(MSBuildThisFileDirectory)../tests.targets" />
   <Import Project="$(MSBuildThisFileDirectory)../publishdependency.targets" />
 
-  <PropertyGroup>
-    <DesiredPackageVersionArg Condition="'$(DesiredPackageVersionArg)' == ''">$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</DesiredPackageVersionArg>
-  </PropertyGroup>
-
   <Target Name="CreateTestOverlay">
     <MSBuild Projects="$(MSBuildProjectFile)"
              Targets="CopyDependencyToCoreRoot"
              Properties="Language=C#;TargetRid=$(TargetRid);RuntimeIdentifier=$(TargetRid)" />
   </Target>
 
-  <!--
-       Targets and properties for creating the testhost directory used to run corefx tests.
-   -->
-
-  <Target Name="CreateTestHost">
-    <MSBuild Projects="$(MSBuildThisFileDirectory)Common\CoreFX\CoreFX.csproj"
-             Targets="SetupTestingHost"
-             Properties="OutputPath=$(NETCoreAppTestSharedFrameworkPath)" />
-  </Target>
-
   <Target Name="Build">
 
     <!-- generate project.lock.json file corresponding to above json file -->
@@ -404,10 +381,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
              Targets="CreateTestOverlay"
              Condition=" '$(GenerateRuntimeLayout)'=='true' "/>
 
-    <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="CreateTestHost"
-             Condition=" '$(GenerateTestHost)'=='true' "/>
-
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="RunTests"
              Condition=" '$(RunTests)'=='true' "/>
   </Target>
diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
index c26b17925b29ae..135cc3aef49365 100644
--- a/src/installer/Directory.Build.props
+++ b/src/installer/Directory.Build.props
@@ -2,12 +2,6 @@
 
   <Import Project="..\..\Directory.Build.props" />
 
-  <!--
-    Get ProjectToBuild and '<subset>ProjectToBuild' items. Using the items lets projects handle
-    $(Subset) automatically when creating project-to-project dependencies.
-  -->
-  <Import Project="$(RepositoryEngineeringDir)Subsets.props" />
-
   <!--
     Before Microsoft.Common.targets, set the extensions path to match the restore dir as Arcade
     sets it, so MSBuild packages with targets files will be found and imported.
@@ -374,7 +368,7 @@
 
   <PropertyGroup>
     <LibPrefix Condition="'$(OSGroup)' != 'Windows_NT'">lib</LibPrefix>
-    <LibSuffix>.so</LibSuffix> 
+    <LibSuffix>.so</LibSuffix>
     <LibSuffix Condition="'$(OSGroup)' == 'Windows_NT'">.dll</LibSuffix>
     <LibSuffix Condition="'$(OSGroup)' == 'OSX'">.dylib</LibSuffix>
   </PropertyGroup>
diff --git a/src/installer/pkg/Directory.Build.targets b/src/installer/pkg/Directory.Build.targets
index cbe076d1e7f617..d457972bfd7f5a 100644
--- a/src/installer/pkg/Directory.Build.targets
+++ b/src/installer/pkg/Directory.Build.targets
@@ -1,10 +1,6 @@
 <Project>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />
 
-  <PropertyGroup>
-    <RuntimeIdGraphDefinitionFile>$(NuGetPackageRoot)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsVersion)\runtime.json</RuntimeIdGraphDefinitionFile>
-  </PropertyGroup>
-
   <!--
     Get branding names for the installers.
   -->
diff --git a/src/installer/pkg/deps/deps.csproj b/src/installer/pkg/deps/deps.csproj
deleted file mode 100644
index f105b8f3826f70..00000000000000
--- a/src/installer/pkg/deps/deps.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="$(MicrosoftNETCorePlatformsPackage)" Version="$(MicrosoftNETCorePlatformsVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index b40cddb9dfd361..46319d4d1e34a6 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -336,4 +336,6 @@
     </ItemGroup>
   </Target>
 
-</Project>
\ No newline at end of file
+  <!-- Override adding packages to get the crossgen tool to no-op since we will resolve the crossgen tool locally. -->
+  <Target Name="AddCrossgenToolPackageReferences" />
+</Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
index 8a92a5716b84c0..bea575e85c83ba 100644
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
+++ b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj
@@ -18,5 +18,10 @@
     <BuildRuntimePackages>false</BuildRuntimePackages>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Dependency Include="Microsoft.NETCore.Platforms" Version="$(Version)" TargetFramework="$(NETCoreAppFramework)" />
+    <Dependency Include="Microsoft.NETCore.Targets" Version="$(Version)" TargetFramework="$(NETCoreAppFramework)" />
+  </ItemGroup>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
index 5a0d9501e728d9..d9d6f3423c3dda 100644
--- a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
+++ b/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Dependency Include="$(MicrosoftNETCorePlatformsPackage)" Version="$(MicrosoftNETCorePlatformsVersion)" />
+    <Dependency Include="Microsoft.NETCore.Platforms" Version="$(Version)" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
index 33d863469cb4ea..d6fe8055204f31 100644
--- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
+++ b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
@@ -1,134 +1,96 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Targets to enable building the NETCoreApp shared framework from a local CoreCLR and CoreFX build. -->
-  
-  <Target Name="OverrideRuntimeFilesFromPackageResolve" Condition="'$(CoreCLROverridePath)' != ''" BeforeTargets="GetFilesFromPackageResolve">
-    <Error Condition="!Exists('$(CoreCLROverridePath)')" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not exist." />
+  <!--
+    Get paths from packages that are needed for crossgen. Only relevant for runtime-specific builds.
+  -->
+  <Target Name="GetCorePackagePaths"
+          DependsOnTargets="ResolveReferences">
     <PropertyGroup>
-      <CoreCLROverridePath>$([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)'))</CoreCLROverridePath>
+      <_winmdPackageDir>$(NuGetPackageRoot)$(MicrosoftTargetingPackPrivateWinRTPackage.ToLowerInvariant())/$(MicrosoftTargetingPackPrivateWinRTVersion)/</_winmdPackageDir>
+      <_diaSymReaderPackageDir>$(NuGetPackageRoot)microsoft.diasymreader.native/$(MicrosoftDiaSymReaderNativeVersion)/</_diaSymReaderPackageDir>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' == 'Windows_NT'">
+      <_crossHostArch>x86</_crossHostArch>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' != 'Windows_NT'">
+      <_crossHostArch>x64</_crossHostArch>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(BuildArchitecture)' != 'arm64'">
+      <_crossHostArch>x64</_crossHostArch>
     </PropertyGroup>
     <PropertyGroup>
-      <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm64' and '$(BuildArchitecture)' != 'arm64'">x64</CoreCLRCrossTargetComponentDirName>
-      <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsWindows)' == 'true'">x86</CoreCLRCrossTargetComponentDirName>
-      <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName>
-      <CoreCLRSharedFrameworkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)','sharedFramework'))</CoreCLRSharedFrameworkDir>
-      <CoreCLRCrossTargetComponentDir
-        Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''">$([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)','$(CoreCLRCrossTargetComponentDir)','sharedFramework'))</CoreCLRCrossTargetComponentDir>
+      <_crossDir Condition="'$(_crossHostArch)' != ''">/$(_crossHostArch)_$(TargetArchitecture)</_crossDir>
     </PropertyGroup>
-    <ItemGroup>
-      <CoreCLRFiles Include="$(CoreCLRSharedFrameworkDir)*.*" />
-      <CoreCLRCrossTargetFiles Condition="'$(CoreCLRCrossTargetComponentDir)' != ''" Include="$(CoreCLRCrossTargetComponentDir)*.*" />
-      <CoreCLRFiles Include="$(CoreCLROverridePath)Redist/**/*.dll" />
-      <CoreCLRFiles>
-        <IsNative>true</IsNative>
-      </CoreCLRFiles>
-      <CoreCLRFiles Include="$(CoreCLROverridePath)System.Private.CoreLib.dll" />
-      <CoreCLRFiles
-        Include="
-          $(CoreCLRSharedFrameworkDir)PDB/*.pdb;
-          $(CoreCLRSharedFrameworkDir)PDB/*.dbg;
-          $(CoreCLRSharedFrameworkDir)PDB/*.dwarf" />
-      <CoreCLRFiles
-        Include="$(CoreCLROverridePath)PDB/System.Private.CoreLib.pdb;$(CoreCLROverridePath)PDB/System.Private.CoreLib.ni.pdb" />
-      <CoreCLRCrossTargetFiles Condition="'$(CoreCLRCrossTargetComponentDir)' != ''"
-        Include="
-          $(CoreCLRCrossTargetComponentDir)PDB/*.pdb;
-          $(CoreCLRCrossTargetComponentDir)PDB/*.dbg;
-          $(CoreCLRCrossTargetComponentDir)PDB/*.dwarf" />
-
-      <CoreCLRFiles>
-        <TargetPath>runtime/$(RuntimeIdentifier)/native</TargetPath>
-      </CoreCLRFiles>
-
-      <CoreCLRCrossTargetFiles>
-        <TargetPath>runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
-      </CoreCLRCrossTargetFiles>
 
-      <CoreCLRFiles Include="@(CoreCLRCrossTargetFiles)" />
-
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'@(CoreCLRFiles->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)'"/>
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="$([System.String]::Copy('%(FileName)').StartsWith('mscordaccore_'))" />
-      <ReferenceCopyLocalPaths Include="@(CoreCLRFiles)" />
+    <ItemGroup>
+      <_requiredProperty Include="_winmdPackageDir" />
     </ItemGroup>
 
-    <Error Condition="'@(CoreCLRFiles)' == ''" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not contain any files." />
+    <Message Text="%(_requiredProperty.Identity): $(%(_requiredProperty.Identity))" />
+    <Error Condition="'$(%(_requiredProperty.Identity))' == ''" Text="Required property %(_requiredProperty.Identity) was not set." />
+    <Error Condition="!Exists('$(%(_requiredProperty.Identity))')" Text="Required property %(_requiredProperty.Identity) with value '$(%(_requiredProperty.Identity))' does not exist." />
   </Target>
 
-  <Target Name="OverrideFrameworkFilesFromPackageResolve" Condition="'$(CoreFXOverridePath)' != ''" BeforeTargets="GetFilesFromPackageResolve">
-    <Error Condition="!Exists('$(CoreFXOverridePath)')" Text="The path provided to CoreFXOverridePath ($(CoreFXOverridePath)) does not exist." />
+  <Target Name="GetCrossgenToolPaths"
+          DependsOnTargets="GetCorePackagePaths">
+    <ItemGroup>
+      <!-- Find crossgen tool assets in package cache to allow ExcludeAssets=All. -->
+      <_windowsWinMD Include="$(_winmdPackageDir)**/Windows.winmd" />
+      <_diaSymReaderAssembly Include="$(_diaSymReaderPackageDir)**\Microsoft.DiaSymReader.Native.*.dll" />
+    </ItemGroup>
 
     <PropertyGroup>
-      <CoreFXSharedFrameworkPackageSpec>$(CoreFXOverridePath)/specs/$(MicrosoftPrivateCoreFxNETCoreAppPackage).nuspec</CoreFXSharedFrameworkPackageSpec>
-      <CoreFXSharedFrameworkImplementationPackageSpec Condition="'$(PackageRID)' != ''">$(CoreFXOverridePath)/specs/runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage).nuspec</CoreFXSharedFrameworkImplementationPackageSpec>
+      <_runtimeDirectory>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework'))</_runtimeDirectory>
+      <_crossGenPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', 'crossgen$(ApplicationFileExtension)'))</_crossGenPath>
     </PropertyGroup>
-    
-    <Error Condition="!Exists('$(CoreFXSharedFrameworkPackageSpec)')" Text="The nuspec for the reference $(MicrosoftPrivateCoreFxNETCoreAppPackage) package does not exist." />
-    <Message Condition="'$(CoreFXSharedFrameworkImplementationPackageSpec)' != '' And !Exists('$(CoreFXSharedFrameworkImplementationPackageSpec)')"
-      Text="The nuspec for the implementation runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage) package does not exist. Falling back to packaged CoreFX." />
 
-    <XmlPeek
-      Namespaces="&lt;Namespace Prefix='nuget' Uri='http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd' /&gt;"
-      Query="nuget:package/nuget:files/nuget:file/@src"
-      XmlInputPath="$(CoreFXSharedFrameworkPackageSpec)">
-      <Output TaskParameter="Result" ItemName="CoreFXReferenceItems" />
-    </XmlPeek>
-
-    <XmlPeek
-      Condition="'$(CoreFXSharedFrameworkImplementationPackageSpec)' != '' And Exists($(CoreFXSharedFrameworkImplementationPackageSpec))"
-      Namespaces="&lt;Namespace Prefix='nuget' Uri='http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd' /&gt;"
-      Query="nuget:package/nuget:files/nuget:file/@src"
-      XmlInputPath="$(CoreFXSharedFrameworkImplementationPackageSpec)">
-      <Output TaskParameter="Result" ItemName="CoreFXReferenceCopyLocalItems" />
-    </XmlPeek>
-    
-    <ItemGroup>
-      <CoreFXReferenceItems NuGetPackageId="$(MicrosoftPrivateCoreFxNETCoreAppPackage)" />
-      <CoreFXReferenceCopyLocalItems NuGetPackageId="runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage)" />
-    </ItemGroup>
+    <PropertyGroup>
+      <_coreLibDirectory>$(CoreCLRArtifactsPath)</_coreLibDirectory>
+      <_fxLibDirectory>$(LibrariesSharedFrameworkBinArtifactsPath)</_fxLibDirectory>
+    </PropertyGroup>
 
-    <ItemGroup>
-      <OverriddenFrameworkReferenceFiles
-        Include="@(Reference)"
-        Condition="
-          '@(CoreFXReferenceItems->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)' And
-          '@(CoreFXReferenceItems->'%(NuGetPackageId)')' == '%(NuGetPackageId)'">
-        <CoreFXFile>@(CoreFXReferenceItems)</CoreFXFile>
-      </OverriddenFrameworkReferenceFiles>
+    <PropertyGroup>
+      <_jitPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', '$(LibraryFilePrefix)clrjit$(LibraryFileExtension)'))</_jitPath>
+    </PropertyGroup>
 
-      <Reference Remove="@(OverriddenFrameworkReferenceFiles)" />
-      <Reference Include="@(OverriddenFrameworkReferenceFiles->Metadata('CoreFXFile'))" />
+    <PropertyGroup Condition="'@(_windowsWinMD)' != ''">
+      <_windowsWinMDDirectory>%(_windowsWinMD.RootDir)%(_windowsWinMD.Directory)</_windowsWinMDDirectory>
+    </PropertyGroup>
 
-      <OverriddenFrameworkImplementationFiles
-        Include="@(ReferenceCopyLocalPaths)"
-        Condition="
-          '@(CoreFXReferenceCopyLocalItems->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)' And
-          '@(CoreFXReferenceCopyLocalItems->'%(NuGetPackageId)')' == '%(NuGetPackageId)'">
-        <CoreFXFile>@(CoreFXReferenceCopyLocalItems)</CoreFXFile>
-      </OverriddenFrameworkImplementationFiles>
+    <PropertyGroup Condition="'@(_diaSymReaderAssembly)' != ''">
+      <_diaSymReaderToolDir>%(_diaSymReaderAssembly.RootDir)%(_diaSymReaderAssembly.Directory)</_diaSymReaderToolDir>
+    </PropertyGroup>
 
-      <OverriddenFrameworkImplementationFiles>
-        <IsNative Condition="$([System.String]::new('%(Identity)').ToLowerInvariant().Replace('\', '/').Contains('/native/'))">true</IsNative>
-      </OverriddenFrameworkImplementationFiles>
+    <!--
+      DiaSymReader can't be built from source, so use an unrelated default directory in that case.
+      This is used as the working directory for crossgen calls.
+    -->
+    <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+      <_diaSymReaderToolDir>$(IntermediateOutputPath)</_diaSymReaderToolDir>
+    </PropertyGroup>
 
-      <ReferenceCopyLocalPaths Remove="@(OverriddenFrameworkImplementationFiles)" />
-      <ReferenceCopyLocalPaths Include="@(OverriddenFrameworkImplementationFiles->Metadata('CoreFXFile'))" />
-    </ItemGroup>
+    <Message Text="%(_requiredProperty.Identity): $(%(_requiredProperty.Identity))" />
+    <Error Condition="'$(%(_requiredProperty.Identity))' == ''" Text="Required property %(_requiredProperty.Identity) was not set." />
+    <Error Condition="!Exists('$(%(_requiredProperty.Identity))')" Text="Required property %(_requiredProperty.Identity) with value '$(%(_requiredProperty.Identity))' does not exist." />
 
-    <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
-      <_coreFXOverrideDocFiles
-        Condition="'$(CoreFXOverridePath)' != '' And '%(NuGetPackageId)' == '$(MicrosoftPrivateCoreFxNETCoreAppPackage)'"
-        Include="@(OverriddenFrameworkReferenceFiles->'$(CoreFXOverridePath)/../../bin/docs/%(FileName).xml')" />
-      <_docFilesToPackage Include="@(_coreFXOverrideDocFiles)" Condition="Exists('%(Identity)')" />
+    <ItemGroup>
+      <!--
+        The following path must be passed to crossgen to locate all dependencies. Include it first
+        so in case of conflicts, DLLs are found in the framework being crossgenned.
+      -->
+      <_crossgenPlatformDirectories Include="%(_filesToCrossGen.RootDir)%(_filesToCrossGen.Directory)" />
+      <!-- the following path *must* be passed to crossgen as it has the CoreLib.ni.dll, it will not use the IL copy. -->
+      <_crossgenPlatformDirectories Include="$(_runtimeDirectory)" />
+      <!-- the following need not be passed to crossgen but we do so to be safe. -->
+      <_crossgenPlatformDirectories Include="$(_coreLibDirectory)" />
+      <_crossgenPlatformDirectories Include="$(_fxLibDirectory)" />
     </ItemGroup>
-  </Target>
 
-  <Target Name="OverrideCrossgenToolPaths" DependsOnTargets="GetCorePackagePaths" AfterTargets="GetCrossgenToolPaths" BeforeTargets="CreateCrossGenImages">  
-    <PropertyGroup Condition="'$(CoreCLROverridePath)' != ''">
-      <_runtimeDirectory>$(CoreCLROverridePath)</_runtimeDirectory>
-      <_crossgenPath>$(CoreCLROverridePath)/crossgen$(ApplicationFileExtension)</_crossgenPath>
-      <_CoreLibSharedDirectory>$(CoreCLROverridePath)</_CoreLibSharedDirectory>
-      <_jitPath>$(CoreClrOverridePath)/$(_crossHostArch)/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
+    <PropertyGroup>
+      <!-- Use PathSeparator so that we get a ':' on unix and ';' on windows
+           Escape the value so that the ';' doesn't result multiple lines when writing to the RSP file -->
+      <_pathSeparatorEscaped>$([MSBuild]::Escape($([System.IO.Path]::PathSeparator.ToString())))</_pathSeparatorEscaped>
+      <_crossgenPlatformAssemblies>@(_crossgenPlatformDirectories->'%(Identity)', '$(_pathSeparatorEscaped)')</_crossgenPlatformAssemblies>
     </PropertyGroup>
-
   </Target>
-
 </Project>
diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
index 91ea562a339c7c..ced5fb1500f081 100644
--- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
+++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
@@ -1,14 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <FrameworkPackageName>Microsoft.NETCore.App</FrameworkPackageName>
+    <ImportLiveBuildsTargets>true</ImportLiveBuildsTargets>
+    <BuildFullPlatformManifest>false</BuildFullPlatformManifest>
+    <CoreCLROSGroup Condition="'$(TargetsWindows)' == 'true'">Windows_NT</CoreCLROSGroup>
+    <CoreCLROSGroup Condition="'$(TargetsLinux)' == 'true'">Linux</CoreCLROSGroup>
+    <CoreCLROSGroup Condition="'$(TargetsOSX)' == 'true'">OSX</CoreCLROSGroup>
+    <CoreCLROSGroup Condition="'$(TargetsFreeBSD)' == 'true'">FreeBSD</CoreCLROSGroup>
+    <LibrariesOSGroup>$(CoreCLROSGroup)</LibrariesOSGroup>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="$(MicrosoftPrivateCoreFxNETCoreAppPackage)" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
-    <PackageReference Include="transport.$(MicrosoftNETCoreRuntimeCoreCLRPackage)" Version="$(MicrosoftNETCoreRuntimeCoreCLRVersion)" />
-    <PackageReference Include="$(MicrosoftNETCorePlatformsPackage)" Version="$(MicrosoftNETCorePlatformsVersion)" />
-    <PackageReference Include="$(MicrosoftNETCoreTargetsPackage)" Version="$(MicrosoftNETCoreTargetsVersion)" />
     <PackageReference Include="$(NETStandardLibraryPackage)" Version="$(NETStandardLibraryVersion)" />
   </ItemGroup>
 
@@ -18,11 +21,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
-    <!-- Bring in Platforms for RID graph, NETStandard.Library for build-tools,
-         Targets for an empty runtime.json to reduce conflicts from 1.x packages -->
+    <!-- Bring in NETStandard.Library for build-tools. -->
     <DependenciesToPackage Include="NETStandard.Library" />
-    <DependenciesToPackage Include="Microsoft.NETCore.Platforms" />
-    <DependenciesToPackage Include="Microsoft.NETCore.Targets" />
   </ItemGroup>
 
   <!-- get paths from packages that are needed for cross-gen and other includes,
@@ -31,53 +31,31 @@
           Condition="'$(PackageTargetRuntime)' != ''"
           DependsOnTargets="GetCorePackagePaths" />
 
-  <Target Name="GetDependencyVersionFiles" DependsOnTargets="ResolveReferences;GetPackagePaths">
-    <ItemGroup>
-      <_coreFxVersionFile
-        Include="$(NuGetPackageRoot)$([System.String]::new('%(Reference.NuGetPackageId)').ToLowerInvariant())/%(Reference.NuGetPackageVersion)/version.txt"
-        Condition="$([System.String]::new('%(Reference.Identity)').ToLowerInvariant().Contains('system.runtime.dll'))"
-        Name="corefx" />
-      <_coreClrVersionFile
-        Include="$(_runtimePackageDir)version.txt"
-        Name="coreclr" />
+  <Target Name="GetDependencyVersionFiles" />
 
-      <DependencyVersionFile Include="@(_coreFxVersionFile);@(_coreClrVersionFile)" />
+  <Target Name="AddRuntimeFilesToPackage" DependsOnTargets="ResolveCoreCLRFilesFromLocalBuild" BeforeTargets="GetFilesFromPackageResolve">
+    <ItemGroup>
+      <CoreCLRFiles>
+        <TargetPath>runtime/$(PackageRID)/native</TargetPath>
+      </CoreCLRFiles>
+      <ReferenceCopyLocalPaths Include="@(CoreCLRFiles);@(CoreCLRCrossTargetFiles)" />
     </ItemGroup>
-
-    <Error
-      Condition="'@(_coreFxVersionFile)' == ''"
-      Text="Failed to locate corefx version.txt file." />
-
-    <Error
-      Condition="'@(_coreClrVersionFile)' == ''"
-      Text="Failed to locate coreclr version.txt file." />
   </Target>
 
-  <!-- Fetches all the runtime items from the packages that we want to redist -->
-  <Target Name="GetRuntimeFilesFromPackages"
-          BeforeTargets="GetRuntimeFilesToPackage"
-          DependsOnTargets="GetCorePackagePaths"
-          Condition="'$(CoreCLROverridePath)' == ''">
-    <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
-      <_ToolsToPackage Include="$(_runtimePackageDir)tools/**/*.*"/>
-      <FilesToPackage Include="@(_ToolsToPackage)">
-        <NuGetPackageId>$(_runtimePackageId)</NuGetPackageId>
-        <!--
-          Trim '/' at the end of the target path, if exists. The packaging tools automatically add
-          an ending '/' for files without any extension, resulting in e.g. 'tools//' for Linux
-          'crossgen', which creates a dir without a name in the nupkg. This folder collapses when
-          extracted to disk, but results in confusing artifacts when inspected manually, especially
-          when 'crossgen.dbg' is outside this nameless dir.
-        -->
-        <TargetPath>$([System.String]::new('tools/%(RecursiveDir)').TrimEnd('/'))</TargetPath>
-        <IsNative>true</IsNative>
-      </FilesToPackage>
-      <FilesToPackage Condition="'$(_crossDir)' != ''" Include="$(_jitPackageDir)runtimes$(_crossDir)/native/*.*">
-        <TargetPath>runtimes$(_crossDir)/native</TargetPath>
-        <IsNative>true</IsNative>
-      </FilesToPackage>
+  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesFromPackageResolve">
+    <ItemGroup>
+      <LibrariesRefAssemblies TargetPath="ref/$(NETCoreAppFramework)" />
+      <Reference Include="@(LibrariesRefAssemblies)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(PackageRID)' != ''">
+      <LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NETCoreAppFramework)" />
+      <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native" />
+      <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" />
     </ItemGroup>
   </Target>
-  
+
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <Import Project="localnetcoreapp.override.targets" />
 </Project>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index dd2bcf6b76f45d..01abd76c661a53 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -100,7 +100,7 @@
     <IsShipping Condition="'$(IsTestProject)' == 'true'">false</IsShipping>
   </PropertyGroup>
 
-  <PropertyGroup>    
+  <PropertyGroup>
     <EnableProjectRestore Condition="'$(IsTestProject)' == 'true'">true</EnableProjectRestore>
   </PropertyGroup>
 
@@ -166,6 +166,7 @@
     <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(ArchGroup)</_packageRID>
     <PackageRID Condition="'$(PackageRID)' == ''">$(_packageRID)</PackageRID>
     <PackageRID Condition="'$(PackageRID)' == ''">$(RuntimeOS)-$(ArchGroup)</PackageRID>
+    <TargetArchitecture>$(ArchGroup)</TargetArchitecture>
   </PropertyGroup>
 
   <!-- Set some shortcuts for more terse conditions in project files -->
@@ -179,6 +180,7 @@
   <PropertyGroup>
     <BuildingNETCoreAppVertical Condition="'$(BuildingNETCoreAppVertical)' == '' and ('$(_bc_TargetGroup)'=='netcoreapp' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETCoreAppVertical>
     <BuildingNETFxVertical Condition="'$(BuildingNETFxVertical)' == '' and ('$(_bc_TargetGroup)'=='netfx' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETFxVertical>
+    <BinPlaceNETCoreAppPackage Condition="'$(BuildingNETCoreAppVertical)' == 'true'">true</BinPlaceNETCoreAppPackage>
   </PropertyGroup>
 
   <!--
@@ -205,14 +207,14 @@
 
     <!-- Empty DebugType when building for netfx and in windows so that it is set to full or pdbonly later -->
     <DebugType Condition="'$(TargetsNetFx)' == 'true' and '$(OS)' == 'Windows_NT'" />
-    
+
     <!-- Workaround for codecov issue https://github.com/tonerdo/coverlet/issues/312 -->
     <EnableSourceLink Condition="'$(ContinuousIntegrationBuild)' != 'true' and '$(OfficialBuildId)' == ''">false</EnableSourceLink>
 
     <!-- TODO-NULLABLE: Remove once netstandard has annotations for Debug.Assert, string.IsNullOrEmpty, etc. -->
     <NoWarn Condition="'$(TargetsNetFx)' == 'true' or '$(TargetsNetStandard)' == 'true'">$(NoWarn);nullable</NoWarn>
   </PropertyGroup>
-    
+
   <!-- Set up Default symbol and optimization for Configuration -->
   <Choose>
     <When Condition="'$(ConfigurationGroup)'=='Debug'">
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 08426497067e93..9eb22055ce2c70 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -7,7 +7,7 @@
     <ErrorReport Condition="'$(ErrorReport)' == 'prompt'" />
     <WarningsAsErrors Condition="'$(WarningsAsErrors)' == 'NU1605'" />
   </PropertyGroup>
-  
+
   <!-- Adds Nullable annotation attributes to netstandard <= 2.0 builds -->
   <Choose>
     <When Condition="'$(Nullable)' != '' and ($(TargetFramework.StartsWith('netstandard1')) or '$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('netcoreapp2')) or '$(TargetsNetFx)' == 'true')">
@@ -70,16 +70,24 @@
       <RefPath>$(BuildConfigurationRefPath)</RefPath>
       <RuntimePath>$(RuntimePath)</RuntimePath>
     </BinPlaceConfiguration>
-    <!-- binplace to directories for packages -->
+    <!-- binplace the shared framework -->
     <BinPlaceConfiguration Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
       <PackageFileRefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</PackageFileRefPath>
       <PackageFileRuntimePath>$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath>
-      <RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime</RuntimePath>
-      <RefPath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true' and '$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app</RefPath>
+      <RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(ArtifactsBinDir)pkg\netcoreapp\runtime\$(_bc_OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</RuntimePath>
+      <RefPath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true' and '$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app\$(ConfigurationGroup)</RefPath>
       <!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly -->
       <SetProperties Condition="'$(BinPlaceRuntime)' == 'true' and '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
     </BinPlaceConfiguration>
 
+    <!-- Binplace the OOB libraries built in the netcoreapp build. -->
+    <BinPlaceConfiguration Condition="'$(IsNETCoreAppRef)' != 'true' and '$(IsReferenceAssembly)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
+      <RefPath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(RefRootPath)oob\$(ConfigurationGroup)</RefPath>
+    </BinPlaceConfiguration>
+    <BinPlaceConfiguration Condition="'$(IsNETCoreApp)' != 'true' and '$(IsSourceProject)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
+      <RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(ArtifactsBinDir)pkg\oob\runtime\$(_bc_OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</RuntimePath>
+    </BinPlaceConfiguration>
+
     <!-- Setup the shared framework directory for testing -->
     <BinPlaceConfiguration Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
       <RuntimePath>$(NETCoreAppTestSharedFrameworkPath)</RuntimePath>
diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj
index bfb02bccfcd639..28a73401c1ed64 100644
--- a/src/libraries/restore/runtime/runtime.depproj
+++ b/src/libraries/restore/runtime/runtime.depproj
@@ -5,22 +5,16 @@
     <RuntimeIdentifier Condition="'$(RuntimeOS)' == 'webassembly'">$(ToolRuntimeRID)</RuntimeIdentifier>
     <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
     <SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' and ('$(ConfigurationGroup)' == 'Debug' or '$(Coverage)' == 'true')">true</SwapNativeForIL>
+    <ImportLiveBuildsTargets>true</ImportLiveBuildsTargets>
+    <CoreCLROSGroup Condition="'$(CoreCLROSGroup)'==''">$(DefaultOSGroup)</CoreCLROSGroup>
+    <CoreCLRConfiguration>$(ConfigurationGroup)</CoreCLRConfiguration>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.7.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <!-- Non-shipping packages do not produce stable versions. -->
-    <MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-rc2.19462.14</MicrosoftNETCoreRuntimeCoreCLRVersion>
-    <MicrosoftPrivateCorefxNETCoreAppVersion>4.6.0-rc2.19462.14</MicrosoftPrivateCorefxNETCoreAppVersion>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
-    <PackageReference Include="transport.Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRVersion)" />
-    <PackageReference Include="Microsoft.NETCore.TestHost" Version="$(MicrosoftNETCoreRuntimeCoreCLRVersion)" />
     <PackageReference Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreDotNetHostVersion)" />
     <PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreDotNetHostPolicyVersion)" />
     <!-- We do not need apphost.exe and the 3.0 SDK will actually remove it.
@@ -30,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.0'" Include="Microsoft.Private.Corefx.NETCoreApp" Version="$(MicrosoftPrivateCorefxNETCoreAppVersion)" />
+    <PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.0'" Include="Microsoft.Private.Corefx.NETCoreApp" Version="4.6.0-rc2.19462.14" />
   </ItemGroup>
 
   <!-- Setup the testing shared framework host -->
@@ -43,7 +37,7 @@
 
       <HostFxrFileName Condition="'$(TargetsWindows)' == 'true'">hostfxr</HostFxrFileName>
       <HostFxrFileName Condition="'$(TargetsWindows)' != 'true'">libhostfxr</HostFxrFileName>
-      
+
       <UseHardlink>true</UseHardlink>
       <!-- workaround core-setup problem for hardlinking dotnet executable to testhost: core-setup #4742 -->
       <UseHardlink Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">false</UseHardlink>
@@ -68,39 +62,16 @@
   </Target>
 
   <Target Name="OverrideRuntime"
-          Condition="'$(CoreCLROverridePath)' != ''"
+          DependsOnTargets="ResolveCoreCLRFilesFromLocalBuild"
           AfterTargets="AfterResolveReferences;FilterNugetPackages">
-    <Error Condition="!Exists('$(CoreCLROverridePath)')" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not exist." />
-    <PropertyGroup>
-      <CoreCLRPDBOverridePath Condition="'$(CoreCLRPDBOverridePath)' == '' and Exists('$(CoreCLROverridePath)/PDB')">$(CoreCLROverridePath)/PDB</CoreCLRPDBOverridePath>
-    </PropertyGroup>
     <ItemGroup>
-      <CoreCLRFiles Include="$(CoreCLROverridePath)/*.*" />
-      <CoreCLRFiles Condition="'$(CoreCLRPDBOverridePath)' != ''" Include="$(CoreCLRPDBOverridePath)/*.pdb;$(CoreCLRPDBOverridePath)/*.dbg" />
-
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'@(CoreCLRFiles->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)'" />
       <ReferenceCopyLocalPaths Include="@(CoreCLRFiles)" />
     </ItemGroup>
-
-    <Error Condition="'@(CoreCLRFiles)' == ''" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not contain any files." />
-  </Target>
-
-  <Target Name="GetCoreLibPackagePath" Condition="'$(CoreCLROverridePath)' == ''" DependsOnTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <_CoreLibFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Private.CoreLib'" />
-    </ItemGroup>
-    <PropertyGroup>
-      <_CoreLibFilePath>%(_CoreLibFile.FullPath)</_CoreLibFilePath>
-      <_CoreLibPackagePath>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes'))))</_CoreLibPackagePath>
-    </PropertyGroup>
-    <Error Condition="'$(_CoreLibPackagePath)' == '' or !Exists('$(_CoreLibPackagePath)')" 
-           Text="Could not locate the CoreClr package." />
   </Target>
 
-  <Target Name="GetCoreCLRILFiles" DependsOnTargets="GetCoreLibPackagePath">
+  <Target Name="GetCoreCLRILFiles" DependsOnTargets="ResolveCoreCLRFilesFromLocalBuild">
     <ItemGroup>
-      <CoreCLRILFiles Condition="'$(CoreCLROverridePath)' == ''" Include="$(_CoreLibPackagePath)/**/il/*.*" />
-      <CoreCLRILFiles Condition="'$(CoreCLROverridePath)' != ''" Include="$(CoreCLROverridePath)/IL/*.*" />
+      <CoreCLRILFiles Include="$(CoreCLRArtifactsPath)/IL/*.*" />
     </ItemGroup>
     <Error Condition="'@(CoreCLRILFiles)' == ''" Text="Could not locate CoreCLR IL files." />
   </Target>
@@ -115,5 +86,5 @@
         <ReferenceCopyLocalPaths Include="@(CoreCLRILFiles)" />
       </ItemGroup>
   </Target>
-  
+
 </Project>