Merge in 'release/6.0' changes

dotnet · Feb 11, 2022 · f01a14d · f01a14d
2 parents e7bfbce + d5d2e4d
commit f01a14d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -543,6 +543,7 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       installJdk: false
+      disableComponentGovernance: true
       skipComponentGovernanceDetection: true
       artifacts:
       - name: Linux_musl_x64_Logs

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
@@ -121,6 +121,8 @@ jobs:
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
     ${{ if ne(parameters.container, '') }}:
       container: ${{ parameters.container }}
+    ${{ if ne(parameters.disableComponentGovernance, '') }}:
+      disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
     variables:
     - AgentOsName: ${{ parameters.agentOs }}
     - ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping