diff --git a/Directory.Build.props b/Directory.Build.props
index b9cc1470bb7805..5104b073389d74 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -304,7 +304,6 @@
 
   <PropertyGroup>
     <CustomBeforeNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets</CustomBeforeNoTargets>
-    <CustomAfterTraversalProps>$(RepositoryEngineeringDir)TraversalSdk.AfterProps.props</CustomAfterTraversalProps>
     <CustomAfterTraversalTargets>$(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets</CustomAfterTraversalTargets>
   </PropertyGroup>
 </Project>
diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md
index 486a0afd091378..e2b281c6790690 100644
--- a/docs/coding-guidelines/project-guidelines.md
+++ b/docs/coding-guidelines/project-guidelines.md
@@ -6,10 +6,13 @@ In order to work in the dotnet/runtime repo you must first run build.cmd/sh from
 - Restore tools
 - Restore external dependencies
  - CoreCLR - Copy to `bin\runtime\$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)`
-- Build targeting pack
- - Build src\libraries\ref.proj which builds all references assembly projects. For reference assembly project information see [ref](#ref)
-- Build product
- - Build src\libraries\src.proj which builds all the source library projects. For source library project information see [src](#src).
+- Build shared framework projects
+ - Build src\libraries\sfx.proj which builds all shared framework projects.
+- Build out of band projects
+ - Build src\libraries\oob.proj which builds all the out-of-band (OOB) projects.
+
+For reference assembly project information see [ref](#ref)
+For source library project information see [src](#src)
 
 # Build Pivots
 Below is a list of all the various options we pivot the project builds on:
diff --git a/eng/NoTargetsSdk.BeforeTargets.targets b/eng/NoTargetsSdk.BeforeTargets.targets
index 9afaad0e75e786..3b516d31887207 100644
--- a/eng/NoTargetsSdk.BeforeTargets.targets
+++ b/eng/NoTargetsSdk.BeforeTargets.targets
@@ -1,9 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <!-- NoTargets SDK needs a TFM set. Use the latest .NETCoreApp TFM that is supported by the SDK.
-         Only set a default if the project isn't multi-targeting. -->
-    <TargetFramework Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' == ''">$(NetCoreAppToolCurrent)</TargetFramework>
+    <!-- NoTargets SDK needs a TFM set. Set a default if the project doesn't multi target. -->
+    <TargetFramework Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' == ''">$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 809af20968ecb1..1213b5407e96f1 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -71,7 +71,7 @@
     <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
                                         '$(BuildTargetFramework)' == '' or
                                         '$(BuildAllConfigurations)' == 'true'">libs.native+</DefaultLibrariesSubsets>
-    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.ref+libs.src</DefaultLibrariesSubsets>
+    <DefaultLibrariesSubsets>$(DefaultLibrariesSubsets)libs.sfx+libs.oob</DefaultLibrariesSubsets>
     <DefaultLibrariesSubsets Condition="'$(DotNetBuildFromSource)' != 'true'">$(DefaultLibrariesSubsets)+libs.pretest</DefaultLibrariesSubsets>
 
     <DefaultHostSubsets>host.native+host.tools</DefaultHostSubsets>
@@ -144,8 +144,10 @@
     <!-- Libs -->
     <SubsetName Include="Libs" Description="The libraries native part, refs and source assemblies, test infra and packages, but NOT the tests (use Libs.Tests to request those explicitly). Equivalent to: $(DefaultLibrariesSubsets)" />
     <SubsetName Include="Libs.Native" Description="The native libraries used in the shared framework." />
-    <SubsetName Include="Libs.Ref" Description="The managed reference libraries." />
-    <SubsetName Include="Libs.Src" Description="The managed implementation libraries." />
+    <SubsetName Include="Libs.Sfx" Description="The managed shared framework libraries." />
+    <SubsetName Include="Libs.Oob" Description="The managed out-of-band libraries." />
+    <SubsetName Include="Libs.Ref" OnDemand="true" Description="The managed reference libraries." />
+    <SubsetName Include="Libs.Src" OnDemand="true" Description="The managed implementation libraries." />
     <SubsetName Include="Libs.PreTest" Description="Test assets which are necessary to run tests." />
     <SubsetName Include="Libs.Packages" Description="The projects that produce NuGet packages from libraries." />
     <SubsetName Include="Libs.Tests" OnDemand="true" Description="The test projects. Note that building this doesn't execute tests: you must also pass the '-test' argument." />
@@ -322,12 +324,20 @@
     <ProjectToBuild Include="$(SharedNativeRoot)libs\build-native.proj" Category="libs" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(_subset.Contains('+libs.ref+'))">
-    <ProjectToBuild Include="$(LibrariesProjectRoot)ref.proj" Category="libs" />
+  <ItemGroup Condition="$(_subset.Contains('+libs.ref+')) or $(_subset.Contains('+libs.src+')) or $(_subset.Contains('+libs.sfx+'))">
+    <ProjectToBuild Include="$(LibrariesProjectRoot)sfx.proj"
+                    Category="libs"
+                    Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
+                               '$(BuildTargetFramework)' == '' or
+                               '$(BuildAllConfigurations)' == 'true'">
+      <AdditionalProperties Condition="$(_subset.Contains('+libs.ref+'))">%(AdditionalProperties);RefOnly=true</AdditionalProperties>
+    </ProjectToBuild>
   </ItemGroup>
 
-  <ItemGroup Condition="$(_subset.Contains('+libs.src+'))">
-    <ProjectToBuild Include="$(LibrariesProjectRoot)src.proj" Category="libs" />
+  <ItemGroup Condition="$(_subset.Contains('+libs.ref+')) or $(_subset.Contains('+libs.src+')) or $(_subset.Contains('+libs.oob+'))">
+    <ProjectToBuild Include="$(LibrariesProjectRoot)oob.proj" Category="libs">
+      <AdditionalProperties Condition="$(_subset.Contains('+libs.ref+'))">%(AdditionalProperties);RefOnly=true</AdditionalProperties>
+    </ProjectToBuild>
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+mono.wasmruntime+'))">
diff --git a/eng/TraversalSdk.AfterProps.props b/eng/TraversalSdk.AfterProps.props
deleted file mode 100644
index 9f3f5fdea7ae95..00000000000000
--- a/eng/TraversalSdk.AfterProps.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <!-- Build for NetCoreAppCurrent by default if no BuildTargetFramework is supplied or if not all configurations are built. -->
-    <TraversalGlobalProperties Condition="'$(BuildAllConfigurations)' != 'true'">BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))</TraversalGlobalProperties>
-  </PropertyGroup>
-
-</Project>
diff --git a/eng/TraversalSdk.AfterTargets.targets b/eng/TraversalSdk.AfterTargets.targets
index f88c48dc8677d6..4eac57bd138aff 100644
--- a/eng/TraversalSdk.AfterTargets.targets
+++ b/eng/TraversalSdk.AfterTargets.targets
@@ -9,10 +9,17 @@
     <VSTestDependsOn>$(VSTestDependsOn);ResolveP2PReferences</VSTestDependsOn>
     <PackDependsOn>$(PackDependsOn);ResolveP2PReferences</PackDependsOn>
     <PublishDependsOn>$(PublishDependsOn);ResolveP2PReferences</PublishDependsOn>
+    <GetTargetPathDependsOn>ResolveP2PReferences</GetTargetPathDependsOn>
+    <!-- Filter out ProjectReferences which aren't compatible with the project's TargetFramework. -->
+    <OmitIncompatibleProjectReferences>true</OmitIncompatibleProjectReferences>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(FilterTraversalProjectReferences)' == 'true'">
-    <ProjectReference Update="@(ProjectReference)" SkipGetTargetFrameworkProperties="false" />
+    <!-- Override the Traversal SDK setting as filtering relies on the TargetFrameworkProperties being fetched
+         and don't flow the BuildTargetFramework property down. -->
+    <ProjectReference Update="@(ProjectReference)"
+                      SkipGetTargetFrameworkProperties="false"
+                      UndefineProperties="%(UndefineProperties);BuildTargetFramework"  />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/generators.targets b/eng/generators.targets
index d73019014a8c7a..1e66f0c38c960a 100644
--- a/eng/generators.targets
+++ b/eng/generators.targets
@@ -13,8 +13,7 @@
          - references System.Runtime.InteropServices -->
     <EnabledGenerators Include="DllImportGenerator"
                        Condition="'$(EnableDllImportGenerator)' == ''
-                        and '$(IsFrameworkSupportFacade)' != 'true'
-                        and '$(IsSourceProject)' == 'true'
+                        and '$(IsRuntimeAssembly)' == 'true'
                         and '$(MSBuildProjectExtension)' == '.csproj'
                         and (
                           ('@(Reference)' != ''
@@ -25,8 +24,7 @@
                             and '$(DisableImplicitAssemblyReferences)' == 'false'))" />
     <EnabledGenerators Include="DllImportGenerator"
                        Condition="'$(EnableDllImportGenerator)' == ''
-                        and '$(IsFrameworkSupportFacade)' != 'true'
-                        and '$(IsSourceProject)' == 'true'
+                        and '$(IsRuntimeAssembly)' == 'true'
                         and '$(MSBuildProjectExtension)' == '.csproj'
                         and ('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETFramework' or ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))))" />
   </ItemGroup>
diff --git a/eng/illink.targets b/eng/illink.targets
index eecd3163559b6c..320d21715ef0ac 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -198,14 +198,22 @@
     </ItemGroup>
   </Target>
 
-  <!-- ILLink.Tasks arguments common to runs for both individual libraries and for the entire runtime pack -->
-  <Target Name="SetCommonILLinkArgs">
+  <Target Name="PrepareForAssembliesTrim">
+    <!-- ILLink.Tasks arguments common to runs for both individual libraries and for the entire runtime pack -->
     <PropertyGroup>
       <!-- don't remove attributes after build, our tooling is not ready for that -->
       <ILLinkArgs>$(ILLinkArgs) --ignore-link-attributes true</ILLinkArgs>
       <!-- ignore unresolved references -->
       <ILLinkArgs>$(ILLinkArgs) --skip-unresolved true</ILLinkArgs>
     </PropertyGroup>
+
+    <!-- When running from Desktop MSBuild, DOTNET_HOST_PATH is not set.
+         In this case, explicitly specify the path to the dotnet host. -->
+    <PropertyGroup Condition="'$(DOTNET_HOST_PATH)' == ''">
+      <!-- This is defined when building in Visual Studio. -->
+      <_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
+      <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)'))</_DotNetHostFileName>
+    </PropertyGroup>
   </Target>
 
   <!-- ILLinkTrimAssembly
@@ -215,7 +223,7 @@
   <UsingTask TaskName="ILLink" AssemblyFile="$(ILLinkTasksAssembly)" Condition="'$(ILLinkTasksAssembly)' != ''" />
   <Target Name="ILLinkTrimAssembly"
           Condition="'$(ILLinkTrimAssembly)' == 'true'"
-          DependsOnTargets="SetCommonILLinkArgs">
+          DependsOnTargets="PrepareForAssembliesTrim">
     <PropertyGroup>
       <!-- default action for assemblies with IsTrimmable attribute -->
       <ILLinkArgs>$(ILLinkArgs) --trim-mode skip</ILLinkArgs>
@@ -285,21 +293,12 @@
       <ILLinkArgs Condition="@(_DependencyDirectories->Count()) > 0">$(ILLinkArgs) -d @(_DependencyDirectories->'"%(Identity)"', ' -d ')</ILLinkArgs>
     </PropertyGroup>
 
-    <!-- When running from Desktop MSBuild, DOTNET_HOST_PATH is not set.
-         In this case, explicitly specify the path to the dotnet host. -->
-    <PropertyGroup Condition=" '$(DOTNET_HOST_PATH)' == '' ">
-      <!-- This is defined when building in Visual Studio. -->
-      <_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
-      <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)'))</_DotNetHostFileName>
-    </PropertyGroup>
-
     <ILLink AssemblyPaths=""
             RootAssemblyNames="@(ILLinkTrimInputAssembly)"
             OutputDirectory="$(ILLinkTrimOutputPath)"
             ExtraArgs="$(ILLinkArgs)"
             ToolExe="$(_DotNetHostFileName)"
             ToolPath="$(_DotNetHostDirectory)" />
-
   </Target>
 
   <!-- ILLink reporting.
diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
index b05315fc7856ef..0c9336479238f6 100644
--- a/eng/pipelines/common/templates/runtimes/build-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -74,7 +74,7 @@ jobs:
       - ${{ each variable in parameters.variables }}:
         - ${{ variable }}
       - name: liveRuntimeBuildParams
-        value: 'libs.ref -c Release -ci'
+        value: 'libs.sfx+libs.oob /p:RefOnly=true -c Release -ci'
       - name: compilerArg
         value: ''
       - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}:
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index 1d404057335430..c817f759a30969 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -57,7 +57,7 @@ stages:
   - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
     - template: /eng/common/templates/job/source-index-stage1.yml
       parameters:
-        sourceIndexBuildCommand: build.cmd -subset libs.ref+libs.src -binarylog -os Linux -ci
+        sourceIndexBuildCommand: build.cmd -subset libs.sfx+libs.oob -binarylog -os Linux -ci
 
   #
   # Build CoreCLR
diff --git a/eng/pipelines/runtime-richnav.yml b/eng/pipelines/runtime-richnav.yml
index df7918ee877abd..341ec115ebfba5 100644
--- a/eng/pipelines/runtime-richnav.yml
+++ b/eng/pipelines/runtime-richnav.yml
@@ -37,7 +37,7 @@ jobs:
       richCodeNavigationEnvironment: "production"
       richCodeNavigationLanguage: "csharp"
       timeoutInMinutes: 240
-      buildArgs: -s libs.ref+libs.src -c debug -allConfigurations
+      buildArgs: -s libs.sfx+libs.oob -allConfigurations
 
 - template: /eng/pipelines/common/platform-matrix.yml
   parameters:
diff --git a/eng/referenceAssemblies.props b/eng/referenceAssemblies.props
index f61d15a3926b52..8c986b4475ae60 100644
--- a/eng/referenceAssemblies.props
+++ b/eng/referenceAssemblies.props
@@ -1,14 +1,9 @@
 <Project>
-  <PropertyGroup Condition="'$(BuildAllProjects)' == 'true' and
-                            !$(BuildTargetFramework.StartsWith('netstandard')) and
-                            !$(BuildTargetFramework.StartsWith('net4'))">
-    <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);netstandard2.0;netstandard2.1</AdditionalBuildTargetFrameworks>
 
+  <PropertyGroup>
     <!-- Reference assemblies are special and don't initialize fields or have empty finalizers, etc. -->
     <RunAnalyzers>false</RunAnalyzers>
-  </PropertyGroup>
 
-  <PropertyGroup>
     <!-- disable warnings about unused fields -->
     <NoWarn>$(NoWarn);CS0169;CS0649;CS8618</NoWarn>
 
@@ -30,4 +25,5 @@
       <_Parameter1_IsLiteral>true</_Parameter1_IsLiteral>
     </AssemblyAttribute>
   </ItemGroup>
+
 </Project>
diff --git a/eng/references.targets b/eng/references.targets
index 4603fb98566a91..c73b8295397584 100644
--- a/eng/references.targets
+++ b/eng/references.targets
@@ -16,19 +16,17 @@
 
   <ItemGroup Condition="'@(ProjectReference)' != ''">
     <_coreLibProjectReference Include="@(ProjectReference->WithMetadataValue('Identity', '$(CoreLibProject)'))" />
-    <ProjectReference Update="@(_coreLibProjectReference)">
-      <!-- Don't flow TargetFramework and Platform to use same inputs and outputs as the CoreLib's build as part of the runtime. -->
-      <UndefineProperties>$(UndefineProperties);TargetFramework;Platform</UndefineProperties>
+    <ProjectReference Update="@(_coreLibProjectReference)"
+                      Private="false">
       <SetConfiguration Condition="'$(RuntimeFlavor)' == 'CoreCLR' and
                                    '$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration)</SetConfiguration>
       <SetConfiguration Condition="'$(RuntimeFlavor)' == 'Mono' and
                                    '$(Configuration)' != '$(MonoConfiguration)'">Configuration=$(MonoConfiguration)</SetConfiguration>
-      <Private>false</Private>
     </ProjectReference>
     <!-- If a CoreLib ProjectReference is present, make all P2P assets non transitive. -->
-    <ProjectReference Update="@(ProjectReference)"
+    <ProjectReference Update="@(ProjectReference->WithMetadataValue('PrivateAssets', ''))"
                       PrivateAssets="all"
-                      Condition="'@(_coreLibProjectReference)' != ''" />
+                      Condition="'$(IsSourceProject)' == 'true' and '@(_coreLibProjectReference)' != ''" />
   </ItemGroup>
 
   <!-- Disable TargetArchitectureMismatch warning when we reference CoreLib as it is platform specific. -->
@@ -78,8 +76,19 @@
 
   <Target Name="ValidateReferenceAssemblyProjectReferences"
           AfterTargets="ResolveReferences"
-          Condition="'$(IsReferenceAssembly)' == 'true'">
+          Condition="'$(IsReferenceAssembly)' == 'true' and
+                     '$(SkipValidateReferenceAssemblyProjectReferences)' != 'true'">
     <Error Condition="'%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' and '%(ReferencePath.IsReferenceAssembly)' != 'true' and '%(ReferencePath.ReferenceAssembly)' == ''"
            Text="Reference assemblies must only reference other reference assemblies and '%(ReferencePath.ProjectReferenceOriginalItemSpec)' is not a reference assembly project and does not set 'ProduceReferenceAssembly'." />
   </Target>
+
+  <!-- An opt-in target to trim out private assemblies from the ref assembly ReferencePath. -->
+  <Target Name="TrimOutPrivateAssembliesFromReferencePath"
+          Condition="'$(CompileUsingReferenceAssemblies)' == 'true' and '$(TrimOutPrivateAssembliesFromReferencePath)' == 'true'"
+          AfterTargets="FindReferenceAssembliesForReferences">
+    <ItemGroup>
+      <ReferencePathWithRefAssemblies Remove="@(ReferencePathWithRefAssemblies)"
+                                      Condition="$(NetCoreAppLibraryNoReference.Contains('%(Filename);'))" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets
index 327273a100e2d4..0e0cfc05c56e0e 100644
--- a/eng/resolveContract.targets
+++ b/eng/resolveContract.targets
@@ -28,7 +28,10 @@
           DependsOnTargets="ResolveProjectReferences"
           AfterTargets="GetTargetPathWithTargetPlatformMoniker">
     <ItemGroup>
