Skip to content

Commit b92b63b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200219.14 (#41813)
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20119.14
1 parent 508ed76 commit b92b63b

File tree

5 files changed

+77
-16
lines changed

5 files changed

+77
-16
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.20118.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20119.14">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>b40d0c89c230189b4c6aeb32c0a43218b4bc3359</Sha>
8+
<Sha>4660949bde1083e8b1efba3096dd145d590a0b17</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/post-build/check-channel-consistency.ps1‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
param(
2+
[Parameter(Mandatory=$true)][string] $PromoteToChannels, # List of channels that the build should be promoted to
3+
[Parameter(Mandatory=$true)][array] $AvailableChannelIds # List of channel IDs available in the YAML implementation
4+
)
5+
6+
try {
7+
. $PSScriptRoot\post-build-utils.ps1
8+
9+
# Check that every channel that Maestro told to promote the build to
10+
# is available in YAML
11+
$PromoteToChannelsIds = $PromoteToChannels -split "\D" | Where-Object { $_ }
12+
13+
foreach ($id in $PromoteToChannelsIds) {
14+
if (($id -ne 0) -and ($id -notin $AvailableChannelIds)) {
15+
Write-PipelineTaskError -Type 'warning' -Message "Channel $id is not present in the post-build YAML configuration!"
16+
}
17+
}
18+
19+
Write-Host 'done.'
20+
}
21+
catch {
22+
Write-Host $_
23+
Write-PipelineTelemetryError -Category 'CheckChannelConsistency' -Message "There was an error while trying to check consistency of Maestro default channels for the build and post-build YAML configuration."
24+
ExitWithExitCode 1
25+
}

‎eng/common/templates/post-build/channels/generic-public-channel.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ stages:
9494
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
9595
- name: AzDOBuildId
9696
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
97+
- name: ArtifactsCategory
98+
value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }}
9799
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
98100
pool:
99101
vmImage: 'windows-2019'
@@ -132,7 +134,7 @@ stages:
132134
inputs:
133135
filePath: eng\common\sdk-task.ps1
134136
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
135-
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
137+
/p:ArtifactsCategory=$(ArtifactsCategory)
136138
/p:IsStableBuild=$(IsStableBuild)
137139
/p:IsInternalBuild=$(IsInternalBuild)
138140
/p:RepositoryName=$(Build.Repository.Name)

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

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,22 @@ parameters:
2222
publishDependsOn:
2323
- Validate
2424

25+
# Channel ID's instantiated in this file.
26+
# When adding a new channel implementation the call to `check-channel-consistency.ps1`
27+
# needs to be updated with the new channel ID
28+
NetEngLatestChannelId: 2
29+
NetEngValidationChannelId: 9
30+
NetCoreDev5ChannelId: 131
31+
GeneralTestingChannelId: 529
32+
NETCoreToolingDevChannelId: 548
33+
NETCoreToolingReleaseChannelId: 549
34+
NETInternalToolingChannelId: 551
35+
NETCoreExperimentalChannelId: 562
36+
NetEngServicesIntChannelId: 678
37+
NetEngServicesProdChannelId: 679
38+
Net5Preview1ChannelId: 737
39+
Net5Preview2ChannelId: 738
40+
2541
stages:
2642
- stage: Validate
2743
dependsOn: ${{ parameters.validateDependsOn }}
@@ -31,6 +47,24 @@ stages:
3147
jobs:
3248
- template: setup-maestro-vars.yml
3349

