From 45a8ea8332796816e943ce652d2d00f75705266c Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 26 Aug 2022 13:09:17 +0200
Subject: [PATCH 01/20] Pass SourceBuild TargetRid and SourceBuildPortable args
 through the native script.

---
 Directory.Build.props             |   2 +-
 eng/SourceBuild.props             |   4 +-
 eng/build.sh                      |  17 ++++-
 eng/native/build-commons.sh       |  15 +++-
 eng/native/init-distro-rid.sh     | 111 ++++++++++++++++--------------
 src/native/corehost/corehost.proj |   1 +
 6 files changed, 91 insertions(+), 59 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 60a661e66ca44..64adc127cf63a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -231,7 +231,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(OutputRid).$(Configuration)', 'corehost'))</DotNetHostBinDir>
+    <DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(PackageRID).$(Configuration)', 'corehost'))</DotNetHostBinDir>
   </PropertyGroup>
 
   <!--Feature switches -->
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index c17838918f8ce..48be2fadb1220 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -32,11 +32,11 @@
       <InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:PackageRid=$(TargetRid)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) --packagerid $(TargetRid)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform)</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) --portablebuild $(SourceBuildPortable)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
     </PropertyGroup>
diff --git a/eng/build.sh b/eng/build.sh
index 84a4fd746c917..b3392315e6797 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -31,6 +31,7 @@ usage()
   echo "  --os                            Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS,"
   echo "                                  tvOSSimulator, iOS, iOSSimulator, Android, Browser, NetBSD, illumos or Solaris."
   echo "                                  [Default: Your machine's OS.]"
+  echo "  --packagerid <rid>              Optional argument that overrides the target rid name."
   echo "  --projects <value>              Project or solution file(s) to build."
   echo "  --runtimeConfiguration (-rc)    Runtime build configuration: Debug, Release or Checked."
   echo "                                  Checked is exclusive to the CLR runtime. It is the same as Debug, except code is"
@@ -134,12 +135,13 @@ initDistroRid()
     local buildArch="$2"
     local isCrossBuild="$3"
     local isPortableBuild="$4"
+    local packageRid="$5"
 
     # Only pass ROOTFS_DIR if __DoCrossArchBuild is specified and the current platform is not OSX that doesn't use rootfs
     if [[ $isCrossBuild == 1 && "$targetOs" != "OSX" ]]; then
         passedRootfsDir=${ROOTFS_DIR}
     fi
-    initDistroRidGlobal ${targetOs} ${buildArch} ${isPortableBuild} ${passedRootfsDir}
+    initDistroRidGlobal ${targetOs} ${buildArch} ${isPortableBuild} "${packageRid}" ${passedRootfsDir}
 }
 
 showSubsetHelp()
@@ -152,6 +154,7 @@ cmakeargs=''
 extraargs=''
 crossBuild=0
 portableBuild=1
+packageRid=''
 
 source $scriptroot/native/init-os-and-arch.sh
 
@@ -402,6 +405,16 @@ while [[ $# > 0 ]]; do
       shift 1
       ;;
 
+     -packagerid)
+      if [ -z ${2+x} ]; then
+        echo "No value for packagerid is supplied. See help (--help) for supported values." 1>&2
+        exit 1
+      fi
+      packageRid="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
+      arguments="$arguments /p:PackageRid=$packageRid"
+      shift 2
+      ;;
+
      -portablebuild)
       if [ -z ${2+x} ]; then
         echo "No value for portablebuild is supplied. See help (--help) for supported values." 1>&2
@@ -468,7 +481,7 @@ if [[ "$os" == "Browser" && "$arch" != "wasm" ]]; then
     arch=wasm
 fi
 
-initDistroRid $os $arch $crossBuild $portableBuild
+initDistroRid $os $arch $crossBuild $portableBuild "$packageRid"
 
 # Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
 # The later changes are ignored when using the cache.
diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
index 4199828f2970b..5942a546db305 100755
--- a/eng/native/build-commons.sh
+++ b/eng/native/build-commons.sh
@@ -11,7 +11,7 @@ initTargetDistroRid()
         passedRootfsDir="$ROOTFS_DIR"
     fi
 
-    initDistroRidGlobal "$__TargetOS" "$__TargetArch" "$__PortableBuild" "$passedRootfsDir"
+    initDistroRidGlobal "$__TargetOS" "$__TargetArch" "$__PortableBuild" "$packageRid" "$passedRootfsDir"
 }
 
 setup_dirs()
@@ -212,6 +212,7 @@ usage()
     echo "-gccx.y: optional argument to build using gcc version x.y."
     echo "-ninja: target ninja instead of GNU make"
     echo "-numproc: set the number of build processes."
+    echo "-packagerid: optional argument that overrides the target rid name."
     echo "-portablebuild: pass -portablebuild=false to force a non-portable build."
     echo "-skipconfigure: skip build configuration."
     echo "-keepnativesymbols: keep native/unmanaged debug symbols."
@@ -253,6 +254,8 @@ else
   fi
 fi
 
+packageRid=''
+
 while :; do
     if [[ "$#" -le 0 ]]; then
         break
@@ -396,6 +399,16 @@ while :; do
             __TargetArch=wasm
             ;;
 
+        packagerid|-packagerid)
+            if [[ -n "$2" ]]; then
+                packageRid="$2"
+                shift
+            else
+                echo "ERROR: 'packageRid' requires a non-empty option argument"
+                exit 1
+            fi
+            ;;
+
         ppc64le|-ppc64le)
             __TargetArch=ppc64le
             ;;
diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index 75012240633da..b852dd59fe7db 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -132,71 +132,76 @@ initDistroRidGlobal()
     local targetOs="$1"
     local buildArch="$2"
     local isPortable="$3"
+    local packageRid="$4"
     local rootfsDir=""
-    if [ "$#" -ge 4 ]; then
-        rootfsDir="$4"
+    if [ "$#" -ge 5 ]; then
+        rootfsDir="$5"
     fi
 
-    if [ -n "${rootfsDir}" ]; then
-        # We may have a cross build. Check for the existence of the rootfsDir
-        if [ ! -e "${rootfsDir}" ]; then
-            echo "Error rootfsDir has been passed, but the location is not valid."
-            exit 1
+    if [ -n "$packageRid" ]; then
+        export __DistroRid=$packageRid
+    else
+        if [ -n "${rootfsDir}" ]; then
+            # We may have a cross build. Check for the existence of the rootfsDir
+            if [ ! -e "${rootfsDir}" ]; then
+                echo "Error rootfsDir has been passed, but the location is not valid."
+                exit 1
+            fi
         fi
-    fi
 
-    initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
+        initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
 
-    if [ "$buildArch" = "wasm" ]; then
-        __DistroRid=browser-wasm
-        export __DistroRid
-    fi
+        if [ "$buildArch" = "wasm" ]; then
+            __DistroRid=browser-wasm
+            export __DistroRid
+        fi
 
-    if [ -z "${__DistroRid}" ]; then
-        # The non-portable build rid was not set. Set the portable rid.
+        if [ -z "${__DistroRid}" ]; then
+            # The non-portable build rid was not set. Set the portable rid.
 
-        __PortableBuild=1
-        export __PortableBuild
-        local distroRid=""
+            __PortableBuild=1
+            export __PortableBuild
+            local distroRid=""
 
-        # Check for musl-based distros (e.g Alpine Linux, Void Linux).
-        if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
-                strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
-            distroRid="linux-musl-${buildArch}"
-        fi
+            # Check for musl-based distros (e.g Alpine Linux, Void Linux).
+            if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
+                    strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
+                distroRid="linux-musl-${buildArch}"
+            fi
 