-      <TargetPathWithTargetPlatformMoniker ReferenceAssembly="@(ResolvedMatchingContract)" />
+      <!-- Allow to point to a different reference project than what GenFacades uses to generate the type forwards. -->
+      <TargetPathWithTargetPlatformMoniker ReferenceAssembly="@(ResolvedMatchingContractOverride)" />
+      <TargetPathWithTargetPlatformMoniker ReferenceAssembly="@(ResolvedMatchingContract)"
+                                           Condition="'@(ResolvedMatchingContractOverride)' == ''" />
     </ItemGroup>
   </Target>
 
@@ -38,7 +41,7 @@
           Condition="'@(ProjectReference)' != '' and '@(_ResolvedProjectReferencePaths)' != ''">
     <!-- If we have a ProjectReference to CoreLib, we need to compile against implementation assemblies. -->
     <PropertyGroup Condition="@(_ResolvedProjectReferencePaths->AnyHaveMetadataValue('MSBuildSourceProjectFile', '$(CoreLibProject)'))">
-      <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
+      <CompileUsingReferenceAssemblies Condition="'$(CompileUsingReferenceAssemblies)' == ''">false</CompileUsingReferenceAssemblies>
     </PropertyGroup>
     <!-- Clear the ReferenceAssembly attribute on resolved P2Ps that set SkipUseReferenceAssembly to true. -->
     <ItemGroup>
diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets
index 33551569c647fe..63aa48746ab2d8 100644
--- a/eng/targetingpacks.targets
+++ b/eng/targetingpacks.targets
@@ -146,6 +146,13 @@
       <_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" />
     </ItemGroup>
 
+    <!-- Filter out shims from the targeting pack references as an opt-in. -->
+    <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
+                          '$(SkipTargetingPackShimReferences)' == 'true'">
+      <_targetingPackReferenceExclusion Include="@(NetFxReference)" />
+      <_targetingPackReferenceExclusion Include="netstandard" />
+    </ItemGroup>
+
     <ItemGroup>
       <_targetingPackReferenceWithProjectName Include="@(Reference->WithMetadataValue('ExternallyResolved', 'true')->Metadata('Filename'))"
                                               OriginalIdentity="%(Identity)" />
diff --git a/eng/versioning.targets b/eng/versioning.targets
index 3a40200c173e73..f31612f41a42f1 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -107,7 +107,10 @@
   <Target Name="AddOSPlatformAttributes"
           BeforeTargets="GenerateAssemblyInfo"
           AfterTargets="PrepareForBuild"
-          Condition="'$(TargetPlatformIdentifier)' == '' and '$(IsTestProject)' != 'true' and '$(TargetFrameworkIdentifier)' != '.NETFramework'">
+          Condition="'$(TargetPlatformIdentifier)' == '' and
+                     '$(IsTestProject)' != 'true' and
+                     '$(TargetFrameworkIdentifier)' != '.NETFramework'
+                     and '$(AddOSPlatformAttributes)' != 'false'">
     <!-- Defensively de-dupe the values -->
     <ItemGroup>
       <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" />
@@ -133,12 +136,15 @@
     </ItemGroup>
   </Target>
 
-  <!-- Removes assembly level attributes from test projects. -->
-  <Target Name="RemoveSupportedOSPlatformAttributeFromTestProjects"
+  <!-- Remove assembly level attributes from certain projects.
+       Use a target for that until https://github.com/dotnet/sdk/issues/14836 is implemented. -->
+  <Target Name="RemoveSupportedOSTargetPlatformAttributeFromProjects"
           AfterTargets="GetAssemblyAttributes"
-          Condition="'$(IsTestProject)' == 'true'">
+          BeforeTargets="CreateGeneratedAssemblyInfoInputsCacheFile">
     <ItemGroup>
-      <AssemblyAttribute Remove="System.Runtime.Versioning.SupportedOSPlatformAttribute" />
+      <AssemblyAttribute Remove="System.Runtime.Versioning.SupportedOSPlatformAttribute"
+                         Condition="'$(IsTestProject)' == 'true' or '$(AddOSPlatformAttributes)' == 'false'" />
+      <!-- Don't include target platform attributes, since we use the target platform to represent RIDs instead. -->
       <AssemblyAttribute Remove="System.Runtime.Versioning.TargetPlatformAttribute" />
     </ItemGroup>
   </Target>
diff --git a/global.json b/global.json
index 7850e7db3d0240..d7074d2befb7ec 100644
--- a/global.json
+++ b/global.json
@@ -15,8 +15,8 @@
     "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22114.7",
     "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22114.7",
     "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22114.7",
-    "Microsoft.Build.NoTargets": "3.1.0",
-    "Microsoft.Build.Traversal": "3.0.23",
+    "Microsoft.Build.NoTargets": "3.3.0",
+    "Microsoft.Build.Traversal": "3.1.3",
     "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22113.2"
   }
 }
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index e94c73bb92386f..377433abcca2c0 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -64,7 +64,6 @@
   </PropertyGroup>
 
   <Import Project="$(LibrariesProjectRoot)NetCoreAppLibrary.props" />
-  <Import Project="$(LibrariesProjectRoot)shims/netfxreference.props" />
 
   <ItemGroup>
     <!-- Public libraries and shims -->
diff --git a/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.csproj b/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.csproj
index d035012419af6d..377403d00620e0 100644
--- a/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.csproj
+++ b/src/libraries/Common/tests/AndroidTestRunner/AndroidTestRunner.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AndroidTestRunner.cs" />
diff --git a/src/libraries/Common/tests/AppleTestRunner/AppleTestRunner.csproj b/src/libraries/Common/tests/AppleTestRunner/AppleTestRunner.csproj
index 74636ca3b58c71..4f33bc8b4a5655 100644
--- a/src/libraries/Common/tests/AppleTestRunner/AppleTestRunner.csproj
+++ b/src/libraries/Common/tests/AppleTestRunner/AppleTestRunner.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AppleTestRunner.cs" />
diff --git a/src/libraries/Common/tests/StreamConformanceTests/StreamConformanceTests.csproj b/src/libraries/Common/tests/StreamConformanceTests/StreamConformanceTests.csproj
index 6959f41279b178..5514898caadc2a 100644
--- a/src/libraries/Common/tests/StreamConformanceTests/StreamConformanceTests.csproj
+++ b/src/libraries/Common/tests/StreamConformanceTests/StreamConformanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\IO\*.cs" />
diff --git a/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj b/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj
index c83346ac205bc0..00e32cde264a82 100644
--- a/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj
+++ b/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>XmlCoreTest.Common</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncUtil.cs" />
diff --git a/src/libraries/Common/tests/TestUtilities.Unicode/TestUtilities.Unicode.csproj b/src/libraries/Common/tests/TestUtilities.Unicode/TestUtilities.Unicode.csproj
index 5f241043489c38..90ad9e72dce0c9 100644
--- a/src/libraries/Common/tests/TestUtilities.Unicode/TestUtilities.Unicode.csproj
+++ b/src/libraries/Common/tests/TestUtilities.Unicode/TestUtilities.Unicode.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <UnicodeUcdVersion>13.0</UnicodeUcdVersion>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Text\Unicode\UnicodeData.cs" />
diff --git a/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.csproj b/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.csproj
index df27382c27a77a..2f60f08a55c44a 100644
--- a/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.csproj
+++ b/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WasmTestRunner.cs" />
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 961c33028eab16..4e62339ce80db8 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -107,9 +107,6 @@
     <UseAppBundleRootForBuildingTests Condition="'$(ArchiveTests)' == 'true' and '$(BuildTestsOnHelix)' != 'true' and '$(TargetsAppleMobile)' == 'true'">true</UseAppBundleRootForBuildingTests>
     <AppBundleRoot Condition="'$(UseAppBundleRootForBuildingTests)' == 'true'">$(ArtifactsDir)bundles\</AppBundleRoot>
 
-    <NetCoreAppCurrentRefPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ref', '$(NetCoreAppCurrent)'))</NetCoreAppCurrentRefPath>
-    <NetCoreAppCurrentRuntimePath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)'))</NetCoreAppCurrentRuntimePath>
-
     <CommonPathRoot>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common'))</CommonPathRoot>
     <CommonPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src'))</CommonPath>
     <CommonTestPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))</CommonTestPath>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 39c393f0fef67f..4e0f4aecebb895 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -16,6 +16,7 @@
     <NativeBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)'))</NativeBinDir>
     <NetCoreAppCurrentTestHostPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)'))</NetCoreAppCurrentTestHostPath>
     <NetCoreAppCurrentTestHostSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))</NetCoreAppCurrentTestHostSharedFrameworkPath>
+    <NETStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))</NETStandard21RefPath>
 
     <NoWarn Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">$(NoWarn);nullable</NoWarn>
     <NoWarn Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">$(NoWarn);nullable;CA1052</NoWarn>
@@ -33,12 +34,26 @@
     <NoWarn Condition="'$(IsPartialFacadeAssembly)' == 'true'">$(NoWarn);SYSLIB0003;SYSLIB0004;SYSLIB0015;SYSLIB0017;SYSLIB0021;SYSLIB0022;SYSLIB0023;SYSLIB0025;SYSLIB0032;SYSLIB0036</NoWarn>
     <!-- Reset these properties back to blank, since they are defaulted by Microsoft.NET.Sdk -->
     <WarningsAsErrors Condition="'$(WarningsAsErrors)' == 'NU1605'" />
-    <IsNETCoreAppSrc Condition="'$(IsNETCoreAppSrc)' == '' and
-                                '$(IsSourceProject)' == 'true' and
+
+    <IsRuntimeAssembly Condition="'$(IsRuntimeAssembly)' == '' and
+                                  '$(IsReferenceAssembly)' != 'true' and
+                                  '$(IsGeneratorProject)' != 'true' and
+                                  '$(IsTestProject)' != 'true' and
+                                  '$(IsTestSupportProject)' != 'true' and
+                                  '$(UsingMicrosoftNoTargetsSdk)' != 'true' and
+                                  '$(UsingMicrosoftTraversalSdk)' != 'true'">true</IsRuntimeAssembly>
+    <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and
+                                              '$(IsRuntimeAssembly)' == 'true' and
+                                              Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)') and
+                                              !Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)/ref') and
+                                              !$(MSBuildProjectName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly>
+
+    <!-- The source of truth for these IsNETCoreApp* properties is NetCoreAppLibrary.props. -->
+    <IsNETCoreAppSrc Condition="('$(IsRuntimeAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')  and
                                 $(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true</IsNETCoreAppSrc>
-    <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == '' and
-                                '$(IsReferenceAssembly)' == 'true' and
-                                $(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true</IsNETCoreAppRef>
+    <IsNETCoreAppRef Condition="('$(IsReferenceAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true') and
+                                $(NetCoreAppLibrary.Contains('$(AssemblyName);')) and
+                                !$(NetCoreAppLibraryNoReference.Contains('$(AssemblyName);'))">true</IsNETCoreAppRef>
     <!-- By default, disable implicit framework references for NetCoreAppCurrent libraries. -->
     <DisableImplicitFrameworkReferences Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
                                                    $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)')) and
@@ -61,11 +76,6 @@
 
   <!-- Libraries-specific binplacing properties -->
   <PropertyGroup>
-    <IsRuntimeAssembly Condition="'$(IsRuntimeAssembly)'=='' and '$(IsReferenceAssembly)' != 'true' and '$(BinPlaceRef)' != 'true' and '$(IsGeneratorProject)' != 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'">true</IsRuntimeAssembly>
-    <!-- Try to determine if this is a simple library without a ref project.
-         https://github.com/dotnet/runtime/issues/19584 is tracking cleaning this up -->
-    <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)') and !Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)/ref') and !$(MSBuildProjectName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly>
-
     <BinPlaceRef Condition="'$(BinPlaceRef)' == '' and ('$(IsReferenceAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef>
     <BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' and ('$(IsRuntimeAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime>
     <BinPlaceForTargetVertical Condition="'$(BinPlaceForTargetVertical)' == ''">true</BinPlaceForTargetVertical>
@@ -81,21 +91,20 @@
   </Target>
 
   <ItemGroup Condition="'@(BinPlaceTargetFrameworks)' == ''">
-    <!-- binplace to directories for the target vertical -->
+    <!-- Used by the runtime tests to prepare the CORE_ROOT layout. Don't use in libraries. -->
     <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)"
                               Condition="'$(BinPlaceForTargetVertical)' == 'true'">
-      <NativePath>$(NetCoreAppCurrentRuntimePath)</NativePath>
-      <RefPath>$(NetCoreAppCurrentRefPath)</RefPath>
-      <RuntimePath>$(NetCoreAppCurrentRuntimePath)</RuntimePath>
+      <NativePath>$(LibrariesAllBinArtifactsPath)</NativePath>
+      <RefPath>$(LibrariesAllRefArtifactsPath)</RefPath>
+      <RuntimePath>$(LibrariesAllBinArtifactsPath)</RuntimePath>
     </BinPlaceTargetFrameworks>
 
     <BinPlaceDir Include="$(MicrosoftNetCoreAppRefPackDir)analyzers\dotnet\$(AnalyzerLanguage)"
                  Condition="'$(IsNETCoreAppAnalyzer)' == 'true'" />
 
     <!-- Setup the shared framework directory for testing -->
-    <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)"
-                              Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
-      <NativePath >$(NetCoreAppCurrentTestHostSharedFrameworkPath)</NativePath>
+    <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)">
+      <NativePath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</NativePath>
       <RuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NetCoreAppCurrentTestHostSharedFrameworkPath)</RuntimePath>
     </BinPlaceTargetFrameworks>
 
@@ -109,8 +118,16 @@
     <BinPlaceTargetFrameworks Include="@(AdditionalBinPlaceTargetFrameworks)" />
   </ItemGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)codeOptimization.targets" />
   <Import Project="$(RepositoryEngineeringDir)targetingpacks.targets" />
+
+  <PropertyGroup>
+      <!-- Libraries non test projects shouldn't reference compat shims. -->
+    <SkipTargetingPackShimReferences Condition="'$(UseLocalTargetingRuntimePack)' == 'true' and
+                                                '$(IsTestProject)' != 'true' and
+                                                '$(IsTestSupportProject)' != 'true'">true</SkipTargetingPackShimReferences>
+  </PropertyGroup>
+
+  <Import Project="$(RepositoryEngineeringDir)codeOptimization.targets" />
   <Import Project="$(RepositoryEngineeringDir)references.targets" />
   <Import Project="$(RepositoryEngineeringDir)resolveContract.targets" />
   <Import Project="$(RepositoryEngineeringDir)testing\tests.targets" Condition="'$(EnableTestSupport)' == 'true'" />
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
index 087671572eab6e..c210043b79103a 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
@@ -10,7 +10,7 @@ Microsoft.Diagnostics.Tracing.EventSource</PackageDescription>
     <PackageId>$(MSBuildProjectName)</PackageId>
     <AssemblyName>Microsoft.Diagnostics.Tracing.EventSource</AssemblyName>
     <DefineConstants>$(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;TARGET_WINDOWS</DefineConstants>
-    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
     <Nullable>enable</Nullable>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
index b1e4dd6e21e7c6..7005c7fdbb8d0f 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);USE_MDT_EVENTSOURCE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <SDTTestDir>..\..\System.Diagnostics.Tracing\tests</SDTTestDir>
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
index b53c4a6b663b6c..5d4bd6530b81d6 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
@@ -6,9 +6,10 @@
     <!-- Use targeting pack references instead of granular ones in the project file. -->
     <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
     <CLSCompliant>false</CLSCompliant>
-    <IsRuntimeAssembly>false</IsRuntimeAssembly>
     <IsPackable>true</IsPackable>
     <PackageDescription>Suite of xUnit.net tests to check for container compatibility with Microsoft.Extensions.DependencyInjection.</PackageDescription>
+    <!-- this assembly doesn't need to be binplaced -->
+    <EnableBinPlacing>false</EnableBinPlacing>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/tests/Microsoft.Extensions.Hosting.Systemd.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting.Systemd/tests/Microsoft.Extensions.Hosting.Systemd.Tests.csproj
index 2fc99da91d90c9..8ed239e3381135 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/tests/Microsoft.Extensions.Hosting.Systemd.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/tests/Microsoft.Extensions.Hosting.Systemd.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <EnableDefaultItems>true</EnableDefaultItems>
   </PropertyGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets
index 50df6bb7cc044f..abc32a36a56bf5 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <EnableDefaultItems>true</EnableDefaultItems>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <Nullable>enable</Nullable>
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
index 41d577d5ef9c8e..4e309fbf7d7c36 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
-    <UseTargetFrameworkPackage>false</UseTargetFrameworkPackage>
+    <EnableBinPlacing>false</EnableBinPlacing>
     <!-- This project should not build against the live built .NETCoreApp targeting pack as it contributes to the build itself. -->
     <UseLocalTargetingRuntimePack>false</UseLocalTargetingRuntimePack>
     <AssemblyName>Microsoft.NETCore.Platforms.BuildTasks</AssemblyName>
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj
index 3b240034081623..b88bec027d8d18 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);XMLSERIALIZERGENERATORTESTS</DefineConstants>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <SkipTestsOnPlatform Condition="'$(TargetsMobile)' == 'true' or '$(TargetOS)' == 'FreeBSD' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'armel' or '$(TargetArchitecture)' == 'wasm'">true</SkipTestsOnPlatform>
   </PropertyGroup>
 
diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props
index 7d7c71c6ecd622..5c46266cb56e73 100644
--- a/src/libraries/NetCoreAppLibrary.props
+++ b/src/libraries/NetCoreAppLibrary.props
@@ -1,7 +1,33 @@
 <Project>
   <PropertyGroup>
     <!-- The trailing semicolon is important for each entry! -->
