From 4feae8288caadeb064543c9b6ab5860bd1eabfac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Feb 2020 13:18:42 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20200211.11 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20111.11 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20111.11 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.SignTool - 5.0.0-beta.20111.11 --- eng/Version.Details.xml | 20 +++++++------- eng/Versions.props | 10 +++---- .../templates/post-build/post-build.yml | 26 +++++++++++++++++++ eng/common/tools.ps1 | 7 ++++- global.json | 4 +-- 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c02e3f85ce..01a70192a34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,25 +4,25 @@ - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 998b715ed1fbb966437345a1996af64e22c83368 diff --git a/eng/Versions.props b/eng/Versions.props index d2d4554366f..5d6d35ce6f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 70cb65f50b4..eff0d9ac798 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -170,6 +170,32 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_Preview1_Publish' + channelName: '.NET 5 Preview 1' + channelId: 737 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_Preview2_Publish' + channelName: '.NET 5 Preview 2' + channelId: 738 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fef7e5a3fdc..a45302b377f 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -399,7 +399,12 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' - Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + try { + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + } + catch { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ + } } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } diff --git a/global.json b/global.json index 8ecbaa0b287..8f6c8f9912c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "3.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.11", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20110.11" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.11", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20111.11" } }