From 403bdaa1a6144d791c8ca38c112c39c7e51def17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 18:05:09 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20200226.7 (#19406) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20126.7 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20126.7 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20126.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../post-build/channels/generic-internal-channel.yml | 1 + .../post-build/channels/generic-public-channel.yml | 1 + global.json | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97d0e39129..38a90d664d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -336,17 +336,17 @@ https://github.com/dotnet/extensions 8fb38ab52b8f873109b6e87b4f04226d6a892ee4 - + https://github.com/dotnet/arcade - 85d76351b1f0245c9f331f72219d12e8e2d48e72 + cd4164e1f3f7daf2a6f8dbd012210c93521bd82f - + https://github.com/dotnet/arcade - 85d76351b1f0245c9f331f72219d12e8e2d48e72 + cd4164e1f3f7daf2a6f8dbd012210c93521bd82f - + https://github.com/dotnet/arcade - 85d76351b1f0245c9f331f72219d12e8e2d48e72 + cd4164e1f3f7daf2a6f8dbd012210c93521bd82f https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 94653236df..d829874c3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ --> - 5.0.0-beta.20123.1 + 5.0.0-beta.20126.7 3.5.0-beta4-20125-04 diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 380122901d..dde27800c3 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -84,6 +84,7 @@ stages: - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars + timeoutInMinutes: 120 variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 00ef36fefe..29bc1a941a 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -83,6 +83,7 @@ stages: - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars + timeoutInMinutes: 120 variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/global.json b/global.json index 9d9a073328..690fcfbd34 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20123.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20123.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20126.7", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20126.7" } }