+    <NetFxReference>
+      mscorlib;
+      Microsoft.VisualBasic;
+      System;
+      System.ComponentModel.DataAnnotations;
+      System.Configuration;
+      System.Core;
+      System.Data;
+      System.Drawing;
+      System.IO.Compression.FileSystem;
+      System.Net;
+      System.Numerics;
+      System.Runtime.Serialization;
+      System.Security;
+      System.ServiceProcess;
+      System.ServiceModel.Web;
+      System.Transactions;
+      System.Web;
+      System.Windows;
+      System.Xml;
+      System.Xml.Serialization;
+      System.Xml.Linq;
+      WindowsBase;
+    </NetFxReference>
     <NetCoreAppLibrary>
+      $(NetFxReference)
+      netstandard;
       Microsoft.CSharp;
       Microsoft.VisualBasic.Core;
       Microsoft.Win32.Primitives;
@@ -76,6 +102,7 @@
       System.Net.WebSockets.Client;
       System.Numerics.Vectors;
       System.ObjectModel;
+      System.Private.CoreLib;
       System.Private.DataContractSerialization;
       System.Private.Runtime.InteropServices.JavaScript;
       System.Private.Uri;
@@ -146,6 +173,15 @@
       System.Xml.XPath;
       System.Xml.XPath.XDocument;
     </NetCoreAppLibrary>
+    <NetCoreAppLibraryNoReference>
+      System.Net.Quic;
+      System.Private.CoreLib;
+      System.Private.DataContractSerialization;
+      System.Private.Runtime.InteropServices.JavaScript;
+      System.Private.Uri;
+      System.Private.Xml;
+      System.Private.Xml.Linq;
+    </NetCoreAppLibraryNoReference>
     <AspNetCoreAppLibrary>
       Microsoft.Extensions.Caching.Abstractions;
       Microsoft.Extensions.Caching.Memory;
@@ -205,7 +241,9 @@
   </PropertyGroup>
   <!-- Make available as an item. -->
   <ItemGroup>
+    <NetFxReference Include="$(NetFxReference)" />
     <NetCoreAppLibrary Include="$(NetCoreAppLibrary)" />
+    <NetCoreAppLibraryNoReference Include="$(NetCoreAppLibraryNoReference)" />
     <AspNetCoreAppLibrary Include="$(AspNetCoreAppLibrary)" />
     <WindowsDesktopCoreAppLibrary Include="$(WindowsDesktopCoreAppLibrary)" />
   </ItemGroup>
diff --git a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj b/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
index 14e49bca740545..e6255639d1d661 100644
--- a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
+++ b/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
index 47b6b84165c322..d226c7d706dfa5 100644
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ArrayPool\ArrayPoolTest.cs" />
diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
index d0beb0ebc46996..4ec01c9ceb9708 100644
--- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
+++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
index 96c0b9471cb72a..9527a6f551a5c4 100644
--- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
+++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
index 9fe63e5d7a9b52..6228374cb47005 100644
--- a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
+++ b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <!-- Common Collections tests -->
diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
index 6dee6b92c77644..3855b43bfa6d9a 100644
--- a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
+++ b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
   </PropertyGroup>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
index df43866bc98e5f..f44f9c112ed439 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <!-- Disable nullable attributes explicitly as some tests depend on them not being present. -->
     <Nullable>disable</Nullable>
   </PropertyGroup>
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
index 72e124ecebf0fb..a5f48c6102dc78 100644
--- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs"
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
index 998921a3eb1769..9df10ea043d27a 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncOperationManagerTests.cs" />
diff --git a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
index 924a2be2b6289b..80d60eb2991f4b 100644
--- a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\ComponentModel\BrowsableAttributeTests.cs" />
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
index 8caeb1d48b8ef2..96936f3df0f19a 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
@@ -4,7 +4,7 @@
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <RootNamespace />
     <AssemblyVersion>9.9.9.9</AssemblyVersion>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Drawing\ColorConverterTests.cs" />
diff --git a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
index d74bd4287594b0..08f7425e7d2ed5 100644
--- a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
+++ b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CancelEventArgsTests.cs" />
diff --git a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj
index ddd698d0d0200d..bf167c01dfdc79 100644
--- a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj
+++ b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ManualTests.cs" />
diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
index 8d16b838b9adee..9cc67ab8f40476 100644
--- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
+++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn),0168,0169,0414,0219,0649</NoWarn>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
-    <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Data\Common\DataColumnMappingTest.cs" />
diff --git a/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj b/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj
index e0e1ad613762af..90da4d0db056c7 100644
--- a/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj
+++ b/src/libraries/System.Data.DataSetExtensions/tests/System.Data.DataSetExtensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Mono\DataRowComparerTest.cs" />
diff --git a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
index 4dbef1eb1e0b76..f9da25e2173dd4 100644
--- a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj
index 0662b27d73c5a7..e9dd8a7adec528 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/TestWithConfigSwitches/System.Diagnostics.DiagnosticSource.Switches.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj
index 56a71b1d27b686..d4160c2651ac8d 100644
--- a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj
@@ -4,5 +4,6 @@
     <Win32Resource>EventLogMessages.res</Win32Resource>
     <!-- Override the parent Directory.Build.props -->
     <SupportedOSPlatforms />
+    <EnableDllImportGenerator>false</EnableDllImportGenerator>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
index 2067fee50c5965..527dbbcae8cd71 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Assembly1.cs" />
diff --git a/src/libraries/System.Diagnostics.Process/tests/LongPath/LongPath.csproj b/src/libraries/System.Diagnostics.Process/tests/LongPath/LongPath.csproj
index 5352a461d8a77b..65c9cdc8746a2c 100644
--- a/src/libraries/System.Diagnostics.Process/tests/LongPath/LongPath.csproj
+++ b/src/libraries/System.Diagnostics.Process/tests/LongPath/LongPath.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ClassDefinedInAssemblyWithAVeryLongPath.cs" />
diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj b/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj
index aec1d927639468..09993688ac1201 100644
--- a/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj
+++ b/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
index 4a5c22ae09ef1a..4dc8b6f1cb8d6b 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CommonUtilities.cs" />
diff --git a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
index afee1da6943ff5..1bdb9839725ac0 100644
--- a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>System.Diagnostics.Tools.Tests</AssemblyName>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
index a143a9a0f05264..7c0de93514b041 100644
--- a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
index 53f60dbcb90928..f99f37a6cd8cfb 100644
--- a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
+++ b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj
index d534e0901a84ed..b891b4550b212b 100644
--- a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj
+++ b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <!-- NuGet restore issue with TargetFrameworks in f# projects: https://github.com/NuGet/Home/issues/10005 -->
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
index 824ce2ad77e4aa..cd8e38755ac08d 100644
--- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
+++ b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
index 34fc322cb83377..2a64681a8b5678 100644
--- a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
+++ b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
index 2a8639e493903e..58d424e4778cda 100644
--- a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
+++ b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj
index b142e220e9d433..7d444810c694cd 100644
--- a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <InvariantGlobalization>true</InvariantGlobalization>
diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
index 31e9eab0301f8a..69b6215fb0a6f7 100644
--- a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <UnicodeUcdVersion>13.0</UnicodeUcdVersion>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
index 623fcad7d7b348..eaab1e89b9ba92 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.IO.FileSystem/tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj
index 3f5205d6a20d07..62623a6e9757cc 100644
--- a/src/libraries/System.IO.FileSystem/tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/ManualTests/System.IO.FileSystem.Manual.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ManualTests.cs" />
diff --git a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
index 86043b1f0aa51a..81eb8e04bf39ee 100644
--- a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
+++ b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <!-- Listing the runtime specific packages to populate the dependencies section.
          Not building these references to avoid unintentional Build/Pack invocations.
-         They are filtered in the traversal build in src.proj based on the OutputRid. -->
+         They are filtered in the traversal build in oob-all.csproj based on the OutputRid. -->
     <ProjectReference Include="$(MSBuildThisFileDirectory)*.proj" Exclude="$(MSBuildProjectFile)" BuildReference="false" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
index c3f6ad83ffb539..71666486850fed 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.IO/tests/System.IO.Tests.csproj b/src/libraries/System.IO/tests/System.IO.Tests.csproj
index b0a0339292e9b7..aa8928e15c44ee 100644
--- a/src/libraries/System.IO/tests/System.IO.Tests.csproj
+++ b/src/libraries/System.IO/tests/System.IO.Tests.csproj
@@ -4,7 +4,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="IndentedTextWriter.cs" />
diff --git a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
index 8b327c062a3e8f..f4c3bb6a22ab24 100644
--- a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
+++ b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs"
diff --git a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
index a0124a904af1b0..0d72e46d8067c4 100644
--- a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
+++ b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AggregateTests.cs" />
diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
index cd15cfbbf59d5d..5cbd9676c14f92 100644
--- a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
+++ b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
index e6638ed601f920..96810612c909ed 100644
--- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
+++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ArrayBufferWriter\ArrayBufferWriterTests.Byte.cs" />
diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
index 7519783c1cbafb..f5243fb9bfc66f 100644
--- a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AlternateViewCollectionTest.cs" />
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
index efd19ba3094f1f..3d2f8e2ac43751 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj
index 1d0cdaed9f8f0a..59c5299406ea5c 100644
--- a/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <Nullable>enable</Nullable>
-    <IsNETCoreAppRef>false</IsNETCoreAppRef>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Quic.cs" />
diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 12bcced0a5f970..6d9e7e5f7cf322 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -139,7 +139,7 @@
                         ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86') and '$(DotNetBuildFromSource)' != 'true'">
     <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" ItemName="NativeBinPlaceItem" />
     <BinPlaceDir Include="$(NetCoreAppCurrentTestHostSharedFrameworkPath)" ItemName="NativeBinPlaceItem" />
-    <BinPlaceDir Include="$(NetCoreAppCurrentRuntimePath)" ItemName="NativeBinPlaceItem" />
+    <BinPlaceDir Include="$(LibrariesAllBinArtifactsPath)" ItemName="NativeBinPlaceItem" />
     <BinPlaceDir Include="$(LibrariesNativeArtifactsPath)" ItemName="NativeBinPlaceItem" />
     <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\*" />
   </ItemGroup>
diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
index 28312f8be52a77..f8ee055fa994e2 100644
--- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
+++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
     <IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
     <!-- SYSLIB0014: WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead. -->
diff --git a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
index 559d6b301ccd02..a938a52f9e3295 100644
--- a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
+++ b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <!-- SYSLIB0014: WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead. -->
     <NoWarn>$(NoWarn);SYSLIB0014</NoWarn>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
index f05e39076dabe6..4d0dfbdac80347 100644
--- a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
+++ b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
     <!-- SYSLIB0014: WebRequest, HttpWebRequest, ServicePoint, and WebClient are obsolete. Use HttpClient instead. -->
     <NoWarn>$(NoWarn);SYSLIB0014</NoWarn>
diff --git a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
index 9b2ed44d268670..2abfd61358cf5e 100644
--- a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
+++ b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WebHeaderCollectionTest.cs" />
diff --git a/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj b/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj
index c2e184303093da..b4667242cfd3ba 100644
--- a/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj
+++ b/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WebProxyTest.cs" />
diff --git a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
index 4e0bc74ebdaeca..70992d1a221d80 100644
--- a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WebSocketTests.cs" />
diff --git a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
index ff4201deb1b70b..54de5ea423256d 100644
--- a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
+++ b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
index 0adc822c3d1e8c..f015015de4d3ed 100644
--- a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
+++ b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerableTest.cs"
diff --git a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj
index fd601765ede457..819b83682306fe 100644
--- a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/System.Private.Uri.ExtendedFunctional.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="UriRelativeResolutionTest.cs" />
diff --git a/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj b/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
index 21bb5200471aa1..151547aba2ce7f 100644
--- a/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <NoWarn>$(NoWarn),SYSLIB0013</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
index c6a5b62dd33c23..83f98440edc7c6 100644
--- a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>436</NoWarn>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj
index f6d376a5a2921c..f1b901dcef576b 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DeepEquals.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj
index 539eeb7552199a..f27f8eba52642e 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/System.Xml.Linq.SDMSample.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SDMAttribute.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj
index efec6d1e5d7fec..821193be1ff754 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/Schema/System.Xml.Schema.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ExtensionTests.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj
index e378e7647ad3a1..43eb42dc98df5f 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="StreamExtensions.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
index f397c8aebbd858..ea539d2f80c484 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs"
diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj
index 9c9ca387bb312c..2cb5a1c584a53b 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>XDocument.Common</AssemblyName>
     <RootNamespace>CoreXml.Test.XLinq</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BridgeHelpers.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj
index d7763b8bbfb764..484159691d8741 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/XPath/XDocument/System.Xml.XPath.XDocument.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <CommonPathXPath>$(CommonTestPath)System\Xml\XPath</CommonPathXPath>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj
index ad977012169bd1..a9f696974be34d 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/axes/System.Xml.Linq.Axes.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AxisOrderValidation.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj
index 0b98d38454da31..e08f84983cdbb4 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EventsAdd.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj
index 0f61d84baa2576..98ae2f27de78db 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/misc/System.Xml.Linq.Misc.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Annotation.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
index 9b130cfa612af6..2f28c03a4f266d 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);xUnit1013</NoWarn>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs"
diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj
index d8ba4d3ed6121d..ec9ddb3c8bd6a3 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>$(NoWarn);xUnit1013</NoWarn>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ClassStamp.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj b/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj
index 37ce217c591df0..7c7c909e2fe01e 100644
--- a/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Misc/System.Xml.Misc.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>XmlMiscTests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="XmlUrlResolverTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
index 500733518dd79d..54f4951e1a8012 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CharReaderTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
index c9f5d55f4dba5e..c9fdced9a6518e 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CReaderTestModule.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
index 5544c95e815aff..efc29f0e74983c 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FactoryReaderTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
index 22491163aa29b2..e186c8769daa99 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CNameTableTestModule.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
index 606537f058d292..9206d87f8c39bd 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ConformanceSettings.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
index 1a332e08e5c1b7..13ab3f63644865 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InheritedCases.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
index f93aee359a72b4..c364cbd2711d6e 100644
--- a/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InheritedCases.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
index 7b797907e05fc5..384e19f2f7b685 100644
--- a/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CFactoryModule.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
index 7ac73f30358cf1..d57538c0fed37e 100644
--- a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <XUnitUseRandomizedTestOrderer>false</XUnitUseRandomizedTestOrderer>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj b/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj
index 521a22fa0d61e5..a7a68d7c276bcc 100644
--- a/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XPath/XPathDocument/System.Xml.XPath.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);FEATURE_XML_XPATH_ID</DefineConstants>
     <RootNamespace>System.Xml.XPath.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <CommonPathXPath>$(CommonTestPath)System\Xml\XPath</CommonPathXPath>
diff --git a/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj b/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj
index 5f969dbf371c40..f6c694a61c513c 100644
--- a/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XPath/XmlDocument/System.Xml.XPath.XmlDocument.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);FEATURE_XML_XPATH_ID</DefineConstants>
     <RootNamespace>System.Xml.XPath.XmlDocument.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <CommonPathXPath>$(CommonTestPath)System\Xml\XPath</CommonPathXPath>
diff --git a/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
index 69106ffa4dd5af..41b44321deb084 100644
--- a/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="EncodeDecodeTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
index 6d7f2706076d68..b3b4b7856a1502 100644
--- a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs"
diff --git a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj
index c56d0cec741b33..ebf9761672a326 100644
--- a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/System.Xml.XmlNodeReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NodeReaderTestHelper.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
index d14c1e04b7e7a5..17acf2cf7303de 100644
--- a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncReaderLateInitTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj
index 8ea232ac294154..e859c9684f24ea 100644
--- a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="XmlSystemPathResolverTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj b/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj
index 652f447c7d9e3e..6b6a6cbeb2bde4 100644
--- a/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>XmlReaderTest.Common</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CDataReader.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj
index bddc7839a717cc..3e89ee8cb7dd5e 100644
--- a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/System.Xml.XmlResolver.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="$(LibrariesProjectRoot)System.Private.Xml\src\Utils\DTDs\XHTML10\no_comments\xhtml1-frameset.dtd">
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
index ecc9f4c2695121..dfb3e10cb41e84 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CError.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
index 6b1cd1c52299ee..a7c9694ae50c39 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Constructor_AddSchema.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
index d7d1f3af3bb87f..61e7c4f436b58d 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Microsoft.XmlSerializer.Generator\tests\SerializableAssembly.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
index 7818cd132825c4..da3288623ff1c4 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Microsoft.XmlSerializer.Generator\tests\SerializableAssembly.csproj" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj
index 6eb1459dada4f8..c3e76cb1a30474 100644
--- a/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DisposeTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj
index 697c0cc5a9e636..f5c7d40ae3c3d7 100644
--- a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj
index 08280f21428706..e7bab91ef318c2 100644
--- a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj
index 3a91657ef67b08..424c4d465db44d 100644
--- a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
diff --git a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
index 490b4b0a011f04..625b708f3f6f72 100644
--- a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
+++ b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CustomAssemblyAttributes.cs" />
diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj b/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj
index 088e8857038adc..3603f510b4d79f 100644
--- a/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj
+++ b/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/TestDependency/System.Reflection.DispatchProxy.TestDependency.csproj b/src/libraries/System.Reflection.DispatchProxy/tests/TestDependency/System.Reflection.DispatchProxy.TestDependency.csproj
index 9c316ce65c01e4..5c142a2c983808 100644
--- a/src/libraries/System.Reflection.DispatchProxy/tests/TestDependency/System.Reflection.DispatchProxy.TestDependency.csproj
+++ b/src/libraries/System.Reflection.DispatchProxy/tests/TestDependency/System.Reflection.DispatchProxy.TestDependency.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj
index a48a6bebe82884..d8d12e1f1f028d 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj b/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj
index 810f81de4c1f4c..23d8ff73a5366b 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj
+++ b/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj
index d47bdd3466c796..3f6a728e01951a 100644
--- a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj
+++ b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj b/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj
index d9932a1017d9af..389f7d02acae54 100644
--- a/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj
+++ b/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj
index 89f7fdd4287a7f..233e848ac80ee8 100644
--- a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj
+++ b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj b/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
index 5b84319432b668..ea0343e7811d73 100644
--- a/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
+++ b/src/libraries/System.Reflection/tests/CoreCLR/System.Reflection.CoreCLR.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
index 7d911f9f127f21..a31fb65f6ce48e 100644
--- a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
+++ b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <!-- LoadFrom_SameIdentityAsAssemblyWithDifferentPath_ReturnsEqualAssemblies test relies on no deps.json -->
     <GenerateDependencyFile>false</GenerateDependencyFile>
