From 298a3042fdfa8b6d89f485ce0b8478ebd0d8db14 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Mon, 23 Sep 2024 10:11:09 -0400
Subject: [PATCH 1/3] Rename SourceBuildUseMonoRuntime property, which is not
 SB specific

This is a coordinated cross-repo change, and might break the build until
all four PRs are merged. The other three are:

Ref: https://github.com/dotnet/source-build/issues/4165
---
 eng/DotNetBuild.props                                       | 2 +-
 src/Installer/redist-installer/redist-installer.csproj      | 2 +-
 src/SourceBuild/content/build.sh                            | 2 +-
 src/SourceBuild/content/repo-projects/Directory.Build.props | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index efb463b9ea62..2d9bb947cf22 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -15,7 +15,7 @@
       <InnerBuildArgs>$(InnerBuildArgs) /p:UseSharedCompilation=false</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:SkipBuildingInstallers=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false</InnerBuildArgs>
-      <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:DISABLE_CROSSGEN=true</InnerBuildArgs>
+      <InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:DISABLE_CROSSGEN=true</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(PgoInstrument)' == 'true'">$(InnerBuildArgs) /p:PgoInstrument=true</InnerBuildArgs>
     </PropertyGroup>
   </Target>
diff --git a/src/Installer/redist-installer/redist-installer.csproj b/src/Installer/redist-installer/redist-installer.csproj
index 972a0838cc9a..6996298b5801 100644
--- a/src/Installer/redist-installer/redist-installer.csproj
+++ b/src/Installer/redist-installer/redist-installer.csproj
@@ -9,7 +9,7 @@
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>none</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <BundleRuntimePacks Condition="'$(BundleRuntimePacks)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</BundleRuntimePacks>
     <!-- DotNetBuildOrchestrator is (currently) needed in order to obtain NuGet packages from the runtime build. -->
-    <BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(SourceBuildUseMonoRuntime)' != 'true' and '$(DotNetBuildOrchestrator)' == 'true'">true</BundleNativeAotCompiler>
+    <BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$(DotNetBuildOrchestrator)' == 'true'">true</BundleNativeAotCompiler>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh
index e32be1f4ca4a..9e870a1b6201 100755
--- a/src/SourceBuild/content/build.sh
+++ b/src/SourceBuild/content/build.sh
@@ -190,7 +190,7 @@ while [[ $# > 0 ]]; do
       prepare_machine=true
       ;;
     -use-mono-runtime)
-      properties+=( "/p:SourceBuildUseMonoRuntime=true" )
+      properties+=( "/p:DotNetBuildUseMonoRuntime=true" )
       ;;
     -dev)
       use_dev_versioning=true
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index deda23c650cc..ec204376f2ec 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -80,7 +80,7 @@
     <BuildArgs Condition="'$(DotNetBuildTests)' == 'true'">$(BuildArgs) /p:DotNetBuildTests=true</BuildArgs>
     <BuildArgs Condition="'$(NuGetConfigFile)' != ''">$(BuildArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</BuildArgs>
     <!-- TODO rename this property https://github.com/dotnet/source-build/issues/4165 -->
-    <BuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(BuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime)</BuildArgs>
+    <BuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(BuildArgs) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime)</BuildArgs>
     <!-- Pass locations for assets -->
     <BuildArgs>$(BuildArgs) /p:SourceBuiltAssetsDir=$(ArtifactsAssetsDir)</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:SourceBuiltAssetManifestsDir=$(RepoAssetManifestsDir)</BuildArgs>

From 9f0a537db010d496b2faedac62970f9a5f2b830d Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Mon, 23 Sep 2024 10:39:26 -0400
Subject: [PATCH 2/3] Add downstream patches for now, pending upstream PR
 merges

---
 ...ldUseMonoRuntime-property-which-is-n.patch | 27 ++++++++++
 ...ldUseMonoRuntime-property-which-is-n.patch | 50 +++++++++++++++++++
 ...ldUseMonoRuntime-property-which-is-n.patch | 27 ++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
 create mode 100644 src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
 create mode 100644 src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch

diff --git a/src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch b/src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
new file mode 100644
index 000000000000..72642590a187
--- /dev/null
+++ b/src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jo Shields <joshield@microsoft.com>
+Date: Mon, 23 Sep 2024 10:11:07 -0400
+Subject: [PATCH] Rename SourceBuildUseMonoRuntime property, which is not SB
+ specific
+
+This is a coordinated cross-repo change, and might break the build until
+all four PRs are merged. The other three are:
+
+Ref: https://github.com/dotnet/source-build/issues/4165
+---
+ eng/DotNetBuild.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
+index 8f6e67aba6..b4a0935104 100644
+--- a/eng/DotNetBuild.props
++++ b/eng/DotNetBuild.props
+@@ -64,7 +64,7 @@
+           BeforeTargets="GetSourceBuildCommandConfiguration">
+ 
+     <PropertyGroup>
+-      <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
++      <InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
+     </PropertyGroup>
+   </Target>
+ 
diff --git a/src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch b/src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
new file mode 100644
index 000000000000..30b5ef5f1578
--- /dev/null
+++ b/src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jo Shields <joshield@microsoft.com>
+Date: Mon, 23 Sep 2024 10:11:01 -0400
+Subject: [PATCH] Rename SourceBuildUseMonoRuntime property, which is not SB
+ specific
+
+This is a coordinated cross-repo change, and might break the build until
+all four PRs are merged. The other three are:
+
+Ref: https://github.com/dotnet/source-build/issues/4165
+---
+ Directory.Build.props | 2 +-
+ eng/DotNetBuild.props | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 7f5b362cb..d16c9ad5d 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -39,7 +39,7 @@
+     <!-- Set PublishReadyToRun to speed up the build. -->
+     <EnablePublishReadyToRun>true</EnablePublishReadyToRun>
+     <!-- Crossgen2 is not built with source-built Mono-based .NET SDKs. -->
+-    <EnablePublishReadyToRun Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">false</EnablePublishReadyToRun>
++    <EnablePublishReadyToRun Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</EnablePublishReadyToRun>
+   </PropertyGroup>
+ 
+   <Import Project="$(RepoRoot)/Directory.Build.props.user" Condition="Exists('$(RepoRoot)/Directory.Build.props.user')" />
+diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
+index c7bc688ba..0734c9cf8 100644
+--- a/eng/DotNetBuild.props
++++ b/eng/DotNetBuild.props
+@@ -30,7 +30,7 @@
+           
+     <PropertyGroup>
+       <SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
+-      <SourceBuildUseMonoRuntime Condition="'$(SourceBuildUseMonoRuntime)' == ''">false</SourceBuildUseMonoRuntime>
++      <DotNetBuildUseMonoRuntime Condition="'$(DotNetBuildUseMonoRuntime)' == ''">false</DotNetBuildUseMonoRuntime>
+     </PropertyGroup>
+ 
+     <!-- this runs the source-build bootstrap path as described in https://github.com/dotnet/fsharp/blob/95df49e380ea8dbf33653fa4209f89dba29413f5/eng/build.sh#L247
+@@ -41,7 +41,7 @@
+          -bl enables the binlogs for the tools and Proto builds, which make debugging failures here easier
+     -->
+     <Exec
+-      Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=$(DotNetBuildOrchestrator)"
++      Command="./build.sh --bootstrap --skipBuild -bl $(SourceBuildBootstrapTfmArg) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime) /p:DotNetBuildSourceOnly=true /p:DotNetBuildInnerRepo=true /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=$(DotNetBuildOrchestrator)"
+       WorkingDirectory="$(InnerSourceBuildRepoRoot)"
+       EnvironmentVariables="@(InnerBuildEnv)" />
+   </Target>
diff --git a/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch b/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
new file mode 100644
index 000000000000..849ae94a30ce
--- /dev/null
+++ b/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jo Shields <joshield@microsoft.com>
+Date: Mon, 23 Sep 2024 10:11:14 -0400
+Subject: [PATCH] Rename SourceBuildUseMonoRuntime property, which is not SB
+ specific
+
+This is a coordinated cross-repo change, and might break the build until
+all four PRs are merged. The other three are:
+
+Ref: https://github.com/dotnet/source-build/issues/4165
+---
+ eng/DotNetBuild.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
+index ce13d6ca5b0..316eea2522b 100644
+--- a/eng/DotNetBuild.props
++++ b/eng/DotNetBuild.props
+@@ -53,7 +53,7 @@
+       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity)</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
+-      <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)usemonoruntime</InnerBuildArgs>
++      <InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)usemonoruntime</InnerBuildArgs>
+       <!-- TODO: This parameter is only available on the Unix script. Intentional? -->
+       <InnerBuildArgs Condition="'$(OS)' != 'Windows_NT'">$(InnerBuildArgs) --outputrid $(TargetRid)</InnerBuildArgs>
+       <!-- PackageOS and ToolsOS control the rids of prebuilts consumed by the build.

From 1351b2ac1c4b1f9e6763e9ccab7541101e72c08a Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Mon, 23 Sep 2024 10:47:41 -0400
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Michael Simons <msimons@microsoft.com>
---
 ...1-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch | 2 +-
 ...1-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch | 2 +-
 ...1-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch b/src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
index 72642590a187..ca51bebf7d5b 100644
--- a/src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
+++ b/src/SourceBuild/patches/aspnetcore/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Rename SourceBuildUseMonoRuntime property, which is not SB
 This is a coordinated cross-repo change, and might break the build until
 all four PRs are merged. The other three are:
 
-Ref: https://github.com/dotnet/source-build/issues/4165
+Backport: https://github.com/dotnet/source-build/issues/4165
 ---
  eng/DotNetBuild.props | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch b/src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
index 30b5ef5f1578..a5c43868588e 100644
--- a/src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
+++ b/src/SourceBuild/patches/fsharp/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Rename SourceBuildUseMonoRuntime property, which is not SB
 This is a coordinated cross-repo change, and might break the build until
 all four PRs are merged. The other three are:
 
-Ref: https://github.com/dotnet/source-build/issues/4165
+Backport: https://github.com/dotnet/source-build/issues/4165
 ---
  Directory.Build.props | 2 +-
  eng/DotNetBuild.props | 4 ++--
diff --git a/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch b/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
index 849ae94a30ce..f3e0e10368c8 100644
--- a/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
+++ b/src/SourceBuild/patches/runtime/0001-Rename-SourceBuildUseMonoRuntime-property-which-is-n.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Rename SourceBuildUseMonoRuntime property, which is not SB
 This is a coordinated cross-repo change, and might break the build until
 all four PRs are merged. The other three are:
 
-Ref: https://github.com/dotnet/source-build/issues/4165
+Backport: https://github.com/dotnet/source-build/issues/4165
 ---
  eng/DotNetBuild.props | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)