Skip to content

Commit 87c90a0

Browse files
[release/5.0-preview3] Update dependencies from dotnet/arcade (#34341)
* Update dependencies from https://github.com/dotnet/arcade build 20200330.5 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20180.5 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20180.5 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20180.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20180.5 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20180.5 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20180.5 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20180.5 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20180.5 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20180.5 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20180.5 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20180.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20180.5 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20180.5 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20180.5 * Revert "Update dependencies from https://github.com/dotnet/arcade build 20200330.5" This reverts commit a195afd. * Manually introduce preview3 channel channels Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
1 parent 372bf42 commit 87c90a0

File tree

2 files changed

+44
-16
lines changed

2 files changed

+44
-16
lines changed

eng/common/templates/post-build/common-variables.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ variables:
99
- name: PublicDevRelease_31_Channel_Id
1010
value: 128
1111

12-
# .NET Core 5 Dev
13-
- name: NetCore_5_Dev_Channel_Id
12+
# .NET 5 Dev
13+
- name: Net_5_Dev_Channel_Id
1414
value: 131
1515

1616
# .NET Eng - Validation
@@ -96,4 +96,4 @@ variables:
9696
- name: skipComponentGovernanceDetection
9797
value: true
9898
- name: runCodesignValidationInjection
99-
value: false
99+
value: false

eng/common/templates/post-build/post-build.yml

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@ parameters:
2727
# needs to be updated with the new channel ID
2828
NetEngLatestChannelId: 2
2929
NetEngValidationChannelId: 9
30-
NetCoreDev5ChannelId: 131
30+
NetDev5ChannelId: 131
3131
GeneralTestingChannelId: 529
3232
NETCoreToolingDevChannelId: 548
3333
NETCoreToolingReleaseChannelId: 549
3434
NETInternalToolingChannelId: 551
3535
NETCoreExperimentalChannelId: 562
3636
NetEngServicesIntChannelId: 678
3737
NetEngServicesProdChannelId: 679
38-
Net5Preview1ChannelId: 737
3938
Net5Preview2ChannelId: 738
39+
Net5Preview3ChannelId: 739
40+
NetCoreSDK313xxChannelId: 759
41+
NetCoreSDK313xxInternalChannelId: 760
4042

4143
stages:
4244
- stage: Validate
@@ -63,7 +65,7 @@ stages:
6365
inputs:
6466
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
6567
arguments: -PromoteToChannels "$(InitialChannels)[$(PromoteToMaestroChannelId)]"
66-
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetCoreDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview1ChannelId}},${{parameters.Net5Preview2ChannelId}}
68+
-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}}
6769

6870
- job:
6971
displayName: NuGet Validation
@@ -198,9 +200,9 @@ stages:
198200
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
199201
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
200202
stageName: 'NetCore_Dev5_Publish'
201-
channelName: '.NET Core 5 Dev'
203+
channelName: '.NET 5 Dev'
202204
akaMSChannelName: 'net5/dev'
203-
channelId: ${{ parameters.NetCoreDev5ChannelId }}
205+
channelId: ${{ parameters.NetDev5ChannelId }}
204206
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
205207
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
206208
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
@@ -211,10 +213,10 @@ stages:
211213
dependsOn: ${{ parameters.publishDependsOn }}
212214
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
213215
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
214-
stageName: 'Net5_Preview1_Publish'
215-
channelName: '.NET 5 Preview 1'
216-
akaMSChannelName: 'net5/preview1'
217-
channelId: ${{ parameters.Net5Preview1ChannelId }}
216+
stageName: 'Net5_Preview2_Publish'
217+
channelName: '.NET 5 Preview 2'
218+
akaMSChannelName: 'net5/preview2'
219+
channelId: ${{ parameters.Net5Preview2ChannelId }}
218220
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
219221
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
220222
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
@@ -225,10 +227,10 @@ stages:
225227
dependsOn: ${{ parameters.publishDependsOn }}
226228
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
227229
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
228-
stageName: 'Net5_Preview2_Publish'
229-
channelName: '.NET 5 Preview 2'
230-
akaMSChannelName: 'net5/preview2'
231-
channelId: ${{ parameters.Net5Preview2ChannelId }}
230+
stageName: 'Net5_Preview3_Publish'
231+
channelName: '.NET 5 Preview 3'
232+
akaMSChannelName: 'net5/preview3'
233+
channelId: ${{ parameters.Net5Preview3ChannelId }}
232234
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
233235
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
234236
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
@@ -352,3 +354,29 @@ stages:
352354
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
353355
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
354356
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
357+
358+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
359+
parameters:
360+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
361+
dependsOn: ${{ parameters.publishDependsOn }}
362+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
363+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
364+
stageName: 'NETCore_SDK_313xx_Publishing'
365+
channelName: '.NET Core SDK 3.1.3xx'
366+
channelId: ${{ parameters.NetCoreSDK313xxChannelId }}
367+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
368+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
369+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
370+
371+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
372+
parameters:
373+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
374+
dependsOn: ${{ parameters.publishDependsOn }}
375+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
376+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
377+
stageName: 'NETCore_SDK_313xx_Internal_Publishing'
378+
channelName: '.NET Core SDK 3.1.3xx Internal'
379+
channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }}
380+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
381+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
382+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'

0 commit comments

Comments
 (0)