diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f616f95edd1..c997a185b057 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,21 +2,21 @@ - + https://github.com/dotnet/arcade - 31e3d884010345c19f6335571e34b2b5c7ce13bc + 184ce2c7f17508264ffa19b307d97e7568da05ab - + https://github.com/dotnet/arcade - 31e3d884010345c19f6335571e34b2b5c7ce13bc + 184ce2c7f17508264ffa19b307d97e7568da05ab - + https://github.com/dotnet/arcade - 31e3d884010345c19f6335571e34b2b5c7ce13bc + 184ce2c7f17508264ffa19b307d97e7568da05ab - + https://github.com/dotnet/arcade - 31e3d884010345c19f6335571e34b2b5c7ce13bc + 184ce2c7f17508264ffa19b307d97e7568da05ab https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 28ba12c6753b..57585199c2ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,9 +15,9 @@ false - 2.2.0-beta.22077.9 - 1.0.0-beta.22077.9 - 2.0.0-beta.22077.9 + 2.2.0-beta.22114.9 + 1.0.0-beta.22114.9 + 2.0.0-beta.22114.9 2.5.1-beta.19278.1 3.3.0-beta2-19367-02 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7a464c0d7222..c43c779e3cac 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -162,6 +162,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - task: ComponentGovernanceComponentDetection@0 + continueOnError: true - ${{ 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 54479e1b298c..296c72f966ff 100644 --- a/global.json +++ b/global.json @@ -7,8 +7,8 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22077.9", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22077.9", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22114.9", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.22114.9", "Microsoft.Build.NoTargets": "1.0.53", "Microsoft.Build.Traversal": "2.0.2" }