From a6d10a50168189cfaf62b8f48b9f2d4be36add6e Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Tue, 1 Aug 2023 08:31:20 -0700
Subject: [PATCH] Use latest ILC to AOT-compile ILC (#89655)

We need to build with a recent enough ILC that has the fix from
b78345e5296c171dc3f43443a83dcf8df0800b83. This sets up a
dependency on the runtime -> runtime package flow to build using
the latest ILC package.

The macOS builds have been updated to machines with XCode 14 that
is required to link against nativeaot framework libraries that
were built using XCode 14 on the official build machines.
---------

Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
---
 eng/Version.Details.xml                                |  4 ++++
 eng/Versions.props                                     |  2 ++
 eng/pipelines/common/xplat-setup.yml                   |  7 ++-----
 eng/pipelines/coreclr/templates/helix-queues-setup.yml |  2 +-
 eng/pipelines/libraries/helix-queues-setup.yml         |  2 +-
 src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj     | 10 ++++++++++
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b1af3d83470..d412e985e50 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -314,6 +314,10 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 442a8e44ae0..153d05421d1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -212,6 +212,8 @@
     <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
     <!-- Mono Cecil -->
     <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
+    <!-- ILCompiler -->
+    <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
     <!-- ICU -->
     <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
index b56f65ef76c..cf9ba83ac47 100644
--- a/eng/pipelines/common/xplat-setup.yml
+++ b/eng/pipelines/common/xplat-setup.yml
@@ -147,11 +147,8 @@ jobs:
           name: $(DncEngInternalBuildPool)
           demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
 
-        # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
-        ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
-          vmImage: 'macos-11'
-
-        ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
+        # OSX Build Pool (we don't have on-prem OSX BuildPool).
+        ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
           vmImage: 'macos-12'
 
         # Official Build Windows Pool
diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
index 88ac4511df6..e264588ee78 100644
--- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml
+++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -56,7 +56,7 @@ jobs:
 
     # iOS devices
     - ${{ if in(parameters.platform, 'ios_arm64') }}:
-      - OSX.1200.Amd64.Iphone.Open
+      - OSX.13.Amd64.Iphone.Open
 
     # tvOS devices
     - ${{ if in(parameters.platform, 'tvos_arm64') }}:
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 49115a44795..72d8d53cd94 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -113,7 +113,7 @@ jobs:
 
     # iOS devices
     - ${{ if in(parameters.platform, 'ios_arm64') }}:
-      - OSX.1200.Amd64.Iphone.Open
+      - OSX.13.Amd64.Iphone.Open
 
     # tvOS devices
     - ${{ if in(parameters.platform, 'tvos_arm64') }}:
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 564a02b632b..7122c81034f 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -19,8 +19,18 @@
     <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
     <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
     <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
+    <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
+    <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
+    <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
+    <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
+    <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
+    <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
+    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
+    <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
+  </ItemGroup>
 
   <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
   <Target Name="_FixIlcTargetTriple"
-- 
GitLab