Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 4334978

Browse files
dotnet-maestro[bot]Jarret Shook
dotnet-maestro[bot]
authored and
Jarret Shook
committed
[release/3.1] Update dependencies from dotnet/arcade (#26886)
* Update dependencies from https://github.com/dotnet/arcade build 20190924.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19474.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19474.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19474.3 * Add lots o' sources * Update dependencies from https://github.com/dotnet/arcade build 20191119.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19569.2 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19569.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19569.2
1 parent 1ed7226 commit 4334978

19 files changed

+296
-782
lines changed

‎NuGet.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<clear />
1212
<add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
1313
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
14+
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
15+
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
16+
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
17+
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
18+
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
1419
<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
1520
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1621
</packageSources>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19461.7">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19569.2">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
7+
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19461.7">
9+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19569.2">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
11+
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19461.7">
13+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19569.2">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
15+
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19461.7">
17+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19569.2">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
19+
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-preview3.19551.4">
2222
<Uri>https://github.com/dotnet/corefx</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<UsingToolXliff>false</UsingToolXliff>
1616
<!-- Package versions -->
1717
<!-- arcade -->
18-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19461.7</MicrosoftDotNetBuildTasksFeedVersion>
19-
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19461.7</MicrosoftDotNetBuildTasksPackagingVersion>
18+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19569.2</MicrosoftDotNetBuildTasksFeedVersion>
19+
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19569.2</MicrosoftDotNetBuildTasksPackagingVersion>
2020
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2121
<!-- roslyn -->
2222
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>

‎eng/common/enable-cross-org-publishing.ps1‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
param(
2+
[string] $token
3+
)
4+
5+
Write-Host "##vso[task.setvariable variable=VSS_NUGET_ACCESSTOKEN]$token"
6+
Write-Host "##vso[task.setvariable variable=VSS_NUGET_URI_PREFIXES]https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/"

‎eng/common/sdl/extract-artifact-packages.ps1‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ param(
55

66
$ErrorActionPreference = "Stop"
77
Set-StrictMode -Version 2.0
8+
9+
# `tools.ps1` checks $ci to perform some actions. Since the post-build
10+
# scripts don't necessarily execute in the same agent that run the
11+
# build.ps1/sh script this variable isn't automatically set.
12+
$ci = $true
13+
. $PSScriptRoot\..\tools.ps1
14+
815
$ExtractPackage = {
916
param(
1017
[string] $PackagePath # Full path to a NuGet package

‎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: 24 additions & 13 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:
@@ -84,10 +90,14 @@ stages:
8490
- task: NuGetAuthenticate@0
8591
displayName: 'Authenticate to AzDO Feeds'
8692

93+
- task: PowerShell@2
94+
displayName: Enable cross-org publishing
95+
inputs:
96+
filePath: eng\common\enable-cross-org-publishing.ps1
97+
arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
98+
8799
- task: PowerShell@2
88100
displayName: Publish Assets
89-
env:
90-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
91101
inputs:
92102
filePath: eng\common\sdk-task.ps1
93103
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
@@ -107,18 +117,19 @@ stages:
107117
/p:Configuration=Release
108118
/p:PublishInstallersAndChecksums=true
109119
/p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
110-
/p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
120+
/p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
111121
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
112-
/p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
122+
/p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
113123
/p:PublishToAzureDevOpsNuGetFeeds=true
114-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
124+
/p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
115125
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
116-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
126+
/p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
117127
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
118-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
128+
/p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
119129
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
130+
/p:PublishToMSDL=false
120131
${{ parameters.artifactsPublishingAdditionalParameters }}
121132

122133
- template: ../../steps/promote-build.yml
123134
parameters:
124-
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: 35 additions & 13 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
@@ -85,10 +103,14 @@ stages:
85103
- task: NuGetAuthenticate@0
86104
displayName: 'Authenticate to AzDO Feeds'
87105

106+
- task: PowerShell@2
107+
displayName: Enable cross-org publishing
108+
inputs:
109+
filePath: eng\common\enable-cross-org-publishing.ps1
110+
arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
111+
88112
- task: PowerShell@2
89113
displayName: Publish Assets
90-
env:
91-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
92114
inputs:
93115
filePath: eng\common\sdk-task.ps1
94116
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
@@ -113,14 +135,14 @@ stages:
113135
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
114136
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
115137
/p:PublishToAzureDevOpsNuGetFeeds=true
116-
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
138+
/p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}'
117139
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
118-
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
140+
/p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}'
119141
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
120-
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
142+
/p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}'
121143
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
122144
${{ parameters.artifactsPublishingAdditionalParameters }}
123145

124146
- template: ../../steps/promote-build.yml
125147
parameters:
126-
ChannelId: ${{ variables.PublicRelease_31_Channel_Id }}
148+
ChannelId: ${{ parameters.channelId }}

0 commit comments

Comments
 (0)