Skip to content

Commit 43ca89b

Browse files
dotnet-maestro[bot]dougbu
dotnet-maestro[bot]
authored and
dougbu
committed
[release/3.0] Update dependencies from dotnet/arcade aspnet/Blazor (#17270)
* Update dependencies from https://github.com/dotnet/arcade build 20191119.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19569.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19569.2 * Update dependencies from https://github.com/aspnet/Blazor build 20191120.2 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19570.2
1 parent 0d37794 commit 43ca89b

15 files changed

+219
-891
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.0.0-preview9.19503.2">
12+
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="3.0.0-preview9.19570.2">
1313
<Uri>https://github.com/aspnet/Blazor</Uri>
14-
<Sha>c606594a0e5ebc36636d36e418ee0e189ce7a012</Sha>
14+
<Sha>a10163f767cf263d593836c9249d8314e8948d89</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.2-servicing.19569.1">
1717
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
@@ -417,17 +417,17 @@
417417
<Uri>https://github.com/aspnet/Extensions</Uri>
418418
<Sha>17edae611c3bfaba25ccee79c4beeaded6f8e9c6</Sha>
419419
</Dependency>
420-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19530.2">
420+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19569.2">
421421
<Uri>https://github.com/dotnet/arcade</Uri>
422-
<Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
422+
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
423423
</Dependency>
424-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19530.2">
424+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19569.2">
425425
<Uri>https://github.com/dotnet/arcade</Uri>
426-
<Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
426+
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
427427
</Dependency>
428-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19530.2">
428+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19569.2">
429429
<Uri>https://github.com/dotnet/arcade</Uri>
430-
<Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
430+
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
431431
</Dependency>
432432
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.2-servicing.19569.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
433433
<Uri>https://github.com/aspnet/Extensions</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
-->
6767
<PropertyGroup Label="Automated">
6868
<!-- Packages from dotnet/arcade -->
69-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19530.2</MicrosoftDotNetGenAPIPackageVersion>
69+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetGenAPIPackageVersion>
7070
<!-- Packages from dotnet/roslyn -->
7171
<MicrosoftNetCompilersToolsetPackageVersion>3.3.1-beta4-19462-11</MicrosoftNetCompilersToolsetPackageVersion>
7272
<!-- Packages from dotnet/core-setup -->
@@ -100,7 +100,7 @@
100100
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
101101
<MicrosoftNETCorePlatformsPackageVersion>3.0.0</MicrosoftNETCorePlatformsPackageVersion>
102102
<!-- Packages from aspnet/Blazor -->
103-
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.0.0-preview9.19503.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
103+
<MicrosoftAspNetCoreBlazorMonoPackageVersion>3.0.0-preview9.19570.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
104104
<!-- Packages from aspnet/Extensions -->
105105
<InternalAspNetCoreAnalyzersPackageVersion>3.0.2-servicing.19569.2</InternalAspNetCoreAnalyzersPackageVersion>
106106
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.2-servicing.19569.2</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>

‎eng/common/templates/job/execute-sdl.yml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ parameters:
66
# This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
77
sdlContinueOnError: false # optional: determines whether to continue the build if the step errors;
88
dependsOn: '' # Optional: dependencies of the job
9+
artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts
10+
# Usage:
11+
# artifactNames:
12+
# - 'BlobArtifacts'
13+
# - 'Artifacts_Windows_NT_Release'
914

1015
jobs:
1116
- job: Run_SDL
@@ -18,13 +23,22 @@ jobs:
1823
steps:
1924
- checkout: self
2025
clean: true
21-
- task: DownloadBuildArtifacts@0
22-
displayName: Download Build Artifacts
23-
inputs:
24-
buildType: current
25-
downloadType: specific files
26-
matchingPattern: "**"
27-
downloadPath: $(Build.SourcesDirectory)\artifacts
26+
- ${{ if ne(parameters.artifactNames, '') }}:
27+
- ${{ each artifactName in parameters.artifactNames }}:
28+
- task: DownloadBuildArtifacts@0
29+
displayName: Download Build Artifacts
30+
inputs:
31+
buildType: current
32+
artifactName: ${{ artifactName }}
33+
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
34+
- ${{ if eq(parameters.artifactNames, '') }}:
35+
- task: DownloadBuildArtifacts@0
36+
displayName: Download Build Artifacts
37+
inputs:
38+
buildType: current
39+
downloadType: specific files
40+
itemPattern: "**"
41+
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
2842
- powershell: eng/common/sdl/extract-artifact-packages.ps1
2943
-InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts
3044
-ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
parameters:
2+
publishInstallersAndChecksums: false
23
symbolPublishingAdditionalParameters: ''
3-
artifactsPublishingAdditionalParameters: ''
4+
stageName: ''
5+
channelName: ''
6+
channelId: ''
7+
transportFeed: ''
8+
shippingFeed: ''
9+
symbolsFeed: ''
410

511
stages:
6-
- stage: NetCore_30_Internal_Servicing_Publishing
12+
- stage: ${{ parameters.stageName }}
713
dependsOn: validate
814
variables:
915
- template: ../common-variables.yml
10-
displayName: .NET Core 3.0 Internal Servicing Publishing
16+
displayName: ${{ parameters.channelName }} Publishing
1117
jobs:
1218
- template: ../setup-maestro-vars.yml
1319

1420
- job:
1521
displayName: Symbol Publishing
1622
dependsOn: setupMaestroVars
17-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id))
23+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
1824
variables:
1925
- group: DotNet-Symbol-Server-Pats
2026
pool:
@@ -55,7 +61,7 @@ stages:
5561
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
5662
- name: IsStableBuild
5763
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
58-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id))
64+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
5965
pool:
6066
vmImage: 'windows-2019'
6167
steps:
@@ -115,14 +121,15 @@ stages:
115121
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
116122
/p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
117123
/p:PublishToAzureDevOpsNuGetFeeds=true
118-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
124+
/p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
119125
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
120-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
126+
/p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
121127
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
122-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
128+
/p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
123129
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
130+
/p:PublishToMSDL=false
124131
${{ parameters.artifactsPublishingAdditionalParameters }}
125132