diff --git a/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj b/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj
index 8604c68a67a018..73f75093fc0f48 100644
--- a/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj
+++ b/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj b/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj
index 3663cd79db5b86..d5075f88aeed06 100644
--- a/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj
+++ b/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj b/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj
index 95dc2ba32a8fc6..93a7320e43d459 100644
--- a/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj
+++ b/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ResourceWriterUnitTest.cs" />
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj
index 782ccb0525e6ac..bf89a31f276089 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/tests/System.Runtime.CompilerServices.VisualC.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Runtime\CompilerServices\RequiredAttributeAttributeTests.cs" />
diff --git a/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.proj b/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.proj
deleted file mode 100644
index 304633a1911a7f..00000000000000
--- a/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.proj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-
-  <ItemGroup>
-    <ProjectReference Include="..\ref\$(MSBuildProjectName).csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj b/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
index 70100c2eeda8a4..013a9f633478b5 100644
--- a/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/TargetFrameworkNameTestApp/TargetFrameworkNameTestApp.csproj
@@ -4,7 +4,7 @@
     <!-- Setting a custom TargetFrameworkAttribute in AssemblyAttributes.cs -->
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <TestRuntime>true</TestRuntime>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
index 27b93a39bd15c4..5383013fa26fd7 100644
--- a/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
@@ -4,7 +4,7 @@
     <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestApp.cs" />
diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
index 457b44b4e0892a..f4d12b87a1127b 100644
--- a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
@@ -4,7 +4,7 @@
     <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
index 4a1f4a2aecee1b..24d65de3594dbd 100644
--- a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
@@ -4,7 +4,7 @@
     <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VoidMainWithExitCodeApp.cs" />
diff --git a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
index 4d44cd6e9c5fae..c65b2d5796024e 100644
--- a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
+++ b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DllImportGenerator.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DllImportGenerator.Tests.csproj
index 5fdc0af1b9630d..7d06c65518fb93 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DllImportGenerator.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DllImportGenerator.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>Preview</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGenerator.Unit.Tests.csproj
index 8c11a8c5bdd05e..e47d1719673ca5 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGenerator.Unit.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGenerator.Unit.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>Preview</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj
index e0e9e306d07009..700b635336022f 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <!-- COM tests are currently only supported only in Windows on coreclr -->
     <IgnoreForCI Condition="'$(TargetOS)' != 'Windows' or '$(RuntimeFlavor)' != 'CoreCLR'">true</IgnoreForCI>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.csproj
index 88c636e683cf6d..4774661ee8e33a 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis/System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass.csproj
index 26f33484620943..0bd7bc67d63ad3 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass/System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField.csproj
index 0a3f60146cac36..c3eff95299ae56 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda.csproj
index 3b402585aa2982..c247d02212c03a 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda/System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange.csproj
index 3989aeb8e2b088..3cf7b235edb25c 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange/System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
     <SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes.csproj
index f347cd960c41ff..a87aeeacdfbbd8 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes/System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete.csproj
index fa4dec5c554d76..81d15c69b4d9e9 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeDelete.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate.csproj
index 985424ab348619..1a076e2237e5cc 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate/System.Reflection.Metadata.ApplyUpdate.Test.CustomAttributeUpdate.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate.csproj
index 1cd197f92264de..37061eb031e388 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate/System.Reflection.Metadata.ApplyUpdate.Test.FirstCallAfterUpdate.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
     <SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange.csproj
index 7a8ab7f07706c1..8ac3144ec0ef6f 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange/System.Reflection.Metadata.ApplyUpdate.Test.LambdaBodyChange.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
     <SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis.csproj
index 8eaf1f08f60eac..a9614c20b305bd 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis/System.Reflection.Metadata.ApplyUpdate.Test.LambdaCapturesThis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
     <SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
diff --git a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1.csproj b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1.csproj
index 57ba4f3ec52983..a51bdaf9d4d0f8 100644
--- a/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1/System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <DeltaScript>deltascript.json</DeltaScript>
     <SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
diff --git a/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj b/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj
index 926dabeb2ef8dc..be61592207c559 100644
--- a/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ContextualReflectionDependency/System.Runtime.Loader.Test.ContextualReflectionDependency.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ContextualReflectionDependency.cs" />
diff --git a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj
index a0304394916779..a49237a8156abe 100644
--- a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <!-- LoadInDefaultContext test relies on no deps.json -->
     <GenerateDependencyFile>false</GenerateDependencyFile>
diff --git a/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Dynamic/LoaderLinkTest.Dynamic.csproj b/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Dynamic/LoaderLinkTest.Dynamic.csproj
index 7fdc93128a864e..2fc6f6d009f0c8 100644
--- a/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Dynamic/LoaderLinkTest.Dynamic.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Dynamic/LoaderLinkTest.Dynamic.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SharedInterfaceImplementation.cs" />
diff --git a/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Shared/LoaderLinkTest.Shared.csproj b/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Shared/LoaderLinkTest.Shared.csproj
index 2adb5cb89d9747..1401d0f55a4a9b 100644
--- a/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Shared/LoaderLinkTest.Shared.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/LoaderLinkTest.Shared/LoaderLinkTest.Shared.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ISharedInterface.cs" />
diff --git a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj
index f1580207d39c13..f8242a8e212f38 100644
--- a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj
index 19df3ccaaa0879..9d1038aa2f9f2a 100644
--- a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLib/ReferencedClassLib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReferencedClassLib.cs" />
diff --git a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj
index 4aa6c84d0f2452..84360f26df731e 100644
--- a/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/ReferencedClassLibNeutralIsSatellite/ReferencedClassLibNeutralIsSatellite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReferencedClassLibNeutralIsSatellite.cs" />
diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
index 572b008d7747f7..b5548c13654b07 100644
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Test expects an un-signed assembly -->
     <SignAssembly>false</SignAssembly>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TestClass.cs" />
diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
index de19f647693804..ef6fe63e0164d8 100644
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>System.Runtime.Loader.Tests</RootNamespace>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <!-- Some tests rely on no deps.json file being present. -->
diff --git a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj
index 976ae7909313ef..4fdda7875bc2c0 100644
--- a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj
+++ b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
-
     <!-- disabled due to https://github.com/dotnet/runtime/issues/65671 -->
     <XUnitUseRandomizedTestOrderer>false</XUnitUseRandomizedTestOrderer>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj b/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj
index 183c1f452a2566..5927c7de07f125 100644
--- a/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/ReflectionOnly/System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs" />
diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
index a736ad7f3179d6..249b763f489ce0 100644
--- a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(TestSourceFolder)DataContractJsonSerializer.cs" />
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj b/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj
index bdc08d8ce75213..aa5368bbad5350 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Runtime\Serialization\CollectionDataContractAttributeTests.cs" />
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
index 320a4c93973da9..9e332f12609925 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(TestSourceFolder)CanonicalizationTestHelper.cs" />
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
index d6c214bbf85807..bc6dd7d7901dbb 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ReflectionOnly</DefineConstants>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs" />
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
index b7878a37204498..5c8b68affe3ccb 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(TestSourceFolder)DataContractSerializerStressTests.cs" />
diff --git a/src/libraries/System.Runtime/src/System.Runtime.csproj b/src/libraries/System.Runtime/src/System.Runtime.csproj
index b8df760b6ba3fc..b8ef29d02f501a 100644
--- a/src/libraries/System.Runtime/src/System.Runtime.csproj
+++ b/src/libraries/System.Runtime/src/System.Runtime.csproj
@@ -20,4 +20,8 @@
     <ProjectReference Include="$(CoreLibProject)" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Uri\src\System.Private.Uri.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <!-- Set the ReferenceAssembly metadata to the inbox version of System.Runtime and not to System.Runtime.Experimental. -->
+    <ProjectReference Include="..\ref\System.Runtime.csproj" ReferenceOutputAssembly="false" OutputItemType="ResolvedMatchingContractOverride" />
+  </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj b/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj
index 74dc03796cf4b9..015d010dbfcbfc 100644
--- a/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj
+++ b/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ClaimsIdentityTests.cs" />
diff --git a/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj b/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj
index 9c2df300511469..c1e5c4a899a58e 100644
--- a/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj
+++ b/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj b/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj
index bbec3408945982..a8fc7a7b34c700 100644
--- a/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj
+++ b/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
index 73021ff5eb92af..2e59a6b32f4b06 100644
--- a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
+++ b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
     <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
     <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Generators.Tests/System.Text.RegularExpressions.Generators.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Generators.Tests/System.Text.RegularExpressions.Generators.Tests.csproj
index ece19d5b758588..f80ffadc2c994b 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Generators.Tests/System.Text.RegularExpressions.Generators.Tests.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Generators.Tests/System.Text.RegularExpressions.Generators.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <EnableDefaultItems>true</EnableDefaultItems>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <Nullable>enable</Nullable>
diff --git a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
index 9b8f3480190fd3..a64b209cfb796b 100644
--- a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
+++ b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
index 3cf17c52a2fc80..44cf712d71c7c2 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
index c26f5f363a0424..4be608cc6847ac 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
index 47e8071237754a..2253b5e87e79d9 100644
--- a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj
index 2b0bf06b422241..e7e4668a5bf3ac 100644
--- a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj
+++ b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj
@@ -4,7 +4,7 @@
     <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DefaultApartmentStateMain.cs" />
diff --git a/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj b/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj
index 5a73878961b5d5..fab048a7e1ecbb 100644
--- a/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj
+++ b/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj
@@ -4,7 +4,7 @@
     <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MTAMain.cs" />
diff --git a/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj b/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj
index cd4443b241facb..5db12bc94a9223 100644
--- a/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj
+++ b/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj
@@ -4,7 +4,7 @@
     <!-- To be consistent between net472 and others we override the SDK behavior which defaults to .dll -->
     <TargetExt>.exe</TargetExt>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="STAMain.cs" />
diff --git a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
index 5f4448b2bc4fb7..6a9977dc6e11b6 100644
--- a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
+++ b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CompressedStackTests.cs" />
diff --git a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
index 2a956d57e24897..a39ec750808ed7 100644
--- a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
+++ b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
index 30d9b8f8a207f0..df6d5e330a30bd 100644
--- a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
+++ b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
index 5b1b5b087b2a2d..81ac83a8a221e7 100644
--- a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
+++ b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AsyncLocalTests.cs" />
diff --git a/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj b/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj
index 97efb68bab6ad5..90c3f0f9742e01 100644
--- a/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj
+++ b/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NonMsdtcPromoterTests.cs" />
diff --git a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj
index f0ec4ac41eb927..6e5f6d3b053cd8 100644
--- a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj
+++ b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <TestRuntime>true</TestRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj b/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj
index c54c46d542fb25..68774a94ba317c 100644
--- a/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj
+++ b/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="HttpUtility\HttpUtilityTest.cs" />
diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/apicompat/ApiCompat.proj
similarity index 65%
rename from src/libraries/shims/ApiCompat.proj
rename to src/libraries/apicompat/ApiCompat.proj
index e27786ccb1a54c..fbbd7eb46e6f7a 100644
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/apicompat/ApiCompat.proj
@@ -1,5 +1,25 @@
 <Project Sdk="Microsoft.Build.NoTargets">
 
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
+    <!-- Reference the dependencies to have the assemblies available for API comparison. -->
+    <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
+    <!-- Target reference assemblies instead of implementation assemblies. -->
+    <CompileUsingReferenceAssemblies>true</CompileUsingReferenceAssemblies>
+    <TrimOutPrivateAssembliesFromReferencePath>true</TrimOutPrivateAssembliesFromReferencePath>
+
+    <ApiCompatNSBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandard.txt</ApiCompatNSBaselineFile>
+    <ApiCompatNSOnlyBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandardOnly.txt</ApiCompatNSOnlyBaselineFile>
+    <PreviousNetCoreAppBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.PreviousNetCoreApp.txt</PreviousNetCoreAppBaselineFile>
+  </PropertyGroup>
+
+  <!-- For API comparision, ApiCompat needs both the inbox and the out-of-band assemblies plus the shims to be built. -->
+  <ItemGroup>
+    <ProjectReference Include="..\sfx-src.proj;
+                               ..\oob-src.proj;
+                               ..\shims.proj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(NetCoreAppLatestStablePackageBaselineVersion)]" />
     <PackageDownload Include="NETStandard.Library.Ref" Version="[$(NETStandardLibraryRefVersion)]" />
@@ -7,29 +27,16 @@
     <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" IsImplicitlyDefined="true" />
   </ItemGroup>
 
-  <Target Name="GetApiCompatInputsAndOutputs">
-    <PropertyGroup>
-      <ApiCompatNSBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandard.txt</ApiCompatNSBaselineFile>
-      <ApiCompatNSOnlyBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandardOnly.txt</ApiCompatNSOnlyBaselineFile>
-      <PreviousNetCoreAppBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.PreviousNetCoreApp.txt</PreviousNetCoreAppBaselineFile>
-      <ApiCompatMarkerFile>$(BaseIntermediateOutputPath)marker.txt</ApiCompatMarkerFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <NetCoreAppCurrentRefFile Include="$(NetCoreAppCurrentRefPath)*.dll" />
-    </ItemGroup>
-  </Target>
-
   <Target Name="RunApiCompat"
-          DependsOnTargets="GetApiCompatInputsAndOutputs"
+          DependsOnTargets="FindReferenceAssembliesForReferences"
           AfterTargets="Build"
-          Inputs="@(NetCoreAppCurrentRefFile);$(ApiCompatNSBaselineFile);$(ApiCompatNSOnlyBaselineFile);$(PreviousNetCoreAppBaselineFile)"
-          Outputs="$(ApiCompatMarkerFile)">
-
+          Inputs="@(ReferencePathWithRefAssemblies);$(ApiCompatNSBaselineFile);$(ApiCompatNSOnlyBaselineFile);$(PreviousNetCoreAppBaselineFile)"
+          Outputs="$(IntermediateOutputPath)$(TargetArchitecture)-marker.txt">
     <PropertyGroup>
-      <ApiCompatResponseFile>$(BaseIntermediateOutputPath)apicompat.rsp</ApiCompatResponseFile>
+      <ApiCompatResponseFile>$(IntermediateOutputPath)apicompat.rsp</ApiCompatResponseFile>
       <ApiCompatExitCode>0</ApiCompatExitCode>
-      <ApiCompatArgs>--impl-dirs "$(NetCoreAppCurrentRefPath.TrimEnd('\/'))"</ApiCompatArgs>
+      <!-- TODO: Replace with ReferencePathWithRefAssemblies when ApiCompat supports passing in a list of assemblies: https://github.com/dotnet/arcade/issues/8394. -->
+      <ApiCompatArgs>--impl-dirs "$(LibrariesAllRefArtifactsPath.TrimEnd('\/'))"</ApiCompatArgs>
       <ApiCompatArgs Condition="'$(ApiCompatExcludeAttributeList)' != ''">$(ApiCompatArgs) --exclude-attributes "$(ApiCompatExcludeAttributeList)"</ApiCompatArgs>
     </PropertyGroup>
 
@@ -45,6 +52,8 @@
       <NetStandard21BaselineModifer Condition="'$(UpdateNETStandardBaseline)' == 'true'">&gt;</NetStandard21BaselineModifer>
     </PropertyGroup>
 
+    <Message Importance="high" Text="ApiCompat -> Comparing $(NetCoreAppCurrent) reference assemblies against .NETStandard2.x and .NETCoreApp$(NetCoreAppLatestStableVersion)..." />
+
     <Exec Command="$(_ApiCompatCommand) &quot;$(NetStandard21OnlyRef)&quot; @&quot;$(ApiCompatResponseFile)&quot; $(NetStandard21BaselineModifer) &quot;$(ApiCompatNSOnlyBaselineFile)&quot;"
           CustomErrorRegularExpression="^[a-zA-Z]+ :"
           StandardOutputImportance="Low"
@@ -77,9 +86,12 @@
     <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing $(NetCoreAppLatestStable) to $(NetCoreAppCurrent). If this breaking change is intentional, the ApiCompat baseline can be updated by running 'dotnet build $(MSBuildThisFileFullPath) /p:UpdatePreviousNetCoreAppBaseline=true'" />
 
     <!-- Create a marker file which serves as the target's output to enable incremental builds. -->
-    <Touch Files="$(ApiCompatMarkerFile)"
+    <Touch Files="$(IntermediateOutputPath)$(TargetArchitecture)-marker.txt"
            AlwaysCreate="true" />
- 
+  </Target>
+
+  <Target Name="CleanAdditionalFiles" AfterTargets="Clean">
+    <RemoveDir Directories="$(IntermediateOutputPath)" />
   </Target>
 
 </Project>
