diff --git a/src/libraries/System.IO.Ports/pkg/runtime.linux-s390.runtime.native.System.IO.Ports.proj b/src/libraries/System.IO.Ports/pkg/runtime.linux-s390.runtime.native.System.IO.Ports.proj
deleted file mode 100644
index 2ae8829c98588c..00000000000000
--- a/src/libraries/System.IO.Ports/pkg/runtime.linux-s390.runtime.native.System.IO.Ports.proj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <Import Project="runtime.native.System.IO.Ports.props" />
-
-  <PropertyGroup>
-    <!-- TODO: Remove when the package shipped. -->
-    <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
index ebbce8353b069e..4232bcfa4331f2 100644
--- a/src/libraries/libraries-packages.proj
+++ b/src/libraries/libraries-packages.proj
@@ -11,10 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Build the identity package in the allconfigurations build. -->
-    <ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj" Condition="'$(BuildAllConfigurations)' == 'true'" />
-    <!-- Build the runtime specific package matching the current RID, outside of an allconfigurations build. -->
-    <ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\runtime.$(OutputRid).*.proj" Condition="'$(BuildAllConfigurations)' != '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>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->