diff --git a/Directory.Build.props b/Directory.Build.props
index 541ad0417e40d..3347d847da79b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -134,6 +134,10 @@
 
     <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux</_runtimeOS>
     <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS>
+
+    <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)</_packageOS>
+    <_packageOS Condition="'$(_packageOS)' == '' and '$(PortableBuild)' == 'true'">$(_portableOS)</_packageOS>
+    <_packageOS Condition="'$(_packageOS)' == ''">$(_runtimeOS)</_packageOS>
   </PropertyGroup>
 
   <PropertyGroup Label="CalculateRID">
@@ -158,15 +162,43 @@
     <MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(PortableBuild)' != 'true' and '$(_portableOS)' == 'linux'">linux-$(_hostArch)</MicrosoftNetCoreIlasmPackageRuntimeId>
     <MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(MicrosoftNetCoreIlasmPackageRuntimeId)' == ''">$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
 
-    <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</_packageRID>
-    <_packageRID Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)-$(TargetArchitecture)</_packageRID>
-    <PackageRID Condition="'$(PackageRID)' == ''">$(_packageRID)</PackageRID>
-    <PackageRID Condition="'$(PackageRID)' == ''">$(_runtimeOS)-$(TargetArchitecture)</PackageRID>
+    <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
+
+    <!-- Crossgen2 does not support armel, so we will use arm instead. -->
+    <Crossgen2PackageRID Condition="'$(TargetArchitecture)' == 'armel'">$(_packageOS)-arm</Crossgen2PackageRID>
+    <Crossgen2PackageRID Condition="'$(TargetArchitecture)' != 'armel'">$(PackageRID)</Crossgen2PackageRID>
 
     <OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid>
     <OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid>
   </PropertyGroup>
 
+  <ItemGroup Label="CalculateRIDLists" Condition="'$(RequiresBuildRid)' == 'true'">
+    <BuildRID Include="linux-arm" Platform="arm" />
+    <BuildRID Include="linux-arm64" Platform="arm64" />
+    <BuildRID Include="linux-musl-arm" Platform="arm" />
+    <BuildRID Include="linux-musl-arm64" Platform="arm64" />
+    <BuildRID Include="linux-musl-x64" Platform="amd64" />
+    <BuildRID Include="linux-x64" Platform="amd64" />
+    <BuildRID Include="osx-x64" Platform="amd64" />
+    <BuildRID Include="rhel.6-x64" Platform="amd64" />
+    <BuildRID Include="win-arm" Platform="arm" />
+    <BuildRID Include="win-arm64" Platform="arm64" />
+    <BuildRID Include="win-x86" Platform="x86" />
+    <BuildRID Include="win-x64" Platform="amd64" />
+
+    <!-- platforms which are not officially supported -->
+    <BuildRID Include="freebsd-x64" Platform="amd64" ExcludeFromPlatformManifest="true" />
+    <BuildRID Include="illumos-x64" Platform="amd64" ExcludeFromPlatformManifest="true" />
+    <BuildRID Include="netbsd-x64" Platform="amd64" ExcludeFromPlatformManifest="true" />
+    <BuildRID Include="solaris-x64" Platform="amd64" ExcludeFromPlatformManifest="true" />
+    <BuildRID Include="tizen.4.0.0-armel" Platform="armel" ExcludeFromPlatformManifest="true" />
+    <BuildRID Include="tizen.5.0.0-armel" Platform="armel" ExcludeFromPlatformManifest="true" />
+
+    <BuildRid Remove="$(ExcludeFromBuildRID)" Condition="'$(ExcludeFromBuildRID)' != ''" />
+
+    <RestoreBuildRID Include="@(BuildRID)" Exclude="@(BuildRID->HasMetadata('ExcludeFromPlatformManifest'))" />
+  </ItemGroup>
+
   <PropertyGroup Label="CalculateTargetOSName" Condition="'$(SkipInferTargetOSName)' != 'true'">
     <TargetsFreeBSD Condition="'$(TargetOS)' == 'FreeBSD'">true</TargetsFreeBSD>
     <Targetsillumos Condition="'$(TargetOS)' == 'illumos'">true</Targetsillumos>