-        if [ -z "${distroRid}" ]; then
-            if [ "$targetOs" = "Linux" ]; then
-                distroRid="linux-$buildArch"
-            elif [ "$targetOs" = "linux-bionic" ]; then
-                distroRid="linux-bionic-$buildArch"
-            elif [ "$targetOs" = "OSX" ]; then
-                distroRid="osx-$buildArch"
-            elif [ "$targetOs" = "MacCatalyst" ]; then
-                distroRid="maccatalyst-$buildArch"
-            elif [ "$targetOs" = "tvOS" ]; then
-                distroRid="tvos-$buildArch"
-            elif [ "$targetOs" = "tvOSSimulator" ]; then
-                distroRid="tvossimulator-$buildArch"
-            elif [ "$targetOs" = "iOS" ]; then
-                distroRid="ios-$buildArch"
-            elif [ "$targetOs" = "iOSSimulator" ]; then
-                distroRid="iossimulator-$buildArch"
-            elif [ "$targetOs" = "Android" ]; then
-                distroRid="android-$buildArch"
-            elif [ "$targetOs" = "Browser" ]; then
-                distroRid="browser-$buildArch"
-            elif [ "$targetOs" = "FreeBSD" ]; then
-                distroRid="freebsd-$buildArch"
-            elif [ "$targetOs" = "illumos" ]; then
-                distroRid="illumos-$buildArch"
-            elif [ "$targetOs" = "Solaris" ]; then
-                distroRid="solaris-$buildArch"
+            if [ -z "${distroRid}" ]; then
+                if [ "$targetOs" = "Linux" ]; then
+                    distroRid="linux-$buildArch"
+                elif [ "$targetOs" = "linux-bionic" ]; then
+                    distroRid="linux-bionic-$buildArch"
+                elif [ "$targetOs" = "OSX" ]; then
+                    distroRid="osx-$buildArch"
+                elif [ "$targetOs" = "MacCatalyst" ]; then
+                    distroRid="maccatalyst-$buildArch"
+                elif [ "$targetOs" = "tvOS" ]; then
+                    distroRid="tvos-$buildArch"
+                elif [ "$targetOs" = "tvOSSimulator" ]; then
+                    distroRid="tvossimulator-$buildArch"
+                elif [ "$targetOs" = "iOS" ]; then
+                    distroRid="ios-$buildArch"
+                elif [ "$targetOs" = "iOSSimulator" ]; then
+                    distroRid="iossimulator-$buildArch"
+                elif [ "$targetOs" = "Android" ]; then
+                    distroRid="android-$buildArch"
+                elif [ "$targetOs" = "Browser" ]; then
+                    distroRid="browser-$buildArch"
+                elif [ "$targetOs" = "FreeBSD" ]; then
+                    distroRid="freebsd-$buildArch"
+                elif [ "$targetOs" = "illumos" ]; then
+                    distroRid="illumos-$buildArch"
+                elif [ "$targetOs" = "Solaris" ]; then
+                    distroRid="solaris-$buildArch"
+                fi
             fi
-        fi
 
-        __DistroRid="${distroRid}"
-        export __DistroRid
+            __DistroRid="${distroRid}"
+            export __DistroRid
+        fi
     fi
 
     if [ -z "$__DistroRid" ]; then
diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj
index 9ce1a640eadaa..5999086ddae56 100644
--- a/src/native/corehost/corehost.proj
+++ b/src/native/corehost/corehost.proj
@@ -81,6 +81,7 @@
       <BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
       <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
       <BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId="$(OfficialBuildId)"</BuildArgs>
+      <BuildArgs Condition="'$(PackageRid)' != ''">$(BuildArgs) -packagerid $(PackageRid)</BuildArgs>
     </PropertyGroup>
 
     <!--

From 9d2af1d394dbc66c3547e3e09ef0973f705086a6 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 31 Aug 2022 09:14:05 +0200
Subject: [PATCH 02/20] Rename -packagerid to -distrorid.

---
 eng/SourceBuild.props             |   2 +-
 eng/build.sh                      |  16 ++---
 eng/native/build-commons.sh       |  12 ++--
 eng/native/init-distro-rid.sh     | 116 +++++++++++++++---------------
 src/native/corehost/corehost.proj |   2 +-
 5 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 48be2fadb1220..adda946c6abdf 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -32,7 +32,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) --packagerid $(TargetRid)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) --distrorid $(TargetRid)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform)</InnerBuildArgs>
diff --git a/eng/build.sh b/eng/build.sh
index b3392315e6797..e54f4edff6a8c 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -31,7 +31,7 @@ usage()
   echo "  --os                            Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS,"
   echo "                                  tvOSSimulator, iOS, iOSSimulator, Android, Browser, NetBSD, illumos or Solaris."
   echo "                                  [Default: Your machine's OS.]"
-  echo "  --packagerid <rid>              Optional argument that overrides the target rid name."
+  echo "  --distrorid <rid>               Optional argument that overrides the target rid name."
   echo "  --projects <value>              Project or solution file(s) to build."
   echo "  --runtimeConfiguration (-rc)    Runtime build configuration: Debug, Release or Checked."
   echo "                                  Checked is exclusive to the CLR runtime. It is the same as Debug, except code is"
@@ -135,13 +135,12 @@ initDistroRid()
     local buildArch="$2"
     local isCrossBuild="$3"
     local isPortableBuild="$4"
-    local packageRid="$5"
 
     # Only pass ROOTFS_DIR if __DoCrossArchBuild is specified and the current platform is not OSX that doesn't use rootfs
     if [[ $isCrossBuild == 1 && "$targetOs" != "OSX" ]]; then
         passedRootfsDir=${ROOTFS_DIR}
     fi
-    initDistroRidGlobal ${targetOs} ${buildArch} ${isPortableBuild} "${packageRid}" ${passedRootfsDir}
+    initDistroRidGlobal ${targetOs} ${buildArch} ${isPortableBuild} ${passedRootfsDir}
 }
 
 showSubsetHelp()
@@ -154,7 +153,6 @@ cmakeargs=''
 extraargs=''
 crossBuild=0
 portableBuild=1
-packageRid=''
 
 source $scriptroot/native/init-os-and-arch.sh
 
@@ -405,13 +403,13 @@ while [[ $# > 0 ]]; do
       shift 1
       ;;
 
-     -packagerid)
+     -distrorid)
       if [ -z ${2+x} ]; then
-        echo "No value for packagerid is supplied. See help (--help) for supported values." 1>&2
+        echo "No value for distrorid is supplied. See help (--help) for supported values." 1>&2
         exit 1
       fi
-      packageRid="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
-      arguments="$arguments /p:PackageRid=$packageRid"
+      __DistroRid="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
+      arguments="$arguments /p:PackageRid=$__DistroRid"
       shift 2
       ;;
 
@@ -481,7 +479,7 @@ if [[ "$os" == "Browser" && "$arch" != "wasm" ]]; then
     arch=wasm
 fi
 
-initDistroRid $os $arch $crossBuild $portableBuild "$packageRid"
+initDistroRid $os $arch $crossBuild $portableBuild
 
 # Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
 # The later changes are ignored when using the cache.
diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
index 5942a546db305..952a3edf79e20 100755
--- a/eng/native/build-commons.sh
+++ b/eng/native/build-commons.sh
@@ -11,7 +11,7 @@ initTargetDistroRid()
         passedRootfsDir="$ROOTFS_DIR"
     fi
 
-    initDistroRidGlobal "$__TargetOS" "$__TargetArch" "$__PortableBuild" "$packageRid" "$passedRootfsDir"
+    initDistroRidGlobal "$__TargetOS" "$__TargetArch" "$__PortableBuild" "$passedRootfsDir"
 }
 
 setup_dirs()
