diff --git a/eng/Subsets.props b/eng/Subsets.props
index 0674e93cf4ded7..f7d03633b15fe5 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -640,7 +640,10 @@
 
   <!-- Libraries sets -->
   <ItemGroup Condition="$(_subset.Contains('+libs.native+'))">
-    <ProjectToBuild Include="$(SharedNativeRoot)libs\build-native.proj" Category="libs" />
+    <ProjectToBuild Include="$(SharedNativeRoot)libs\build-native.proj"
+                    AdditionalProperties="LibrariesRuntimeFlavor=$(RuntimeFlavor);RuntimeFlavor=$(RuntimeFlavor)"
+                    GlobalPropertiesToRemove="RuntimeIdentifier;TargetFramework"
+                    Category="libs" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+libs.sfx+'))">
@@ -780,7 +783,9 @@
           </ItemGroup>
           <ItemGroup>
             <SharedFrameworkProjectToBuild Condition="'$(_BuildBundle)' == 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
-            <ProjectToBuild Include="@(SharedFrameworkProjectToBuild)" Category="packs" />
+            <ProjectToBuild Include="@(SharedFrameworkProjectToBuild)"
+                            AdditionalProperties="%(SharedFrameworkProjectToBuild.AdditionalProperties);LibrariesRuntimeFlavor=$(RuntimeFlavor)"
+                            Category="packs" />
           </ItemGroup>
         </Otherwise>
       </Choose>
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index e494ca933bdbea..0e650e92fffe8e 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -166,16 +166,25 @@
     Ensure artifacts exist for the more advanced paths. If the configuration is '*', don't emit
     these errors: it isn't a local dev scenario.
   -->
-  <Target Name="EnsureLocalOSGroupConfigurationArchitectureSpecificArtifactsExist"
+  <Target Name="EnsureLocalLibrariesRuntimeArtifactsExist"
           Condition="'$(LibrariesTargetOSConfigurationArchitecture)' != '*'">
     <Error Condition="!Exists('$(LibrariesSharedFrameworkBinArtifactsPath)')"
            Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesSharedFrameworkBinArtifactsPath). Configuration: '$(LibrariesConfiguration)'. To use a different configuration, specify the 'LibrariesConfiguration' property." />
     <Error Condition="'$(IncludeOOBLibraries)' == 'true' and !Exists('$(LibrariesAllBinArtifactsPath)')"
            Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesAllBinArtifactsPath). Configuration: '$(LibrariesConfiguration)'. To use a different configuration, specify the 'LibrariesConfiguration' property." />
+  </Target>
+
+  <Target Name="EnsureLocalLibrariesNativeArtifactsExist"
+          Condition="'$(LibrariesTargetOSConfigurationArchitecture)' != '*'">
     <Error Condition="!Exists('$(LibrariesNativeArtifactsPath)')"
            Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesNativeArtifactsPath). Configuration: '$(LibrariesConfiguration)'. To use a different configuration, specify the 'LibrariesConfiguration' property." />
   </Target>
 
+  <Target Name="EnsureLocalOSGroupConfigurationArchitectureSpecificArtifactsExist"
+          DependsOnTargets="
+            EnsureLocalLibrariesRuntimeArtifactsExist;
+            EnsureLocalLibrariesNativeArtifactsExist" />
+
   <Target Name="ResolveLibrariesRefAssembliesFromLocalBuild"
           DependsOnTargets="EnsureLocalArtifactsExist">
     <ItemGroup>
@@ -185,10 +194,8 @@
     <Error Condition="'@(LibrariesRefAssemblies)' == ''" Text="The 'libs' subset must be built before building this project." />
   </Target>
 
-  <Target Name="ResolveLibrariesRuntimeFilesFromLocalBuild"
-          DependsOnTargets="
-            EnsureLocalArtifactsExist;
-            EnsureLocalOSGroupConfigurationArchitectureSpecificArtifactsExist">
+  <Target Name="ResolveLibrariesManagedRuntimeFilesFromLocalBuild"
+          DependsOnTargets="EnsureLocalLibrariesRuntimeArtifactsExist">
     <ItemGroup>
       <LibrariesRuntimeFiles Condition="'$(IncludeOOBLibraries)' != 'true'" Include="
         $(LibrariesSharedFrameworkBinArtifactsPath)*.dll;