diff --git a/src/coreclr/.nuget/Directory.Build.props b/src/coreclr/.nuget/Directory.Build.props
index cff00f49e0e56..456a152bc5ba8 100644
--- a/src/coreclr/.nuget/Directory.Build.props
+++ b/src/coreclr/.nuget/Directory.Build.props
@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <RequiresBuildRid>true</RequiresBuildRid>
+  </PropertyGroup>
+
   <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
   <Import Project="..\Directory.Build.props" />
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
@@ -34,28 +38,8 @@
 
     <!-- indicates that lib prefix is not added to library names for Unix-like operating systems -->
     <SkipLibraryPrefixFromUnix>true</SkipLibraryPrefixFromUnix>
-
-    <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">windows;OSX;Android;Linux;FreeBSD;NetBSD;illumos;Solaris</SupportedPackageOSGroups>
-    <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups>
-
-    <_isSupportedOSGroup>true</_isSupportedOSGroup>
   </PropertyGroup>
 
-  <!-- derive an OS Group based on the OS Family -->
-  <PropertyGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(TargetOS)' != ''">$(TargetOS)</_derivedPackageTargetOSGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux</_derivedPackageTargetOSGroup>
-
-    <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false</_isSupportedOSGroup>
-  </PropertyGroup>
-
-  <!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for
-       an unsupported OS Group -->
-  <PropertyGroup Condition="'$(PackageTargetRuntime)' != '' and '$(_isSupportedOSGroup)' == 'true'">
-    <!-- Android will use Linux package definitions -->
-    <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup)</_packageTargetOSGroup>
-    <_packageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == 'Android'">Linux</_packageTargetOSGroup>
-  </PropertyGroup>
   <PropertyGroup>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <OutputPath>$(PackageOutputPath)</OutputPath>
@@ -66,67 +50,6 @@
     <IncludeRuntimeJson>true</IncludeRuntimeJson>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Linux;'))">
-    <OfficialBuildRID Include="linux-x64" />
-    <OfficialBuildRID Include="linux-musl-x64" />
-    <OfficialBuildRID Include="rhel.6-x64" />
-    <OfficialBuildRID Include="linux-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-musl-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-musl-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="tizen.4.0.0-armel">
-      <Platform>armel</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="tizen.5.0.0-armel">
-      <Platform>armel</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';OSX;'))">
-    <OfficialBuildRID Include="osx-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';FreeBSD;'))">
-    <OfficialBuildRID Include="freebsd-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';NetBSD;'))">
-    <OfficialBuildRID Include="netbsd-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';illumos;'))">
-    <OfficialBuildRID Include="illumos-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Solaris;'))">
-    <OfficialBuildRID Include="solaris-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';windows;'))">
-    <OfficialBuildRID Include="win-x86">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-x64" />
-    <OfficialBuildRID Include="win-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-  <ItemGroup>
-    <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but
-         don't build the RID-specific package if we're in an unsupported os family -->
-    <BuildRID Include="@(OfficialBuildRID)" Exclude="$(OutputRid)"/>
-    <BuildRID Include="$(OutputRid)"
-              Condition="'$(_isSupportedOSGroup)' == 'true'">
-      <Platform Condition="'$(TargetArchitecture)' == 'x64'">amd64</Platform>
-      <Platform Condition="'$(TargetArchitecture)' != 'x64'">$(TargetArchitecture)</Platform>
-    </BuildRID>
-  </ItemGroup>
-
   <ItemGroup>
     <_project Include="@(BuildRID)">
       <Platform Condition="'%(Platform)' == ''">amd64</Platform>
diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
index 4b1fc1af49908..9418b5202206d 100644
--- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
+++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj
@@ -4,10 +4,7 @@
     <!-- The default value for macOS is false -->
     <UseAppHost>true</UseAppHost>
 
-    <TargetArchitectureAppHost>$(TargetArchitecture)</TargetArchitectureAppHost>
-    <TargetArchitectureAppHost Condition="'$(TargetArchitectureAppHost)'=='armel'">arm</TargetArchitectureAppHost>
-
-    <AppHostRuntimeIdentifier>$(PackageRID)</AppHostRuntimeIdentifier>
+    <AppHostRuntimeIdentifier>$(Crossgen2PackageRID)</AppHostRuntimeIdentifier>
   </PropertyGroup>
   <Import Project="crossgen2.props" />
 </Project>
diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props
index e95f6a113e787..9fd428958bf5f 100644
--- a/src/installer/pkg/projects/Directory.Build.props
+++ b/src/installer/pkg/projects/Directory.Build.props
@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <RequiresBuildRid>true</RequiresBuildRid>
+  </PropertyGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
@@ -64,27 +68,6 @@
     <TargetFramework Condition="'$(TargetFramework)' == ''">$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <RIDPropsFile Condition="'$(RIDPropsFile)' == ''">$(MSBuildThisFileDirectory)\netcoreappRIDs.props</RIDPropsFile>
-  </PropertyGroup>
-
-  <Import Project="$(RIDPropsFile)" />
-
-  <ItemGroup>
-    <_buildingOnRID Include="$(PackageRID)" Condition="'$(BuildOnUnknownPlatforms)' != 'false'">
-      <Platform>$(Platform)</Platform>
-    </_buildingOnRID>
-    <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set -->
-    <BuildRID Include="@(OfficialBuildRID)" Exclude="@(_buildingOnRID)"/>
-    <!-- Include Unofficial Build RIDs in runtime.json's but do not include in the platform manifest -->
-    <BuildRID Include="@(UnofficialBuildRID)" Exclude="@(_buildingOnRID)">
-      <ExcludeFromPlatformManifest>true</ExcludeFromPlatformManifest>
-    </BuildRID>
-    <BuildRID Include="@(_buildingOnRID)"/>
-
-    <RestoreBuildRID Include="@(BuildRID)" Exclude="@(UnofficialBuildRID)" />
-  </ItemGroup>
-
   <PropertyGroup>
     <!--
       By default, lineup and runtime packages are built by the same project. Allow overriding so
diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props
deleted file mode 100644
index f3d784e9c82ec..0000000000000
--- a/src/installer/pkg/projects/netcoreappRIDs.props
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ItemGroup>
-    <OfficialBuildRID Include="linux-x64" />
-    <OfficialBuildRID Include="linux-musl-x64" />
-    <OfficialBuildRID Include="osx-x64" />
-    <OfficialBuildRID Include="osx-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <!-- Not currently built by CoreFX. -->
-    <!-- <OfficialBuildRID Include="freebsd-x64" /> -->
-    <!-- <OfficialBuildRID Include="netbsd-x64" /> -->
-    <!-- <OfficialBuildRID Include="illumos-x64" /> -->
-    <!-- <OfficialBuildRID Include="solaris-x64" /> -->
-    <OfficialBuildRID Include="win-x86">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-x64"/>
-    <OfficialBuildRID Include="win-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-musl-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-musl-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-
-    <!-- The following RIDs are not officically supported and are not
-         built during official builds, however we wish to include them
-         in our runtime.json to enable others to provide them.  -->
-    <UnofficialBuildRID Include="freebsd-x64" />
-    <UnofficialBuildRID Include="tizen.4.0.0-armel">
-      <Platform>armel</Platform>
-    </UnofficialBuildRID>
-    <UnofficialBuildRID Include="tizen.5.0.0-armel">
-      <Platform>armel</Platform>
-    </UnofficialBuildRID>
-  </ItemGroup>
-</Project>
diff --git a/src/libraries/pkg/Directory.Build.props b/src/libraries/pkg/Directory.Build.props
index d31c32ee6470c..1582bb3d07122 100644
--- a/src/libraries/pkg/Directory.Build.props
+++ b/src/libraries/pkg/Directory.Build.props
@@ -9,20 +9,6 @@
     <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
 