diff --git a/src/libraries/shims/ApiCompatBaseline.PreviousNetCoreApp.txt b/src/libraries/apicompat/ApiCompatBaseline.PreviousNetCoreApp.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.PreviousNetCoreApp.txt
rename to src/libraries/apicompat/ApiCompatBaseline.PreviousNetCoreApp.txt
diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandard.txt b/src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandard.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandard.txt
rename to src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandard.txt
diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt b/src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
rename to src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
diff --git a/src/libraries/frameworklist.targets b/src/libraries/frameworklist.targets
new file mode 100644
index 00000000000000..6e1966fe424540
--- /dev/null
+++ b/src/libraries/frameworklist.targets
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.DotNet.SharedFramework.Sdk">
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <FrameworkListOutputPath>$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml</FrameworkListOutputPath>
+  </PropertyGroup>
+
+  <Target Name="GetGenerateFrameworkListFileInputs">
+    <ItemGroup>
+      <SharedFrameworkAssemblyWithReferenceAssembly Include="@(SharedFrameworkAssembly->HasMetadata('ReferenceAssembly'))" />
+      <SharedFrameworkAssemblyWithoutReferenceAssembly Include="@(SharedFrameworkAssembly)"
+                                                       Exclude="@(SharedFrameworkAssemblyWithReferenceAssembly)" />
+
+      <FrameworkListInputFile Include="@(SharedFrameworkAssemblyWithReferenceAssembly->Metadata('ReferenceAssembly'));
+                                       @(SharedFrameworkAssemblyWithoutReferenceAssembly)"
+                              TargetPath="ref/$(NetCoreAppCurrent)"
+                              Condition="!$(NetCoreAppLibraryNoReference.Contains('%(Filename);'))" />
+    </ItemGroup>
+  </Target>
+
+  <UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetSharedFrameworkTaskFile)"/>
+  <Target Name="GenerateFrameworkListFile"
+          DependsOnTargets="GetGenerateFrameworkListFileInputs"
+          AfterTargets="Build"
+          Condition="'@(SharedFrameworkAssembly)' != ''"
+          Inputs="@(FrameworkListInputFile)"
+          Outputs="$(FrameworkListOutputPath)">
+    <ItemGroup>
+      <FrameworkListRootAttribute Include="Name" Value="$(NetCoreAppCurrentBrandName)" />
+      <FrameworkListRootAttribute Include="TargetFrameworkIdentifier" Value="$(NetCoreAppCurrentIdentifier)" />
+      <FrameworkListRootAttribute Include="TargetFrameworkVersion" Value="$(NetCoreAppCurrentVersion)" />
+      <FrameworkListRootAttribute Include="FrameworkName" Value="$(MicrosoftNetCoreAppFrameworkName)" />
+    </ItemGroup>
+
+    <CreateFrameworkListFile Files="@(FrameworkListInputFile)"
+                             TargetFile="$(FrameworkListOutputPath)"
+                             TargetFilePrefixes="ref/;runtimes/"
+                             RootAttributes="@(FrameworkListRootAttribute)" />
+  </Target>
+
+</Project>
diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets
deleted file mode 100644
index d609c1d47bdf26..00000000000000
--- a/src/libraries/illink-oob.targets
+++ /dev/null
@@ -1,84 +0,0 @@
-<Project>
-
-  <Target Name="GetOOBAssembliesToTrim"
-          DependsOnTargets="PrepareForAssembliesTrim">
-
-    <PropertyGroup>
-      <OOBAssembliesTrimmedArtifactsPath>$([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-oobs'))</OOBAssembliesTrimmedArtifactsPath>
-      <OOBAssembliesMarkerFile>$(IntermediateOutputPath)oob-linker-$(TargetOS)-$(TargetArchitecture)-marker.txt</OOBAssembliesMarkerFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- Include suppression XML files bin-placed in earlier per-library linker run. -->
-      <OOBLibrarySuppressionsXml Include="$(ILLinkTrimAssemblyOOBSuppressionsXmlsDir)*.xml" />
-      
-      <!-- The following is the list of all the OOBs we will ignore for now -->
-      <OOBAssemblyToIgnore Include="System.CodeDom" />
-      <OOBAssemblyToIgnore Include="System.ComponentModel.Composition" />
-      <OOBAssemblyToIgnore Include="System.ComponentModel.Composition.Registration" />
-      <OOBAssemblyToIgnore Include="System.Composition.AttributedModel" />
-      <OOBAssemblyToIgnore Include="System.Composition.Convention" />
-      <OOBAssemblyToIgnore Include="System.Composition.Hosting" />
-      <OOBAssemblyToIgnore Include="System.Composition.Runtime" />
-      <OOBAssemblyToIgnore Include="System.Composition.TypedParts" />
-      <OOBAssemblyToIgnore Include="System.Configuration.ConfigurationManager" />
-      <OOBAssemblyToIgnore Include="System.Speech" />
-
-      <NetCoreAppCurrentAssembly Include="$(NetCoreAppCurrentRuntimePath)*.dll"
-                                 Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator*.dll;
-                                          $(NetCoreAppCurrentRuntimePath)*.Native.dll;
-                                          $(NetCoreAppCurrentRuntimePath)*msquic.dll" />
-      <SharedFrameworkAssembly Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" />
-
-      <!-- Move items to FileName so that we can subtract them -->
-      <NetCoreAppCurrentAssemblyWithFilename Include="@(NetCoreAppCurrentAssembly -> '%(FileName)')"
-                                             OriginalIdentity="%(Identity)" />
-      <SharedFrameworkAssemblyWithFilename Include="@(SharedFrameworkAssembly -> '%(FileName)')"
-                                           OriginalIdentity="%(Identity)" />
-
-      <OOBAssemblyToTrimWithFileName Include="@(NetCoreAppCurrentAssemblyWithFilename)"
-                                     Exclude="@(SharedFrameworkAssemblyWithFilename);
-                                              @(OOBAssemblyToIgnore)" />
-      <OOBAssemblyToTrim Include="@(OOBAssemblyToTrimWithFileName -> '%(OriginalIdentity)')" />
-      
-      <OOBAssemblyReferenceWithFilename Include="@(NetCoreAppCurrentAssemblyWithFilename)"
-                                        Exclude="@(OOBAssemblyToTrimWithFileName)" />
-      <OOBAssemblyReference Include="@(OOBAssemblyReferenceWithFilename -> '%(OriginalIdentity)')" />
-      <OOBAssemblyReference Include="$(SystemPrivateCoreLibPath)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <OOBLibraryTrimmed Include="$(OOBAssembliesTrimmedArtifactsPath)*.*" />
-    </ItemGroup>
-
-  </Target>
-
-  <Target Name="ILLinkTrimOOBAssemblies"
-          AfterTargets="Build"
-          DependsOnTargets="GetOOBAssembliesToTrim;PrepareForAssembliesTrim"
-          Inputs="$(ILLinkTasksAssembly);@(OOBAssemblyToTrim);@(OOBAssemblyReference);@(OOBLibrarySuppressionsXml)"
-          Outputs="$(OOBAssembliesMarkerFile)">
-
-    <Message Text="Trimming $(PackageRID) out-of-band assemblies with ILLinker..." Importance="high" />
-
-   <PropertyGroup>
-      <OOBILLinkArgs>$(ILLinkArgs)</OOBILLinkArgs>
-      <OOBILLinkArgs Condition="'@(OOBLibrarySuppressionsXml)' != ''" >$(OOBILLinkArgs) --link-attributes &quot;@(OOBLibrarySuppressionsXml->'%(FullPath)', '&quot; --link-attributes &quot;')&quot;</OOBILLinkArgs>
-    </PropertyGroup>
-
-    <ILLink AssemblyPaths=""
-        RootAssemblyNames="@(OOBAssemblyToTrim)"
-        ReferenceAssemblyPaths="@(OOBAssemblyReference)"
-        OutputDirectory="$(OOBAssembliesTrimmedArtifactsPath)"
-        ExtraArgs="$(OOBILLinkArgs)"
-        ToolExe="$(_DotNetHostFileName)"
-        ToolPath="$(_DotNetHostDirectory)" />
-
-    <!-- Create a marker file which serves as the target's output to enable incremental builds. -->
-    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(OOBAssembliesMarkerFile)'))" />
-    <Touch Files="$(OOBAssembliesMarkerFile)"
-           AlwaysCreate="true" />
-
-  </Target>
-
-</Project>
diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets
deleted file mode 100644
index 8641657b9f58d0..00000000000000
--- a/src/libraries/illink-sharedframework.targets
+++ /dev/null
@@ -1,66 +0,0 @@
-<Project>
-
-  <Target Name="GetSharedFrameworkAssembliesToTrim"
-          DependsOnTargets="PrepareForAssembliesTrim">
-
-    <PropertyGroup>
-      <SharedFrameworkAssembliesTrimmedArtifactsPath>$([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-runtimepack'))</SharedFrameworkAssembliesTrimmedArtifactsPath>
-      <SharedFrameworkAssembliesMarkerFile>$(IntermediateOutputPath)sfx-linker-$(TargetOS)-$(TargetArchitecture)-marker.txt</SharedFrameworkAssembliesMarkerFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- Include suppression XML files bin-placed in earlier per-library linker run. -->
-      <SharedFrameworkSuppressionsXml Include="$(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir)*.xml" />
-      <!-- Collect CoreLib suppression XML files not bin-placed in earlier per-library linker run. CoreLib doesn't use bin-place logic. -->
-      <SharedFrameworkSuppressionsXml Include="$(CoreLibSharedDir)ILLink\ILLink.Suppressions.LibraryBuild.xml" />
-      <SharedFrameworkSuppressionsXml Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$(CoreClrProjectRoot)System.Private.CoreLib\$(ProjectILLinkSuppressionsFile).LibraryBuild.xml" />
-      
-      <SharedFrameworkAssemblyToTrim Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" />
-      <SharedFrameworkAssemblyToTrim Include="$(SystemPrivateCoreLibPath)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <SharedFrameworkAssemblyTrimmed Include="$(SharedFrameworkAssembliesTrimmedArtifactsPath)*.*" />
-    </ItemGroup>
-
-  </Target>
-
-  <Target Name="ILLinkTrimSharedFramework"
-          AfterTargets="Build"
-          DependsOnTargets="GetSharedFrameworkAssembliesToTrim;PrepareForAssembliesTrim"
-          Inputs="$(ILLinkTasksAssembly);@(SharedFrameworkAssemblyToTrim);@(SharedFrameworkSuppressionsXml)"
-          Outputs="$(SharedFrameworkAssembliesMarkerFile)">
-
-    <Message Text="Trimming $(PackageRID) shared framework assemblies with ILLinker..." Importance="high" />
-
-    <PropertyGroup>
-      <SharedFrameworkILLinkArgs>$(ILLinkArgs)</SharedFrameworkILLinkArgs>
-      <!-- update debug symbols -->
-      <SharedFrameworkILLinkArgs>$(SharedFrameworkILLinkArgs) -b true</SharedFrameworkILLinkArgs>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <RootAssemblies Include="@(SharedFrameworkAssemblyToTrim)">
-        <RootMode>library</RootMode>
-      </RootAssemblies>
-    </ItemGroup>
-
-    <PropertyGroup>
-      <SharedFrameworkILLinkArgs Condition="'@(SharedFrameworkSuppressionsXml)' != ''" >$(SharedFrameworkILLinkArgs) --link-attributes &quot;@(SharedFrameworkSuppressionsXml->'%(FullPath)', '&quot; --link-attributes &quot;')&quot;</SharedFrameworkILLinkArgs>
-    </PropertyGroup>
-
-    <ILLink AssemblyPaths=""
-        RootAssemblyNames="@(RootAssemblies)"
-        OutputDirectory="$(SharedFrameworkAssembliesTrimmedArtifactsPath)"
-        ExtraArgs="$(SharedFrameworkILLinkArgs)"
-        ToolExe="$(_DotNetHostFileName)"
-        ToolPath="$(_DotNetHostDirectory)" />
-
-    <!-- Create a marker file which serves as the target's output to enable incremental builds. -->
-    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(SharedFrameworkAssembliesMarkerFile)'))" />
-    <Touch Files="$(SharedFrameworkAssembliesMarkerFile)"
-           AlwaysCreate="true" />
-
-  </Target>
-
-</Project>
diff --git a/src/libraries/illink-trimassemblies.targets b/src/libraries/illink-trimassemblies.targets
deleted file mode 100644
index 8de8f3264f62dc..00000000000000
--- a/src/libraries/illink-trimassemblies.targets
+++ /dev/null
@@ -1,41 +0,0 @@
-<Project>
-
-  <Target Name="PrepareForAssembliesTrim"
-          DependsOnTargets="SetCommonILLinkArgs">
-
-    <!-- Retrieve CoreLib's path as it isn't binplaced alongside the libraries - https://github.com/dotnet/runtime/issues/43095. -->
-    <ItemGroup>
-      <CoreLibProjectWithRuntimeConfig Include="$(CoreLibProject)">
-        <!-- Don't flow TargetFramework and Platform to use same inputs and outputs as the CoreLib's build as part of the runtime. -->
-        <UndefineProperties>$(UndefineProperties);TargetFramework;Platform</UndefineProperties>
-        <!-- If conflicting, manually set the Configuration property of the CoreLib project so that it aligns with the specified runtime configuration in the libraries' build. -->
-        <Properties Condition="'$(RuntimeFlavor)' == 'CoreCLR' and
-                               '$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration)</Properties>
-        <Properties Condition="'$(RuntimeFlavor)' == 'Mono' and
-                               '$(Configuration)' != '$(MonoConfiguration)'">Configuration=$(MonoConfiguration)</Properties>
-      </CoreLibProjectWithRuntimeConfig>
-    </ItemGroup>
-
-    <MSBuild Projects="@(CoreLibProjectWithRuntimeConfig)"
-             Targets="GetTargetPath">
-      <Output TaskParameter="TargetOutputs" PropertyName="SystemPrivateCoreLibPath" />
-    </MSBuild>
-
-    <PropertyGroup>
-      <ProjectILLinkSuppressionsFile>src\ILLink\ILLink.Suppressions</ProjectILLinkSuppressionsFile>
-    </PropertyGroup>
-
-    <!-- When running from Desktop MSBuild, DOTNET_HOST_PATH is not set.
-      In this case, explicitly specify the path to the dotnet host. -->
-    <PropertyGroup Condition=" '$(DOTNET_HOST_PATH)' == '' ">
-      <!-- This is defined when building in Visual Studio. -->
-      <_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
-      <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)'))</_DotNetHostFileName>
-    </PropertyGroup>
-    
-  </Target>
-
-  <Import Project="$(RepositoryEngineeringDir)illink.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)illink-sharedframework.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)illink-oob.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/libraries/oob-all.proj b/src/libraries/oob-all.proj
new file mode 100644
index 00000000000000..a444e6eb44912c
--- /dev/null
+++ b/src/libraries/oob-all.proj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.Build.Traversal">
+
+  <PropertyGroup Condition="'$(BuildTargetFramework)' == 'net48'">
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+    <!-- Filter ProjectReferences to build the best matching target framework only. -->
+    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
+  </PropertyGroup>
+
+  <!-- Reference all out-of-band projects. -->
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.*proj"
+                      Exclude="@(ProjectExclusions);
+                               $(MSBuildThisFileDirectory)*\src\**\*.shproj;
+                               shims\src\*.csproj" />
+
+    <!-- Build these packages in the allconfigurations leg only. -->
+    <ProjectReference Remove="Microsoft.Internal.Runtime.AspNetCore.Transport\src\Microsoft.Internal.Runtime.AspNetCore.Transport.proj;
+                              Microsoft.Internal.Runtime.WindowsDesktop.Transport\src\Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj;
+                              Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj;
+                              Microsoft.NETCore.Platforms\src\Microsoft.NETCore.Platforms.csproj"
+                      Condition="'$(BuildAllConfigurations)' != 'true'" />
+
+    <!-- Skip these projects during source-build as they rely on external prebuilts. -->
+    <ProjectReference Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj;
+                              Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj"
+                      Condition="'$(DotNetBuildFromSource)' == 'true'" />
+
+    <!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. -->
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj"
+                      Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(BuildAllConfigurations)' == 'true'" />
+    <!-- During an official Build, build the rid specific package matching the OutputRid only outside of an allconfigurations build and only when targeting the CoreCLR runtime.
+         The limitation on the CoreCLR runtime is entirely artificial but avoids duplicate assets being publish. -->
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRid).*.proj"
+                      Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or ('$(BuildAllConfigurations)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)')" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/libraries/oob-ref.proj b/src/libraries/oob-ref.proj
new file mode 100644
index 00000000000000..33f580285a5fc6
--- /dev/null
+++ b/src/libraries/oob-ref.proj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.Build.Traversal">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <!-- Filter ProjectReferences to build the best matching target framework only. -->
+    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
+  </PropertyGroup>
+
+  <!-- Reference all NetCoreAppCurrent out-of-band ref projects. -->
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\ref\*.csproj"
+                      Exclude="@(ProjectExclusions);
+                               shims\ref\*.csproj;
+                               @(NetCoreAppLibrary->'%(Identity)\ref\%(Identity).csproj')" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/libraries/oob-src.proj b/src/libraries/oob-src.proj
new file mode 100644
index 00000000000000..1edbe734b9371d
--- /dev/null
+++ b/src/libraries/oob-src.proj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.Build.Traversal">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
+    <!-- Filter ProjectReferences to build the best matching target framework only. -->
+    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
+  </PropertyGroup>
+
+  <!-- Reference all NetCoreAppCurrent out-of-band src projects. -->
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.*proj"
+                      Exclude="@(ProjectExclusions);
+                               $(MSBuildThisFileDirectory)*\src\*.shproj;
+                               shims\src\*.csproj;
+                               @(NetCoreAppLibrary->'%(Identity)\src\%(Identity).csproj');
+                               Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj" />
+
+    <!-- Don't build task and tools project in the NetCoreAppCurrent vertical. -->
+    <ProjectReference Remove="Microsoft.NETCore.Platforms\src\Microsoft.NETCore.Platforms.csproj;
+                              Microsoft.XmlSerializer.Generator\src\Microsoft.XmlSerializer.Generator.csproj" />
+
+    <!-- Don't build meta-projects in the NetCoreAppCurrent vertical. -->
+    <ProjectReference Remove="Microsoft.Internal.Runtime.AspNetCore.Transport\src\Microsoft.Internal.Runtime.AspNetCore.Transport.proj;
+                              Microsoft.Internal.Runtime.WindowsDesktop.Transport\src\Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj;
+                              Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" />
+
+    <!-- Filter out projects which aren't source-buildable. -->
+    <ProjectReference Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj"
+                      Condition="'$(DotNetBuildFromSource)' == 'true'" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/libraries/oob.proj b/src/libraries/oob.proj
new file mode 100644
index 00000000000000..74a8bfb3b18859
--- /dev/null
+++ b/src/libraries/oob.proj
@@ -0,0 +1,108 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
+    <!-- By default, build the NetCoreAppCurrent vertical only. -->
+    <BuildTargetFramework Condition="'$(BuildAllConfigurations)' != 'true'">$(NetCoreAppCurrent)</BuildTargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
+    <ProjectReference Include="sfx-src.proj" OutputItemType="SharedFrameworkAssembly" />
+    <ProjectReference Include="oob-src.proj" OutputItemType="OOBAssembly" />
+    <ProjectReference Include="shims.proj" OutputItemType="SharedFrameworkAssembly" />
+
+    <ProjectReference Include="apicompat\ApiCompat.proj"
+                      Condition="'$(DotNetBuildFromSource)' != 'true' and '$(RunApiCompat)' != 'false'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BuildTargetFramework)' != '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
+    <ProjectReference Include="oob-all.proj" SkipGetTargetFrameworkProperties="true" />
+  </ItemGroup>
+
+  <!-- Support building reference projects only. -->
+  <ItemGroup Condition="'$(RefOnly)' == 'true'">
+    <ProjectReference Remove="@(ProjectReference)" />
+    <ProjectReference Include="sfx-ref.proj" OutputItemType="SharedFrameworkAssembly" />
+    <ProjectReference Include="oob-ref.proj" />
+    <ProjectReference Include="shims.proj" OutputItemType="SharedFrameworkAssembly" />
+  </ItemGroup>
+
+  <ImportGroup Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
+    <!-- Re-generate the targeting pack's framework list to include shims. -->
+    <Import Project="frameworklist.targets" />
+    <!-- Import the illink file which contains some of the logic required to illink the out-of-band assemblies. -->
+    <Import Project="$(RepositoryEngineeringDir)illink.targets" />
+  </ImportGroup>
+
+  <Target Name="GetTrimOOBAssembliesInputs"
+          DependsOnTargets="ResolveProjectReferences">
+    <PropertyGroup>
+      <OOBAssembliesTrimmedArtifactsPath>$([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-oobs'))</OOBAssembliesTrimmedArtifactsPath>
+      <OOBAssembliesMarkerFile>$(IntermediateOutputPath)linker-$(TargetArchitecture)-marker.txt</OOBAssembliesMarkerFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- Include suppression XML files bin-placed in earlier per-library linker run. -->
+      <OOBLibrarySuppressionsXml Include="$(ILLinkTrimAssemblyOOBSuppressionsXmlsDir)*.xml" />
+      
+      <!-- The following is the list of all the OOBs we will ignore for now -->
+      <OOBAssemblyToIgnore Include="System.CodeDom;
+                                    System.ComponentModel.Composition;
+                                    System.ComponentModel.Composition.Registration;
+                                    System.Composition.AttributedModel;
+                                    System.Composition.Convention;
+                                    System.Composition.Hosting;
+                                    System.Composition.Runtime;
+                                    System.Composition.TypedParts;
+                                    System.Configuration.ConfigurationManager;
+                                    System.Speech;
+                                    Microsoft.Extensions.DependencyInjection.Specification.Tests" />
+
+      <!-- Move items to FileName so that we can subtract them. -->
+      <OOBAssemblyWithFilename Include="@(OOBAssembly->Metadata('Filename'))"
+                               OriginalIdentity="%(Identity)" />
+      <OOBAssemblyToTrimWithFilename Include="@(OOBAssemblyWithFilename)"
+                                     Exclude="@(OOBAssemblyToIgnore)" />
+      <OOBAssemblyToIgnoreWithFilename Include="@(OOBAssemblyWithFilename)"
+                                       Exclude="@(OOBAssemblyToTrimWithFilename)" />
+
+      <OOBAssemblyToTrim Include="@(OOBAssemblyToTrimWithFilename->Metadata('OriginalIdentity'))" />
+      <OOBAssemblyReference Include="@(OOBAssemblyToIgnoreWithFilename->Metadata('OriginalIdentity'));
+                                     @(SharedFrameworkAssembly)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="TrimOOBAssemblies"
+          AfterTargets="Build"
+          Condition="'$(RefOnly)' != 'true' and '@(OOBAssembly)' != ''"
+          DependsOnTargets="GetTrimOOBAssembliesInputs;PrepareForAssembliesTrim"
+          Inputs="$(ILLinkTasksAssembly);@(OOBAssemblyToTrim);@(OOBAssemblyReference);@(OOBLibrarySuppressionsXml)"
+          Outputs="$(OOBAssembliesMarkerFile)">
+    <Message Text="$(MSBuildProjectName) -> Trimming $(PackageRID) out-of-band assemblies with ILLinker..." Importance="high" />
+
+    <PropertyGroup>
+      <OOBILLinkArgs>$(ILLinkArgs)</OOBILLinkArgs>
+      <OOBILLinkArgs Condition="'@(OOBLibrarySuppressionsXml)' != ''" >$(OOBILLinkArgs) --link-attributes &quot;@(OOBLibrarySuppressionsXml->'%(FullPath)', '&quot; --link-attributes &quot;')&quot;</OOBILLinkArgs>
+    </PropertyGroup>
+
+    <ILLink AssemblyPaths=""
+        RootAssemblyNames="@(OOBAssemblyToTrim)"
+        ReferenceAssemblyPaths="@(OOBAssemblyReference)"
+        OutputDirectory="$(OOBAssembliesTrimmedArtifactsPath)"
+        ExtraArgs="$(OOBILLinkArgs)"
+        ToolExe="$(_DotNetHostFileName)"
+        ToolPath="$(_DotNetHostDirectory)" />
+
+    <!-- Create a marker file which serves as the target's output to enable incremental builds. -->
+    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(OOBAssembliesMarkerFile)'))" />
+    <Touch Files="$(OOBAssembliesMarkerFile)"
+           AlwaysCreate="true" />
+  </Target>
+
+  <Target Name="SetAzureDevOpsVariableForBuiltPackages"
+          Condition="'$(ContinuousIntegrationBuild)' == 'true'"
+          AfterTargets="Build;Pack">
+    <Message Condition="Exists('$(ArtifactsDir)packages')" Importance="High" Text="##vso[task.setvariable variable=_librariesBuildProducedPackages]true" />
+  </Target>
+
+</Project>
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
deleted file mode 100644
index 4d67c2f01c6b94..00000000000000
--- a/src/libraries/ref.proj
+++ /dev/null
@@ -1,99 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
-
-  <PropertyGroup>
-    <TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(BuildTargetFramework)' == 'net48'">
-    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
-    <!-- Filter out ProjectReferences which aren't compatible with the above TargetFramework. -->
-    <OmitIncompatibleProjectReferences>true</OmitIncompatibleProjectReferences>
-    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <_allRef Include="$(MSBuildThisFileDirectory)*\ref\*.csproj"
-             Exclude="@(ProjectExclusions)" />
-    <NonNetCoreAppProject Include="@(_allRef)"
-                          Exclude="@(NetCoreAppLibrary->'%(Identity)\ref\%(Identity).csproj')" />
-    <NetCoreAppProject Include="@(_allRef)"
-                       Exclude="@(NonNetCoreAppProject)" />
-    <GeneratedShimProject Include="shims\generated\*.csproj"
-                          Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="@(NetCoreAppProject)" />
-
-    <!-- Restore only and build later. -->
-    <ProjectReference Include="@(NonNetCoreAppProject);
-                               @(GeneratedShimProject)"
-                      Condition="'$(MSBuildRestoreSessionId)' != ''" />
-  </ItemGroup>
-
-  <Target Name="BuildGeneratedShims"
-          AfterTargets="Build"
-          Condition="'@(GeneratedShimProject)' != ''">
-    <MSBuild Targets="Build"
-             Projects="@(GeneratedShimProject)"
-             Properties="$(TraversalGlobalProperties)" />
-  </Target>
-
-  <Target Name="GetRefPackFiles">
-    <ItemGroup>
-      <RefPackLibFile Include="$(MicrosoftNetCoreAppRefPackRefDir)*.*">
-        <TargetPath>ref/$(NetCoreAppCurrent)</TargetPath>
-        <IsSymbolFile Condition="$([System.String]::Copy('%(Identity)').EndsWith('pdb'))">true</IsSymbolFile>
-      </RefPackLibFile>
-    </ItemGroup>
-    <!-- We need to set this metadata in a separate ItemGroup than when the Items are initially populated in order to
-    have access to the Extension metadata. -->
-    <ItemGroup>
-      <RefPackLibFile>
-        <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile>
-      </RefPackLibFile>
-    </ItemGroup>
-  </Target>
-
-  <!-- Generate the ref pack's FrameworkList.xml -->
-  <UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetSharedFrameworkTaskFile)"/>
-  <Target Name="GenerateFrameworkListFile"
-          DependsOnTargets="GetRefPackFiles"
-          AfterTargets="BuildGeneratedShims"
-          Inputs="@(RefPackLibFile)"
-          Outputs="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml"
-          Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
-    <ItemGroup>
-      <FrameworkListRootAttribute Include="Name" Value="$(NetCoreAppCurrentBrandName)" />
-      <FrameworkListRootAttribute Include="TargetFrameworkIdentifier" Value="$(NetCoreAppCurrentIdentifier)" />
-      <FrameworkListRootAttribute Include="TargetFrameworkVersion" Value="$(NetCoreAppCurrentVersion)" />
-      <FrameworkListRootAttribute Include="FrameworkName" Value="$(MicrosoftNetCoreAppFrameworkName)" />
-    </ItemGroup>
-
-    <CreateFrameworkListFile Files="@(RefPackLibFile)"
-                             TargetFile="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml"
-                             TargetFilePrefixes="ref/;runtimes/"
-                             RootAttributes="@(FrameworkListRootAttribute)" />
-  </Target>
-
-  <Target Name="BuildNonNetCoreAppProjects"
-          AfterTargets="GenerateFrameworkListFile">
-    <MSBuild Targets="Build"
-             BuildInParallel="true"
-             Projects="@(NonNetCoreAppProject)"
-             Properties="$(TraversalGlobalProperties)" />
-  </Target>
-
-  <!-- Build generated shims with the full reference closure, including OOB assemblies. -->
-  <Target Name="RebuildGeneratedShims"
-          AfterTargets="BuildNonNetCoreAppProjects"
-          Condition="'@(GeneratedShimProject)' != ''">
-    <MSBuild Targets="Build"
-             Projects="@(GeneratedShimProject)"
-             Properties="$(TraversalGlobalProperties);_Incremental=true" />
-  </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
-</Project>
diff --git a/src/libraries/sfx-ref.proj b/src/libraries/sfx-ref.proj
new file mode 100644
index 00000000000000..ae5b1deaf96581
--- /dev/null
+++ b/src/libraries/sfx-ref.proj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.Build.Traversal">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <!-- Filter ProjectReferences to build the best matching target framework only. -->
+    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
+  </PropertyGroup>
+
+  <!-- Reference all NetCoreAppCurrent shared framework ref projects. -->
+  <ItemGroup>
+    <AnyProject Include="$(MSBuildThisFileDirectory)*\ref\*.csproj"
+                Exclude="@(ProjectExclusions)" />
+    <NonNetCoreAppProject Include="@(AnyProject)"
+                          Exclude="@(NetCoreAppLibrary->'%(Identity)\ref\%(Identity).csproj')" />
+    <ProjectReference Include="@(AnyProject)"
+                      Exclude="@(NonNetCoreAppProject)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/libraries/sfx-src.proj b/src/libraries/sfx-src.proj
new file mode 100644
index 00000000000000..8e7679dac15eb8
--- /dev/null
+++ b/src/libraries/sfx-src.proj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.Build.Traversal">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
+    <!-- Filter ProjectReferences to build the best matching target framework only. -->
+    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
+  </PropertyGroup>
+
+  <!-- Reference all NetCoreAppCurrent shared framework src projects. -->
+  <ItemGroup>
+    <AnyProject Include="$(MSBuildThisFileDirectory)*\src\*.*proj"
+                Exclude="@(ProjectExclusions);
+                         $(MSBuildThisFileDirectory)*\src\*.shproj" />
+    <NonNetCoreAppProject Include="@(AnyProject)"
+                          Exclude="@(NetCoreAppLibrary->'%(Identity)\src\%(Identity).csproj');
+                                   Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj" />
+    <ProjectReference Include="@(AnyProject);
+                               $(CoreLibProject)"
+                      Exclude="@(NonNetCoreAppProject)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/libraries/sfx.proj b/src/libraries/sfx.proj
new file mode 100644
index 00000000000000..ff1e898d72db48
--- /dev/null
+++ b/src/libraries/sfx.proj
@@ -0,0 +1,71 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
+    <BuildInParallel>false</BuildInParallel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- The sfx ref projects must be built first as sfx src projects don't use P2Ps to reference each other. Instead the
+         references are defined manually via Reference items, therefore the reference assemblies must exist before that. -->
+    <ProjectReference Include="sfx-ref.proj">
+      <OutputItemType Condition="'$(RefOnly)' == 'true'">SharedFrameworkAssembly</OutputItemType>
+    </ProjectReference>
+    <!-- Support building only the reference assemblies. -->
+    <ProjectReference Include="sfx-src.proj"
+                      OutputItemType="SharedFrameworkAssembly"
+                      Condition="'$(RefOnly)' != 'true'" />
+  </ItemGroup>
+
+  <!-- Generate the targeting pack's framework list so that out-of-band projects can leverage it. -->
+  <Import Project="frameworklist.targets" />
+  <!-- Import the illink file which contains some of the logic required to illink the shared framework assemblies. -->
+  <Import Project="$(RepositoryEngineeringDir)illink.targets" />
+
+  <Target Name="GetTrimSharedFrameworkAssembliesInputs">
+    <PropertyGroup>
+      <SharedFrameworkAssembliesMarkerFile>$(IntermediateOutputPath)linker-$(TargetArchitecture)-marker.txt</SharedFrameworkAssembliesMarkerFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- Include suppression XML files bin-placed in earlier per-library linker run. -->
+      <SharedFrameworkSuppressionsXml Include="$(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir)*.xml" />
+      <!-- Collect CoreLib suppression XML files not bin-placed in earlier per-library linker run. CoreLib doesn't use bin-place logic. -->
+      <SharedFrameworkSuppressionsXml Include="$(CoreLibSharedDir)ILLink\ILLink.Suppressions.LibraryBuild.xml" />
+      <SharedFrameworkSuppressionsXml Condition="'$(RuntimeFlavor)' == 'CoreCLR'" Include="$(CoreClrProjectRoot)System.Private.CoreLib\src\ILLink\ILLink.Suppressions.LibraryBuild.xml" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="TrimSharedFrameworkAssemblies"
+          AfterTargets="Build"
+          DependsOnTargets="ResolveProjectReferences;GetTrimSharedFrameworkAssembliesInputs;PrepareForAssembliesTrim"
+          Condition="'$(RefOnly)' != 'true'"
+          Inputs="@(SharedFrameworkAssembly);@(SharedFrameworkSuppressionsXml);$(ILLinkTasksAssembly)"
+          Outputs="$(SharedFrameworkAssembliesMarkerFile)">
+    <Message Text="$(MSBuildProjectName) -> Trimming $(PackageRID) shared framework assemblies with ILLinker..." Importance="high" />
+
+    <PropertyGroup>
+      <SharedFrameworkILLinkArgs>$(ILLinkArgs)</SharedFrameworkILLinkArgs>
+      <!-- update debug symbols -->
+      <SharedFrameworkILLinkArgs>$(SharedFrameworkILLinkArgs) -b true</SharedFrameworkILLinkArgs>
+      <SharedFrameworkILLinkArgs Condition="'@(SharedFrameworkSuppressionsXml)' != ''" >$(SharedFrameworkILLinkArgs) --link-attributes &quot;@(SharedFrameworkSuppressionsXml->'%(FullPath)', '&quot; --link-attributes &quot;')&quot;</SharedFrameworkILLinkArgs>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <SharedFrameworkAssembly RootMode="library" />
+    </ItemGroup>
+
+    <ILLink AssemblyPaths=""
+        RootAssemblyNames="@(SharedFrameworkAssembly)"
+        OutputDirectory="$([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-runtimepack'))"
+        ExtraArgs="$(SharedFrameworkILLinkArgs)"
+        ToolExe="$(_DotNetHostFileName)"
+        ToolPath="$(_DotNetHostDirectory)" />
+
+    <!-- Create a marker file which serves as the target's output to enable incremental builds. -->  
+    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(SharedFrameworkAssembliesMarkerFile)'))" />
+    <Touch Files="$(SharedFrameworkAssembliesMarkerFile)"
+           AlwaysCreate="true" />
+  </Target>
+
+</Project>
diff --git a/src/libraries/shims.proj b/src/libraries/shims.proj
new file mode 100644
index 00000000000000..5c138fd1e7063c
--- /dev/null
+++ b/src/libraries/shims.proj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.Build.Traversal">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Reference the source project shims which themselves then reference their corresponding ref project, if it exists. -->
+  <ItemGroup>
+    <ProjectReference Include="shims\src\*.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(RefOnly)' == 'true'">
+    <ReferenceShimProject Include="shims\ref\*.csproj" />
+    <ProjectReference Include="@(ReferenceShimProject)" />
+    <!-- Omit projects which depend on source projects to be built. -->
+    <ProjectReference Remove="@(ReferenceShimProject->'shims\src\%(Filename)%(Extension)')" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index 6c19fac9a86df4..679f0230ef3b13 100644
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -1,12 +1,11 @@
 <Project>
 
   <Import Project="..\Directory.Build.props" />
-  <Import Project="netfxreference.props" />
-
-  <PropertyGroup Condition="'$(IsFrameworkSupportFacade)' == 'true'">
-    <IsNETCoreAppSrc>true</IsNETCoreAppSrc>
-    <IsNETCoreAppRef>true</IsNETCoreAppRef>
 
+  <PropertyGroup>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
+    <!-- By default make shims compile against reference assemblies. -->
+    <CompileUsingReferenceAssemblies>true</CompileUsingReferenceAssemblies>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <GenFacadesIgnoreMissingTypes>true</GenFacadesIgnoreMissingTypes>
     <!-- ensure the desktop compat shims reference the lowest possible version of dependencies
@@ -14,7 +13,11 @@
          to reference the latest packages.
          netstandard.dll doesn't need to do this since it has no dangling dependencies -->
     <GenFacadesForceZeroVersionSeeds Condition="'$(MSBuildProjectName)' != 'netstandard'">true</GenFacadesForceZeroVersionSeeds>
-    <HasMatchingContract>true</HasMatchingContract>
+    <!-- Opt out of some features which are on by default. -->
+    <EnableDllImportGenerator>false</EnableDllImportGenerator>
+    <RunApiCompat>false</RunApiCompat>
+    <ILLinkTrimAssembly>false</ILLinkTrimAssembly>
+    <AddOSPlatformAttributes>false</AddOSPlatformAttributes>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(MSBuildProjectName)' == 'System.Runtime' or
@@ -26,10 +29,34 @@
     <Compile Include="$(MSBuildThisFileDirectory)System.Void.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(IsFrameworkSupportFacade)' == 'true'">
-    <!-- include any forwards needed by both generated and manual projects -->
-    <Compile Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildProjectName).forwards.cs')"
-                 Include="$(MSBuildThisFileDirectory)$(MSBuildProjectName).forwards.cs" />
+  <ItemGroup>
+    <!-- Include any forwards needed by both ref and src projects. -->
+    <Compile Include="$(MSBuildThisFileDirectory)$(MSBuildProjectName).forwards.cs"
+             Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildProjectName).forwards.cs')" />
+  </ItemGroup>
+
+  <!-- Include any props setting files needed by both ref and src projects.-->
+  <Import Project="$(MSBuildThisFileDirectory)$(MSBuildProjectName).props"
+          Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildProjectName).props')" />
+
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\sfx-src.proj" Condition="'$(RefOnly)' != 'true'" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\sfx-ref.proj" Condition="'$(RefOnly)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(MSBuildProjectName)' != 'netstandard'">
+    <!-- .NET Framework shims compile against OOBs and the netstandard shim. -->
+    <ProjectReference Include="$(MSBuildThisFileDirectory)src\netstandard.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\oob-src.proj" Condition="'$(RefOnly)' != 'true'" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\oob-ref.proj" Condition="'$(RefOnly)' == 'true'" />
+  </ItemGroup>
+                      
+  <ItemGroup>
+    <!-- System.Data.SqlClient is not live built anymore, reference it manually to avoid tfm nuget selection fallback errors
+         when the TargetOS i.e. is MacCatalyst. Set Private false so that it doesn't flow down to consuming projects. -->
+    <PackageDownload Include="System.Data.SqlClient"
+                     Version="[$(SystemDataSqlClientVersion)]" />
+    <Reference Include="$([MSBuild]::NormalizePath('$(NuGetPackageRoot)', 'system.data.sqlclient', '$(SystemDataSqlClientVersion)', 'ref', 'netcoreapp2.1', 'System.Data.SqlClient.dll'))" Private="false" />
   </ItemGroup>
 
 </Project>
