diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e10d3b6a9..f54a81e65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,19 +177,19 @@ - + 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/source-build-reference-packages @@ -201,9 +201,9 @@ 192fa29996b63bd32b0b112e7757e2ca1c2bfbbb - + https://github.com/dotnet/xliff-tasks - 9291d7c5bc7ff23d9b79f44fb4a1968b269c5bb2 + 91bcb257dfae52bdea37186c40ca6c28382de05b diff --git a/eng/Versions.props b/eng/Versions.props index c0a09f13e..b3bc80f1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22075.6 + 7.0.0-beta.22076.9 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7678b94ce..c5c2a9915 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 fe9dfdf72..d91bf9147 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 554e71cfc..70d44735a 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 c830e6f27..1ac7f49a4 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 4c6a37477..01727b40f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22075.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22076.9" } }