-  <!-- Packages opt-in to automatic RID-specific builds by placing a *.RID.props next to their project
-       that defines the OfficialBuildRID item: all RIDs targeted by the package -->
-  <Import Project="$(MSBuildProjectDirectory)\*.rids.props" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(RuntimeFlavor)' != 'Mono'"/>
-
-  <!-- create the "BuildRID" item which is the set of all supported RIDs, with metadata.
-       We'll add a RID for the current platform even if it isn't in the officially supported set -->
-  <ItemGroup Condition="'@(OfficialBuildRID)' != ''">
-    <BuildRID Include="@(OfficialBuildRID)" Exclude="$(OutputRid)"/>
-    <BuildRID Include="$(OutputRid)">
-      <Platform Condition="'$(TargetArchitecture)' == 'x64'">amd64</Platform>
-      <Platform Condition="'$(TargetArchitecture)' != 'x64'">$(TargetArchitecture)</Platform>
-    </BuildRID>
-  </ItemGroup>
-
   <!-- create the "Project" item which is the current $(MSBuildProjectName).pkgproj with meta-data for all
        supported RIDs -->
   <ItemGroup>
diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props b/src/libraries/pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props
deleted file mode 100644
index c5cf15fa7356c..0000000000000
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-  <ItemGroup Condition="'$(GeneratePackage)' == 'true'">
-    <BuildRID Include="linux-arm">
-      <Platform>arm</Platform>
-    </BuildRID>
-    <BuildRID Include="linux-arm64">
-      <Platform>arm64</Platform>
-    </BuildRID>
-    <BuildRID Include="linux-x64" />
-    <BuildRID Include="osx-x64" />
-  </ItemGroup>
-</Project>
diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
index b7b43e933dfd8..e7efc6be5e61e 100644
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
+++ b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
@@ -1,4 +1,10 @@
 <Project DefaultTargets="Build">
+  <PropertyGroup>
+    <BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' and '$(OfficialBuildId)' != '' and '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
+    <RequiresBuildRid Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(RuntimeFlavor)' != 'Mono'">true</RequiresBuildRid>
+    <ExcludeFromBuildRID>win*;linux-musl*</ExcludeFromBuildRID>
+  </PropertyGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <PropertyGroup>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.proj b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.proj
index a1ec1ea4bd1c9..a9105834e4fff 100644
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.proj
+++ b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.proj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 
   <ItemGroup Condition="'$(BuildAllConfigurations)' == 'true'">
-    <!-- identity project built in AllConfigurations leg, runtime specific projects are included through netcoreapp.rids.props -->
+    <!-- identity project built in AllConfigurations leg -->
     <Project Include="$(MSBuildProjectName).pkgproj" />
   </ItemGroup>
 
diff --git a/src/tests/Common/publishdependency.targets b/src/tests/Common/publishdependency.targets
index 596e4573756df..30dbb39cb13a6 100644
--- a/src/tests/Common/publishdependency.targets
+++ b/src/tests/Common/publishdependency.targets
@@ -5,13 +5,6 @@
     </TestTargetFramework>
   </ItemGroup>
 
-  <PropertyGroup>
-    <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(TargetArchitecture)</PackagePlatform>
-    <MinOSForArch>win7</MinOSForArch>
-    <MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
-    <MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
-  </PropertyGroup>
-
   <ItemGroup>
     <!-- These projects are individually restored in order. Each
          subsequent restore only copies files that don't already exist