From deb09dd75f8e9d0eb02f78d150787dd63af13da7 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 17 Jan 2025 10:11:36 -0800
Subject: [PATCH 1/5] Set BuildHostTools after NETCoreSdkRuntimeIdentifier has
 been set by the SDK (it's not set before Subsets.props)

---
 Directory.Build.props       | 1 +
 eng/NetSdk.AfterProps.props | 9 +++++++++
 eng/Subsets.props           | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 eng/NetSdk.AfterProps.props

diff --git a/Directory.Build.props b/Directory.Build.props
index 79ec992824c389..a9f6ec33714cf3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -498,6 +498,7 @@
   <PropertyGroup>
     <CustomBeforeNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets</CustomBeforeNoTargets>
     <CustomAfterTraversalTargets>$(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets</CustomAfterTraversalTargets>
+    <AfterMicrosoftNetSdkProps>$(AfterMicrosoftNetSdkProps);$(RepositoryEngineeringDir)NetSdk.AfterProps.props</AfterMicrosoftNetSdkProps>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/eng/NetSdk.AfterProps.props b/eng/NetSdk.AfterProps.props
new file mode 100644
index 00000000000000..680607412fe5ac
--- /dev/null
+++ b/eng/NetSdk.AfterProps.props
@@ -0,0 +1,9 @@
+<Project>
+  <!--
+    Set properties based on the SDK's RID here. Setting the properties here will ensure they're available during property evaulation in project files
+    and during item evaluation everywhere.
+  -->
+  <PropertyGroup>
+    <BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
+  </PropertyGroup>
+</Project>
diff --git a/eng/Subsets.props b/eng/Subsets.props
index cb73295ecdf258..90d1111eefc33c 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -576,7 +576,6 @@
             <_BuildNativeAOTRuntimePack Condition="'$(BuildNativeAOTRuntimePack)' == 'true'">true</_BuildNativeAOTRuntimePack>
             <_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true' and '$(BuildNativeAOTRuntimePack)' != 'true'">true</_BuildHostPack>
             <_BuildBundle Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildBundle>
-            <BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
           </PropertyGroup>
 
           <PropertyGroup Condition="'$(DotNetBuildAllRuntimePacks)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'">

From 256edb951aa311b67c23cbcb8ee2f4ebfa4fc089 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 17 Jan 2025 10:29:33 -0800
Subject: [PATCH 2/5] Use ILCompiler_publish.csproj to handle the publish flow
 like how we do with crossgen2.

---
 eng/Subsets.props                                  |  3 ++-
 src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 10 ----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 90d1111eefc33c..8ea8b81efc8ba3 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -388,10 +388,11 @@
     <!-- skip the architectures that don't have LKG runtime packs -->
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_publish.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.Build.Tasks\ILCompiler.Build.Tasks.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
-    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_publish.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
 
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="clr" />
 
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" />
 
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 4610386a84b038..3c460dec31cba8 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -5,14 +5,4 @@
   </PropertyGroup>
 
   <Import Project="ILCompiler.props" />
-
-  <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
-    <PublishDir>$(RuntimeBinDir)ilc-published/</PublishDir>
-  </PropertyGroup>
-
-  <Target Name="PublishCompiler"
-          Condition="'$(BuildingInsideVisualStudio)' != 'true'"
-          AfterTargets="Build"
-          DependsOnTargets="Publish" />
-
 </Project>

From a2207e6b756d466dcba1e100374f112f4345fdb9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 17 Jan 2025 11:05:29 -0800
Subject: [PATCH 3/5] Don't build the non-inbuild, non-publish variants in the
 stage one build

---
 eng/Subsets.props | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 8ea8b81efc8ba3..7220d3156a1f35 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -392,10 +392,11 @@
     <ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
 
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" />
-    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="clr" />
-
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" />
 
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Condition="'$(StageOneBuild)' != 'true'" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Condition="'$(StageOneBuild)' != 'true'" Category="clr" />
+
     <ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
 
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\cdac-build-tool\cdac-build-tool.csproj" Category="clr" />

From 0efafaa9c3b1ac1827a0527d97db1a173a4272a9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 17 Jan 2025 11:12:07 -0800
Subject: [PATCH 4/5] Adjust to handle the linux-armel build

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

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 7220d3156a1f35..055a99632af906 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -391,12 +391,13 @@
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_publish.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
 
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
+
+    <!-- Always build the in-build variants of these tools. They run on the host machine, which we always have LKG packs for. -->
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" />
 
-    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Condition="'$(StageOneBuild)' != 'true'" Category="clr" />
-    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Condition="'$(StageOneBuild)' != 'true'" Category="clr" />
-
     <ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
 
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\cdac-build-tool\cdac-build-tool.csproj" Category="clr" />

From 8e2cad3ff94dcda113daba74c12c5c88ab6060ec Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 17 Jan 2025 11:58:07 -0800
Subject: [PATCH 5/5] Define property in Directory.Build.targets instead of
 using the SDK hook

---
 Directory.Build.props       | 1 -
 Directory.Build.targets     | 5 +++++
 eng/NetSdk.AfterProps.props | 9 ---------
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 eng/NetSdk.AfterProps.props

diff --git a/Directory.Build.props b/Directory.Build.props
index a9f6ec33714cf3..79ec992824c389 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -498,7 +498,6 @@
   <PropertyGroup>
     <CustomBeforeNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets</CustomBeforeNoTargets>
     <CustomAfterTraversalTargets>$(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets</CustomAfterTraversalTargets>
-    <AfterMicrosoftNetSdkProps>$(AfterMicrosoftNetSdkProps);$(RepositoryEngineeringDir)NetSdk.AfterProps.props</AfterMicrosoftNetSdkProps>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index f07a28552df3b8..7f7454a965662b 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -54,6 +54,11 @@
     <SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v$(NETCoreAppMaximumVersion)" DisplayName=".NET $(NETCoreAppMaximumVersion)" Alias="net$(NETCoreAppMaximumVersion)" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <!-- Define properties that depend on the host SDK RID here. -->
+    <BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
+  </PropertyGroup>
+
   <!-- The Default behavior in VS is to show files for the first target framework in TargetFrameworks property.
        This is required to show all the files corresponding to all target frameworks in VS. -->
   <ItemGroup Condition="'$(DefaultLanguageSourceExtension)' != '' and
diff --git a/eng/NetSdk.AfterProps.props b/eng/NetSdk.AfterProps.props
deleted file mode 100644
index 680607412fe5ac..00000000000000
--- a/eng/NetSdk.AfterProps.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <!--
-    Set properties based on the SDK's RID here. Setting the properties here will ensure they're available during property evaulation in project files
-    and during item evaluation everywhere.
-  -->
-  <PropertyGroup>
-    <BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
-  </PropertyGroup>
-</Project>