@@ -212,7 +212,7 @@ usage()
     echo "-gccx.y: optional argument to build using gcc version x.y."
     echo "-ninja: target ninja instead of GNU make"
     echo "-numproc: set the number of build processes."
-    echo "-packagerid: optional argument that overrides the target rid name."
+    echo "-distrorid: optional argument that overrides the target rid name."
     echo "-portablebuild: pass -portablebuild=false to force a non-portable build."
     echo "-skipconfigure: skip build configuration."
     echo "-keepnativesymbols: keep native/unmanaged debug symbols."
@@ -254,8 +254,6 @@ else
   fi
 fi
 
-packageRid=''
-
 while :; do
     if [[ "$#" -le 0 ]]; then
         break
@@ -399,12 +397,12 @@ while :; do
             __TargetArch=wasm
             ;;
 
-        packagerid|-packagerid)
+        distrorid|-distrorid)
             if [[ -n "$2" ]]; then
-                packageRid="$2"
+                __DistroRid="$2"
                 shift
             else
-                echo "ERROR: 'packageRid' requires a non-empty option argument"
+                echo "ERROR: 'distrorid' requires a non-empty option argument"
                 exit 1
             fi
             ;;
diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index b852dd59fe7db..cc8b5a49f98ff 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -132,76 +132,76 @@ initDistroRidGlobal()
     local targetOs="$1"
     local buildArch="$2"
     local isPortable="$3"
-    local packageRid="$4"
     local rootfsDir=""
-    if [ "$#" -ge 5 ]; then
-        rootfsDir="$5"
+    if [ "$#" -ge 4 ]; then
+        rootfsDir="$4"
     fi
 
-    if [ -n "$packageRid" ]; then
-        export __DistroRid=$packageRid
-    else
-        if [ -n "${rootfsDir}" ]; then
-            # We may have a cross build. Check for the existence of the rootfsDir
-            if [ ! -e "${rootfsDir}" ]; then
-                echo "Error rootfsDir has been passed, but the location is not valid."
-                exit 1
-            fi
+    if [ -n "$__DistroRid" ]; then
+        export __DistroRid
+        return
+    fi
+
+    if [ -n "${rootfsDir}" ]; then
+        # We may have a cross build. Check for the existence of the rootfsDir
+        if [ ! -e "${rootfsDir}" ]; then
+            echo "Error rootfsDir has been passed, but the location is not valid."
+            exit 1
         fi
+    fi
 
-        initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
+    initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
 
-        if [ "$buildArch" = "wasm" ]; then
-            __DistroRid=browser-wasm
-            export __DistroRid
-        fi
+    if [ "$buildArch" = "wasm" ]; then
+        __DistroRid=browser-wasm
+        export __DistroRid
+    fi
 
-        if [ -z "${__DistroRid}" ]; then
-            # The non-portable build rid was not set. Set the portable rid.
+    if [ -z "${__DistroRid}" ]; then
+        # The non-portable build rid was not set. Set the portable rid.
 
-            __PortableBuild=1
-            export __PortableBuild
-            local distroRid=""
+        __PortableBuild=1
+        export __PortableBuild
+        local distroRid=""
 
-            # Check for musl-based distros (e.g Alpine Linux, Void Linux).
-            if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
-                    strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
-                distroRid="linux-musl-${buildArch}"
-            fi
+        # Check for musl-based distros (e.g Alpine Linux, Void Linux).
+        if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
+                strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
+            distroRid="linux-musl-${buildArch}"
+        fi
 
-            if [ -z "${distroRid}" ]; then
-                if [ "$targetOs" = "Linux" ]; then
-                    distroRid="linux-$buildArch"
-                elif [ "$targetOs" = "linux-bionic" ]; then
-                    distroRid="linux-bionic-$buildArch"
-                elif [ "$targetOs" = "OSX" ]; then
-                    distroRid="osx-$buildArch"
-                elif [ "$targetOs" = "MacCatalyst" ]; then
-                    distroRid="maccatalyst-$buildArch"
-                elif [ "$targetOs" = "tvOS" ]; then
-                    distroRid="tvos-$buildArch"
-                elif [ "$targetOs" = "tvOSSimulator" ]; then
-                    distroRid="tvossimulator-$buildArch"
-                elif [ "$targetOs" = "iOS" ]; then
-                    distroRid="ios-$buildArch"
-                elif [ "$targetOs" = "iOSSimulator" ]; then
-                    distroRid="iossimulator-$buildArch"
-                elif [ "$targetOs" = "Android" ]; then
-                    distroRid="android-$buildArch"
-                elif [ "$targetOs" = "Browser" ]; then
-                    distroRid="browser-$buildArch"
-                elif [ "$targetOs" = "FreeBSD" ]; then
-                    distroRid="freebsd-$buildArch"
-                elif [ "$targetOs" = "illumos" ]; then
-                    distroRid="illumos-$buildArch"
-                elif [ "$targetOs" = "Solaris" ]; then
-                    distroRid="solaris-$buildArch"
-                fi
+        if [ -z "${distroRid}" ]; then
+            if [ "$targetOs" = "Linux" ]; then
+                distroRid="linux-$buildArch"
+            elif [ "$targetOs" = "linux-bionic" ]; then
+                distroRid="linux-bionic-$buildArch"
+            elif [ "$targetOs" = "OSX" ]; then
+                distroRid="osx-$buildArch"
+            elif [ "$targetOs" = "MacCatalyst" ]; then
+                distroRid="maccatalyst-$buildArch"
+            elif [ "$targetOs" = "tvOS" ]; then
+                distroRid="tvos-$buildArch"
+            elif [ "$targetOs" = "tvOSSimulator" ]; then
+                distroRid="tvossimulator-$buildArch"
+            elif [ "$targetOs" = "iOS" ]; then
+                distroRid="ios-$buildArch"
+            elif [ "$targetOs" = "iOSSimulator" ]; then
+                distroRid="iossimulator-$buildArch"
+            elif [ "$targetOs" = "Android" ]; then
+                distroRid="android-$buildArch"
+            elif [ "$targetOs" = "Browser" ]; then
+                distroRid="browser-$buildArch"
+            elif [ "$targetOs" = "FreeBSD" ]; then
+                distroRid="freebsd-$buildArch"
+            elif [ "$targetOs" = "illumos" ]; then
+                distroRid="illumos-$buildArch"
+            elif [ "$targetOs" = "Solaris" ]; then
+                distroRid="solaris-$buildArch"
             fi
-
-            __DistroRid="${distroRid}"
-            export __DistroRid
         fi
+
+        __DistroRid="${distroRid}"
+        export __DistroRid
     fi
 
     if [ -z "$__DistroRid" ]; then
diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj
index 5999086ddae56..76e1dbaa677b9 100644
--- a/src/native/corehost/corehost.proj
+++ b/src/native/corehost/corehost.proj
@@ -81,7 +81,7 @@
       <BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
       <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
       <BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId="$(OfficialBuildId)"</BuildArgs>
-      <BuildArgs Condition="'$(PackageRid)' != ''">$(BuildArgs) -packagerid $(PackageRid)</BuildArgs>
+      <BuildArgs Condition="'$(PackageRid)' != ''">$(BuildArgs) -distrorid $(PackageRid)</BuildArgs>
     </PropertyGroup>
 
     <!--

From a6195945d1d66b0511a58fb3bec7666dcf9d2039 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 31 Aug 2022 09:21:13 +0200
Subject: [PATCH 03/20] Fix init-distro-rid.sh.

---
 eng/native/init-distro-rid.sh | 117 +++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 60 deletions(-)

diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index cc8b5a49f98ff..3c217eb5c1200 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -137,77 +137,74 @@ initDistroRidGlobal()
         rootfsDir="$4"
     fi
 