@@ -198,6 +205,13 @@
         $(LibrariesAllBinArtifactsPath)*.dll;
         $(LibrariesAllBinArtifactsPath)*.pdb"
         IsNative="" />
+    </ItemGroup>
+    <Error Condition="'@(LibrariesRuntimeFiles)' == ''" Text="The 'libs' subset must be built before building this project." />
+  </Target>
+
+  <Target Name="ResolveLibrariesNativeRuntimeFilesFromLocalBuild"
+          DependsOnTargets="EnsureLocalLibrariesNativeArtifactsExist">
+    <ItemGroup>
       <ExcludeNativeLibrariesRuntimeFiles Condition="'$(IncludeOOBLibraries)' != 'true'"
                                           Include="$(LibrariesNativeArtifactsPath)libSystem.IO.Ports.Native.*" />
 
@@ -373,6 +387,11 @@
     <Error Condition="'@(LibrariesRuntimeFiles)' == ''" Text="The 'libs' subset must be built before building this project." />
   </Target>
 
+  <Target Name="ResolveLibrariesRuntimeFilesFromLocalBuild"
+          DependsOnTargets="
+            ResolveLibrariesManagedRuntimeFilesFromLocalBuild;
+            ResolveLibrariesNativeRuntimeFilesFromLocalBuild" />
+
   <Target Name="ResolveLibrariesFromLocalBuild"
           DependsOnTargets="
             ResolveLibrariesRefAssembliesFromLocalBuild;
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
index 0bc53a584574bf..75bb3c07743fc6 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
@@ -9,13 +9,52 @@
     <PackageDescription>A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.</PackageDescription>
   </PropertyGroup>
 
-  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesToPackage">
+  <Import Project="$(LibrariesProjectRoot)NetCoreAppLibraryProjectReferences.props" />
+
+  <ItemGroup>
+    <ProjectReference Include="$(LibrariesProjectRoot)sfx-src.proj"
+                      AdditionalProperties="RuntimeFlavor=$(_NetCoreAppLibrariesRuntimeFlavor)"
+                      GlobalPropertiesToRemove="RuntimeIdentifier;TargetFramework"
+                      ReferenceOutputAssembly="false"
+                      SetConfiguration="Configuration=$(LibrariesConfiguration)"
+                      SkipGetTargetFrameworkProperties="true"
+                      OutputItemType="_NetCoreAppLibrarySourceAssembly" />
+    <ProjectReference Include="@(NetCoreAppLibraryGeneratorProject)"
+                      GlobalPropertiesToRemove="RuntimeIdentifier"
+                      OutputItemType="_NetCoreAppRefPackGeneratorFile"
+                      ReferenceOutputAssembly="false"
+                      SetConfiguration="Configuration=$(LibrariesConfiguration)"
+                      SetTargetFramework="TargetFramework=netstandard2.0" />
+  </ItemGroup>
+
+  <Target Name="AddFrameworkFilesToPackage"
+          DependsOnTargets="ResolveProjectReferences"
+          BeforeTargets="GetFilesToPackage">
     <ItemGroup>
