From 40eca5c80537c001c66a2139c6e30de33c8b9da4 Mon Sep 17 00:00:00 2001 From: Tanay Parikh Date: Tue, 1 Feb 2022 13:03:07 -0800 Subject: [PATCH 1/2] Extend disable component governance for linux Extension of https://github.com/dotnet/aspnetcore/pull/39898 --- .azure/pipelines/jobs/default-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index f5365e9c8502..16fe0dcdc387 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -146,6 +146,8 @@ jobs: - LC_ALL: 'en_US.UTF-8' - LANG: 'en_US.UTF-8' - LANGUAGE: 'en_US.UTF-8' + - ${{ if ne(parameters.disableComponentGovernance, '') }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64 - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}: From d9c320b6b34bed572573c86e27a91be1e4c32588 Mon Sep 17 00:00:00 2001 From: Tanay Parikh Date: Tue, 1 Feb 2022 13:51:54 -0800 Subject: [PATCH 2/2] PR Feedback --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 16fe0dcdc387..2e11e722e1ec 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -132,6 +132,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 @@ -146,8 +148,6 @@ jobs: - LC_ALL: 'en_US.UTF-8' - LANG: 'en_US.UTF-8' - LANGUAGE: 'en_US.UTF-8' - - ${{ if ne(parameters.disableComponentGovernance, '') }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64 - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}: