From 22b5bb97deaf39efa19bdfdbab9b375141ef6837 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Tue, 11 Feb 2025 16:33:17 +0200
Subject: [PATCH 1/4] Add two-stage build support in source-build

---
 eng/DotNetBuild.props | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 75cfd1acb039f5..0f7100b2fb1f5b 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -105,6 +105,10 @@
 
       <!-- Needed until https://github.com/dotnet/runtime/issues/109329 is fixed. -->
       <InnerBuildArgs Condition="'$(NetCoreAppToolCurrentVersion)' != ''">$(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion)</InnerBuildArgs>
+
+      <!-- Two-stage build is for live runtime packs; apphost, crossgen2 and ilcompiler. It is typically (but not limited to be) used for community-supported platform builds. -->
+      <InnerBuildArgs Condition="'$(StageOneBuild)' != ''">$(InnerBuildArgs) /p:StageOneBuild=$(StageOneBuild) /p:Subset=clr+libs+host</InnerBuildArgs>
+      <InnerBuildArgs Condition="'$(StageTwoBuild)' != ''">$(InnerBuildArgs) /p:StageTwoBuild=$(StageTwoBuild) /p:Subset=clr.tools+packs</InnerBuildArgs>
     </PropertyGroup>
   </Target>
 

From 4d13dd319d3d7a964cf5e39fff40640f09750ac8 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Tue, 11 Feb 2025 16:34:35 +0200
Subject: [PATCH 2/4] Update Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj

---
 .../Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
index 14522c2c74e79e..a3a03aad50f9ae 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
@@ -27,6 +27,8 @@
     <PublishReadyToRun Condition="'$(TargetOS)' == 'netbsd' or '$(TargetOS)' == 'illumos' or '$(TargetOS)' == 'solaris' or '$(TargetOS)' == 'haiku'">false</PublishReadyToRun>
     <!-- Disable crossgen on FreeBSD when cross building from Linux. -->
     <PublishReadyToRun Condition="'$(TargetOS)'=='freebsd' and '$(CrossBuild)'=='true'">false</PublishReadyToRun>
+    <!-- Disable crossgen for StageTwoBuild under source build. -->
+    <PublishReadyToRun Condition="'$(StageTwoBuild)'=='true' and '$(DotNetBuildSourceOnly)'=='true'">false</PublishReadyToRun>
     <UsesMuxerHostModel Condition="'$(TargetsMobile)' != 'true'">true</UsesMuxerHostModel>
     <IncludeDiaSymReaderNative Condition="'$(TargetOS)' == 'windows'">true</IncludeDiaSymReaderNative>
     <UseLocalCrossgen2Pack>$(PublishReadyToRun)</UseLocalCrossgen2Pack>

From a2ab3eb1d7f5df16eb5fdfa143429f334a5ab15b Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Tue, 11 Feb 2025 16:40:42 +0200
Subject: [PATCH 3/4] Update Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj

---
 .../Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
index a3a03aad50f9ae..11cdfbfea2eb6a 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
@@ -27,8 +27,8 @@
     <PublishReadyToRun Condition="'$(TargetOS)' == 'netbsd' or '$(TargetOS)' == 'illumos' or '$(TargetOS)' == 'solaris' or '$(TargetOS)' == 'haiku'">false</PublishReadyToRun>
     <!-- Disable crossgen on FreeBSD when cross building from Linux. -->
     <PublishReadyToRun Condition="'$(TargetOS)'=='freebsd' and '$(CrossBuild)'=='true'">false</PublishReadyToRun>
-    <!-- Disable crossgen for StageTwoBuild under source build. -->
-    <PublishReadyToRun Condition="'$(StageTwoBuild)'=='true' and '$(DotNetBuildSourceOnly)'=='true'">false</PublishReadyToRun>
+    <!-- Disable crossgen for StageTwoBuild. -->
+    <PublishReadyToRun Condition="'$(StageTwoBuild)'=='true'">false</PublishReadyToRun>
     <UsesMuxerHostModel Condition="'$(TargetsMobile)' != 'true'">true</UsesMuxerHostModel>
     <IncludeDiaSymReaderNative Condition="'$(TargetOS)' == 'windows'">true</IncludeDiaSymReaderNative>
     <UseLocalCrossgen2Pack>$(PublishReadyToRun)</UseLocalCrossgen2Pack>

From 269b64460351319b4ed017e31961b04e85768aa1 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Wed, 12 Feb 2025 14:25:01 +0200
Subject: [PATCH 4/4] Build tools.illink subset in stage2

---
 eng/DotNetBuild.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 0f7100b2fb1f5b..100e80fa26f561 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -108,7 +108,7 @@
 
       <!-- Two-stage build is for live runtime packs; apphost, crossgen2 and ilcompiler. It is typically (but not limited to be) used for community-supported platform builds. -->
       <InnerBuildArgs Condition="'$(StageOneBuild)' != ''">$(InnerBuildArgs) /p:StageOneBuild=$(StageOneBuild) /p:Subset=clr+libs+host</InnerBuildArgs>
-      <InnerBuildArgs Condition="'$(StageTwoBuild)' != ''">$(InnerBuildArgs) /p:StageTwoBuild=$(StageTwoBuild) /p:Subset=clr.tools+packs</InnerBuildArgs>
+      <InnerBuildArgs Condition="'$(StageTwoBuild)' != ''">$(InnerBuildArgs) /p:StageTwoBuild=$(StageTwoBuild) /p:Subset=clr.tools+tools.illink+packs</InnerBuildArgs>
     </PropertyGroup>
   </Target>