-      <ReferencePath Include="@(LibrariesRefAssemblies)" />
+      <_NetCoreAppRefPackGeneratorRelatedFile Include="@(_NetCoreAppRefPackGeneratorFile)" />
+      <_NetCoreAppRefPackGeneratorRelatedFile Include="@(_NetCoreAppRefPackGeneratorFile->'%(RootDir)%(Directory)%(Filename).pdb')" />
+      <_NetCoreAppRefPackGeneratorRelatedFile Include="%(_NetCoreAppRefPackGeneratorFile.RootDir)%(_NetCoreAppRefPackGeneratorFile.Directory)*\%(_NetCoreAppRefPackGeneratorFile.Filename).resources.dll" />
+      <_NetCoreAppRefPackGeneratorRelatedFile Remove="@(_NetCoreAppRefPackGeneratorRelatedFile)"
+                                              Condition="!Exists('%(_NetCoreAppRefPackGeneratorRelatedFile.Identity)')" />
+      <_NetCoreAppLibraryPublicSourceAssembly Include="@(_NetCoreAppLibrarySourceAssembly)"
+                                              Condition="'%(_NetCoreAppLibrarySourceAssembly.Extension)' == '.dll' and '%(_NetCoreAppLibrarySourceAssembly.IsPrivateAssembly)' != 'true'" />
+      <_NetCoreAppLibrarySourceAssemblyWithReferenceAssembly Include="@(_NetCoreAppLibraryPublicSourceAssembly)"
+                                                             Condition="'%(_NetCoreAppLibraryPublicSourceAssembly.ReferenceAssembly)' != ''" />
+      <_NetCoreAppLibraryReferenceAssembly Include="@(_NetCoreAppLibrarySourceAssemblyWithReferenceAssembly->Metadata('ReferenceAssembly'))" />
+      <_NetCoreAppLibraryReferenceAssembly Include="@(_NetCoreAppLibraryPublicSourceAssembly)"
+                                           Exclude="@(_NetCoreAppLibrarySourceAssemblyWithReferenceAssembly)" />
+      <_NetCoreAppLibraryReferenceAssemblySymbols Include="@(_NetCoreAppLibraryReferenceAssembly->'%(RootDir)%(Directory)%(Filename).pdb')" />
+      <_NetCoreAppLibraryReferenceAssemblySymbols Remove="@(_NetCoreAppLibraryReferenceAssemblySymbols)"
+                                                  Condition="!Exists('%(_NetCoreAppLibraryReferenceAssemblySymbols.Identity)')" />
+      <ReferencePath Include="@(_NetCoreAppLibraryReferenceAssembly);
+                              @(_NetCoreAppLibraryReferenceAssemblySymbols)" />
       <ReferencePath ReferenceAssembly="%(Identity)" />
-      <DocFilesToPackage Include="$(MicrosoftNetCoreAppRefPackRefDir)%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(MicrosoftNetCoreAppRefPackRefDir)%(LibrariesRefAssemblies.FileName).xml')"/>
-      <Analyzer Include="$(MicrosoftNetCoreAppRefPackDir)/analyzers/**/*.*" />
-      <FilesToPackage Include="@(Analyzer)" ExcludeFromValidation="true" TargetPath="analyzers/%(RecursiveDir)" />
+      <_NetCoreAppLibrarySourceAssemblyWithDocumentation Include="@(_NetCoreAppLibraryPublicSourceAssembly)"
+                                                         Condition="'%(_NetCoreAppLibraryPublicSourceAssembly.DocFileItem)' != '' and Exists('%(_NetCoreAppLibraryPublicSourceAssembly.DocFileItem)')" />
+      <DocFilesToPackage Include="@(_NetCoreAppLibrarySourceAssemblyWithDocumentation->Metadata('DocFileItem'))" />
+      <FilesToPackage Include="@(_NetCoreAppRefPackGeneratorRelatedFile)"
+                      ExcludeFromValidation="true"
+                      TargetPath="analyzers/dotnet/cs/%(_NetCoreAppRefPackGeneratorRelatedFile.RecursiveDir)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
index 5841a1ca33f320..1cbc5c78a0649f 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
@@ -75,13 +75,16 @@
        webcil-in-wasm R2R images under native/r2r/ for trimming and per-app R2R. -->
   <Target Name="_ConfigureBrowserFrameworkR2R"
           Condition="'$(TargetOS)' == 'browser' and '$(PublishReadyToRun)' == 'true'"
