Fix #18777 (#18778)

Author: directhex

eng/pipelines/templates/jobs/vmr-build.yml

@@ -31,6 +31,11 @@ parameters:
   type: string
   default: ''
 
+- name: useMonoRuntime
+  displayName: True when build output uses the mono runtime
+  type: boolean
+  default: false
+
 #### SOURCE-ONLY parameters ####
 
 # Instead of building the VMR directly, exports the sources into a tarball and builds from that
@@ -66,11 +71,6 @@ parameters:
   type: boolean
   default: false
 
-- name: useMonoRuntime
-  displayName: True when build output uses the mono runtime
-  type: boolean
-  default: false
-
 # Freeform field for extra values to pass to build.sh for special build modes
 - name: extraProperties
   type: string

src/SourceBuild/content/build.sh

@@ -28,7 +28,6 @@ usage()
   echo "  --release-manifest <FILE>       A JSON file, an alternative source of Source Link metadata"
   echo "  --source-repository <URL>       Source Link repository URL, required when building from tarball"
   echo "  --source-version <SHA>          Source Link revision, required when building from tarball"
-  echo "  --use-mono-runtime              Output uses the mono runtime"
   echo "  --with-packages <DIR>           Use the specified directory of previously-built packages"
   echo "  --with-sdk <DIR>                Use the SDK in the specified directory for bootstrapping"
   echo ""
@@ -38,6 +37,7 @@ usage()
   echo "  --clean-while-building          Cleans each repo after building (reduces disk space usage, short: -cwb)"
   echo "  --excludeCIBinarylog            Don't output binary log (short: -nobl)"
   echo "  --prepareMachine                Prepare machine for CI run, clean up processes after build"
+  echo "  --use-mono-runtime              Output uses the mono runtime"
   echo ""
   echo "Command line arguments not listed above are passed thru to msbuild."
   echo "Arguments can also be passed in with a single hyphen."
@@ -139,9 +139,6 @@ while [[ $# > 0 ]]; do
       sourceVersion="$2"
       shift
       ;;
-    -use-mono-runtime)
-      properties="$properties /p:SourceBuildUseMonoRuntime=true"
-      ;;
     -with-packages)
       CUSTOM_PACKAGES_DIR="$(cd -P "$2" && pwd)"
       if [ ! -d "$CUSTOM_PACKAGES_DIR" ]; then
@@ -176,6 +173,9 @@ while [[ $# > 0 ]]; do
     -preparemachine)
       prepare_machine=true
       ;;
+    -use-mono-runtime)
+      properties="$properties /p:SourceBuildUseMonoRuntime=true"
+      ;;
 
     *)
       properties="$properties $1"

src/SourceBuild/content/repo-projects/Directory.Build.props

@@ -78,6 +78,8 @@
     <!-- Only pass when enabled to reduce command line noise. -->
     <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>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
@@ -89,7 +91,6 @@
     <BuildArgs>$(BuildArgs) /p:DotNetBuildSourceOnly=true</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)"</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)"</BuildArgs>
-    <BuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(BuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime)</BuildArgs>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(EnableExtraDebugging)' == 'true'">

src/SourceBuild/content/repo-projects/runtime.proj

@@ -20,7 +20,6 @@
     <BuildArgs Condition="'$(DotNetBuildRuntimeWasmEnableThreads)' == 'true'">$(BuildArgs) /p:DotNetBuildRuntimeWasmEnableThreads=true</BuildArgs>
     <BuildArgs Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">$(BuildArgs) /p:DotNetBuildRuntimeNativeAOTRuntimePack=true</BuildArgs>
     <BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)pgoinstrument</BuildArgs>
-    <BuildArgs Condition="'$(SourceBuildUseMonoRuntime)' != ''">$(BuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime)</BuildArgs>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">