Restore creation of binary logs in CI runs

This reverts part of commit d5849f3.
- was "[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#21630)"

Author: dougbu

.azure/pipelines/ci.yml

@@ -129,10 +129,10 @@ stages:
       # The sign settings have been configured to
       - script: ./build.cmd
                 -ci
-                -nobl
                 -arch x64
                 -pack
                 -all
+                /bl:artifacts/log/build.x64.binlog
                 $(_BuildArgs)
                 $(_InternalRuntimeDownloadArgs)
         displayName: Build x64
@@ -141,20 +141,19 @@ stages:
       # This is going to actually build x86 native assets.
       - script: ./build.cmd
                 -ci
-                -nobl
                 -arch x86
                 -pack
                 -all
                 -noBuildJava
                 /p:OnlyPackPlatformSpecificPackages=true
+                /bl:artifacts/log/build.x86.binlog
                 $(_BuildArgs)
                 $(_InternalRuntimeDownloadArgs)
         displayName: Build x86
 
       # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
       - script: .\src\SiteExtensions\build.cmd
                 -ci
-                -nobl
                 -pack
                 -noBuildDeps
                 $(_BuildArgs)
@@ -167,20 +166,20 @@ stages:
       # Sign check is disabled because it is run in a separate step below, after installers are built.
       - script: ./build.cmd
                 -ci
-                -nobl
                 -noBuild
                 -noRestore
                 -sign
+                /bl:artifacts/log/build.codesign.binlog
                 /p:DotNetSignType=$(_SignType)
                 $(_BuildArgs)
         displayName: Code sign packages
 
       # Windows installers bundle both x86 and x64 assets
       - script: ./build.cmd
                 -ci
-                -nobl
                 -sign
                 -buildInstallers
+                /bl:artifacts/log/installers.msbuild.binlog
                 /p:DotNetSignType=$(_SignType)
                 /p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
                 $(_BuildArgs)
@@ -220,6 +219,7 @@ stages:
         -pack
         -noBuildNodeJS
         -noBuildJava
+        /bl:artifacts/log/build.win-arm.binlog
         /p:DotNetSignType=$(_SignType)
         /p:OnlyPackPlatformSpecificPackages=true
         /p:AssetManifestFileName=aspnetcore-win-arm.xml
@@ -249,6 +249,7 @@ stages:
         -pack
         -noBuildNodeJS
         -noBuildJava
+        /bl:artifacts/log/build.win-arm64.binlog
         /p:DotNetSignType=$(_SignType)
         /p:OnlyPackPlatformSpecificPackages=true
         /p:AssetManifestFileName=aspnetcore-win-arm64.xml
@@ -279,6 +280,7 @@ stages:
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
+        -bl:artifacts/log/build.macos.binlog
         -p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -306,43 +308,43 @@ stages:
       steps:
       - script: ./build.sh
             --ci
-            --nobl
             --arch x64
             --pack
             --all
             --no-build-nodejs
             --no-build-java
             -p:OnlyPackPlatformSpecificPackages=true
+            -bl:artifacts/log/build.linux-x64.binlog
             $(_BuildArgs)
             $(_InternalRuntimeDownloadArgs)
         displayName: Run build.sh
       - script: |
           git clean -xfd src/**/obj/
           ./dockerbuild.sh bionic \
             --ci \
-            --nobl \
             --arch x64 \
             --build-installers \
             --no-build-deps \
             --no-build-nodejs \
             -p:OnlyPackPlatformSpecificPackages=true \
             -p:BuildRuntimeArchive=false \
             -p:LinuxInstallerType=deb \
+            -bl:artifacts/log/build.deb.binlog \
             $(_BuildArgs) \
             $(_InternalRuntimeDownloadArgs)
         displayName: Build Debian installers
       - script: |
           git clean -xfd src/**/obj/
           ./dockerbuild.sh rhel \
             --ci \
-            --nobl \
             --arch x64 \
             --build-installers \
             --no-build-deps \
             --no-build-nodejs \
             -p:OnlyPackPlatformSpecificPackages=true \
             -p:BuildRuntimeArchive=false \
             -p:LinuxInstallerType=rpm \
+            -bl:artifacts/log/build.rpm.binlog \
             -p:AssetManifestFileName=aspnetcore-Linux_x64.xml \
             $(_BuildArgs) \
             $(_PublishArgs) \
