From f932c791e77a913b8daa040bdeaf8194dcfe65de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2020 15:55:51 -0800 Subject: [PATCH] [master] Update dependencies from dotnet/arcade (#992) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20125.9 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20125.9 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20125.9 --- 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 e3b8801e..0c54e105 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + e6c7061dacf795792aa7d1213dba0e532bbd85bd - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + e6c7061dacf795792aa7d1213dba0e532bbd85bd - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + e6c7061dacf795792aa7d1213dba0e532bbd85bd diff --git a/eng/Versions.props b/eng/Versions.props index 04eea490..a83aee4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ prerelease - 5.0.0-beta.20124.3 + 5.0.0-beta.20125.9 4.6.0 4.6.0 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 38012290..dde27800 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 00ef36fe..29bc1a94 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 b62d3af5..6b5649cf 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "3.1.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20124.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20124.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20125.9", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20125.9" } } -- GitLab