From c9f12d2718f68b94e63bbdece29bee61c643e497 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 23 Sep 2022 14:49:55 +0200
Subject: [PATCH 1/6] Use generated runtime.json when building shared framework
 packages.

---
 Directory.Build.props                            |  3 ++-
 eng/liveBuilds.targets                           |  2 +-
 src/installer/pkg/sfx/Directory.Build.targets    |  4 ++++
 .../src/Microsoft.NETCore.Platforms.csproj       | 16 +++++++++-------
 src/libraries/oob-src.proj                       |  3 +--
 src/libraries/pretest.proj                       |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6f9b97c0a9c57..b91f3dbfdfd89 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -274,7 +274,8 @@
     <PackageProjectUrl>https://dot.net</PackageProjectUrl>
     <Owners>microsoft,dotnetframework</Owners>
     <IncludeSymbols>true</IncludeSymbols>
-    <RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
+    <SourceRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</SourceRuntimeIdentifierGraphFile>
+    <GeneratedRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', '$(Configuration)', 'runtime.json'))</GeneratedRuntimeIdentifierGraphFile>
     <LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 982413a4ebae2..b5e46801b787c 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -223,6 +223,6 @@
             ResolveLibrariesRuntimeFilesFromLocalBuild" />
 
   <PropertyGroup>
-    <BundledRuntimeIdentifierGraphFile>$(RuntimeIdGraphDefinitionFile)</BundledRuntimeIdentifierGraphFile>
+    <BundledRuntimeIdentifierGraphFile>$(SourceRuntimeIdentifierGraphFile)</BundledRuntimeIdentifierGraphFile>
   </PropertyGroup>
 </Project>
diff --git a/src/installer/pkg/sfx/Directory.Build.targets b/src/installer/pkg/sfx/Directory.Build.targets
index 8cfdfceff5536..1be9f17d7c585 100644
--- a/src/installer/pkg/sfx/Directory.Build.targets
+++ b/src/installer/pkg/sfx/Directory.Build.targets
@@ -1,3 +1,7 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <BundledRuntimeIdentifierGraphFile>$(GeneratedRuntimeIdentifierGraphFile)</BundledRuntimeIdentifierGraphFile>
+  </PropertyGroup>
 </Project>
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 482e0b70e47e7..b43817672cebc 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -17,7 +17,6 @@
     <AvoidRestoreCycleOnSelfReference>true</AvoidRestoreCycleOnSelfReference>
     <!-- TODO: Remove with AvoidRestoreCycleOnSelfReference hack. -->
     <PackageValidationBaselineName>$(MSBuildProjectName)</PackageValidationBaselineName>
-    <BeforePack>GenerateRuntimeJson;UpdateRuntimeJson;$(BeforePack)</BeforePack>
     
     <_generateRuntimeGraphTargetFramework Condition="'$(MSBuildRuntimeType)' == 'core'">$(NetCoreAppToolCurrent)</_generateRuntimeGraphTargetFramework>
     <_generateRuntimeGraphTargetFramework Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_generateRuntimeGraphTargetFramework>
@@ -43,8 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Condition="'$(AdditionalRuntimeIdentifiers)' == ''" Include="runtime.json" PackagePath="/" />
-    <Content Condition="'$(AdditionalRuntimeIdentifiers)' != ''" Include="$(IntermediateOutputPath)runtime.json" PackagePath="/" />
+    <Content Include="$(GeneratedRuntimeIdentifierGraphFile)" PackagePath="/" />
     <Content Include="$(PlaceholderFile)" PackagePath="lib/netstandard1.0" />
   </ItemGroup>
 
@@ -58,16 +56,20 @@
   
   <UsingTask TaskName="GenerateRuntimeGraph" AssemblyFile="$(_generateRuntimeGraphTask)"/>
 
-  <Target Name="GenerateRuntimeJson" Condition="'$(AdditionalRuntimeIdentifiers)' != ''">
+  <Target Name="GenerateRuntimeJson" BeforeTargets="UpdateRuntimeJson">
     <MakeDir Directories="$(IntermediateOutputPath)" />
-    <GenerateRuntimeGraph RuntimeGroups="@(RuntimeGroupWithQualifiers)"
+    <GenerateRuntimeGraph Condition="'$(AdditionalRuntimeIdentifiers)' != ''"
+                          RuntimeGroups="@(RuntimeGroupWithQualifiers)"
                           AdditionalRuntimeIdentifiers="$(AdditionalRuntimeIdentifiers)"
                           AdditionalRuntimeIdentifierParent="$(AdditionalRuntimeIdentifierParent)"
-                          RuntimeJson="$(IntermediateOutputPath)runtime.json"
+                          RuntimeJson="$(GeneratedRuntimeIdentifierGraphFile)"
                           UpdateRuntimeFiles="True" />
+    <Copy Condition="'$(AdditionalRuntimeIdentifiers)' == ''"
+          SourceFiles="runtime.json"
+          DestinationFiles="$(GeneratedRuntimeIdentifierGraphFile)" />
   </Target>
 
-  <Target Name="UpdateRuntimeJson">
+  <Target Name="UpdateRuntimeJson" BeforeTargets="Build">
     <!-- Generates a Runtime graph using RuntimeGroups and diffs it with the graph described by runtime.json and runtime.compatibility.json
          Specifying UpdateRuntimeFiles=true skips the diff and updates those files.
          The graph can be visualized using the generated dmgl -->
diff --git a/src/libraries/oob-src.proj b/src/libraries/oob-src.proj
index 2cbfdf9bb3c55..472a2dfb5e708 100644
--- a/src/libraries/oob-src.proj
+++ b/src/libraries/oob-src.proj
@@ -21,8 +21,7 @@
                                                                                                             ('$(BuildAllConfigurations)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)')" />
 
     <!-- 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" />
+    <ProjectReference Remove="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;
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index b6e9721ca79a8..9b0d54d78d8de 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -94,7 +94,7 @@
           Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
     <!-- Shared framework deps file generation. Produces a test shared-framework deps file. -->
     <GenerateTestSharedFrameworkDepsFile SharedFrameworkDirectory="$(NetCoreAppCurrentTestHostSharedFrameworkPath)"
-                                         RuntimeGraphFiles="$(RuntimeIdGraphDefinitionFile)"
+                                         RuntimeGraphFiles="$(SourceRuntimeIdentifierGraphFile)"
                                          TargetRuntimeIdentifier="$(PackageRID)" />
   </Target>
 

From 4155c27b1adb25fb04d02fe2c368e8efe5022c17 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 26 Sep 2022 06:26:15 +0200
Subject: [PATCH 2/6] Don't UpdateRuntimeJson on Build.

---
 .../src/Microsoft.NETCore.Platforms.csproj                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 b43817672cebc..5af35ccfe6d55 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -56,7 +56,7 @@
   
   <UsingTask TaskName="GenerateRuntimeGraph" AssemblyFile="$(_generateRuntimeGraphTask)"/>
 
-  <Target Name="GenerateRuntimeJson" BeforeTargets="UpdateRuntimeJson">
+  <Target Name="GenerateRuntimeJson" BeforeTargets="Build">
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <GenerateRuntimeGraph Condition="'$(AdditionalRuntimeIdentifiers)' != ''"
                           RuntimeGroups="@(RuntimeGroupWithQualifiers)"
@@ -69,7 +69,7 @@
           DestinationFiles="$(GeneratedRuntimeIdentifierGraphFile)" />
   </Target>
 
-  <Target Name="UpdateRuntimeJson" BeforeTargets="Build">
+  <Target Name="UpdateRuntimeJson">
     <!-- Generates a Runtime graph using RuntimeGroups and diffs it with the graph described by runtime.json and runtime.compatibility.json
          Specifying UpdateRuntimeFiles=true skips the diff and updates those files.
          The graph can be visualized using the generated dmgl -->

