Merge pull request #9821 from dotnet/merges/master-to-feature/tasks

Merge master to feature/tasks

eng/Build.ps1

@@ -37,6 +37,7 @@ param (
     [string]$bootstrapConfiguration = "Proto",
     [string]$bootstrapTfm = "net472",
     [switch][Alias('bl')]$binaryLog,
+    [switch][Alias('nobl')]$excludeCIBinaryLog,
     [switch]$ci,
     [switch]$official,
     [switch]$procdump,
@@ -69,6 +70,7 @@ function Print-Usage() {
     Write-Host "  -verbosity <value>        Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
     Write-Host "  -deployExtensions         Deploy built vsixes"
     Write-Host "  -binaryLog                Create MSBuild binary log (short: -bl)"
+    Write-Host "  -excludeCIBinaryLog       When running on CI, allow no binary log (short: -nobl)"
     Write-Host ""
     Write-Host "Actions:"
     Write-Host "  -restore                  Restore packages (short: -r)"
@@ -173,7 +175,12 @@ function BuildSolution() {
 
     Write-Host "$($solution):"
 
+    if ($binaryLog -and $excludeCIBinaryLog) { 
+        Write-Host "Invalid argument -binarylog(-bl) and -excludeCIBinaryLog(-nobl) cannot be set at the same time"
+        ExitWithExitCode 1
+        }
     $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }
+
     $projects = Join-Path $RepoRoot $solution
     $officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
     $toolsetBuildProj = InitializeToolset