@@ -374,6 +376,7 @@ stages:
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
+        -bl:artifacts/log/build.linux-arm.binlog
         -p:AssetManifestFileName=aspnetcore-Linux_arm.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -404,6 +407,7 @@ stages:
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
+        -bl:artifacts/log/build.arm64.binlog
         -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -436,6 +440,7 @@ stages:
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
+        -bl:artifacts/log/build.musl.binlog
         -p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -469,6 +474,7 @@ stages:
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
+        -bl:artifacts/log/build.musl.binlog
         -p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -499,7 +505,7 @@ stages:
       - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
         displayName: Setup IISExpress test certificates and schema
       afterBuild:
-      - powershell: "& ./build.ps1 -CI -nobl -NoBuild -Test /p:RunQuarantinedTests=true"
+      - powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunQuarantinedTests=true"
         displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
@@ -530,11 +536,11 @@ stages:
       agentOs: Windows
       isTestingJob: true
       steps:
-      - script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
+      - script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs)
         displayName: Build Repo
-      - script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
+      - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog"
         displayName: Pack Templates
-      - script: ./src/ProjectTemplates/build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
+      - script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
         displayName: Test Templates
       artifacts:
       - name: Windows_Test_Templates_Dumps
@@ -562,11 +568,11 @@ stages:
       - bash: "./eng/scripts/install-nginx-mac.sh"
         displayName: Installing Nginx
       afterBuild:
-      - bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
+      - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
         displayName: Pack Packages (for Template tests)
-      - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
+      - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
         displayName: Pack Templates (for Template tests)
-      - bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
+      - bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
         displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
@@ -600,11 +606,11 @@ stages:
       - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
         displayName: Increase inotify limit
       afterBuild:
-      - bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
+      - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
         displayName: Pack Packages (for Template tests)
-      - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
+      - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
         displayName: Pack Templates (for Template tests)
-      - bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
+      - bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
         displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
@@ -633,11 +639,11 @@ stages:
       timeoutInMinutes: 180
       steps:
       # Build the shared framework
-      - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      - script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
         displayName: Build shared fx
-      - script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
+      - script: .\restore.cmd -ci /p:BuildInteropProjects=true
         displayName: Restore interop projects
-      - script: .\build.cmd -ci -nobl -NoRestore -test -all -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      - script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
         displayName: Run build.cmd helix target
         env:
           HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -657,11 +663,11 @@ stages:
       timeoutInMinutes: 180
       steps:
       # Build the shared framework
-      - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      - script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
         displayName: Build shared fx
-      - script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
+      - script: .\restore.cmd -ci /p:BuildInteropProjects=true
         displayName: Restore interop projects
-      - script: .\build.cmd -ci -nobl -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      - script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
         displayName: Run build.cmd helix target
         env:
           HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -682,9 +688,9 @@ stages:
       timeoutInMinutes: 180
       steps:
       # Build the shared framework
-      - script: ./restore.sh -ci -nobl
+      - script: ./restore.sh -ci
         displayName: Restore
-      - script: ./build.sh -ci --nobl --arch arm64 -test --no-build-nodejs --all -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      - script: ./build.sh -ci --arch arm64 -test --no-build-nodejs --all -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
         displayName: Run build.sh helix arm64 target
         env:
           HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -721,7 +727,7 @@ stages:
             arguments: $(Build.SourcesDirectory)/NuGet.config $Token
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
-    - script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
+    - script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
       displayName: Run ci-source-build.sh
     - task: PublishBuildArtifacts@1
       displayName: Upload logs

.azure/pipelines/jobs/default-build.yml

@@ -191,13 +191,13 @@ jobs:
     - ${{ if eq(parameters.steps, '')}}:
       - ${{ if eq(parameters.buildScript, '') }}:
         - ${{ if eq(parameters.agentOs, 'Windows') }}:
-          - script: .\$(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
+          - script: .\$(BuildDirectory)\build.cmd -ci -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
-          - script: ./$(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: ./$(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
       - ${{ if ne(parameters.buildScript, '') }}:
-        - script: $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
+        - script: $(BuildScript) -ci -Configuration $(BuildConfiguration) $(BuildScriptArgs)
           displayName: run $(BuildScript)
 
     - ${{ parameters.afterBuild }}

eng/scripts/CodeCheck.ps1

@@ -48,10 +48,10 @@ try {
     if ($ci) {
         # Install dotnet.exe
         if ($DotNetRuntimeSourceFeed -or $DotNetRuntimeSourceFeedKey) {
-            & $repoRoot/restore.cmd -ci -nobl -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
+            & $repoRoot/restore.cmd -ci -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
         }
         else{
-            & $repoRoot/restore.cmd -ci -nobl -noBuildNodeJS
+            & $repoRoot/restore.cmd -ci -noBuildNodeJS
         }
     }