50+
- job:
51+
displayName: Post-build Checks
52+
dependsOn: setupMaestroVars
53+
variables:
54+
- name: InitialChannels
55+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'] ]
56+
- name: PromoteToMaestroChannelId
57+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'] ]
58+
pool:
59+
vmImage: 'windows-2019'
60+
steps:
61+
- task: PowerShell@2
62+
displayName: Maestro Channels Consistency
63+
inputs:
64+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
65+
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}}
67+
3468
- job:
3569
displayName: NuGet Validation
3670
dependsOn: setupMaestroVars
@@ -165,7 +199,7 @@ stages:
165199
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
166200
stageName: 'NetCore_Dev5_Publish'
167201
channelName: '.NET Core 5 Dev'
168-
channelId: 131
202+
channelId: ${{ parameters.NetCoreDev5ChannelId }}
169203
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
170204
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
171205
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
@@ -178,7 +212,7 @@ stages:
178212
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
179213
stageName: 'Net5_Preview1_Publish'
180214
channelName: '.NET 5 Preview 1'
181-
channelId: 737
215+
channelId: ${{ parameters.Net5Preview1ChannelId }}
182216
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
183217
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
184218
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
@@ -191,7 +225,7 @@ stages:
191225
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
192226
stageName: 'Net5_Preview2_Publish'
193227
channelName: '.NET 5 Preview 2'
194-
channelId: 738
228+
channelId: ${{ parameters.Net5Preview2ChannelId }}
195229
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
196230
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
197231
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
@@ -204,7 +238,7 @@ stages:
204238
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
205239
stageName: 'Net_Eng_Latest_Publish'
206240
channelName: '.NET Eng - Latest'
207-
channelId: 2
241+
channelId: ${{ parameters.NetEngLatestChannelId }}
208242
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
209243
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
210244
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
@@ -217,7 +251,7 @@ stages:
217251
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
218252
stageName: 'Net_Eng_Validation_Publish'
219253
channelName: '.NET Eng - Validation'
220-
channelId: 9
254+
channelId: ${{ parameters.NetEngValidationChannelId }}
221255
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
222256
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
223257
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
@@ -230,7 +264,7 @@ stages:
230264
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
231265
stageName: 'General_Testing_Publish'
232266
channelName: 'General Testing'
233-
channelId: 529
267+
channelId: ${{ parameters.GeneralTestingChannelId }}
234268
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
235269
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
236270
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
@@ -243,7 +277,7 @@ stages:
243277
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
244278
stageName: 'NETCore_Tooling_Dev_Publishing'
245279
channelName: '.NET Core Tooling Dev'
246-
channelId: 548
280+
channelId: ${{ parameters.NETCoreToolingDevChannelId }}
247281
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
248282
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
249283
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
@@ -256,7 +290,7 @@ stages:
256290
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
257291
stageName: 'NETCore_Tooling_Release_Publishing'
258292
channelName: '.NET Core Tooling Release'
259-
channelId: 549
293+
channelId: ${{ parameters.NETCoreToolingReleaseChannelId }}
260294
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
261295
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
262296
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
@@ -269,7 +303,7 @@ stages:
269303
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
270304
stageName: 'NET_Internal_Tooling_Publishing'
271305
channelName: '.NET Internal Tooling'
272-
channelId: 551
306+
channelId: ${{ parameters.NETInternalToolingChannelId }}
273307
transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
274308
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json'
275309
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json'
@@ -282,7 +316,7 @@ stages:
282316
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
283317
stageName: 'NETCore_Experimental_Publishing'
284318
channelName: '.NET Core Experimental'
285-
channelId: 562
319+
channelId: ${{ parameters.NETCoreExperimentalChannelId }}
286320
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
287321
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
288322
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
@@ -295,7 +329,7 @@ stages:
295329
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
296330
stageName: 'Net_Eng_Services_Int_Publish'
297331
channelName: '.NET Eng Services - Int'
298-
channelId: 678
332+
channelId: ${{ parameters.NetEngServicesIntChannelId }}
299333
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
300334
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
301335
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
@@ -308,7 +342,7 @@ stages:
308342
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
309343
stageName: 'Net_Eng_Services_Prod_Publish'
310344
channelName: '.NET Eng Services - Prod'
311-
channelId: 679
345+
channelId: ${{ parameters.NetEngServicesProdChannelId }}
312346
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
313347
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
314348
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"xcopy-msbuild": "16.4.0-alpha"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20118.1"
10+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20119.14"
1111
}
1212
}

0 commit comments

Comments
 (0)