diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61288802b1466d..6bf62b25973779 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 4d24e26939bf0770047cd59299235cf6caa86cdb - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 4d6406fa2e84c8516a338694be3a4097e6e1f104 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index a188dcda8fa17a..9ac49fd2db0a82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 2.5.1-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 2.5.1-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 7.0.0-beta.22102.1 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 6.0.0-preview.1.102 diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 769650362f4aa4..19d3d311b166f5 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -2,6 +2,6 @@ - + diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7678b94ce740c0..c5c2a9915121b3 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 fe9dfdf720cf8a..d91bf9147116f0 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 554e71cfc436dd..70d44735ace4a9 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 c830e6f277606e..1ac7f49a43ca87 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 e583797992ab24..cdc6966b29227b 100644 --- a/global.json +++ b/global.json @@ -12,9 +12,9 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22075.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22075.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22080.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22080.2"