diff --git a/src/libraries/shims/Directory.Build.targets b/src/libraries/shims/Directory.Build.targets
index aa615fdd535971..0780fa92ad2e82 100644
--- a/src/libraries/shims/Directory.Build.targets
+++ b/src/libraries/shims/Directory.Build.targets
@@ -1,22 +1,17 @@
 <Project>
+  <!-- Define before the import so that ResolvedMatchingContract is set before resolveContract.targets is imported. -->
+  <ItemGroup Condition="'$(MSBuildProjectName)' != 'netstandard'">
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net48"
+                     Version="[$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)]" />
+    <ResolvedMatchingContract Include="$([MSBuild]::NormalizePath('$(NuGetPackageRoot)', 'microsoft.netframework.referenceassemblies.net48', '$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)', 'build', '.NETFramework', 'v4.8', '$(MSBuildProjectName).dll'))" />
+  </ItemGroup>
+
   <Import Project="..\Directory.Build.targets" />
 
-  <PropertyGroup>
-    <NETFrameworkReferenceAssemblyTFM>net48</NETFrameworkReferenceAssemblyTFM>
-    <NetFxRefPath>$(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)\build\.NETFramework\v4.8\</NetFxRefPath>
-    <NETStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))</NETStandard21RefPath>
+  <!-- Tell GenFacades to use reference assemblies instead of the implementation assemblies (for most of the shims). -->
+  <PropertyGroup Condition="'$(CompileUsingReferenceAssemblies)' != 'false'">
+    <TrimOutPrivateAssembliesFromReferencePath>true</TrimOutPrivateAssembliesFromReferencePath>
+    <GeneratePartialFacadeSourceDependsOn>$(GeneratePartialFacadeSourceDependsOn);FindReferenceAssembliesForReferences</GeneratePartialFacadeSourceDependsOn>
+    <GenFacadesReferencePathItemName>ReferencePathWithRefAssemblies</GenFacadesReferencePathItemName>
   </PropertyGroup>