-          BeforeTargets="_PrepareForReadyToRunCompilation">
+          BeforeTargets="_PrepareForReadyToRunCompilation"
+          DependsOnTargets="ResolveProjectReferences;ResolveRuntimeFilesFromLocalBuild">
     <ItemGroup>
-      <_WasmFrameworkR2RInput Include="$(LibrariesSharedFrameworkBinArtifactsPath)*.dll"
-                              Exclude="$(LibrariesSharedFrameworkBinArtifactsPath)*.resources.dll" />
+      <_WasmFrameworkR2RReference Include="@(_NetCoreAppLibrarySourceAssembly)"
+                                  Condition="'%(_NetCoreAppLibrarySourceAssembly.Extension)' == '.dll' and
+                                             '%(_NetCoreAppLibrarySourceAssembly.Filename)' != 'System.Private.CoreLib'" />
+      <_WasmFrameworkR2RInput Include="@(_WasmFrameworkR2RReference)" />
       <_WasmFrameworkR2RInput Remove="@(_WasmFrameworkR2RInput)"
                               Condition="'$(WasmFrameworkR2RSubset)' != '' and !$([System.String]::Copy(';$(WasmFrameworkR2RSubset);').Contains(';%(FileName);'))" />
-      <_WasmFrameworkR2RExclude Include="$(LibrariesSharedFrameworkBinArtifactsPath)*.dll"
+      <_WasmFrameworkR2RExclude Include="@(_WasmFrameworkR2RReference)"
                                 Exclude="@(_WasmFrameworkR2RInput)" />
       <PublishReadyToRunExclude Include="@(_WasmFrameworkR2RExclude->'%(FileName)%(Extension)')" />
       <PublishReadyToRunExclude Include="System.Private.CoreLib.dll" />
@@ -96,7 +99,7 @@
     <Error Condition="!Exists('$(_WasmCrossgen2Exe)')"
            Text="PublishReadyToRun is true but crossgen2 was not found at '$(_WasmCrossgen2Exe)'. Build the crossgen2 pack or set PublishReadyToRun=false." />
     <ItemGroup>
-      <_ReadyToRunCompilerInputs Include="$(LibrariesSharedFrameworkBinArtifactsPath)*.dll;$(_WasmCoreLibIL)" />
+      <_ReadyToRunCompilerInputs Include="@(_WasmFrameworkR2RReference);$(_WasmCoreLibIL)" />
       <_ReadyToRunCompilerInputs Include="$(Crossgen2InBuildDir)*jit*.dll;$(Crossgen2InBuildDir)*jit*.dylib;$(Crossgen2InBuildDir)*jit*.so" />
     </ItemGroup>
   </Target>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
index db017617784bac..2449e70a676069 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
@@ -1,4 +1,22 @@
 <Project>
+  <Import Project="$(LibrariesProjectRoot)NetCoreAppLibraryProjectReferences.props" />
+
+  <ItemGroup>
+    <ProjectReference Include="$(SharedNativeRoot)libs\build-native.proj"
+                      AdditionalProperties="RuntimeFlavor=$(_NetCoreAppLibrariesRuntimeFlavor)"
+                      GlobalPropertiesToRemove="RuntimeIdentifier;TargetFramework"
+                      ReferenceOutputAssembly="false"
+                      SetConfiguration="Configuration=$(LibrariesConfiguration)"
+                      SkipGetTargetFrameworkProperties="true" />
+    <ProjectReference Include="$(LibrariesProjectRoot)sfx-src.proj"
+                      AdditionalProperties="RuntimeFlavor=$(_NetCoreAppLibrariesRuntimeFlavor)"
+                      GlobalPropertiesToRemove="RuntimeIdentifier;TargetFramework"
+                      ReferenceOutputAssembly="false"
+                      SetConfiguration="Configuration=$(LibrariesConfiguration)"
+                      SkipGetTargetFrameworkProperties="true"
+                      OutputItemType="_NetCoreAppLibrarySourceAssembly" />
+  </ItemGroup>
+
   <PropertyGroup>
     <IncludeFallbacksInDepsFile>true</IncludeFallbacksInDepsFile>
     <GetSharedFrameworkFilesForReadyToRunDependsOn>
