From b2928a69f5e3cf618580a6d8bb0bf7744b79f0e7 Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Wed, 20 Sep 2023 12:33:17 -0400
Subject: [PATCH] Add macOS RIDs to code which adds ILAsm/ILDAsm dependency
 (#17385)

Co-authored-by: Michael Simons <msimons@microsoft.com>
---
 .../buildBootstrapPreviouslySB.csproj         | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
index e38e77b24..56d828d22 100644
--- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
+++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
@@ -19,10 +19,12 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <LinuxRid Include="linux-x64" />
-    <LinuxRid Include="linux-musl-x64" />
-    <LinuxRid Include="linux-arm64" />
-    <LinuxRid Include="linux-musl-arm64" />
+    <UnixRid Include="linux-x64" />
+    <UnixRid Include="linux-musl-x64" />
+    <UnixRid Include="linux-arm64" />
+    <UnixRid Include="linux-musl-arm64" />
+    <UnixRid Include="osx-x64" />
+    <UnixRid Include="osx-arm64" />
   </ItemGroup>
 
   <!-- These packages will be replaced with ms-built packages downloaded from official package feeds-->
@@ -51,44 +53,44 @@
           AfterTargets="CollectPackageDownloads"
           Returns="@(PackageDownload)">
     <ItemGroup>
-      <!-- Generate a cross-product between runtime packs and Linux RIDs -->
-      <RuntimePackWithLinuxRid Include="@(RuntimePack)">
-        <LinuxRid>%(LinuxRid.Identity)</LinuxRid>
-      </RuntimePackWithLinuxRid>
+      <!-- Generate a cross-product between runtime packs and Unix RIDs -->
+      <RuntimePackWithUnixRid Include="@(RuntimePack)">
+        <UnixRid>%(UnixRid.Identity)</UnixRid>
+      </RuntimePackWithUnixRid>
 
-      <!-- Generate a cross-product between portable packages and Linux RIDs -->
-      <PortablePackageWithLinuxRid Include="@(PortablePackage)">
-        <LinuxRid>%(LinuxRid.Identity)</LinuxRid>
-      </PortablePackageWithLinuxRid>
+      <!-- Generate a cross-product between portable packages and Unix RIDs -->
+      <PortablePackageWithUnixRid Include="@(PortablePackage)">
+        <UnixRid>%(UnixRid.Identity)</UnixRid>
+      </PortablePackageWithUnixRid>
 
     </ItemGroup>
     <ItemGroup>
       <!--
-            Generate package names for runtime packs by concatenating the base name with the Linux RID
+            Generate package names for runtime packs by concatenating the base name with the Unix RID
             (e.g. Microsoft.Aspnetcore.App.Runtime.linux-x64)
         -->
-      <PackageWithName Include="@(RuntimePackWithLinuxRid)">
-        <PackageName>%(RuntimePackWithLinuxRid.Identity).%(RuntimePackWithLinuxRid.LinuxRid)</PackageName>
+      <PackageWithName Include="@(RuntimePackWithUnixRid)">
+        <PackageName>%(RuntimePackWithUnixRid.Identity).%(RuntimePackWithUnixRid.UnixRid)</PackageName>
       </PackageWithName>
 
       <!--
             Include the base name of each portable package (e.g. Microsoft.NETCore.ILAsm)
             Exclude any that are native packages.
         -->
-      <PackageWithName Include="@(PortablePackageWithLinuxRid)" Condition=" '%(PortablePackageWithLinuxRid.IsNative)' != 'true' ">
-        <PackageName>%(PortablePackageWithLinuxRid.Identity)</PackageName>
+      <PackageWithName Include="@(PortablePackageWithUnixRid)" Condition=" '%(PortablePackageWithUnixRid.IsNative)' != 'true' ">
+        <PackageName>%(PortablePackageWithUnixRid.Identity)</PackageName>
       </PackageWithName>
 
       <!--
-            Generate Linux RID package names for portable packages by concatenating the base name with the Linux RID
+            Generate Unix RID package names for portable packages by concatenating the base name with the Unix RID
             (e.g. runtime.linux-x64.Microsoft.NETCore.ILAsm)
             Do this for two groups: native and non-native packages. They have different naming conventions.
         -->
-      <PackageWithName Include="@(PortablePackageWithLinuxRid)" Condition=" '%(PortablePackageWithLinuxRid.IsNative)' != 'true' ">
-        <PackageName>runtime.%(PortablePackageWithLinuxRid.LinuxRid).%(PortablePackageWithLinuxRid.Identity)</PackageName>
+      <PackageWithName Include="@(PortablePackageWithUnixRid)" Condition=" '%(PortablePackageWithUnixRid.IsNative)' != 'true' ">
+        <PackageName>runtime.%(PortablePackageWithUnixRid.UnixRid).%(PortablePackageWithUnixRid.Identity)</PackageName>
       </PackageWithName>
-      <PackageWithName Include="@(PortablePackageWithLinuxRid)" Condition=" '%(PortablePackageWithLinuxRid.IsNative)' == 'true' ">
-        <PackageName>runtime.%(PortablePackageWithLinuxRid.LinuxRid).runtime.native.%(PortablePackageWithLinuxRid.Identity)</PackageName>
+      <PackageWithName Include="@(PortablePackageWithUnixRid)" Condition=" '%(PortablePackageWithUnixRid.IsNative)' == 'true' ">
+        <PackageName>runtime.%(PortablePackageWithUnixRid.UnixRid).runtime.native.%(PortablePackageWithUnixRid.Identity)</PackageName>
       </PackageWithName>
     </ItemGroup>