-
-  <!-- Download the corresponding targeting pack to build against the contract. -->
-  <ItemGroup Condition="'$(IsFrameworkSupportFacade)' == 'true' and '$(MSBuildProjectName)' == 'netstandard'">
-    <PackageDownload Include="NETStandard.Library.Ref"
-                     Version="[$(NETStandardLibraryRefVersion)]" />
-    <ResolvedMatchingContract Include="$(NETStandard21RefPath)$(MSBuildProjectName).dll" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(IsFrameworkSupportFacade)' == 'true' and '$(MSBuildProjectName)' != 'netstandard'">
-    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.$(NETFrameworkReferenceAssemblyTFM)"
-                     Version="[$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)]" />
-    <ResolvedMatchingContract Include="$(NetFxRefPath)$(MSBuildProjectName).dll" />
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/shims/generated/System.Xml.props b/src/libraries/shims/System.Xml.props
similarity index 96%
rename from src/libraries/shims/generated/System.Xml.props
rename to src/libraries/shims/System.Xml.props
index 15ea92775b285c..aa8f28fe4562b5 100644
--- a/src/libraries/shims/generated/System.Xml.props
+++ b/src/libraries/shims/System.Xml.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <!-- type is obsolete in a way that prevents compilation, as such we cannot type forward to it, omit since it can never be used -->
+    <!-- type is obsolete in a way that prevents compilation, as such we cannot type forward to it, omit since it can never be used. -->
     <GenFacadesOmitType Include="System.Xml.IApplicationResourceStreamResolver" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/shims/generateShims.proj b/src/libraries/shims/generateShims.proj
deleted file mode 100644
index fd7404dba99b76..00000000000000
--- a/src/libraries/shims/generateShims.proj
+++ /dev/null
@@ -1,60 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- IMPORTANT: please rebuild this project and check in the generated output 
-                  when making changes to this file -->
-  <ItemGroup>
-    <GenFacadesContracts Include="@(NetFxReference)" ContractDir="NetFxRefPath" />
-    <GenFacadesContracts Include="netstandard" ContractDir="NETStandard21RefPath" />
-  </ItemGroup>
-  
-  <Target Name="GenerateShimProjectFiles"
-          Inputs="$(MSBuildProjectFile)"
-          Outputs="generated/%(GenFacadesContracts.Identity).csproj">
-     <PropertyGroup>
-       <_contractName>%(GenFacadesContracts.Identity)</_contractName>
-       <_contractStrongNameKeyId>%(GenFacadesContracts.StrongNameKeyId)</_contractStrongNameKeyId>
-       <_contractStrongNameKeyId Condition="'$(_contractStrongNameKeyId)' == ''">Microsoft</_contractStrongNameKeyId>
-       <_contractAssembly>$(%(GenFacadesContracts.ContractDir))$(_contractName).dll</_contractAssembly>
-       <_contractProjectFile>generated/$(_contractName).csproj</_contractProjectFile>
-     </PropertyGroup>
-
-     <GetAssemblyIdentity AssemblyFiles="$(_contractAssembly)">
-       <Output TaskParameter="Assemblies" ItemName="_contractIdentity" />
-     </GetAssemblyIdentity>
-
-     <PropertyGroup>
-       <_contractAssemblyVersion>%(_contractIdentity.Version)</_contractAssemblyVersion>
-       <_contractAssemblyPublicKey>%(_contractIdentity.PublicKeyToken)</_contractAssemblyPublicKey>
-       <_contractStrongNameKeyId Condition="'$(_contractAssemblyPublicKey)' == 'b77a5c561934e089'">ECMA</_contractStrongNameKeyId>
-       <_contractStrongNameKeyId Condition="'$(_contractAssemblyPublicKey)' == 'b03f5f7f11d50a3a'">Microsoft</_contractStrongNameKeyId>
-       <_contractStrongNameKeyId Condition="'$(_contractAssemblyPublicKey)' == '31bf3856ad364e35'">MicrosoftShared</_contractStrongNameKeyId>
-       <_contractStrongNameKeyId Condition="'$(_contractAssemblyPublicKey)' == 'cc7b13ffcd2ddd51'">Open</_contractStrongNameKeyId>
-       <_contractProjectContent><![CDATA[<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'%24(MSBuildProjectFullPath)' == '%24(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>$(_contractAssemblyVersion)</AssemblyVersion>
-    <StrongNameKeyId>$(_contractStrongNameKeyId)</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'%24(MSBuildProjectFullPath)' == '%24(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
-]]></_contractProjectContent>
-     </PropertyGroup>
-
-     <Error Condition="'$(_contractStrongNameKeyId)' == ''" Text="Could not determine StrongNameKeyId for contract $(_contractName) with public key token $(_contractAssemblyPublicKey)" />
-     
-     <WriteLinesToFile
-        File="$(_contractProjectFile)"
-        Lines="$(_contractProjectContent)"
-        Overwrite="true" />
-      <Message Importance="High" Text="Generated $(_contractProjectFile)" />
-  </Target>
-
-  <!-- boilerplate to satisfy Microsoft.Common.Targets -->
-  <PropertyGroup>
-    <SkipCopyBuildProduct>true</SkipCopyBuildProduct>
-  </PropertyGroup>
-  <Target Name="CreateManifestResourceNames" />
-  <Target Name="CoreCompile" DependsOnTargets="GenerateShimProjectFiles" />
-</Project>
diff --git a/src/libraries/shims/generated/Directory.Build.props b/src/libraries/shims/generated/Directory.Build.props
deleted file mode 100644
index 4694448ae164b8..00000000000000
--- a/src/libraries/shims/generated/Directory.Build.props
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- Shims built from this directory will double as reference and runtime facades -->
-    <BinPlaceRef>true</BinPlaceRef>
-    <IsFrameworkSupportFacade>true</IsFrameworkSupportFacade>
-    <!-- if a manual project exists, it will be used for the runtime facade instead -->
-    <IsRuntimeAssembly Condition="!Exists('$(MSBuildThisFileDirectory)../manual/$(MSBuildProjectName).csproj')">true</IsRuntimeAssembly>
-  </PropertyGroup>
-
-  <Import Condition="Exists('$(MSBuildProjectName).props')" Project="$(MSBuildProjectName).props" />
-  <Import Project="..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-  </PropertyGroup>
-
-  <!-- System.Data.SqlClient is not live built anymore, reference it manually. -->
-  <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient"
-                      Version="$(SystemDataSqlClientVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- reference everything but self -->
-    <!-- Type duplicated in Microsoft.Extensions.DependencyModel. Exclude it for now: https://github.com/dotnet/runtime/issues/34420 -->
-    <ReferencePath
-      Include="$(NetCoreAppCurrentRefPath)*.dll"
-      Exclude="$(NetCoreAppCurrentRefPath)$(MSBuildProjectName).dll;
-               $(NetCoreAppCurrentRefPath)netstandard.dll;
-               $(NetCoreAppCurrentRefPath)Microsoft.Extensions.DependencyModel.dll" />
-
-    <!-- required by compiler to resolve core types -->
-    <ProjectReference Include="netstandard.csproj"
-                      Condition="'$(MSBuildProjectName)' != 'netstandard'"
-                      SkipUseReferenceAssembly="true" />
-  </ItemGroup>
-</Project>
diff --git a/src/libraries/shims/generated/Microsoft.VisualBasic.csproj b/src/libraries/shims/generated/Microsoft.VisualBasic.csproj
deleted file mode 100644
index 086cd1f1c38623..00000000000000
--- a/src/libraries/shims/generated/Microsoft.VisualBasic.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>10.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.ComponentModel.DataAnnotations.csproj b/src/libraries/shims/generated/System.ComponentModel.DataAnnotations.csproj
deleted file mode 100644
index 926a3d52b61eaa..00000000000000
--- a/src/libraries/shims/generated/System.ComponentModel.DataAnnotations.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Configuration.csproj b/src/libraries/shims/generated/System.Configuration.csproj
deleted file mode 100644
index e501d2d3dfd2f7..00000000000000
--- a/src/libraries/shims/generated/System.Configuration.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Core.csproj b/src/libraries/shims/generated/System.Core.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Core.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Data.csproj b/src/libraries/shims/generated/System.Data.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Data.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Drawing.csproj b/src/libraries/shims/generated/System.Drawing.csproj
deleted file mode 100644
index e501d2d3dfd2f7..00000000000000
--- a/src/libraries/shims/generated/System.Drawing.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.IO.Compression.FileSystem.csproj b/src/libraries/shims/generated/System.IO.Compression.FileSystem.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.IO.Compression.FileSystem.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Net.csproj b/src/libraries/shims/generated/System.Net.csproj
deleted file mode 100644
index e501d2d3dfd2f7..00000000000000
--- a/src/libraries/shims/generated/System.Net.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Numerics.csproj b/src/libraries/shims/generated/System.Numerics.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Numerics.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Runtime.Serialization.csproj b/src/libraries/shims/generated/System.Runtime.Serialization.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Runtime.Serialization.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Security.csproj b/src/libraries/shims/generated/System.Security.csproj
deleted file mode 100644
index e501d2d3dfd2f7..00000000000000
--- a/src/libraries/shims/generated/System.Security.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.ServiceModel.Web.csproj b/src/libraries/shims/generated/System.ServiceModel.Web.csproj
deleted file mode 100644
index 926a3d52b61eaa..00000000000000
--- a/src/libraries/shims/generated/System.ServiceModel.Web.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.ServiceProcess.csproj b/src/libraries/shims/generated/System.ServiceProcess.csproj
deleted file mode 100644
index e501d2d3dfd2f7..00000000000000
--- a/src/libraries/shims/generated/System.ServiceProcess.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Transactions.csproj b/src/libraries/shims/generated/System.Transactions.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Transactions.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Web.csproj b/src/libraries/shims/generated/System.Web.csproj
deleted file mode 100644
index e501d2d3dfd2f7..00000000000000
--- a/src/libraries/shims/generated/System.Web.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Windows.csproj b/src/libraries/shims/generated/System.Windows.csproj
deleted file mode 100644
index e501d2d3dfd2f7..00000000000000
--- a/src/libraries/shims/generated/System.Windows.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Xml.Linq.csproj b/src/libraries/shims/generated/System.Xml.Linq.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Xml.Linq.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Xml.Serialization.csproj b/src/libraries/shims/generated/System.Xml.Serialization.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Xml.Serialization.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.Xml.csproj b/src/libraries/shims/generated/System.Xml.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.Xml.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/System.csproj b/src/libraries/shims/generated/System.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/System.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/WindowsBase.csproj b/src/libraries/shims/generated/WindowsBase.csproj
deleted file mode 100644
index 926a3d52b61eaa..00000000000000
--- a/src/libraries/shims/generated/WindowsBase.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/mscorlib.csproj b/src/libraries/shims/generated/mscorlib.csproj
deleted file mode 100644
index da05b9146f56ef..00000000000000
--- a/src/libraries/shims/generated/mscorlib.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <StrongNameKeyId>ECMA</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/generated/netstandard.csproj b/src/libraries/shims/generated/netstandard.csproj
deleted file mode 100644
index 7cf2a84f2ef50e..00000000000000
--- a/src/libraries/shims/generated/netstandard.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <!-- this is a generated project, to make changes update the template above this directory
-       and rebuild generateShims.proj -->
-  <!-- only import SDK if this project is built directly -->
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <StrongNameKeyId>Open</StrongNameKeyId>
-  </PropertyGroup>
-  <Import Condition="'$(MSBuildProjectFullPath)' == '$(MSBuildThisFileFullPath)'" Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props
deleted file mode 100644
index d2bb299a05ed78..00000000000000
--- a/src/libraries/shims/manual/Directory.Build.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- ensure these projects use a different intermediate and output directory than generated projects -->
-    <OutDirName>manual.$(MSBuildProjectName)</OutDirName>
-    <IsFrameworkSupportFacade>true</IsFrameworkSupportFacade>
-  </PropertyGroup>
-
-  <Import Project="..\Directory.Build.props" />
-
-  <!-- import generated projects in order to share generated properties -->
-  <Import Project="..\generated\$(MSBuildProjectName).csproj" />
-
-  <PropertyGroup>
-    <IsRuntimeAssembly>true</IsRuntimeAssembly>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ReferencePath Include="$(NetCoreAppCurrentRuntimePath)System.*.dll;
-                            $(NetCoreAppCurrentRuntimePath)Microsoft.Win32.*.dll;
-                            $(NetCoreAppCurrentRuntimePath)netstandard.dll"
-                   Exclude="$(NetCoreAppCurrentRuntimePath)$(MSBuildProjectName).dll;
-                            $(NetCoreAppCurrentRuntimePath)System.*.Native.dll" />
-    <ProjectReference Include="$(CoreLibProject)" />
-  </ItemGroup>
-</Project>
diff --git a/src/libraries/shims/manual/System.Data.csproj b/src/libraries/shims/manual/System.Data.csproj
deleted file mode 100644
index 2f89b12251ad26..00000000000000
--- a/src/libraries/shims/manual/System.Data.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <Compile Include="System.Data.forwards.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <!-- System.Data.SqlClient is not live built anymore, reference it manually. -->
-    <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
-  </ItemGroup>
-</Project>
diff --git a/src/libraries/shims/manual/System.Xml.csproj b/src/libraries/shims/manual/System.Xml.csproj
deleted file mode 100644
index 11e762bbe731bf..00000000000000
--- a/src/libraries/shims/manual/System.Xml.csproj
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- required in order to include runtime facade to obsoleted type System.Xml.IApplicationResourceStreamResolver -->
-</Project>
\ No newline at end of file
diff --git a/src/libraries/shims/manual/System.csproj b/src/libraries/shims/manual/System.csproj
deleted file mode 100644
index f88c9ea94c0f5d..00000000000000
--- a/src/libraries/shims/manual/System.csproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <Compile Include="System.forwards.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/shims/manual/mscorlib.csproj b/src/libraries/shims/manual/mscorlib.csproj
deleted file mode 100644
index 43e1fcbd742552..00000000000000
--- a/src/libraries/shims/manual/mscorlib.csproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <Compile Include="mscorlib.forwards.cs" />
-  </ItemGroup>
-</Project>
diff --git a/src/libraries/shims/netfxreference.props b/src/libraries/shims/netfxreference.props
deleted file mode 100644
index deed47dc14b1b7..00000000000000
--- a/src/libraries/shims/netfxreference.props
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project>
-  <!-- IMPORTANT: please rebuild generateShims.proj when making changes to this file -->
-  <ItemGroup>
-    <NetFxReference Include="mscorlib" />
-    <NetFxReference Include="Microsoft.VisualBasic" />
-    <NetFxReference Include="System" />
-    <NetFxReference Include="System.ComponentModel.DataAnnotations" />
-    <NetFxReference Include="System.Configuration" />
-    <NetFxReference Include="System.Core" />
-    <NetFxReference Include="System.Data" />
-    <NetFxReference Include="System.Drawing" />
-    <NetFxReference Include="System.IO.Compression.FileSystem" />
-    <NetFxReference Include="System.Net" />
-    <NetFxReference Include="System.Numerics" />
-    <NetFxReference Include="System.Runtime.Serialization" />
-    <NetFxReference Include="System.Security" />
-    <NetFxReference Include="System.ServiceProcess" />
-    <NetFxReference Include="System.ServiceModel.Web" />
-    <NetFxReference Include="System.Transactions" />
-    <NetFxReference Include="System.Web" />
-    <NetFxReference Include="System.Windows" />
-    <NetFxReference Include="System.Xml" />
-    <NetFxReference Include="System.Xml.Serialization" />
-    <NetFxReference Include="System.Xml.Linq" />
-    <NetFxReference Include="WindowsBase" />
-  </ItemGroup>
-</Project>
diff --git a/src/libraries/shims/ref/Directory.Build.props b/src/libraries/shims/ref/Directory.Build.props
new file mode 100644
index 00000000000000..bfad4de87ffae9
--- /dev/null
+++ b/src/libraries/shims/ref/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <!-- Allow shim ref projects to reference source projects. -->
+    <SkipValidateReferenceAssemblyProjectReferences>true</SkipValidateReferenceAssemblyProjectReferences>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/ref/System.Data.csproj b/src/libraries/shims/ref/System.Data.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/ref/System.Data.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/ref/System.Xml.csproj b/src/libraries/shims/ref/System.Xml.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/ref/System.Xml.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/ref/System.csproj b/src/libraries/shims/ref/System.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/ref/System.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/ref/mscorlib.csproj b/src/libraries/shims/ref/mscorlib.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/ref/mscorlib.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/Directory.Build.props b/src/libraries/shims/src/Directory.Build.props
new file mode 100644
index 00000000000000..5841ecb19f20cb
--- /dev/null
+++ b/src/libraries/shims/src/Directory.Build.props
@@ -0,0 +1,15 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <ContractProject>$(MSBuildThisFileDirectory)..\ref\$(MSBuildProjectName).csproj</ContractProject>
+    <IsRuntimeAndReferenceAssembly Condition="!Exists('$(ContractProject)')">true</IsRuntimeAndReferenceAssembly>
+  </PropertyGroup>
+
+  <!-- Reference the contract project so that this project's ReferenceAssembly attribute points to the contract, as expected. -->
+  <ItemGroup Condition="'$(IsRuntimeAndReferenceAssembly)' != 'true'">
+    <ProjectReference Include="$(ContractProject)"
+                      ReferenceOutputAssembly="false"
+                      OutputItemType="ResolvedMatchingContractOverride" />
+  </ItemGroup>
+</Project>
diff --git a/src/libraries/shims/src/Microsoft.VisualBasic.csproj b/src/libraries/shims/src/Microsoft.VisualBasic.csproj
new file mode 100644
index 00000000000000..46ce55f6fe75e4
--- /dev/null
+++ b/src/libraries/shims/src/Microsoft.VisualBasic.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>10.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.ComponentModel.DataAnnotations.csproj b/src/libraries/shims/src/System.ComponentModel.DataAnnotations.csproj
new file mode 100644
index 00000000000000..ab1cdec3ed6e7b
--- /dev/null
+++ b/src/libraries/shims/src/System.ComponentModel.DataAnnotations.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Configuration.csproj b/src/libraries/shims/src/System.Configuration.csproj
new file mode 100644
index 00000000000000..b65b1ff9c7098b
--- /dev/null
+++ b/src/libraries/shims/src/System.Configuration.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Core.csproj b/src/libraries/shims/src/System.Core.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/src/System.Core.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Data.csproj b/src/libraries/shims/src/System.Data.csproj
new file mode 100644
index 00000000000000..d2d96b4f4967a0
--- /dev/null
+++ b/src/libraries/shims/src/System.Data.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+    <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="System.Data.forwards.cs" />
+  </ItemGroup>
+</Project>
diff --git a/src/libraries/shims/manual/System.Data.forwards.cs b/src/libraries/shims/src/System.Data.forwards.cs
similarity index 69%
rename from src/libraries/shims/manual/System.Data.forwards.cs
rename to src/libraries/shims/src/System.Data.forwards.cs
index 53ce0c7c4b7aa7..16a3a2c8bcad9c 100644
--- a/src/libraries/shims/manual/System.Data.forwards.cs
+++ b/src/libraries/shims/src/System.Data.forwards.cs
@@ -3,8 +3,5 @@
 
 // Add any internal types that we need to forward from System.Data.
 
