[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling

.azure/pipelines/benchmarks.yml

@@ -12,7 +12,7 @@ jobs:
     jobName: Windows_Build
     jobDisplayName: "Build only : Windows"
     agentOs: Windows
-    buildArgs: -ci -all -pack
+    buildArgs: -all -pack
     artifacts:
     - path: artifacts/
       includeForks: true

.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,19 +141,20 @@ 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)
@@ -166,20 +167,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)
@@ -219,7 +220,6 @@ stages:
         -pack
         -noBuildNodeJS
         -noBuildJava
-        /bl:artifacts/log/build.win-arm.binlog
         /p:DotNetSignType=$(_SignType)
         /p:OnlyPackPlatformSpecificPackages=true
         /p:AssetManifestFileName=aspnetcore-win-arm.xml
@@ -249,7 +249,6 @@ stages:
         -pack
         -noBuildNodeJS
         -noBuildJava
-        /bl:artifacts/log/build.win-arm64.binlog
         /p:DotNetSignType=$(_SignType)
         /p:OnlyPackPlatformSpecificPackages=true
         /p:AssetManifestFileName=aspnetcore-win-arm64.xml
@@ -280,7 +279,6 @@ stages:
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
-        -bl:artifacts/log/build.macos.binlog
         -p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -308,43 +306,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) \
@@ -376,7 +374,6 @@ 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)
@@ -407,7 +404,6 @@ stages:
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
-        -bl:artifacts/log/build.arm64.binlog
         -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -433,15 +429,13 @@ stages:
       agentOs: Linux
       buildScript: ./dockerbuild.sh alpine
       buildArgs:
-        --ci
         --arch x64
         --os-name linux-musl
         --pack
         --all
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
-        -bl:artifacts/log/build.musl.binlog
         -p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -468,15 +462,13 @@ stages:
       useHostedUbuntu: false
       buildScript: ./dockerbuild.sh ubuntu-alpine37
       buildArgs:
-        --ci
         --arch arm64
         --os-name linux-musl
         --pack
         --all
         --no-build-nodejs
         --no-build-java
         -p:OnlyPackPlatformSpecificPackages=true
-        -bl:artifacts/log/build.musl.binlog
         -p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
         $(_BuildArgs)
         $(_PublishArgs)
@@ -507,7 +499,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 -NoBuild -Test /p:RunQuarantinedTests=true"
+      - powershell: "& ./build.ps1 -CI -nobl -NoBuild -Test /p:RunQuarantinedTests=true"
         displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
@@ -538,11 +530,11 @@ stages:
       agentOs: Windows
       isTestingJob: true
       steps:
-      - script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs)
+      - script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
         displayName: Build Repo
-      - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog"
+      - script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
         displayName: Pack Templates
-      - script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
+      - script: ./src/ProjectTemplates/build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
         displayName: Test Templates
       artifacts:
       - name: Windows_Test_Templates_Dumps
@@ -570,11 +562,11 @@ stages:
       - bash: "./eng/scripts/install-nginx-mac.sh"
         displayName: Installing Nginx
       afterBuild:
-      - bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
+      - bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
         displayName: Pack Packages (for Template tests)
-      - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
+      - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
         displayName: Pack Templates (for Template tests)
-      - bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
+      - bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
         displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
@@ -608,11 +600,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 --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
+      - bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
         displayName: Pack Packages (for Template tests)
-      - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
+      - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
         displayName: Pack Templates (for Template tests)
-      - bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
+      - bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
         displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
@@ -641,11 +633,11 @@ stages:
       timeoutInMinutes: 180
       steps:
       # Build the shared framework
-      - script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
+      - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
         displayName: Build shared fx
-      - script: .\restore.cmd -ci /p:BuildInteropProjects=true
+      - script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
         displayName: Restore interop projects
-      - 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
+      - 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
         displayName: Run build.cmd helix target
         env:
           HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -665,11 +657,11 @@ stages:
       timeoutInMinutes: 180
       steps:
       # Build the shared framework
-      - script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
+      - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
         displayName: Build shared fx
-      - script: .\restore.cmd -ci /p:BuildInteropProjects=true
+      - script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
         displayName: Restore interop projects
-      - 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
+      - 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
         displayName: Run build.cmd helix target
         env:
           HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -690,9 +682,9 @@ stages:
       timeoutInMinutes: 180
       steps:
       # Build the shared framework
-      - script: ./restore.sh -ci
+      - script: ./restore.sh -ci -nobl
         displayName: Restore
-      - 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
+      - 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
         displayName: Run build.sh helix arm64 target
         env:
           HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -729,7 +721,7 @@ stages:
             arguments: $(Build.SourcesDirectory)/NuGet.config $Token
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
-    - script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
+    - script: ./eng/scripts/ci-source-build.sh --ci --nobl --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 /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: .\$(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
-          - script: ./$(BuildDirectory)/build.sh -ci -configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: ./$(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
       - ${{ if ne(parameters.buildScript, '') }}:
-        - script: $(BuildScript) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
+        - script: $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
           displayName: run $(BuildScript)
 
     - ${{ parameters.afterBuild }}

Directory.Build.props

@@ -56,7 +56,7 @@
 
     <IncludeSymbols>true</IncludeSymbols>
 
-    <DefaultNetCoreTargetFramework>netcoreapp5.0</DefaultNetCoreTargetFramework>
+    <DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
   </PropertyGroup>
 
   <!-- Warnings and errors -->

build.ps1

@@ -71,6 +71,9 @@ You can also use -NoBuildInstallers to suppress this project type.
 .PARAMETER BinaryLog
 Enable the binary logger
 
+.PARAMETER ExcludeCIBinarylog
+Don't output binary log by default in CI builds (short: -nobl).
+
 .PARAMETER Verbosity
 MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
 
@@ -151,6 +154,8 @@ param(
     # Diagnostics
     [Alias('bl')]
     [switch]$BinaryLog,
+    [Alias('nobl')]
+    [switch]$ExcludeCIBinarylog,
     [Alias('v')]
     [string]$Verbosity = 'minimal',
     [switch]$DumpProcesses, # Capture all running processes and dump them to a file.
@@ -344,11 +349,10 @@ if ($ForceCoreMsbuild) {
     $msbuildEngine = 'dotnet'
 }
 
-# Workaround Arcade check which asserts BinaryLog is true on CI.
-# We always use binlogs on CI, but we customize the name of the log file
-$tmpBinaryLog = $BinaryLog
-if ($CI) {
-    $BinaryLog = $true
+# Ensure passing neither -bl nor -nobl on CI avoids errors in tools.ps1. This is needed because both parameters are
+# $false by default i.e. they always exist. (We currently avoid binary logs but that is made visible in the YAML.)
+if ($CI -and -not $excludeCIBinarylog) {
+    $binaryLog = $true
 }
 
 # tools.ps1 corrupts global state, so reset these values in case they carried over from a previous build
@@ -360,10 +364,6 @@ Remove-Item variable:global:_MSBuildExe -ea Ignore
 # Import Arcade
 . "$PSScriptRoot/eng/common/tools.ps1"
 
-if ($tmpBinaryLog) {
-    $MSBuildArguments += "/bl:$LogDir/Build.binlog"
-}
-
 # Capture MSBuild crash logs
 $env:MSBUILDDEBUGPATH = $LogDir