From 68cb01b92543da06f3d79e6bee049d9750af5e72 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 26 Sep 2022 15:04:24 +0200
Subject: [PATCH 3/6] PR feedback.

---
 Directory.Build.props                                         | 3 +--
 eng/liveBuilds.targets                                        | 3 ++-
 src/installer/pkg/sfx/Directory.Build.targets                 | 4 ----
 .../src/Microsoft.NETCore.Platforms.csproj                    | 4 +++-
 src/libraries/oob-all.proj                                    | 3 +--
 src/libraries/pretest.proj                                    | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b91f3dbfdfd89..24551a44590e7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -274,8 +274,7 @@
     <PackageProjectUrl>https://dot.net</PackageProjectUrl>
     <Owners>microsoft,dotnetframework</Owners>
     <IncludeSymbols>true</IncludeSymbols>
-    <SourceRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</SourceRuntimeIdentifierGraphFile>
-    <GeneratedRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', '$(Configuration)', 'runtime.json'))</GeneratedRuntimeIdentifierGraphFile>
+    <GeneratedRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', 'runtime.json'))</GeneratedRuntimeIdentifierGraphFile>
     <LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index b5e46801b787c..6acd861c74f4b 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -223,6 +223,7 @@
             ResolveLibrariesRuntimeFilesFromLocalBuild" />
 
   <PropertyGroup>
-    <BundledRuntimeIdentifierGraphFile>$(SourceRuntimeIdentifierGraphFile)</BundledRuntimeIdentifierGraphFile>
+    <BundledRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
+    <BundledRuntimeIdentifierGraphFile Condition="Exists('$(GeneratedRuntimeIdentifierGraphFile)')">$(GeneratedRuntimeIdentifierGraphFile)</BundledRuntimeIdentifierGraphFile>
   </PropertyGroup>
 </Project>
diff --git a/src/installer/pkg/sfx/Directory.Build.targets b/src/installer/pkg/sfx/Directory.Build.targets
index 1be9f17d7c585..8cfdfceff5536 100644
--- a/src/installer/pkg/sfx/Directory.Build.targets
+++ b/src/installer/pkg/sfx/Directory.Build.targets
@@ -1,7 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
-
-  <PropertyGroup>
-    <BundledRuntimeIdentifierGraphFile>$(GeneratedRuntimeIdentifierGraphFile)</BundledRuntimeIdentifierGraphFile>
-  </PropertyGroup>
 </Project>
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 5af35ccfe6d55..ea19e9b425d29 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -8,6 +8,8 @@
     <AssemblyName>Microsoft.NETCore.Platforms.BuildTasks</AssemblyName>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
+    <!-- Generate a package only during the allconfigurations leg to avoid package clashes during publish. -->
+    <GeneratePackageOnBuild Condition="'$(BuildAllConfigurations)' != 'true'">false</GeneratePackageOnBuild>
 
     <IsPackable>true</IsPackable>
     <PackageId>$(MSBuildProjectName)</PackageId>
@@ -56,7 +58,7 @@
   
   <UsingTask TaskName="GenerateRuntimeGraph" AssemblyFile="$(_generateRuntimeGraphTask)"/>
 
-  <Target Name="GenerateRuntimeJson" BeforeTargets="Build">
+  <Target Name="GenerateRuntimeJson" AfterTargets="Build">
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <GenerateRuntimeGraph Condition="'$(AdditionalRuntimeIdentifiers)' != ''"
                           RuntimeGroups="@(RuntimeGroupWithQualifiers)"
diff --git a/src/libraries/oob-all.proj b/src/libraries/oob-all.proj
index f84c5b4050251..9164a5846ceb4 100644
--- a/src/libraries/oob-all.proj
+++ b/src/libraries/oob-all.proj
@@ -16,8 +16,7 @@
     <!-- 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"