-    if [ -n "$__DistroRid" ]; then
-        export __DistroRid
-        return
-    fi
-
-    if [ -n "${rootfsDir}" ]; then
-        # We may have a cross build. Check for the existence of the rootfsDir
-        if [ ! -e "${rootfsDir}" ]; then
-            echo "Error rootfsDir has been passed, but the location is not valid."
-            exit 1
+    if [ -z "${__DistroRid:-}" ]; then
+        if [ -n "${rootfsDir}" ]; then
+            # We may have a cross build. Check for the existence of the rootfsDir
+            if [ ! -e "${rootfsDir}" ]; then
+                echo "Error rootfsDir has been passed, but the location is not valid."
+                exit 1
+            fi
         fi
-    fi
 
-    initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
+        initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
 
-    if [ "$buildArch" = "wasm" ]; then
-        __DistroRid=browser-wasm
-        export __DistroRid
-    fi
+        if [ "$buildArch" = "wasm" ]; then
+            __DistroRid=browser-wasm
+            export __DistroRid
+        fi
 
-    if [ -z "${__DistroRid}" ]; then
-        # The non-portable build rid was not set. Set the portable rid.
+        if [ -z "${__DistroRid}" ]; then
+            # The non-portable build rid was not set. Set the portable rid.
 
-        __PortableBuild=1
-        export __PortableBuild
-        local distroRid=""
+            __PortableBuild=1
+            export __PortableBuild
+            local distroRid=""
 
-        # Check for musl-based distros (e.g Alpine Linux, Void Linux).
-        if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
-                strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
-            distroRid="linux-musl-${buildArch}"
-        fi
+            # Check for musl-based distros (e.g Alpine Linux, Void Linux).
+            if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
+                    strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
+                distroRid="linux-musl-${buildArch}"
+            fi
 
-        if [ -z "${distroRid}" ]; then
-            if [ "$targetOs" = "Linux" ]; then
-                distroRid="linux-$buildArch"
-            elif [ "$targetOs" = "linux-bionic" ]; then
-                distroRid="linux-bionic-$buildArch"
-            elif [ "$targetOs" = "OSX" ]; then
-                distroRid="osx-$buildArch"
-            elif [ "$targetOs" = "MacCatalyst" ]; then
-                distroRid="maccatalyst-$buildArch"
-            elif [ "$targetOs" = "tvOS" ]; then
-                distroRid="tvos-$buildArch"
-            elif [ "$targetOs" = "tvOSSimulator" ]; then
-                distroRid="tvossimulator-$buildArch"
-            elif [ "$targetOs" = "iOS" ]; then
-                distroRid="ios-$buildArch"
-            elif [ "$targetOs" = "iOSSimulator" ]; then
-                distroRid="iossimulator-$buildArch"
-            elif [ "$targetOs" = "Android" ]; then
-                distroRid="android-$buildArch"
-            elif [ "$targetOs" = "Browser" ]; then
-                distroRid="browser-$buildArch"
-            elif [ "$targetOs" = "FreeBSD" ]; then
-                distroRid="freebsd-$buildArch"
-            elif [ "$targetOs" = "illumos" ]; then
-                distroRid="illumos-$buildArch"
-            elif [ "$targetOs" = "Solaris" ]; then
-                distroRid="solaris-$buildArch"
+            if [ -z "${distroRid}" ]; then
+                if [ "$targetOs" = "Linux" ]; then
+                    distroRid="linux-$buildArch"
+                elif [ "$targetOs" = "linux-bionic" ]; then
+                    distroRid="linux-bionic-$buildArch"
+                elif [ "$targetOs" = "OSX" ]; then
+                    distroRid="osx-$buildArch"
+                elif [ "$targetOs" = "MacCatalyst" ]; then
+                    distroRid="maccatalyst-$buildArch"
+                elif [ "$targetOs" = "tvOS" ]; then
+                    distroRid="tvos-$buildArch"
+                elif [ "$targetOs" = "tvOSSimulator" ]; then
+                    distroRid="tvossimulator-$buildArch"
+                elif [ "$targetOs" = "iOS" ]; then
+                    distroRid="ios-$buildArch"
+                elif [ "$targetOs" = "iOSSimulator" ]; then
+                    distroRid="iossimulator-$buildArch"
+                elif [ "$targetOs" = "Android" ]; then
+                    distroRid="android-$buildArch"
+                elif [ "$targetOs" = "Browser" ]; then
+                    distroRid="browser-$buildArch"
+                elif [ "$targetOs" = "FreeBSD" ]; then
+                    distroRid="freebsd-$buildArch"
+                elif [ "$targetOs" = "illumos" ]; then
+                    distroRid="illumos-$buildArch"
+                elif [ "$targetOs" = "Solaris" ]; then
+                    distroRid="solaris-$buildArch"
+                fi
             fi
-        fi
 
-        __DistroRid="${distroRid}"
-        export __DistroRid
-    fi
+            __DistroRid="${distroRid}"
+        fi
 
-    if [ -z "$__DistroRid" ]; then
-        echo "DistroRid is not set. This is almost certainly an error"
-        exit 1
+        if [ -z "$__DistroRid" ]; then
+            echo "DistroRid is not set. This is almost certainly an error"
+            exit 1
+        fi
     fi
 
+    export __DistroRid
     echo "__DistroRid: ${__DistroRid}"
 }

From 599ef824089c48f6748bd84099b2900fd42bbfc3 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 31 Aug 2022 11:36:15 +0200
Subject: [PATCH 04/20] Use OutputRid instead of PackageRid.

---
 Directory.Build.props             | 2 +-
 src/native/corehost/corehost.proj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 64adc127cf63a..60a661e66ca44 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -231,7 +231,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(PackageRID).$(Configuration)', 'corehost'))</DotNetHostBinDir>
+    <DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(OutputRid).$(Configuration)', 'corehost'))</DotNetHostBinDir>
   </PropertyGroup>
 
   <!--Feature switches -->
diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj
index 76e1dbaa677b9..58093203c2503 100644
--- a/src/native/corehost/corehost.proj
+++ b/src/native/corehost/corehost.proj
@@ -81,7 +81,7 @@
       <BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
       <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
       <BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId="$(OfficialBuildId)"</BuildArgs>
-      <BuildArgs Condition="'$(PackageRid)' != ''">$(BuildArgs) -distrorid $(PackageRid)</BuildArgs>
+      <BuildArgs Condition="'$(OutputRid)' != ''">$(BuildArgs) -distrorid $(OutputRid)</BuildArgs>
     </PropertyGroup>
 
     <!--

From f39f89017f545024ac8ae12662d28f88890c8696 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 31 Aug 2022 11:54:40 +0200
Subject: [PATCH 05/20] Drop unnecessary Condition.

---
 src/native/corehost/corehost.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj
index 58093203c2503..6910d2a21e925 100644
--- a/src/native/corehost/corehost.proj
+++ b/src/native/corehost/corehost.proj
@@ -81,7 +81,7 @@
       <BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
       <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
       <BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId="$(OfficialBuildId)"</BuildArgs>
-      <BuildArgs Condition="'$(OutputRid)' != ''">$(BuildArgs) -distrorid $(OutputRid)</BuildArgs>
+      <BuildArgs>$(BuildArgs) -distrorid $(OutputRid)</BuildArgs>
     </PropertyGroup>
 
     <!--

From 3da8276be829977f445615b122bdb98b32ef511f Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 31 Aug 2022 12:01:32 +0200
Subject: [PATCH 06/20] Try passing --distrorid as OutputRid.

---
 eng/build.sh                                       | 2 +-
 src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/build.sh b/eng/build.sh
