Skip to content

Commit 75443e2

Browse files
dotnet-maestro[bot]baronfel
dotnet-maestro[bot]
authored and
baronfel
committed
[master] Update dependencies from dotnet/arcade (#7853)
* Update dependencies from https://github.com/dotnet/arcade build 20191112.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19562.5 * Update dependencies from https://github.com/dotnet/arcade build 20191113.9 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19563.9 * Update dependencies from https://github.com/dotnet/arcade build 20191114.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19564.2
1 parent 478f445 commit 75443e2

File tree

10 files changed

+146
-549
lines changed

10 files changed

+146
-549
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19561.8">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19564.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>4fd4ceae13d9305a5868bd1c11409c89905f5aa1</Sha>
8+
<Sha>44214d4d7d9091e31f57c5e6bc51180cbb0f79bf</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/templates/post-build/channels/netcore-internal-30.yml renamed to eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,27 @@ stages:
1212
- Validate
1313
publishInstallersAndChecksums: false
1414
symbolPublishingAdditionalParameters: ''
15+
stageName: ''
16+
channelName: ''
17+
channelId: ''
18+
transportFeed: ''
19+
shippingFeed: ''
20+
symbolsFeed: ''
1521

1622
stages:
17-
- stage: NetCore_30_Internal_Servicing_Publishing
23+
- stage: ${{ parameters.stageName }}
1824
dependsOn: ${{ parameters.dependsOn }}
1925
>>>>>>> refs/rewritten/master
2026
variables:
2127
- template: ../common-variables.yml
22-
displayName: .NET Core 3.0 Internal Servicing Publishing
28+
displayName: ${{ parameters.channelName }} Publishing
2329
jobs:
2430
- template: ../setup-maestro-vars.yml
2531

2632
- job: publish_symbols
2733
displayName: Symbol Publishing
2834
dependsOn: setupMaestroVars
29-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id))
35+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
3036
variables:
3137
- group: DotNet-Symbol-Server-Pats
3238
pool:
@@ -75,7 +81,7 @@ stages:
7581

7682
- template: ../../steps/publish-logs.yml
7783
parameters:
78-
StageLabel: 'Channel_Net_30_Internal_Servicing'
84+
StageLabel: '${{ parameters.stageName }}'
7985
JobLabel: 'SymbolPublishing'
8086

8187
- job: publish_assets
@@ -86,7 +92,7 @@ stages:
8692
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
8793
- name: IsStableBuild
8894
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
89-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id))
95+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
9096
pool:
9197
vmImage: 'windows-2019'
9298
steps:
@@ -153,20 +159,20 @@ stages:
153159
/p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
154160
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
155161
/p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
156-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
162+
/p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
157163
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
158-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
164+
/p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
159165
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
160-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
166+
/p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
161167
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
162168
/p:PublishToMSDL=false
163169
${{ parameters.artifactsPublishingAdditionalParameters }}
164170

165171
- template: ../../steps/publish-logs.yml
166172
parameters:
167-
StageLabel: 'Channel_Net_30_Internal_Servicing'
168-
JobLabel: 'AssetPublishing'
173+
StageLabel: '${{ parameters.stageName }}'
174+
JobLabel: 'AssetsPublishing'
169175

170176
- template: ../../steps/promote-build.yml
171177
parameters:
172-
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
178+
ChannelId: ${{ parameters.channelId }}

eng/common/templates/post-build/channels/general-testing.yml renamed to eng/common/templates/post-build/channels/generic-public-channel.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,26 @@ parameters:
44
- Validate
55
publishInstallersAndChecksums: false
66
symbolPublishingAdditionalParameters: ''
7+
stageName: ''
8+
channelName: ''
9+
channelId: ''
10+
transportFeed: ''
11+
shippingFeed: ''
12+
symbolsFeed: ''
713

814
stages:
9-
- stage: General_Testing_Publish
15+
- stage: ${{ parameters.stageName }}
1016
dependsOn: ${{ parameters.dependsOn }}
1117
variables:
1218
- template: ../common-variables.yml
13-
displayName: General Testing Publishing
19+
displayName: ${{ parameters.channelName }} Publishing
1420
jobs:
1521
- template: ../setup-maestro-vars.yml
1622

1723
- job: publish_symbols
1824
displayName: Symbol Publishing
1925
dependsOn: setupMaestroVars
20-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.GeneralTesting_Channel_Id))
26+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
2127
variables:
2228
- group: DotNet-Symbol-Server-Pats
2329
pool:
@@ -62,7 +68,7 @@ stages:
6268

6369
- template: ../../steps/publish-logs.yml
6470
parameters:
65-
StageLabel: 'Channel_General_Testing'
71+
StageLabel: '${{ parameters.stageName }}'
6672
JobLabel: 'SymbolPublishing'
6773

6874

@@ -74,7 +80,7 @@ stages:
7480
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
7581
- name: IsStableBuild
7682
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
77-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.GeneralTesting_Channel_Id))
83+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
7884
pool:
7985
vmImage: 'windows-2019'
8086
steps:
@@ -136,19 +142,19 @@ stages:
136142
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
137143
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
138144
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
139-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
145+
/p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
140146
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
141-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
147+
/p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
142148
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
143-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
149+
/p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
144150
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
145151
${{ parameters.artifactsPublishingAdditionalParameters }}
146152

147153
- template: ../../steps/publish-logs.yml
148154
parameters:
149-
StageLabel: 'Channel_General_Testing'
155+
StageLabel: '${{ parameters.stageName }}'
150156
JobLabel: 'AssetsPublishing'
151157

152158
- template: ../../steps/promote-build.yml
153159
parameters:
154-
ChannelId: ${{ variables.GeneralTesting_Channel_Id }}
160+
ChannelId: ${{ parameters.channelId }}

‎eng/common/templates/post-build/channels/netcore-3-eng-validation.yml‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)