From fe018f0b3f9d9aaa62dc066dfdc8d017976e0771 Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Tue, 15 Aug 2023 13:25:55 -0700
Subject: [PATCH 1/2] Add AdditionalRuntimeIdentifier if building from source

---
 src/Layout/redist/targets/GenerateLayout.targets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
index 3b93e5f9bc74..3cf4f8adc598 100644
--- a/src/Layout/redist/targets/GenerateLayout.targets
+++ b/src/Layout/redist/targets/GenerateLayout.targets
@@ -2,7 +2,11 @@
 
   <Target Name="PublishPortableRuntimeIdentifierGraph"
           BeforeTargets="Build">
-    
+
+      <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(TargetRid)' != '' AND '$(TargetRid)' != '$(PortableRid)'">
+        <AdditionalRuntimeIdentifier Include="$(TargetRid)" Imports="$(PortableRid)" />
+      </ItemGroup>
+
       <UpdatePortableRuntimeIdentifierGraph
         InputFile="PortableRuntimeIdentifierGraph.json"
         OutputFile="$(OutputPath)/PortableRuntimeIdentifierGraph.json"

From d541f85fd80e27b18f5220502f637dd3784f6d5a Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Wed, 16 Aug 2023 13:31:54 -0700
Subject: [PATCH 2/2] Update src/Layout/redist/targets/GenerateLayout.targets

---
 src/Layout/redist/targets/GenerateLayout.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
index 3cf4f8adc598..dca524e27607 100644
--- a/src/Layout/redist/targets/GenerateLayout.targets
+++ b/src/Layout/redist/targets/GenerateLayout.targets
@@ -3,7 +3,7 @@
   <Target Name="PublishPortableRuntimeIdentifierGraph"
           BeforeTargets="Build">
 
-      <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(TargetRid)' != '' AND '$(TargetRid)' != '$(PortableRid)'">
+      <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(TargetRid)' != '' AND '$(PortableRid)' != '' AND '$(TargetRid)' != '$(PortableRid)'">
         <AdditionalRuntimeIdentifier Include="$(TargetRid)" Imports="$(PortableRid)" />
       </ItemGroup>