index e54f4edff6a8c..a8172baafcdc6 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -409,7 +409,7 @@ while [[ $# > 0 ]]; do
         exit 1
       fi
       __DistroRid="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
-      arguments="$arguments /p:PackageRid=$__DistroRid"
+      arguments="$arguments /p:OutputRid=$__DistroRid"
       shift 2
       ;;
 
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 0f53c52bca6bb..4fbe2ef2b6a4c 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputPath>$(RuntimeBinDir)ilc/</OutputPath>
-    <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
+    <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="ILCompiler.props" />

From 2fdda4ad6c6c5feeaa6868c62763b9144f48ac3a Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 31 Aug 2022 18:01:25 +0200
Subject: [PATCH 07/20] NativeExport: use PackageRID for
 AppHostRuntimeIdentifier.

---
 .../tests/TestAssets/NativeExports/NativeExports.csproj         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
index d420161d1a6eb..57344f0474432 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
@@ -9,7 +9,7 @@
     <DnneGenRollForward>Major</DnneGenRollForward>
     <!-- To integrate with DNNE's architecture calculation, we need to set the RID for this project. -->
     <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
-    <AppHostRuntimeIdentifier>$(OutputRid)</AppHostRuntimeIdentifier>
+    <AppHostRuntimeIdentifier>$(PackageRID)</AppHostRuntimeIdentifier>
     <_TargetsAppleOS Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'MacCatalyst' or
       '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOSSimulator' or
       '$(TargetOS)' == 'tvOSSimulator'">true</_TargetsAppleOS>

From d89911f74ac9d8efa4c0447c80d7d614f04eb7b3 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 31 Aug 2022 18:42:43 +0200
Subject: [PATCH 08/20] Rename --distrorid to --outputrid.

---
 eng/build.sh                      |   9 ++-
 eng/native/build-commons.sh       |  13 ++--
 eng/native/init-distro-rid.sh     | 110 +++++++++++++++---------------
 src/native/corehost/build.sh      |   7 +-
 src/native/corehost/corehost.proj |   2 +-
 5 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/eng/build.sh b/eng/build.sh
index a8172baafcdc6..352761a5208b9 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -31,7 +31,7 @@ usage()
   echo "  --os                            Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS,"
   echo "                                  tvOSSimulator, iOS, iOSSimulator, Android, Browser, NetBSD, illumos or Solaris."
   echo "                                  [Default: Your machine's OS.]"
-  echo "  --distrorid <rid>               Optional argument that overrides the target rid name."
+  echo "  --outputrid <rid>               Optional argument that overrides the target rid name."
   echo "  --projects <value>              Project or solution file(s) to build."
   echo "  --runtimeConfiguration (-rc)    Runtime build configuration: Debug, Release or Checked."
   echo "                                  Checked is exclusive to the CLR runtime. It is the same as Debug, except code is"
@@ -403,13 +403,12 @@ while [[ $# > 0 ]]; do
       shift 1
       ;;
 
-     -distrorid)
+     -outputrid)
       if [ -z ${2+x} ]; then
-        echo "No value for distrorid is supplied. See help (--help) for supported values." 1>&2
+        echo "No value for outputrid is supplied. See help (--help) for supported values." 1>&2
         exit 1
       fi
-      __DistroRid="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
-      arguments="$arguments /p:OutputRid=$__DistroRid"
+      arguments="$arguments /p:OutputRid=$(echo "$2" | tr "[:upper:]" "[:lower:]")"
       shift 2
       ;;
 
diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
index 952a3edf79e20..bc0083eed7185 100755
--- a/eng/native/build-commons.sh
+++ b/eng/native/build-commons.sh
@@ -212,7 +212,7 @@ usage()
     echo "-gccx.y: optional argument to build using gcc version x.y."
     echo "-ninja: target ninja instead of GNU make"
     echo "-numproc: set the number of build processes."
-    echo "-distrorid: optional argument that overrides the target rid name."
+    echo "-outputrid: optional argument that overrides the target rid name."
     echo "-portablebuild: pass -portablebuild=false to force a non-portable build."
     echo "-skipconfigure: skip build configuration."
     echo "-keepnativesymbols: keep native/unmanaged debug symbols."
@@ -233,6 +233,7 @@ __TargetArch=$arch
 __TargetOS=$os
 __HostOS=$os
 __BuildOS=$os
+__OutputRid=''
 
 # Get the number of processors available to the scheduler
 # Other techniques such as `nproc` only get the number of
@@ -397,12 +398,12 @@ while :; do
             __TargetArch=wasm
             ;;
 
-        distrorid|-distrorid)
+        outputrid|-outputrid)
             if [[ -n "$2" ]]; then
-                __DistroRid="$2"
+                __OutputRid="$2"
                 shift
             else
-                echo "ERROR: 'distrorid' requires a non-empty option argument"
+                echo "ERROR: 'outputrid' requires a non-empty option argument"
                 exit 1
             fi
             ;;
@@ -489,3 +490,7 @@ fi
 
 # init the target distro name
 initTargetDistroRid
+
+if [ -z "$__OutputRid" ]; then
+    __OutputRid="$(echo $__DistroRid | tr '[:upper:]' '[:lower:]')"
+fi
diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index 3c217eb5c1200..86d319d8ef5a2 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -137,72 +137,70 @@ initDistroRidGlobal()
         rootfsDir="$4"
     fi
 
-    if [ -z "${__DistroRid:-}" ]; then
-        if [ -n "${rootfsDir}" ]; then
-            # We may have a cross build. Check for the existence of the rootfsDir
-            if [ ! -e "${rootfsDir}" ]; then
-                echo "Error rootfsDir has been passed, but the location is not valid."
-                exit 1
-            fi
+    if [ -n "${rootfsDir}" ]; then
+        # We may have a cross build. Check for the existence of the rootfsDir
+        if [ ! -e "${rootfsDir}" ]; then
+            echo "Error rootfsDir has been passed, but the location is not valid."
+            exit 1
         fi
+    fi
 
-        initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
+    initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}"
 
-        if [ "$buildArch" = "wasm" ]; then
-            __DistroRid=browser-wasm
-            export __DistroRid
-        fi
+    if [ "$buildArch" = "wasm" ]; then
+        __DistroRid=browser-wasm
+        export __DistroRid
+    fi
 
-        if [ -z "${__DistroRid}" ]; then
-            # The non-portable build rid was not set. Set the portable rid.
+    if [ -z "${__DistroRid}" ]; then
+        # The non-portable build rid was not set. Set the portable rid.
 
-            __PortableBuild=1
-            export __PortableBuild
-            local distroRid=""
+        __PortableBuild=1
+        export __PortableBuild
+        local distroRid=""
 
-            # Check for musl-based distros (e.g Alpine Linux, Void Linux).
-            if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
-                    strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
-                distroRid="linux-musl-${buildArch}"
-            fi
+        # Check for musl-based distros (e.g Alpine Linux, Void Linux).
+        if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
+                strings "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl; then
+            distroRid="linux-musl-${buildArch}"
+        fi
 
-            if [ -z "${distroRid}" ]; then
-                if [ "$targetOs" = "Linux" ]; then
-                    distroRid="linux-$buildArch"
-                elif [ "$targetOs" = "linux-bionic" ]; then
-                    distroRid="linux-bionic-$buildArch"
-                elif [ "$targetOs" = "OSX" ]; then
-                    distroRid="osx-$buildArch"
-                elif [ "$targetOs" = "MacCatalyst" ]; then
-                    distroRid="maccatalyst-$buildArch"
-                elif [ "$targetOs" = "tvOS" ]; then
-                    distroRid="tvos-$buildArch"
-                elif [ "$targetOs" = "tvOSSimulator" ]; then
-                    distroRid="tvossimulator-$buildArch"
-                elif [ "$targetOs" = "iOS" ]; then
-                    distroRid="ios-$buildArch"
-                elif [ "$targetOs" = "iOSSimulator" ]; then
-                    distroRid="iossimulator-$buildArch"
-                elif [ "$targetOs" = "Android" ]; then
-                    distroRid="android-$buildArch"
-                elif [ "$targetOs" = "Browser" ]; then
-                    distroRid="browser-$buildArch"
-                elif [ "$targetOs" = "FreeBSD" ]; then
-                    distroRid="freebsd-$buildArch"
-                elif [ "$targetOs" = "illumos" ]; then
-                    distroRid="illumos-$buildArch"
-                elif [ "$targetOs" = "Solaris" ]; then
-                    distroRid="solaris-$buildArch"
-                fi
+        if [ -z "${distroRid}" ]; then
+            if [ "$targetOs" = "Linux" ]; then
+                distroRid="linux-$buildArch"
+            elif [ "$targetOs" = "linux-bionic" ]; then
+                distroRid="linux-bionic-$buildArch"
+            elif [ "$targetOs" = "OSX" ]; then
+                distroRid="osx-$buildArch"
+            elif [ "$targetOs" = "MacCatalyst" ]; then
+                distroRid="maccatalyst-$buildArch"
+            elif [ "$targetOs" = "tvOS" ]; then
+                distroRid="tvos-$buildArch"
+            elif [ "$targetOs" = "tvOSSimulator" ]; then
+                distroRid="tvossimulator-$buildArch"
+            elif [ "$targetOs" = "iOS" ]; then
+                distroRid="ios-$buildArch"
+            elif [ "$targetOs" = "iOSSimulator" ]; then
+                distroRid="iossimulator-$buildArch"
+            elif [ "$targetOs" = "Android" ]; then
+                distroRid="android-$buildArch"
+            elif [ "$targetOs" = "Browser" ]; then
+                distroRid="browser-$buildArch"
+            elif [ "$targetOs" = "FreeBSD" ]; then
+                distroRid="freebsd-$buildArch"
+            elif [ "$targetOs" = "illumos" ]; then
+                distroRid="illumos-$buildArch"
+            elif [ "$targetOs" = "Solaris" ]; then
+                distroRid="solaris-$buildArch"
             fi
-
-            __DistroRid="${distroRid}"
         fi
 
-        if [ -z "$__DistroRid" ]; then
-            echo "DistroRid is not set. This is almost certainly an error"
-            exit 1
-        fi
+        __DistroRid="${distroRid}"
+    fi
+
+    if [ -z "$__DistroRid" ]; then
+        echo "DistroRid is not set. This is almost certainly an error"
+        exit 1
     fi
 
     export __DistroRid
diff --git a/src/native/corehost/build.sh b/src/native/corehost/build.sh
index ae44091c54892..f300b10f672f5 100755
--- a/src/native/corehost/build.sh
+++ b/src/native/corehost/build.sh
@@ -74,14 +74,13 @@ __LogsDir="$__RootBinDir/log"
 __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
 
 # Set the remaining variables based upon the determined build configuration
-__DistroRidLower="$(echo $__DistroRid | tr '[:upper:]' '[:lower:]')"
-__BinDir="$__RootBinDir/bin/$__DistroRidLower.$__BuildType"
-__IntermediatesDir="$__RootBinDir/obj/$__DistroRidLower.$__BuildType"
+__BinDir="$__RootBinDir/bin/$__OutputRid.$__BuildType"
+__IntermediatesDir="$__RootBinDir/obj/$__OutputRid.$__BuildType"
 
 export __BinDir __IntermediatesDir __RuntimeFlavor
 
 __CMakeArgs="-DCLI_CMAKE_HOST_VER=\"$__host_ver\" -DCLI_CMAKE_COMMON_HOST_VER=\"$__apphost_ver\" -DCLI_CMAKE_HOST_FXR_VER=\"$__fxr_ver\" $__CMakeArgs"
-__CMakeArgs="-DCLI_CMAKE_HOST_POLICY_VER=\"$__policy_ver\" -DCLI_CMAKE_PKG_RID=\"$__DistroRid\" -DCLI_CMAKE_COMMIT_HASH=\"$__commit_hash\" $__CMakeArgs"
+__CMakeArgs="-DCLI_CMAKE_HOST_POLICY_VER=\"$__policy_ver\" -DCLI_CMAKE_PKG_RID=\"$__OutputRid\" -DCLI_CMAKE_COMMIT_HASH=\"$__commit_hash\" $__CMakeArgs"
 __CMakeArgs="-DRUNTIME_FLAVOR=\"$__RuntimeFlavor\" $__CMakeArgs"
 __CMakeArgs="-DFEATURE_DISTRO_AGNOSTIC_SSL=$__PortableBuild $__CMakeArgs"
 
diff --git a/src/native/corehost/corehost.proj b/src/native/corehost/corehost.proj
index 6910d2a21e925..a320ab4d814ab 100644
--- a/src/native/corehost/corehost.proj
+++ b/src/native/corehost/corehost.proj
@@ -81,7 +81,7 @@
       <BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
       <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
       <BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId="$(OfficialBuildId)"</BuildArgs>
-      <BuildArgs>$(BuildArgs) -distrorid $(OutputRid)</BuildArgs>
+      <BuildArgs>$(BuildArgs) -outputrid $(OutputRid)</BuildArgs>
     </PropertyGroup>
 
     <!--

From 165206c88ab4828ece22756c054b5880e69a365e Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Thu, 1 Sep 2022 09:05:43 +0200
Subject: [PATCH 09/20] Fix SourceBuild.props.

---
 eng/SourceBuild.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index adda946c6abdf..7428387be4b76 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -32,11 +32,11 @@
       <InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) --distrorid $(TargetRid)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) --outputrid $(TargetRid)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) --portablebuild $(SourceBuildPortable)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform)</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) --portablebuild $(SourceBuildPortable)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
     </PropertyGroup>

From 3499ee1d705f301d209ff8bfebcd9ff2a2847c26 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Thu, 1 Sep 2022 09:08:56 +0200
Subject: [PATCH 10/20] Undo changes to init-distro-rid.sh.

---
 eng/native/init-distro-rid.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index 86d319d8ef5a2..75012240633da 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -196,6 +196,7 @@ initDistroRidGlobal()
         fi
 
         __DistroRid="${distroRid}"
+        export __DistroRid
     fi
 
     if [ -z "$__DistroRid" ]; then
@@ -203,6 +204,5 @@ initDistroRidGlobal()
         exit 1
     fi
 
-    export __DistroRid
     echo "__DistroRid: ${__DistroRid}"
 }

From b1b93c2798a50ebeb40402402c95addc5ca9cb68 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Thu, 1 Sep 2022 22:17:04 +0200
Subject: [PATCH 11/20] Let source-build leg build 'banana-x64' rid.

---
 eng/pipelines/common/global-build-job.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index e1a8e45ba97bc..b036919662179 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -141,6 +141,7 @@ jobs:
           platform:
             buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
             nonPortable: true
+            targetRID: banana-x64
 
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
       - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO

From 8b7f3f903f5ed0ccdda4b09632afac7b18708957 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 2 Sep 2022 07:14:39 +0200
Subject: [PATCH 12/20] SourceBuild.props: don't force a RuntimeOS.

---
 eng/SourceBuild.props | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 7428387be4b76..1227e68608bc0 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -17,8 +17,7 @@
 
     <!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
     <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
-    <TargetRidWithoutPlatform>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</TargetRidWithoutPlatform>
-    <TargetRidPlatform>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetRidPlatform>
+    <TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
 
     <LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>
   </PropertyGroup>
