From cc61cc866bb97e8c70d1810be8c98f6d2b30b528 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 27 Jan 2022 13:40:47 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20220126.9 (#1283)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 +++++++++----------
eng/common/templates/job/job.yml | 4 ++++
.../templates/job/publish-build-assets.yml | 4 ----
eng/common/templates/jobs/jobs.yml | 4 ++++
.../templates/post-build/common-variables.yml | 4 ----
global.json | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f47b68e6..b980d484 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9
+ 93656ab81d1b7f4507edc971465ef2e640694e64
-
+
https://github.com/dotnet/arcade
- 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9
+ 93656ab81d1b7f4507edc971465ef2e640694e64
-
+
https://github.com/dotnet/arcade
- 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9
+ 93656ab81d1b7f4507edc971465ef2e640694e64
-
+
https://github.com/dotnet/arcade
- 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9
+ 93656ab81d1b7f4507edc971465ef2e640694e64
-
+
https://github.com/dotnet/arcade
- 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9
+ 93656ab81d1b7f4507edc971465ef2e640694e64
https://github.com/dotnet/arcade-services
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 7678b94c..c5c2a991 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -24,6 +24,7 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
+ disableComponentGovernance: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
@@ -137,6 +138,9 @@ jobs:
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true
+ - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
+ - task: ComponentGovernanceComponentDetection@0
+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index fe9dfdf7..d91bf914 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -38,10 +38,6 @@ jobs:
value: ${{ parameters.configuration }}
- group: Publish-Build-Assets
- group: AzureDevOps-Artifact-Feeds-Pats
- # Skip component governance and codesign validation for SDL. These jobs
- # create no content.
- - name: skipComponentGovernanceDetection
- value: true
- name: runCodesignValidationInjection
value: false
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 554e71cf..70d44735 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -8,6 +8,10 @@ parameters:
# Optional: Enable publishing using release pipelines
enablePublishUsingPipelines: false
+ # Optional: Disable component governance detection. In general, component governance
+ # should be on for all jobs. Use only in the event of issues.
+ disableComponentGovernance: false
+
# Optional: Enable running the source-build jobs to build repo from source
enableSourceBuild: false
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index c830e6f2..1ac7f49a 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -22,9 +22,5 @@ variables:
- name: SymbolToolVersion
value: 1.0.1
- # Skip component governance and codesign validation for SDL. These jobs
- # create no content.
- - name: skipComponentGovernanceDetection
- value: true
- name: runCodesignValidationInjection
value: false
diff --git a/global.json b/global.json
index a132d53f..e40d34c7 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9"
}
}