From 911c39d2f05020a705add45471b841209b8b017b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Apr 2020 05:15:41 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200420.5 (#21047) - Microsoft.AspNetCore.Mvc.Razor.Extensions: 5.0.0-preview.4.20220.1 -> 5.0.0-preview.4.20220.5 - Microsoft.AspNetCore.Razor.Language: 5.0.0-preview.4.20220.1 -> 5.0.0-preview.4.20220.5 - Microsoft.CodeAnalysis.Razor: 5.0.0-preview.4.20220.1 -> 5.0.0-preview.4.20220.5 - Microsoft.NET.Sdk.Razor: 5.0.0-preview.4.20220.1 -> 5.0.0-preview.4.20220.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3b9425ce..aec5cd2d4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/dotnet/blazor dd7fb4d3931d556458f62642c2edfc59f6295bfb - + https://github.com/dotnet/aspnetcore-tooling - edaad8431c1bed3083e04ea731e466b84679a85f + d25c72e24489b2645df3f285bb62521d810c2100 - + https://github.com/dotnet/aspnetcore-tooling - edaad8431c1bed3083e04ea731e466b84679a85f + d25c72e24489b2645df3f285bb62521d810c2100 - + https://github.com/dotnet/aspnetcore-tooling - edaad8431c1bed3083e04ea731e466b84679a85f + d25c72e24489b2645df3f285bb62521d810c2100 - + https://github.com/dotnet/aspnetcore-tooling - edaad8431c1bed3083e04ea731e466b84679a85f + d25c72e24489b2645df3f285bb62521d810c2100 https://github.com/dotnet/efcore diff --git a/eng/Versions.props b/eng/Versions.props index 202bbc07bc..8f7fac92d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,10 +137,10 @@ 5.0.0-preview.4.20219.3 5.0.0-preview.4.20219.3 - 5.0.0-preview.4.20220.1 - 5.0.0-preview.4.20220.1 - 5.0.0-preview.4.20220.1 - 5.0.0-preview.4.20220.1 + 5.0.0-preview.4.20220.5 + 5.0.0-preview.4.20220.5 + 5.0.0-preview.4.20220.5 + 5.0.0-preview.4.20220.5 3.2.0-preview1.20067.1 - 5.0.0-preview.4.20219.3 - 5.0.0-preview.4.20219.3 - 5.0.0-preview.4.20219.3 - 5.0.0-preview.4.20219.3 - 5.0.0-preview.4.20219.3 - 5.0.0-preview.4.20219.3 - 5.0.0-preview.4.20219.3 + 5.0.0-preview.4.20220.10 + 5.0.0-preview.4.20220.10 + 5.0.0-preview.4.20220.10 + 5.0.0-preview.4.20220.10 + 5.0.0-preview.4.20220.10 + 5.0.0-preview.4.20220.10 + 5.0.0-preview.4.20220.10 5.0.0-preview.4.20220.5 5.0.0-preview.4.20220.5 From be0084b819798e45d8f8b14786af8cb927d617d2 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 20 Apr 2020 19:02:53 -0700 Subject: [PATCH 3/3] Use newer post-build.yml than Arcade provides --- .../templates/post-build/post-build.yml | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fbab4cb5dc..e148ca710b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -35,8 +35,9 @@ parameters: NETCoreExperimentalChannelId: 562 NetEngServicesIntChannelId: 678 NetEngServicesProdChannelId: 679 - Net5Preview2ChannelId: 738 Net5Preview3ChannelId: 739 + Net5Preview4ChannelId: 856 + Net5Preview5ChannelId: 857 NetCoreSDK313xxChannelId: 759 NetCoreSDK313xxInternalChannelId: 760 @@ -65,7 +66,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(InitialChannels)[$(PromoteToMaestroChannelId)]" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview2ChannelId}},${{parameters.Net5Preview3ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}}${{parameters.Net5Preview3ChannelId}},${{parameters.Net5Preview4ChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} - job: displayName: NuGet Validation @@ -213,10 +214,10 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview2_Publish' - channelName: '.NET 5 Preview 2' - akaMSChannelName: 'net5/preview2' - channelId: ${{ parameters.Net5Preview2ChannelId }} + stageName: 'Net5_Preview3_Publish' + channelName: '.NET 5 Preview 3' + akaMSChannelName: 'net5/preview3' + channelId: ${{ parameters.Net5Preview3ChannelId }} 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' @@ -227,10 +228,24 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview3_Publish' - channelName: '.NET 5 Preview 3' - akaMSChannelName: 'net5/preview3' - channelId: ${{ parameters.Net5Preview3ChannelId }} + stageName: 'Net5_Preview4_Publish' + channelName: '.NET 5 Preview 4' + akaMSChannelName: 'net5/preview4' + channelId: ${{ parameters.Net5Preview4ChannelId }} + 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_Preview5_Publish' + channelName: '.NET 5 Preview 5' + akaMSChannelName: 'net5/preview5' + channelId: ${{ parameters.Net5Preview5ChannelId }} 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' @@ -380,3 +395,4 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' +