@@ -44,10 +62,18 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild">
+  <Target Name="AddFrameworkFilesToPackage"
+          DependsOnTargets="ResolveProjectReferences;ResolveLibrariesNativeRuntimeFilesFromLocalBuild">
     <ItemGroup>
+      <_NetCoreAppLibraryRuntimeAssembly Include="@(_NetCoreAppLibrarySourceAssembly)"
+                                         Condition="'%(_NetCoreAppLibrarySourceAssembly.Extension)' == '.dll' and '%(_NetCoreAppLibrarySourceAssembly.Filename)' != 'System.Private.CoreLib'" />
+      <_NetCoreAppLibraryRuntimeAssemblySymbols Include="@(_NetCoreAppLibraryRuntimeAssembly->'%(RootDir)%(Directory)%(Filename).pdb')" />
+      <_NetCoreAppLibraryRuntimeAssemblySymbols Remove="@(_NetCoreAppLibraryRuntimeAssemblySymbols)"
+                                                Condition="!Exists('%(_NetCoreAppLibraryRuntimeAssemblySymbols.Identity)')" />
+      <ReferenceCopyLocalPaths Include="@(_NetCoreAppLibraryRuntimeAssembly);
+                                        @(_NetCoreAppLibraryRuntimeAssemblySymbols)" />
       <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)"
-        Condition="'%(LibrariesRuntimeFiles.Extension)' != '$(StaticLibSuffix)' or '$(IncludeStaticLibrariesInPack)' == 'true'">
+                               Condition="'%(LibrariesRuntimeFiles.Extension)' != '$(StaticLibSuffix)' or '$(IncludeStaticLibrariesInPack)' == 'true'">
         <TargetPath Condition="'%(LibrariesRuntimeFiles.NativeSubDirectory)' != ''">runtimes/$(RuntimeIdentifier)/native/%(LibrariesRuntimeFiles.NativeSubDirectory)%(RecursiveDir)</TargetPath>
       </ReferenceCopyLocalPaths>
     </ItemGroup>