@@ -26,7 +25,7 @@
   <Target Name="GetRuntimeSourceBuildCommandConfiguration"
           BeforeTargets="GetSourceBuildCommandConfiguration">
     <PropertyGroup>
-      <InnerBuildArgs>$(InnerBuildArgs) --arch $(TargetRidPlatform)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) --arch $(TargetArch)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --configuration $(Configuration)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(SourceBuildNonPortable)' == 'true'">$(InnerBuildArgs) --allconfigurations</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs>
@@ -36,7 +35,6 @@
       <InnerBuildArgs>$(InnerBuildArgs) --portablebuild $(SourceBuildPortable)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
     </PropertyGroup>

From 9244703acd864c712865248dba17df3bb67965ab Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 2 Sep 2022 08:57:19 +0200
Subject: [PATCH 13/20] SourceBuild.props: set
 AdditionalRuntimeIdentifierParent.

---
 eng/SourceBuild.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 1227e68608bc0..2626cacd19346 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -19,6 +19,8 @@
     <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
     <TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
 
+    <AdditionalRuntimeIdentifierParent Condition="'$(AdditionalRuntimeIdentifierParent)' == ''">linux-$(TargetArch)</AdditionalRuntimeIdentifierParent>
+
     <LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>
   </PropertyGroup>
 
@@ -37,6 +39,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(AdditionalRuntimeIdentifierParent)</InnerBuildArgs>
     </PropertyGroup>
   </Target>
 

From 77958f979737701c6b4220a1ddecc6b6d8d7005a Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 2 Sep 2022 09:18:12 +0200
Subject: [PATCH 14/20] Build banana.24-x64 instead.

---
 eng/SourceBuild.props                     | 14 +++++++++-----
 eng/pipelines/common/global-build-job.yml |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 2626cacd19346..78c664376b579 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -15,11 +15,14 @@
     <TargetRid Condition="'$(TargetRid)' == '' and '$(SourceBuildNonPortable)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
     <TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid>
 
-    <!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
-    <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
-    <TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
+    <!-- From the target rid (for example fedora.36-x64), derive the TargetArch ('x64') and the DistroRid ('fedora-x64'). -->
+    <_targetRidArchIndex>$(TargetRid.LastIndexOf('-'))</_targetRidArchIndex>
+    <TargetArch>$(TargetRid.Substring($(_targetRidArchIndex)).TrimStart('-'))</TargetArch>
+    <_distroRidIndex>$(TargetRid.FirstIndexOf('.'))</_distroRidIndex>
+    <DistroRid Condition="'$(DistroRid)' == '' and '$(_distroRidIndex)' != '-1'">$(TargetRid.Substring(0, $(_distroRidIndex))-$(TargetArch)</DistroRid>
 
-    <AdditionalRuntimeIdentifierParent Condition="'$(AdditionalRuntimeIdentifierParent)' == ''">linux-$(TargetArch)</AdditionalRuntimeIdentifierParent>
+    <!-- BaseRid is an expected known rid in the graph that DistroRid is compatible with. -->
+    <BaseRid Condition="'$(BaseRid)' == ''">linux-$(TargetArch)</BaseRid>
 
     <LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>
   </PropertyGroup>
@@ -39,7 +42,8 @@
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(AdditionalRuntimeIdentifierParent)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifiers=$(DistroRid)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseRid)</InnerBuildArgs>
     </PropertyGroup>
   </Target>
 
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index b036919662179..b15847aadeea7 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -141,7 +141,7 @@ jobs:
           platform:
             buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
             nonPortable: true
-            targetRID: banana-x64
+            targetRID: banana.24-x64
 
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
       - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO

From 2b3a641fe1df223c1f7105b276a7335a82c8ca53 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 2 Sep 2022 09:56:43 +0200
Subject: [PATCH 15/20] Fix SourceBuild.props.

---
 eng/SourceBuild.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 78c664376b579..10965d4a067ff 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -18,8 +18,8 @@
     <!-- From the target rid (for example fedora.36-x64), derive the TargetArch ('x64') and the DistroRid ('fedora-x64'). -->
     <_targetRidArchIndex>$(TargetRid.LastIndexOf('-'))</_targetRidArchIndex>
     <TargetArch>$(TargetRid.Substring($(_targetRidArchIndex)).TrimStart('-'))</TargetArch>
-    <_distroRidIndex>$(TargetRid.FirstIndexOf('.'))</_distroRidIndex>
-    <DistroRid Condition="'$(DistroRid)' == '' and '$(_distroRidIndex)' != '-1'">$(TargetRid.Substring(0, $(_distroRidIndex))-$(TargetArch)</DistroRid>
+    <_distroRidIndex>$(TargetRid.IndexOf('.'))</_distroRidIndex>
+    <DistroRid Condition="'$(DistroRid)' == '' and '$(_distroRidIndex)' != '-1'">$(TargetRid.Substring(0, $(_distroRidIndex)))-$(TargetArch)</DistroRid>
 
     <!-- BaseRid is an expected known rid in the graph that DistroRid is compatible with. -->
     <BaseRid Condition="'$(BaseRid)' == ''">linux-$(TargetArch)</BaseRid>

From 763dc66733d168100322c38a5126137bef95a5dc Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 2 Sep 2022 12:24:02 +0200
Subject: [PATCH 16/20] SourceBuild.props: try fix AdditionalRuntimeIdentifier*
 usage.

---
 eng/SourceBuild.props | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 10965d4a067ff..2e49df0143259 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -15,14 +15,12 @@
     <TargetRid Condition="'$(TargetRid)' == '' and '$(SourceBuildNonPortable)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
     <TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid>
 
-    <!-- From the target rid (for example fedora.36-x64), derive the TargetArch ('x64') and the DistroRid ('fedora-x64'). -->
+    <!-- From the target rid (for example fedora.36-x64), derive the TargetArch ('x64'). -->
     <_targetRidArchIndex>$(TargetRid.LastIndexOf('-'))</_targetRidArchIndex>
     <TargetArch>$(TargetRid.Substring($(_targetRidArchIndex)).TrimStart('-'))</TargetArch>
-    <_distroRidIndex>$(TargetRid.IndexOf('.'))</_distroRidIndex>
-    <DistroRid Condition="'$(DistroRid)' == '' and '$(_distroRidIndex)' != '-1'">$(TargetRid.Substring(0, $(_distroRidIndex)))-$(TargetArch)</DistroRid>
 
-    <!-- BaseRid is an expected known rid in the graph that DistroRid is compatible with. -->
-    <BaseRid Condition="'$(BaseRid)' == ''">linux-$(TargetArch)</BaseRid>
+    <!-- BaseRidOS is an expected known rid in the graph that TargetRid is compatible with. -->
+    <BaseRidOS Condition="'$(BaseRidOS)' == ''">linux</BaseRidOS>
 
     <LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>
   </PropertyGroup>
@@ -42,8 +40,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifiers=$(DistroRid)</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseRid)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseRidOS)</InnerBuildArgs>
     </PropertyGroup>
   </Target>
 

From a9da4afabda4bc65bd498552c8f9230e9aa30f18 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Fri, 2 Sep 2022 12:46:36 +0200
Subject: [PATCH 17/20] source-build.yml: add runtimeOS parameter.

---
 eng/SourceBuild.props                       | 8 +++++---
 eng/common/templates/steps/source-build.yml | 6 ++++++
 eng/pipelines/common/global-build-job.yml   | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 2e49df0143259..0272b16c9c6eb 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -15,9 +15,10 @@
     <TargetRid Condition="'$(TargetRid)' == '' and '$(SourceBuildNonPortable)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
     <TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid>
 
