From c52de51ceabaa57a0761769a9e4b1b549530acdd Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Thu, 3 Mar 2022 16:58:06 -0800
Subject: [PATCH] Fix System.IO.Ports native package not getting published any
 longer after the oob + sfx split

---
 src/libraries/oob-all.proj | 4 ----
 src/libraries/oob-src.proj | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libraries/oob-all.proj b/src/libraries/oob-all.proj
index a444e6eb44912c..f84c5b40502513 100644
--- a/src/libraries/oob-all.proj
+++ b/src/libraries/oob-all.proj
@@ -28,10 +28,6 @@
     <!-- 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-src.proj b/src/libraries/oob-src.proj
index 1edbe734b9371d..2cbfdf9bb3c554 100644
--- a/src/libraries/oob-src.proj
+++ b/src/libraries/oob-src.proj
@@ -15,6 +15,11 @@
                                @(NetCoreAppLibrary->'%(Identity)\src\%(Identity).csproj');
                                Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj" />
 
+    <!-- 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)')" />
+
     <!-- 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" />