diff --git a/src/libraries/NetCoreAppLibraryProjectReferences.props b/src/libraries/NetCoreAppLibraryProjectReferences.props
new file mode 100644
index 00000000000000..3e10e1020db71a
--- /dev/null
+++ b/src/libraries/NetCoreAppLibraryProjectReferences.props
@@ -0,0 +1,47 @@
+<Project>
+
+  <PropertyGroup>
+    <_NetCoreAppLibrariesRuntimeFlavor>$([MSBuild]::ValueOrDefault('$(LibrariesRuntimeFlavor)', '$(RuntimeFlavor)'))</_NetCoreAppLibrariesRuntimeFlavor>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <_NetCoreAppLibrarySourceProject Include="$(LibrariesProjectRoot)*\src\*.*proj"
+                                     Exclude="@(ProjectExclusions);
+                                              $(LibrariesProjectRoot)*\src\*.shproj" />
+    <_NonNetCoreAppLibrarySourceProject Include="@(_NetCoreAppLibrarySourceProject)"
+                                        Exclude="@(NetCoreAppLibrary->'$(LibrariesProjectRoot)%(Identity)\src\%(Identity).csproj');
+                                                 $(LibrariesProjectRoot)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj" />
+
+    <_NetCoreAppLibraryShimProject Include="$(LibrariesProjectRoot)shims\*\src\*.csproj"
+                                   OriginalIdentity="%(Identity)" />
+    <_NetCoreAppLibraryShimProjectName Include="@(_NetCoreAppLibraryShimProject->Metadata('Filename'))" />
+    <_NonNetCoreAppLibraryShimProjectName Include="@(_NetCoreAppLibraryShimProjectName)"
+                                          Exclude="@(NetCoreAppLibrary)" />
+    <_IncludedNetCoreAppLibraryShimProjectName Include="@(_NetCoreAppLibraryShimProjectName)"
+                                               Exclude="@(_NonNetCoreAppLibraryShimProjectName)" />
+
+    <NetCoreAppLibrarySourceProject Include="@(_NetCoreAppLibrarySourceProject);
+                                             $(CoreLibProject);
+                                             @(_IncludedNetCoreAppLibraryShimProjectName->Metadata('OriginalIdentity'))"
+                                    Exclude="@(_NonNetCoreAppLibrarySourceProject)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <_NetCoreAppLibraryGeneratorProject Include="$(LibrariesProjectRoot)*\gen\**\*.*proj"
+                                        Exclude="@(ProjectExclusions)"
+                                        OriginalIdentity="%(Identity)" />
+    <_NetCoreAppLibraryGeneratorProjectName Include="@(_NetCoreAppLibraryGeneratorProject->Metadata('Filename'))" />
+    <_NonNetCoreAppLibraryGeneratorProjectName Include="@(_NetCoreAppLibraryGeneratorProjectName)"
+                                               Exclude="@(NetCoreAppLibraryGenerator)" />
+    <_IncludedNetCoreAppLibraryGeneratorProjectName Include="@(_NetCoreAppLibraryGeneratorProjectName)"
+                                                    Exclude="@(_NonNetCoreAppLibraryGeneratorProjectName)" />
+    <NetCoreAppLibraryGeneratorProject Include="@(_IncludedNetCoreAppLibraryGeneratorProjectName->Metadata('OriginalIdentity'))" />
+  </ItemGroup>
+
+  <Target Name="ValidateNetCoreAppLibraryShimProjects"
+          BeforeTargets="Build"
+          Condition="'@(_NonNetCoreAppLibraryShimProjectName)' != ''">
+    <Error Text="Shared framework shim projects must be listed in NetCoreAppLibrary.props: @(_NonNetCoreAppLibraryShimProjectName, ', ')" />
+  </Target>
+
+</Project>
diff --git a/src/libraries/sfx-gen.proj b/src/libraries/sfx-gen.proj
index 1b3bdf6c104c8d..ac449c9c34fb42 100644
--- a/src/libraries/sfx-gen.proj
+++ b/src/libraries/sfx-gen.proj
@@ -7,17 +7,10 @@
     <NoDefaultSlnGenSolutionFolder>true</NoDefaultSlnGenSolutionFolder>
   </PropertyGroup>
 
-  <!-- Reference all NetCoreAppCurrent shared framework generator projects. -->
+  <Import Project="NetCoreAppLibraryProjectReferences.props" />
+
   <ItemGroup>
-    <AnyProject Include="$(MSBuildThisFileDirectory)*\gen\**\*.*proj"
-                Exclude="@(ProjectExclusions)"
-                OriginalIdentity="%(Identity)" />
-    <AnyProjectWithProjectName Include="@(AnyProject->Metadata('Filename'))" />
-    <NonNetCoreAppProjectWithProjectName Include="@(AnyProjectWithProjectName)"
-                                         Exclude="@(NetCoreAppLibraryGenerator)" />
-    <NetCoreAppProjectWithProjectName Include="@(AnyProjectWithProjectName)"
-                                      Exclude="@(NonNetCoreAppProjectWithProjectName)" />
-    <ProjectReference Include="@(NetCoreAppProjectWithProjectName->Metadata('OriginalIdentity'))" />
+    <ProjectReference Include="@(NetCoreAppLibraryGeneratorProject)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/libraries/sfx-src.proj b/src/libraries/sfx-src.proj
index 8da1f3b306c227..b2823831c9be8d 100644
--- a/src/libraries/sfx-src.proj
+++ b/src/libraries/sfx-src.proj
@@ -7,18 +7,10 @@
     <NoDefaultSlnGenSolutionFolder>true</NoDefaultSlnGenSolutionFolder>
   </PropertyGroup>
 