-    <!-- From the target rid (for example fedora.36-x64), derive the TargetArch ('x64'). -->
-    <_targetRidArchIndex>$(TargetRid.LastIndexOf('-'))</_targetRidArchIndex>
-    <TargetArch>$(TargetRid.Substring($(_targetRidArchIndex)).TrimStart('-'))</TargetArch>
+    <!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
+    <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
+    <RuntimeOS>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</RuntimeOS>
+    <TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
 
     <!-- BaseRidOS is an expected known rid in the graph that TargetRid is compatible with. -->
     <BaseRidOS Condition="'$(BaseRidOS)' == ''">linux</BaseRidOS>
@@ -38,6 +39,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) --portablebuild $(SourceBuildPortable)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(RuntimeOS)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseRidOS)</InnerBuildArgs>
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 12a8ff94d8e96..4624885e3bfeb 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,6 +63,11 @@ steps:
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
+    runtimeOsArgs=
+    if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
+      runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
+    fi
+
     publishArgs=
     if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
       publishArgs='--publish'
@@ -75,6 +80,7 @@ steps:
       $internalRuntimeDownloadArgs \
       $internalRestoreArgs \
       $targetRidArgs \
+      $runtimeOsArgs \
       /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
       /p:ArcadeBuildFromSource=true
   displayName: Build
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index b15847aadeea7..e043c0040661f 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -142,6 +142,7 @@ jobs:
             buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
             nonPortable: true
             targetRID: banana.24-x64
+            runtimeOS: linux
 
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
       - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO

From 0b228a7abb21c1f8b40d97037bf69a6a83f64d47 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Tue, 27 Sep 2022 08:13:08 +0200
Subject: [PATCH 18/20] SourceBuild.props: derive RuntimeOS from
 NETCoreSdkRuntimeIdentifier.

---
 eng/SourceBuild.props                       | 13 +++++++------
 eng/common/templates/steps/source-build.yml |  6 ------
 eng/pipelines/common/global-build-job.yml   |  1 -
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index e24b5ae926fc3..bebdcc2cf24c3 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -15,13 +15,14 @@
     <TargetRid Condition="'$(TargetRid)' == '' and '$(SourceBuildNonPortable)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
     <TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid>
 
-    <!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
+    <_sdkRuntimeIdentifierPlatformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_sdkRuntimeIdentifierPlatformIndex>
+    <BootstrapOS Condition="'$(BootstrapOS)' == ''">$(NETCoreSdkRuntimeIdentifier.Substring(0, $(_sdkRuntimeIdentifierPlatformIndex)))</BootstrapOS>
+
     <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
-    <RuntimeOS>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</RuntimeOS>
     <TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
 
-    <!-- BaseRidOS is an expected known rid in the graph that TargetRid is compatible with. -->
-    <BaseRidOS Condition="'$(BaseRidOS)' == ''">linux</BaseRidOS>
+    <!-- BaseOS is an expected known rid in the graph that TargetRid is compatible with. -->
+    <BaseOS Condition="'$(BaseOS)' == ''">$(BootstrapOS)</BaseOS>
 
     <LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>
   </PropertyGroup>
@@ -39,12 +40,12 @@
       <InnerBuildArgs>$(InnerBuildArgs) --portablebuild $(SourceBuildPortable)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(RuntimeOS)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(BootstrapOS)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(OfficialBuildId)' != ''">$(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseRidOS)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS)</InnerBuildArgs>
     </PropertyGroup>
   </Target>
 
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 4624885e3bfeb..12a8ff94d8e96 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,11 +63,6 @@ steps:
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
-    runtimeOsArgs=
-    if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
-      runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
-    fi
-
     publishArgs=
     if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
       publishArgs='--publish'
@@ -80,7 +75,6 @@ steps:
       $internalRuntimeDownloadArgs \
       $internalRestoreArgs \
       $targetRidArgs \
-      $runtimeOsArgs \
       /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
       /p:ArcadeBuildFromSource=true
   displayName: Build
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index e043c0040661f..b15847aadeea7 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -142,7 +142,6 @@ jobs:
             buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
             nonPortable: true
             targetRID: banana.24-x64
-            runtimeOS: linux
 
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
       - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO

From 5aa074afe2e112fe732b09ad06fa1c37a165737a Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Tue, 27 Sep 2022 10:27:24 +0200
Subject: [PATCH 19/20] Undo using NETCoreSdkRuntimeIdentifier.

---
 eng/SourceBuild.props                       | 16 +++++++++-------
 eng/common/templates/steps/source-build.yml |  6 ++++++
 eng/pipelines/common/global-build-job.yml   |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index bebdcc2cf24c3..ebf8e683ed0ce 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -11,18 +11,20 @@
     <SourceBuildPortable>true</SourceBuildPortable>
     <SourceBuildPortable Condition="'$(SourceBuildNonPortable)' == 'true'">false</SourceBuildPortable>
 
-    <!-- If TargetRid not specified, detect RID based on portability. -->
+    <!-- TargetRid names what gets built. -->
     <TargetRid Condition="'$(TargetRid)' == '' and '$(SourceBuildNonPortable)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid>
     <TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid>
 
-    <_sdkRuntimeIdentifierPlatformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_sdkRuntimeIdentifierPlatformIndex>
-    <BootstrapOS Condition="'$(BootstrapOS)' == ''">$(NETCoreSdkRuntimeIdentifier.Substring(0, $(_sdkRuntimeIdentifierPlatformIndex)))</BootstrapOS>
-
+    <!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
     <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
     <TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
 
-    <!-- BaseOS is an expected known rid in the graph that TargetRid is compatible with. -->
-    <BaseOS Condition="'$(BaseOS)' == ''">$(BootstrapOS)</BaseOS>
+    <!-- RuntimeOS is the build host rid OS. -->
+    <RuntimeOS>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</RuntimeOS>
+
+    <!-- BaseOS is an expected known rid in the graph that TargetRid is compatible with.
+         It's used to add TargetRid in the graph if the parent can't be detected. -->
+    <BaseOS>$(RuntimeOS)</BaseOS>
 
     <LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>
   </PropertyGroup>
@@ -40,7 +42,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) --portablebuild $(SourceBuildPortable)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:NoPgoOptimize=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:KeepNativeSymbols=true</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(BootstrapOS)</InnerBuildArgs>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(RuntimeOS)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(OfficialBuildId)' != ''">$(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 12a8ff94d8e96..4624885e3bfeb 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,6 +63,11 @@ steps:
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
+    runtimeOsArgs=
+    if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
+      runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
+    fi
+
     publishArgs=
     if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
       publishArgs='--publish'
@@ -75,6 +80,7 @@ steps:
       $internalRuntimeDownloadArgs \
       $internalRestoreArgs \
       $targetRidArgs \
+      $runtimeOsArgs \
       /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
       /p:ArcadeBuildFromSource=true
   displayName: Build
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index b15847aadeea7..e043c0040661f 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -142,6 +142,7 @@ jobs:
             buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
             nonPortable: true
             targetRID: banana.24-x64
+            runtimeOS: linux
 
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
       - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO

From 1965c296fe1b07adcb2fae87cb1b8867a0141bed Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Tue, 27 Sep 2022 18:35:06 +0200
Subject: [PATCH 20/20] Update eng/pipelines/common/global-build-job.yml

Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
---
 eng/pipelines/common/global-build-job.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index e043c0040661f..61ee087bfa0cc 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -141,6 +141,7 @@ jobs:
           platform:
             buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
             nonPortable: true
+            # Use a custom RID that isn't in the RID graph here to validate we don't break the usage of custom rids that aren't in the graph.
             targetRID: banana.24-x64
             runtimeOS: linux