-// These types are required for Desktop to Core serialization as they are not covered by GenAPI because they are not exposed in the ref assembly.
-#if NETCOREAPP
-// System.Data.Odbc is only supported on netcoreapp
+// These types are required for Desktop to Core serialization as they are not covered by GenFacades because they are not exposed in the ref assembly.
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.Odbc.ODBC32))]
-#endif
diff --git a/src/libraries/shims/src/System.Drawing.csproj b/src/libraries/shims/src/System.Drawing.csproj
new file mode 100644
index 00000000000000..b65b1ff9c7098b
--- /dev/null
+++ b/src/libraries/shims/src/System.Drawing.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.IO.Compression.FileSystem.csproj b/src/libraries/shims/src/System.IO.Compression.FileSystem.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/src/System.IO.Compression.FileSystem.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Net.csproj b/src/libraries/shims/src/System.Net.csproj
new file mode 100644
index 00000000000000..b65b1ff9c7098b
--- /dev/null
+++ b/src/libraries/shims/src/System.Net.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Numerics.csproj b/src/libraries/shims/src/System.Numerics.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/src/System.Numerics.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Runtime.Serialization.csproj b/src/libraries/shims/src/System.Runtime.Serialization.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/src/System.Runtime.Serialization.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Security.csproj b/src/libraries/shims/src/System.Security.csproj
new file mode 100644
index 00000000000000..b65b1ff9c7098b
--- /dev/null
+++ b/src/libraries/shims/src/System.Security.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.ServiceModel.Web.csproj b/src/libraries/shims/src/System.ServiceModel.Web.csproj
new file mode 100644
index 00000000000000..ab1cdec3ed6e7b
--- /dev/null
+++ b/src/libraries/shims/src/System.ServiceModel.Web.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.ServiceProcess.csproj b/src/libraries/shims/src/System.ServiceProcess.csproj
new file mode 100644
index 00000000000000..b65b1ff9c7098b
--- /dev/null
+++ b/src/libraries/shims/src/System.ServiceProcess.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Transactions.csproj b/src/libraries/shims/src/System.Transactions.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/src/System.Transactions.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Web.csproj b/src/libraries/shims/src/System.Web.csproj
new file mode 100644
index 00000000000000..b65b1ff9c7098b
--- /dev/null
+++ b/src/libraries/shims/src/System.Web.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Windows.csproj b/src/libraries/shims/src/System.Windows.csproj
new file mode 100644
index 00000000000000..b65b1ff9c7098b
--- /dev/null
+++ b/src/libraries/shims/src/System.Windows.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Xml.Linq.csproj b/src/libraries/shims/src/System.Xml.Linq.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/src/System.Xml.Linq.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Xml.Serialization.csproj b/src/libraries/shims/src/System.Xml.Serialization.csproj
new file mode 100644
index 00000000000000..6d4156e41f437b
--- /dev/null
+++ b/src/libraries/shims/src/System.Xml.Serialization.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/System.Xml.csproj b/src/libraries/shims/src/System.Xml.csproj
new file mode 100644
index 00000000000000..b1ba3bbbb230d2
--- /dev/null
+++ b/src/libraries/shims/src/System.Xml.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- required in order to include runtime facade to obsoleted type System.Xml.IApplicationResourceStreamResolver -->
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+    <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/shims/src/System.csproj b/src/libraries/shims/src/System.csproj
new file mode 100644
index 00000000000000..e11b22d3519c01
--- /dev/null
+++ b/src/libraries/shims/src/System.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+    <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="System.forwards.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/shims/manual/System.forwards.cs b/src/libraries/shims/src/System.forwards.cs
similarity index 89%
rename from src/libraries/shims/manual/System.forwards.cs
rename to src/libraries/shims/src/System.forwards.cs
index 7502705da1fc13..19fac75cffcfc9 100644
--- a/src/libraries/shims/manual/System.forwards.cs
+++ b/src/libraries/shims/src/System.forwards.cs
@@ -3,7 +3,7 @@
 
 // Add any internal types that we need to forward from System.
 
-// These types are required for Desktop to Core serialization as they are not covered by GenAPI because they are marked as internal.
+// These types are required for Desktop to Core serialization as they are not covered by GenFacades because they are marked as internal.
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.TreeSet<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.ZLibException))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.CookieVariant))]
diff --git a/src/libraries/shims/src/WindowsBase.csproj b/src/libraries/shims/src/WindowsBase.csproj
new file mode 100644
index 00000000000000..ab1cdec3ed6e7b
--- /dev/null
+++ b/src/libraries/shims/src/WindowsBase.csproj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/shims/src/mscorlib.csproj b/src/libraries/shims/src/mscorlib.csproj
new file mode 100644
index 00000000000000..718cd1a3f18127
--- /dev/null
+++ b/src/libraries/shims/src/mscorlib.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <StrongNameKeyId>ECMA</StrongNameKeyId>
+    <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="mscorlib.forwards.cs" />
+  </ItemGroup>
+</Project>
diff --git a/src/libraries/shims/manual/mscorlib.forwards.cs b/src/libraries/shims/src/mscorlib.forwards.cs
similarity index 96%
rename from src/libraries/shims/manual/mscorlib.forwards.cs
rename to src/libraries/shims/src/mscorlib.forwards.cs
index 874380a6550fac..5598f5bf8f24dd 100644
--- a/src/libraries/shims/manual/mscorlib.forwards.cs
+++ b/src/libraries/shims/src/mscorlib.forwards.cs
@@ -3,7 +3,7 @@
 
 // Add any internal types that we need to forward from mscorlib.
 
-// These types are required for Desktop to Core serialization as they are not covered by GenAPI because they are marked as internal.
+// These types are required for Desktop to Core serialization as they are not covered by GenFacades because they are marked as internal.
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.GenericComparer<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.NullableComparer<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.ObjectComparer<>))]
diff --git a/src/libraries/shims/src/netstandard.csproj b/src/libraries/shims/src/netstandard.csproj
new file mode 100644
index 00000000000000..cce47288ba655b
--- /dev/null
+++ b/src/libraries/shims/src/netstandard.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <StrongNameKeyId>Open</StrongNameKeyId>
+  </PropertyGroup>
+
+  <!-- Download the corresponding targeting pack to build against the contract. -->
+  <ItemGroup>
+    <PackageDownload Include="NETStandard.Library.Ref"
+                     Version="[$(NETStandardLibraryRefVersion)]" />
+    <ResolvedMatchingContract Include="$(NETStandard21RefPath)$(MSBuildProjectName).dll" />
+  </ItemGroup>
+</Project>
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
deleted file mode 100644
index 5929fa37ff03b5..00000000000000
--- a/src/libraries/src.proj
+++ /dev/null
@@ -1,92 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-
-  <PropertyGroup>
-    <TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(BuildTargetFramework)' == 'net48'">
-    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
-    <!-- Filter out ProjectReferences which aren't compatible with the above TargetFramework. -->
-    <OmitIncompatibleProjectReferences>true</OmitIncompatibleProjectReferences>
-    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <_allSrc Include="$(MSBuildThisFileDirectory)*\src\*.*proj"
-             Exclude="@(ProjectExclusions);
-                      $(MSBuildThisFileDirectory)*\src\**\*.shproj" />
-    <!-- Build these packages which reference many other projects in the allconfigurations leg only. -->
-    <_allSrc Remove="Microsoft.Internal.Runtime.AspNetCore.Transport\src\Microsoft.Internal.Runtime.AspNetCore.Transport.proj;
-                     Microsoft.Internal.Runtime.WindowsDesktop.Transport\src\Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj;
-                     Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj"
-             Condition="'$(BuildAllConfigurations)' != 'true'" />
-
-    <!-- These projects do not need to be built during source-build. -->
-    <_allSrc Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj;
-                     Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj"
-             Condition="'$(DotNetBuildFromSource)' == 'true'" />
-
-    <NonNetCoreAppProject Include="@(_allSrc)"
-                          Exclude="@(NetCoreAppLibrary->'%(Identity)\src\%(Identity).csproj');
-                                   $(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj" />
-    <!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. -->
-    <NonNetCoreAppProject Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(BuildAllConfigurations)' == 'true'" />
-    <!-- During an official Build, build the rid specific package matching the OutputRid only outside of an allconfigurations build and only when targeting the CoreCLR runtime.
-         The limitation on the CoreCLR runtime is entirely artificial but avoids duplicate assets being publish. -->
-    <NonNetCoreAppProject Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRid).*.proj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or
-                                                                                                            ('$(BuildAllConfigurations)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)')" />
-
-    <NetCoreAppProject Include="$(CoreLibProject);
-                                @(_allSrc)"
-                       Exclude="@(NonNetCoreAppProject)" />
-    <ManualShimProject Include="shims\manual\*.csproj" Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />
-    <ApiCompatProject Include="shims\ApiCompat.proj"
-                      Condition="'$(DotNetBuildFromSource)' != 'true' and
-                                 ('$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == '') and
-                                 '$(RunApiCompat)' != 'false'" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="@(NetCoreAppProject)" />
-
-    <!-- Restore only and build before/after. -->
-    <ProjectReference Include="@(NonNetCoreAppProject);
-                               @(ManualShimProject);
-                               @(ApiCompatProject)"
-                      Condition="'$(MSBuildRestoreSessionId)' != ''" />
-  </ItemGroup>
-
-  <Target Name="BuildNonNetCoreAppProjects"
-          AfterTargets="Build">
-    <MSBuild Targets="Build"
-             BuildInParallel="true"
-             Projects="@(NonNetCoreAppProject)"
-             Properties="$(TraversalGlobalProperties)" />
-  </Target>
-
-  <Target Name="BuildManualShims"
-          AfterTargets="BuildNonNetCoreAppProjects"
-          Condition="'@(ManualShimProject)' != ''">
-    <MSBuild Targets="Build"
-             Projects="@(ManualShimProject)"
-             Properties="$(TraversalGlobalProperties)" />
-  </Target>
-
-  <Import Project="$(MSBuildThisFileDirectory)illink-trimassemblies.targets"
-          Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />
-
-  <Target Name="RunApiCompat"
-          Condition="'@(ApiCompatProject)' != ''"
-          AfterTargets="BuildManualShims">
-    <MSBuild Targets="Build"
-             Projects="@(ApiCompatProject)"
-             Properties="$(TraversalGlobalProperties)" />
-  </Target>
-
-  <Target Name="SetAzureDevOpsVariableForBuiltPackages"
-          Condition="'$(ContinuousIntegrationBuild)' == 'true'"
-          AfterTargets="Build;Pack">
-    <Message Condition="Exists('$(ArtifactsDir)packages')" Importance="High" Text="##vso[task.setvariable variable=_librariesBuildProducedPackages]true" />
-  </Target>
-
-</Project>
diff --git a/src/libraries/testPackages/build/Directory.Build.props b/src/libraries/testPackages/build/Directory.Build.props
index d26162f97bd955..b61b68b026ea25 100644
--- a/src/libraries/testPackages/build/Directory.Build.props
+++ b/src/libraries/testPackages/build/Directory.Build.props
@@ -5,5 +5,5 @@
   </PropertyGroup>
 
   <Import Project="Versions.props" />
-  <Import Project="netfxreference.props" />
+  <Import Project="NetCoreAppLibrary.props" />
 </Project>
diff --git a/src/libraries/testPackages/testPackages.proj b/src/libraries/testPackages/testPackages.proj
index c0924b462ecb54..a27484cc6580f1 100644
--- a/src/libraries/testPackages/testPackages.proj
+++ b/src/libraries/testPackages/testPackages.proj
@@ -43,7 +43,7 @@
                               $(RepoRoot)NuGet.config;
                               $(RepositoryEngineeringDir)Versions.props;
                               $(RepositoryEngineeringDir)targetingpacks.targets;
-                              $(LibrariesProjectRoot)shims\netfxreference.props;
+                              $(LibrariesProjectRoot)NetCoreAppLibrary.props;
                               build\packageTest.targets;
                               build\Directory.Build.props;
                               build\Directory.Build.targets"
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 133f62f029a99d..0aaa1549675b30 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -1,5 +1,12 @@
 <Project Sdk="Microsoft.Build.Traversal">
 
+  <PropertyGroup Condition="'$(BuildAllConfigurations)' != 'true'">
+    <!-- Build for NetCoreAppCurrent by default if no BuildTargetFramework is supplied or if not all configurations are built. -->
+    <TargetFramework>$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))-$(TargetOS)</TargetFramework>
+    <!-- Filter ProjectReferences to build the best matching target framework only. -->
+    <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
+  </PropertyGroup>
+
   <PropertyGroup>
     <TestInParallel Condition="'$(Coverage)' == 'true'">false</TestInParallel>
     <!-- For tests we want to continue running if a test run failed. -->
diff --git a/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1 b/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1
index 98242949f440b4..904f7ea3cb1c20 100644
--- a/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1
+++ b/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1
@@ -14,7 +14,7 @@ $refPackPath = "$repoRoot/artifacts/bin/ref/net$majorVersion.$minorVersion"
 
 if (-not (Test-Path $refPackPath))
 {
-    Write-Error "Reference assemblies not found in the artifacts folder at '$refPackPath'. Did you build the libs.ref subset? Did the repo layout change?"
+    Write-Error "Reference assemblies not found in the artifacts folder at '$refPackPath'. Did you invoke 'build.cmd libs.sfx+libs.oob /p:RefOnly=true' to make sure that refs are built? Did the repo layout change?"
     return 1
 }