+                              Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj"
                       Condition="'$(BuildAllConfigurations)' != 'true'" />
 
     <!-- Skip these projects during source-build as they rely on external prebuilts. -->
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 9b0d54d78d8de..ac4f3c9021c0c 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -94,7 +94,7 @@
           Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
     <!-- Shared framework deps file generation. Produces a test shared-framework deps file. -->
     <GenerateTestSharedFrameworkDepsFile SharedFrameworkDirectory="$(NetCoreAppCurrentTestHostSharedFrameworkPath)"
-                                         RuntimeGraphFiles="$(SourceRuntimeIdentifierGraphFile)"
+                                         RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"
                                          TargetRuntimeIdentifier="$(PackageRID)" />
   </Target>
 

From 6337a647f1c5c151153b73ea4367f0c95ddaacf8 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 26 Sep 2022 15:38:48 +0200
Subject: [PATCH 4/6] PR feedback.

---
 .../src/Microsoft.NETCore.Platforms.csproj        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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 ea19e9b425d29..ad0a60f6e62c0 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -8,10 +8,10 @@
     <AssemblyName>Microsoft.NETCore.Platforms.BuildTasks</AssemblyName>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
-    <!-- Generate a package only during the allconfigurations leg to avoid package clashes during publish. -->
-    <GeneratePackageOnBuild Condition="'$(BuildAllConfigurations)' != 'true'">false</GeneratePackageOnBuild>
 
     <IsPackable>true</IsPackable>
+    <!-- Generate a package only during the allconfigurations leg to avoid package clashes during publish. -->
+    <GeneratePackageOnBuild Condition="'$(BuildAllConfigurations)' != 'true'">false</GeneratePackageOnBuild>
     <PackageId>$(MSBuildProjectName)</PackageId>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>Provides runtime information required to resolve target framework, platform, and runtime specific implementations of .NETCore packages.</PackageDescription>
@@ -44,7 +44,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(GeneratedRuntimeIdentifierGraphFile)" PackagePath="/" />
+    <Content Condition="'$(AdditionalRuntimeIdentifiers)' == ''" Include="runtime.json" PackagePath="/" />
+    <Content Condition="'$(AdditionalRuntimeIdentifiers)' != ''" Include="$(GeneratedRuntimeIdentifierGraphFile)" PackagePath="/" />
     <Content Include="$(PlaceholderFile)" PackagePath="lib/netstandard1.0" />
   </ItemGroup>
 
@@ -58,17 +59,13 @@
   
   <UsingTask TaskName="GenerateRuntimeGraph" AssemblyFile="$(_generateRuntimeGraphTask)"/>
 
-  <Target Name="GenerateRuntimeJson" AfterTargets="Build">
+  <Target Name="GenerateRuntimeJson" AfterTargets="Build" Condition="'$(AdditionalRuntimeIdentifiers)' != ''">
     <MakeDir Directories="$(IntermediateOutputPath)" />
-    <GenerateRuntimeGraph Condition="'$(AdditionalRuntimeIdentifiers)' != ''"
-                          RuntimeGroups="@(RuntimeGroupWithQualifiers)"
+    <GenerateRuntimeGraph RuntimeGroups="@(RuntimeGroupWithQualifiers)"
                           AdditionalRuntimeIdentifiers="$(AdditionalRuntimeIdentifiers)"
                           AdditionalRuntimeIdentifierParent="$(AdditionalRuntimeIdentifierParent)"
                           RuntimeJson="$(GeneratedRuntimeIdentifierGraphFile)"
                           UpdateRuntimeFiles="True" />
-    <Copy Condition="'$(AdditionalRuntimeIdentifiers)' == ''"
-          SourceFiles="runtime.json"
-          DestinationFiles="$(GeneratedRuntimeIdentifierGraphFile)" />
   </Target>
 
   <Target Name="UpdateRuntimeJson">

