Enable -mt in PR CIs with 2 stages

.vsts-dotnet-ci.yml

@@ -98,7 +98,7 @@ jobs:
     displayName: cibuild_bootstrapped_msbuild.cmd
     inputs:
       filename: 'eng/cibuild_bootstrapped_msbuild.cmd'
-      arguments: -onlyDocChanged $(onlyDocChanged)
+      arguments: '-onlyDocChanged $(onlyDocChanged) -stage2Properties /mt'
     env:
       ForceUseXCopyMSBuild: 1
 # Task to collect code coverage on Windows. Disabled by default due to being unstable and sometimes it stucks forever
@@ -210,7 +210,7 @@ jobs:
     displayName: cibuild_bootstrapped_msbuild.cmd
     inputs:
       filename: 'eng/cibuild_bootstrapped_msbuild.cmd'
-      arguments: '-msbuildEngine dotnet -onlyDocChanged $(onlyDocChanged)'
+      arguments: '-msbuildEngine dotnet -onlyDocChanged $(onlyDocChanged) -stage2Properties /mt'
     env:
       MSBUILDUSESERVER: "1"
 # Task to collect code coverage on Windows. Disabled by default due to being unstable and sometimes it stucks forever
@@ -267,6 +267,9 @@ jobs:
     continueOnError: true
     condition: eq(variables.onlyDocChanged, 0)
 
+# Dedicated /mt validation that turns on the ThreadSafeTaskAnalyzer (BuildAnalyzer=true),
+# kept as a separate Linux Core job because the analyzer is more expensive and the regular
+# bootstrapped CI jobs (which all run /mt now too) do not need it.
 - job: BootstrapMSBuildWithMTMode
   displayName: "Linux Core Multithreaded Mode"
   pool:
@@ -324,13 +327,13 @@ jobs:
     displayName: cibuild.cmd
     inputs:
       filename: 'eng/cibuild.cmd'
-      arguments: '-configuration Release -test'
+      arguments: '-configuration Release -test /mt'
     condition: eq(variables.onlyDocChanged, 0)
   - task: BatchScript@1
     displayName: cibuild.cmd without test
     inputs:
       filename: 'eng/cibuild.cmd'
-      arguments: '-configuration Release'
+      arguments: '-configuration Release /mt'
     condition: eq(variables.onlyDocChanged, 1)
 # Task to collect code coverage on Windows. Disabled by default due to being unstable and sometimes it stucks forever
 #   - task: PowerShell@2
@@ -406,7 +409,7 @@ jobs:
         Token: $(dn-bot-dnceng-artifact-feeds-rw)
   - bash: sudo apt-get update
   - bash: sudo apt-get install -y libxml2
-  - bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
+  - bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged) --stage2Properties '/mt'
     displayName: CI Build
     env:
         MSBUILDUSESERVER: "1"
@@ -494,7 +497,7 @@ jobs:
         arguments: $(Build.SourcesDirectory)/NuGet.config $Token
       env:
         Token: $(dn-bot-dnceng-artifact-feeds-rw)
-  - bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
+  - bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged) --stage2Properties '/mt'
     displayName: CI Build
     env:
         MSBUILDUSESERVER: "1"

azure-pipelines/.vsts-dotnet-build-jobs.yml

@@ -12,6 +12,9 @@ parameters:
 - name: enableOptProf
   type: boolean
   default: false
+- name: additionalBuildArgs
+  type: string
+  default: ''
 
 jobs:
 - job: Windows_NT
@@ -147,6 +150,7 @@ jobs:
               /p:GenerateSbom=true
               /p:SuppressFinalPackageVersion=${{ parameters.isExperimental }}
               /p:IsExperimental=${{ parameters.isExperimental }}
+              ${{ parameters.additionalBuildArgs }}
 
     displayName: Build
     condition: succeeded()

azure-pipelines/.vsts-dotnet-exp-perf.yml

@@ -94,6 +94,7 @@ extends:
           enableComponentGovernance: false
           signTypeParameter: ${{ parameters.signTypeParameter }}
           enableOptProf: ${{ parameters.enableOptProf }}
+          additionalBuildArgs: '/mt'
 
     - template: /eng/common/templates-official/post-build/post-build.yml@self
       parameters:

eng/cibuild_bootstrapped_msbuild.ps1

@@ -5,6 +5,8 @@ Param(
   [switch] $prepareMachine,
   [bool] $buildStage1 = $True,
   [bool] $onlyDocChanged = 0,
+  [switch] $skipTests,
+  [string] $stage2Properties = "",
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
@@ -117,14 +119,29 @@ try {
   # Opt into performance logging. https://github.com/dotnet/msbuild/issues/5900
   $env:DOTNET_PERFLOG_DIR=$PerfLogDir
 
+  # Mirrors cibuild_bootstrapped_msbuild.sh. Some MSBuild scenarios (notably /mt routing tasks
+  # to a sidecar TaskHost) require this so the apphost-based child can locate the runtime.
+  # The SDK CLI (`dotnet msbuild`) sets it automatically; `dotnet exec MSBuild.dll` does not.
+  $env:DOTNET_HOST_PATH=$dotnetExePath
+
   # When using bootstrapped MSBuild:
   # - Turn off node reuse (so that bootstrapped MSBuild processes don't stay running and lock files)
   # - Create bootstrap environment as it's required when also running tests
+  # - $stage2Properties are appended to the stage 2 build only (matching cibuild_bootstrapped_msbuild.sh).
+  #   Use this for switches like /mt that should not be passed to the SDK MSBuild used in stage 1.
+  # Branches mirror cibuild_bootstrapped_msbuild.sh exactly:
+  #   onlyDocChanged=1 → bootstrap not created (artifacts not needed downstream)
+  #   skipTests        → bootstrap IS created (downstream MAY consume it), tests omitted
+  #   default          → bootstrap created, tests run
+  $stage2Args = if ($stage2Properties) { $stage2Properties -split '\s+' | Where-Object { $_ } } else { @() }
   if ($onlyDocChanged) {
-    & $PSScriptRoot\Common\Build.ps1 -restore -build -ci /p:CreateBootstrap=false /nr:false @properties
+    & $PSScriptRoot\Common\Build.ps1 -restore -build -ci /p:CreateBootstrap=false /nr:false @properties @stage2Args
+  }
+  elseif ($skipTests) {
+    & $PSScriptRoot\Common\Build.ps1 -restore -build -ci /nr:false @properties @stage2Args
   }
   else {
-    & $PSScriptRoot\Common\Build.ps1 -restore -build -test -ci /nr:false @properties
+    & $PSScriptRoot\Common\Build.ps1 -restore -build -test -ci /nr:false @properties @stage2Args
   }
 
   exit $lastExitCode