Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,16 @@ stages:
displayName: Preserve cache diagnostics and clean failed seed outputs
condition: and(always(), ne(variables['MSBuildCacheBuildSucceeded'], 'true'))

# Keep the cache support packages out of the multithreaded fallback. Their unannotated
# ResolveFileAccesses task currently fails in MSBuild's sidecar task host under -mt.
- script: eng\common\CIBuild.cmd
-configuration $(_BuildConfig)
-msbuildMultiThreaded 1
-prepareMachine
/p:Publish=false
/p:Test=false
/p:FastAcceptanceTest=true
/p:MSBuildCachePackageEnabled=true
/p:MSBuildCachePackageEnabled=false
/p:MSBuildCacheEnabled=false
name: Build
displayName: Build
Expand Down Expand Up @@ -705,13 +708,16 @@ stages:

# Fallback build. Skipped when the MSBuildCache steps above already produced, signed and packed the
# outputs; also skipped when they failed with build errors, because this step would only reproduce them.
# Keep the cache support packages out of this multithreaded build because their unannotated
# ResolveFileAccesses task currently fails in MSBuild's sidecar task host under -mt.
- script: eng\common\CIBuild.cmd
-configuration $(_BuildConfig)
-msbuildMultiThreaded 1
-prepareMachine
/p:Publish=false
/p:Test=false
/p:FastAcceptanceTest=true
/p:MSBuildCachePackageEnabled=true
/p:MSBuildCachePackageEnabled=false
/p:MSBuildCacheEnabled=false
name: Build
displayName: Build
Expand Down Expand Up @@ -850,6 +856,7 @@ stages:
steps:
- script: eng/common/cibuild.sh
-configuration $(_BuildConfig)
-msbuildMultiThreaded true
-prepareMachine
/p:Test=false
/p:Publish=false
Expand Down Expand Up @@ -889,6 +896,7 @@ stages:
steps:
- script: eng/common/cibuild.sh
-configuration $(_BuildConfig)
-msbuildMultiThreaded true
-prepareMachine
/p:Test=false
/p:Publish=false
Expand Down
5 changes: 5 additions & 0 deletions eng/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Param(
[string] $msbuildEngine = $null,
[bool] $warnAsError = $true,
[bool] $nodeReuse = $true,
[bool][Alias('mt')]$msbuildMultiThreaded = $false,
[switch][Alias('r')]$restore,
[switch] $deployDeps,
[switch][Alias('b')]$build,
Expand Down Expand Up @@ -82,4 +83,8 @@ if ($installWindowsSdk) {
$null = $PSBoundParameters.Remove("vs")
$null = $PSBoundParameters.Remove("installWindowsSdk")

if (-not $PSBoundParameters.ContainsKey("msbuildMultiThreaded")) {
$PSBoundParameters["msbuildMultiThreaded"] = -not $ci
Comment on lines +86 to +87
}

& $PSScriptRoot\common\Build.ps1 @PSBoundParameters
Loading