diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3bfd642d..223c42d33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - df8799988af6503cbcd9544713d30732328c8c57 + 23a23b5025d64557329b638329c136ebbc20989b - + https://github.com/dotnet/arcade - df8799988af6503cbcd9544713d30732328c8c57 + 23a23b5025d64557329b638329c136ebbc20989b - + https://github.com/dotnet/arcade - df8799988af6503cbcd9544713d30732328c8c57 + 23a23b5025d64557329b638329c136ebbc20989b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 64f548faf..e6d9eb8a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23228.7 + 7.0.0-beta.23254.2 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 3cb5145ea..486eef770 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -145,10 +145,12 @@ jobs: - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/global.json b/global.json index 4d4fe182c..26ae086a4 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.23228.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23228.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23254.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23254.2" } }