File tree Expand file tree Collapse file tree 2 files changed +12
-0
lines changed Expand file tree Collapse file tree 2 files changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -349,6 +349,12 @@ if ($ForceCoreMsbuild) {
349349 $msbuildEngine = ' dotnet'
350350}
351351
352+ # Ensure passing neither -bl nor -nobl on CI avoids errors in tools.ps1. This is needed because both parameters are
353+ # $false by default i.e. they always exist. (We currently avoid binary logs but that is made visible in the YAML.)
354+ if ($CI -and -not $excludeCIBinarylog ) {
355+ $binaryLog = $true
356+ }
357+
352358# tools.ps1 corrupts global state, so reset these values in case they carried over from a previous build
353359Remove-Item variable:global:_BuildTool - ea Ignore
354360Remove-Item variable:global:_DotNetInstallDir - ea Ignore
Original file line number Diff line number Diff line change @@ -314,6 +314,12 @@ export MSBUILDDISABLENODEREUSE=1
314314# Fixing this is tracked by https://github.com/dotnet/aspnetcore-internal/issues/601
315315warn_as_error=false
316316
317+ # Ensure passing neither --bl nor --nobl on CI avoids errors in tools.sh. This is needed because we set both variables
318+ # to false by default i.e. they always exist. (We currently avoid binary logs but that is made visible in the YAML.)
319+ if [[ " $ci " == true && " $exclude_ci_binary_log " == false ]]; then
320+ binary_log=true
321+ fi
322+
317323# increase file descriptor limit on macOS
318324if [ " $( uname) " = " Darwin" ]; then
319325 ulimit -n 10000
You can’t perform that action at this time.
0 commit comments