From e47e4f0a00ef6cd145cbb29167def566ad6019e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Feb 2021 13:01:23 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210201.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21081.1 -> To Version 6.0.0-beta.21101.7 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../templates/post-build/post-build.yml | 20 +++++++++++++++++-- global.json | 4 ++-- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a2d0fd4408..1a16d481f39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - f6ed3308865528c56ed26b85004121fce56bf4f4 + 2b430e5bbfaec37a6cead2f0cf79157f01f1a623 - + https://github.com/dotnet/arcade - f6ed3308865528c56ed26b85004121fce56bf4f4 + 2b430e5bbfaec37a6cead2f0cf79157f01f1a623 - + https://github.com/dotnet/arcade - f6ed3308865528c56ed26b85004121fce56bf4f4 + 2b430e5bbfaec37a6cead2f0cf79157f01f1a623 - + https://github.com/dotnet/arcade - f6ed3308865528c56ed26b85004121fce56bf4f4 + 2b430e5bbfaec37a6cead2f0cf79157f01f1a623 - + https://github.com/dotnet/arcade - f6ed3308865528c56ed26b85004121fce56bf4f4 + 2b430e5bbfaec37a6cead2f0cf79157f01f1a623 diff --git a/eng/Versions.props b/eng/Versions.props index e27c4eddd68..f087ebfdd68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21081.1 - 6.0.0-beta.21081.1 - 6.0.0-beta.21081.1 + 6.0.0-beta.21101.7 + 6.0.0-beta.21101.7 + 6.0.0-beta.21101.7 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index b9aa5b6052c..822ff5975b0 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -62,7 +62,8 @@ parameters: VS168ChannelId: 1154 VSMasterChannelId: 1012 VS169ChannelId: 1473 - + VS1610ChannelId: 1692 + stages: - ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate @@ -91,7 +92,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}} - job: displayName: NuGet Validation @@ -568,3 +569,18 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_16_10_Publishing' + channelName: 'VS 16.10' + channelId: ${{ parameters.VS1610ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index ca6a0ebad04..23993d0dc0d 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21081.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21081.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21101.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21101.7" }, "sdk": { "version": "5.0.100"