-  <!-- Reference all NetCoreAppCurrent shared framework src projects. -->
+  <Import Project="NetCoreAppLibraryProjectReferences.props" />
+
   <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);
-                               shims\*\src\*.csproj"
-                      Exclude="@(NonNetCoreAppProject)" />
+    <ProjectReference Include="@(NetCoreAppLibrarySourceProject)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj
index 710a36801a553b..b98e470596a40e 100644
--- a/src/mono/browser/browser.proj
+++ b/src/mono/browser/browser.proj
@@ -39,7 +39,7 @@
   </Target>
 
   <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.Mono.ManagedToNativeGenerator" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" TaskFactory="TaskHostFactory" />
-  <Target Name="GenerateManagedToNative" DependsOnTargets="CheckEnv;ResolveLibrariesFromLocalBuild">
+  <Target Name="GenerateManagedToNative" DependsOnTargets="CheckEnv;ResolveLibrariesManagedRuntimeFilesFromLocalBuild">
     <PropertyGroup>
       <WasmPInvokeTablePath>$(WasmObjDir)\pinvoke-table.h</WasmPInvokeTablePath>
       <WasmInterpToNativeTablePath>$(WasmObjDir)\wasm_m2n_invoke.g.h</WasmInterpToNativeTablePath>
diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj
index 66fcd6e7fe4b71..c8408670ee032b 100644
--- a/src/mono/wasi/wasi.proj
+++ b/src/mono/wasi/wasi.proj
@@ -17,7 +17,7 @@
   </Target>
 
   <UsingTask TaskName="Microsoft.WebAssembly.Build.Tasks.Mono.ManagedToNativeGenerator" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
-  <Target Name="GenerateManagedToNative" DependsOnTargets="CheckEnv;ResolveLibrariesFromLocalBuild">
+  <Target Name="GenerateManagedToNative" DependsOnTargets="CheckEnv;ResolveLibrariesManagedRuntimeFilesFromLocalBuild">
     <PropertyGroup>
       <WasmPInvokeTablePath>$(WasiObjDir)\pinvoke-table.h</WasmPInvokeTablePath>
       <WasmInterpToNativeTablePath>$(WasiObjDir)\wasm_m2n_invoke.g.h</WasmInterpToNativeTablePath>
diff --git a/src/tests/tracing/eventcounter/runtimecounters.csproj b/src/tests/tracing/eventcounter/runtimecounters.csproj
index 65765cf833dc31..11514bf23b6325 100644
--- a/src/tests/tracing/eventcounter/runtimecounters.csproj
+++ b/src/tests/tracing/eventcounter/runtimecounters.csproj
@@ -19,7 +19,7 @@
   -->
   <!-- Get all the *.dll files that has IsNative != "true"-->
   <Target Name="GetRequiredNativeAOTAssemblies"
-      DependsOnTargets="ResolveLibrariesRuntimeFilesFromLocalBuild"
+      DependsOnTargets="ResolveLibrariesManagedRuntimeFilesFromLocalBuild"
       BeforeTargets="ComputeIlcCompileInputs"
       Condition="'$(TestBuildMode)' == 'nativeaot'">
     <ItemGroup>
diff --git a/src/tests/tracing/eventpipe/Directory.Build.targets b/src/tests/tracing/eventpipe/Directory.Build.targets
index fd50f939a9c55e..6f9eb6518aeba0 100644
--- a/src/tests/tracing/eventpipe/Directory.Build.targets
+++ b/src/tests/tracing/eventpipe/Directory.Build.targets
@@ -7,7 +7,7 @@
   -->
   <!-- Get all the *.dll files that has IsNative != "true"-->
   <Target Name="GetRequiredNativeAOTAssemblies" 
-      DependsOnTargets="ResolveLibrariesRuntimeFilesFromLocalBuild"
+      DependsOnTargets="ResolveLibrariesManagedRuntimeFilesFromLocalBuild"
       BeforeTargets="ComputeIlcCompileInputs"
       Condition="'$(TestBuildMode)' == 'nativeaot'">
     <ItemGroup>