126133
- template: ../../steps/promote-build.yml
127134
parameters:
128-
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
135+
ChannelId: ${{ parameters.channelId }}

‎eng/common/templates/post-build/channels/netcore-release-31.yml‎ renamed to ‎eng/common/templates/post-build/channels/generic-public-channel.yml‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
parameters:
2-
symbolPublishingAdditionalParameters: ''
32
artifactsPublishingAdditionalParameters: ''
43
publishInstallersAndChecksums: false
4+
symbolPublishingAdditionalParameters: ''
5+
stageName: ''
6+
channelName: ''
7+
channelId: ''
8+
transportFeed: ''
9+
shippingFeed: ''
10+
symbolsFeed: ''
511

612
stages:
7-
- stage: NetCore_Release31_Publish
13+
- stage: ${{ parameters.stageName }}
814
dependsOn: validate
915
variables:
1016
- template: ../common-variables.yml
11-
displayName: .NET Core 3.1 Release Publishing
17+
displayName: ${{ parameters.channelName }} Publishing
1218
jobs:
1319
- template: ../setup-maestro-vars.yml
1420

1521
- job:
1622
displayName: Symbol Publishing
1723
dependsOn: setupMaestroVars
18-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id))
24+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
1925
variables:
2026
- group: DotNet-Symbol-Server-Pats
2127
pool:
@@ -33,6 +39,18 @@ stages:
3339
artifactName: 'PDBArtifacts'
3440
continueOnError: true
3541

42+
# This is necessary whenever we want to publish/restore to an AzDO private feed
43+
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
44+
# otherwise it'll complain about accessing a private feed.
45+
- task: NuGetAuthenticate@0
46+
displayName: 'Authenticate to AzDO Feeds'
47+
48+
- task: PowerShell@2
49+
displayName: Enable cross-org publishing
50+
inputs:
51+
filePath: eng\common\enable-cross-org-publishing.ps1
52+
arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
53+
3654
- task: PowerShell@2
3755
displayName: Publish
3856
inputs:
@@ -50,13 +68,11 @@ stages:
5068
displayName: Publish Assets
5169
dependsOn: setupMaestroVars
5270
variables:
53-
- group: DotNet-Blob-Feed
54-
- group: AzureDevOps-Artifact-Feeds-Pats
5571
- name: BARBuildId
5672
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
5773
- name: IsStableBuild
5874
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
59-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id))
75+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
6076
pool:
6177
vmImage: 'windows-2019'
6278
steps:
@@ -65,12 +81,14 @@ stages:
6581
inputs:
6682
buildType: current
6783
artifactName: PackageArtifacts
84+
continueOnError: true
6885

6986
- task: DownloadBuildArtifacts@0
7087
displayName: Download Blob Artifacts
7188
inputs:
7289
buildType: current
7390
artifactName: BlobArtifacts
91+
continueOnError: true
7492

7593
- task: DownloadBuildArtifacts@0
7694
displayName: Download Asset Manifests
@@ -117,14 +135,14 @@ stages:
117135
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
118136
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
119137
/p:PublishToAzureDevOpsNuGetFeeds=true
120-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
138+
/p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
121139
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
122-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
140+
/p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
123141
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
124-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
142+
/p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
125143
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
126144
${{ parameters.artifactsPublishingAdditionalParameters }}
127145

128146
- template: ../../steps/promote-build.yml
129147
parameters:
130-
ChannelId: ${{ variables.PublicRelease_31_Channel_Id }}
148+
ChannelId: ${{ parameters.channelId }}

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

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

0 commit comments

Comments
 (0)