From 20723ec98d197f0147fc8ca123a21d30866e30cb Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Tue, 27 Sep 2022 07:48:00 +0200
Subject: [PATCH 5/6] PR feedback.

---
 Directory.Build.props                                        | 1 -
 eng/liveBuilds.targets                                       | 5 +++--
 .../src/Microsoft.NETCore.Platforms.csproj                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 24551a44590e7..7d6cab2ecd1ea 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -274,7 +274,6 @@
     <PackageProjectUrl>https://dot.net</PackageProjectUrl>
     <Owners>microsoft,dotnetframework</Owners>
     <IncludeSymbols>true</IncludeSymbols>
-    <GeneratedRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', 'runtime.json'))</GeneratedRuntimeIdentifierGraphFile>
     <LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 6acd861c74f4b..3006fd92e756e 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -223,7 +223,8 @@
             ResolveLibrariesRuntimeFilesFromLocalBuild" />
 
   <PropertyGroup>
-    <BundledRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
-    <BundledRuntimeIdentifierGraphFile Condition="Exists('$(GeneratedRuntimeIdentifierGraphFile)')">$(GeneratedRuntimeIdentifierGraphFile)</BundledRuntimeIdentifierGraphFile>
+    <!-- Keep in sync with outputs defined in Microsoft.NETCore.Platforms.csproj. -->
+    <BundledRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
+    <BundledRuntimeIdentifierGraphFile Condition="!Exists('$(BundledRuntimeIdentifierGraphFile)')">$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
   </PropertyGroup>
 </Project>
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 ad0a60f6e62c0..d414a7a0e4333 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -45,7 +45,7 @@
 
   <ItemGroup>
     <Content Condition="'$(AdditionalRuntimeIdentifiers)' == ''" Include="runtime.json" PackagePath="/" />
-    <Content Condition="'$(AdditionalRuntimeIdentifiers)' != ''" Include="$(GeneratedRuntimeIdentifierGraphFile)" PackagePath="/" />
+    <Content Condition="'$(AdditionalRuntimeIdentifiers)' != ''" Include="$(BaseOutputPath)runtime.json" PackagePath="/" />
     <Content Include="$(PlaceholderFile)" PackagePath="lib/netstandard1.0" />
   </ItemGroup>
 
@@ -64,7 +64,7 @@
     <GenerateRuntimeGraph RuntimeGroups="@(RuntimeGroupWithQualifiers)"
                           AdditionalRuntimeIdentifiers="$(AdditionalRuntimeIdentifiers)"
                           AdditionalRuntimeIdentifierParent="$(AdditionalRuntimeIdentifierParent)"
-                          RuntimeJson="$(GeneratedRuntimeIdentifierGraphFile)"
+                          RuntimeJson="$(BaseOutputPath)runtime.json"
                           UpdateRuntimeFiles="True" />
   </Target>
 

From 43e52ad802ca42d9a48d96021733596f0faddc15 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 27 Sep 2022 10:38:06 +0200
Subject: [PATCH 6/6] Update Microsoft.NETCore.Platforms.csproj

---
 .../src/Microsoft.NETCore.Platforms.csproj                      | 2 --
 1 file changed, 2 deletions(-)

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 d414a7a0e4333..742f17881891c 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -10,8 +10,6 @@
     <IncludeSymbols>false</IncludeSymbols>
 
     <IsPackable>true</IsPackable>
-    <!-- Generate a package only during the allconfigurations leg to avoid package clashes during publish. -->
-    <GeneratePackageOnBuild Condition="'$(BuildAllConfigurations)' != 'true'">false</GeneratePackageOnBuild>
     <PackageId>$(MSBuildProjectName)</PackageId>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>Provides runtime information required to resolve target framework, platform, and runtime specific implementations of .NETCore packages.</PackageDescription>