Skip to content

Commit c11b9d1

Browse files
dotnet-maestro[bot]baronfel
dotnet-maestro[bot]
authored and
baronfel
committed
Update dependencies from https://github.com/dotnet/arcade build 20190905.21 (#7507)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.21
1 parent 5b12870 commit c11b9d1

14 files changed

Lines changed: 247 additions & 297 deletions

‎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="1.0.0-beta.19454.31">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19455.21">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
8+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/templates/job/job.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ parameters:
2424

2525
workspace: ''
2626

27-
# Job base template specific parameters
27+
# Job base template specific parameters
2828
# Optional: Enable installing Microbuild plugin
2929
# if 'true', these "variables" must be specified in the variables object or as part of the queue matrix
3030
# _TeamName - the name of your team
@@ -151,6 +151,9 @@ jobs:
151151
continueOnError: ${{ parameters.continueOnError }}
152152
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
153153

154+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
155+
- task: NuGetAuthenticate@0
156+
154157
- ${{ each step in parameters.steps }}:
155158
- ${{ step }}
156159

‎eng/common/templates/job/publish-build-assets.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
downloadPath: '$(Build.StagingDirectory)/Download'
4848
condition: ${{ parameters.condition }}
4949
continueOnError: ${{ parameters.continueOnError }}
50+
51+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
52+
- task: NuGetAuthenticate@0
53+
5054
- task: PowerShell@2
5155
displayName: Publish Build Assets
5256
inputs:
@@ -59,6 +63,7 @@ jobs:
5963
/p:Configuration=$(_BuildConfig)
6064
condition: ${{ parameters.condition }}
6165
continueOnError: ${{ parameters.continueOnError }}
66+
6267
- task: powershell@2
6368
displayName: Create ReleaseConfigs Artifact
6469
inputs:
@@ -67,12 +72,14 @@ jobs:
6772
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
6873
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
6974
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
75+
7076
- task: PublishBuildArtifacts@1
7177
displayName: Publish ReleaseConfigs Artifact
7278
inputs:
7379
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
7480
PublishLocation: Container
7581
ArtifactName: ReleaseConfigs
82+
7683
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
7784
- task: PublishBuildArtifacts@1
7885
displayName: Publish Logs to VSTS

‎eng/common/templates/post-build/channels/netcore-dev-30.yml‎

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ stages:
4747
/p:Configuration=Release
4848
${{ parameters.symbolPublishingAdditionalParameters }}
4949

50-
- job:
50+
- job: publish_assets
5151
displayName: Publish Assets
5252
dependsOn: setupMaestroVars
5353
variables:
@@ -79,55 +79,48 @@ stages:
7979
buildType: current
8080
artifactName: AssetManifests
8181

82+
- task: NuGetToolInstaller@1
83+
displayName: 'Install NuGet.exe'
84+
85+
# This is necessary whenever we want to publish/restore to an AzDO private feed
86+
- task: NuGetAuthenticate@0
87+
displayName: 'Authenticate to AzDO Feeds'
88+
8289
- task: PowerShell@2
83-
displayName: Add Assets Location
90+
displayName: Publish Assets
8491
env:
85-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
92+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
8693
inputs:
8794
filePath: eng\common\sdk-task.ps1
88-
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
89-
/p:ChannelId=$(PublicDevRelease_30_Channel_Id)
95+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
9096
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
9197
/p:IsStableBuild=$(IsStableBuild)
9298
/p:IsInternalBuild=$(IsInternalBuild)
9399
/p:RepositoryName=$(Build.Repository.Name)
94100
/p:CommitSha=$(Build.SourceVersion)
95-
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
96-
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
97-
/p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
98-
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
99-
/p:BARBuildId=$(BARBuildId)
100-
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
101-
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
102-
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
103-
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
104-
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
105-
/p:Configuration=Release
101+
/p:StaticInternalFeed=$(StaticInternalFeed)
102+
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
103+
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
104+
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
105+
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
106+
/p:NugetPath=$(NuGetExeToolPath)
107+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
108+
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
109+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
110+
/p:BARBuildId=$(BARBuildId)
111+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
112+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
113+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
114+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
115+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
116+
/p:Configuration=Release
106117
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
107118
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
108119
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
109120
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
110121
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
111122
${{ parameters.artifactsPublishingAdditionalParameters }}
112123

113-
- task: NuGetCommand@2
114-
displayName: Publish Packages to AzDO Feed
115-
condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com')
116-
inputs:
117-
command: push
118-
vstsFeed: $(AzDoFeedName)
119-
packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg
120-
publishVstsFeed: $(AzDoFeedName)
121-
122-
- task: PowerShell@2
123-
displayName: Publish Blobs to AzDO Feed
124-
inputs:
125-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1
126-
arguments: -FeedName $(AzDoFeedName)
127-
-SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/
128-
-PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw)
129-
enabled: false
130-
131124

132125
- stage: NetCore_Dev30_Publish_Validation
133126
displayName: .NET Core 3.0 Dev Publish Validation
@@ -156,10 +149,6 @@ stages:
156149
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
157150
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
158151

159-
- template: ../darc-gather-drop.yml
160-
parameters:
161-
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
162-
163152
- template: ../promote-build.yml
164153
parameters:
165154
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

‎eng/common/templates/post-build/channels/netcore-dev-31.yml‎

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,33 @@ stages:
7979
buildType: current
8080
artifactName: AssetManifests
8181

82+
- task: NuGetToolInstaller@1
83+
displayName: 'Install NuGet.exe'
84+
85+
# This is necessary whenever we want to publish/restore to an AzDO private feed
86+
- task: NuGetAuthenticate@0
87+
displayName: 'Authenticate to AzDO Feeds'
88+
8289
- task: PowerShell@2
83-
displayName: Add Assets Location
90+
displayName: Publish Assets
8491
env:
85-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
92+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
8693
inputs:
8794
filePath: eng\common\sdk-task.ps1
8895
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
89-
/p:ChannelId=$(PublicDevRelease_31_Channel_Id)
9096
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
9197
/p:IsStableBuild=$(IsStableBuild)
9298
/p:IsInternalBuild=$(IsInternalBuild)
9399
/p:RepositoryName=$(Build.Repository.Name)
94100
/p:CommitSha=$(Build.SourceVersion)
95-
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
96-
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
97-
/p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
101+
/p:StaticInternalFeed=$(StaticInternalFeed)
102+
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
103+
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
104+
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
105+
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
106+
/p:NugetPath=$(NuGetExeToolPath)
107+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
108+
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
98109
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
99110
/p:BARBuildId=$(BARBuildId)
100111
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
@@ -110,24 +121,6 @@ stages:
110121
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
111122
${{ parameters.artifactsPublishingAdditionalParameters }}
112123

113-
- task: NuGetCommand@2
114-
displayName: Publish Packages to AzDO Feed
115-
condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com')
116-
inputs:
117-
command: push
118-
vstsFeed: $(AzDoFeedName)
119-
packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg
120-
publishVstsFeed: $(AzDoFeedName)
121-
122-
- task: PowerShell@2
123-
displayName: Publish Blobs to AzDO Feed
124-
inputs:
125-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1
126-
arguments: -FeedName $(AzDoFeedName)
127-
-SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/
128-
-PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw)
129-
enabled: false
130-
131124

132125
- stage: NetCore_Dev31_Publish_Validation
133126
displayName: .NET Core 3.1 Dev Publish Validation
@@ -156,10 +149,6 @@ stages:
156149
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
157150
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
158151

159-
- template: ../darc-gather-drop.yml
160-
parameters:
161-
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}
162-
163152
- template: ../promote-build.yml
164153
parameters:
165154
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}

‎eng/common/templates/post-build/channels/netcore-dev-5.yml‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ parameters:
33
symbolPublishingAdditionalParameters: ''
44
artifactsPublishingAdditionalParameters: ''
55
publishInstallersAndChecksums: false
6+
publishToAzureDevOpsFeeds: true
67

78
stages:
89
- stage: NetCore_Dev5_Publish
@@ -47,7 +48,7 @@ stages:
4748
/p:Configuration=Release
4849
${{ parameters.symbolPublishingAdditionalParameters }}
4950

50-
- job:
51+
- job: publish_assets
5152
displayName: Publish Assets
5253
dependsOn: setupMaestroVars
5354
variables:
@@ -79,55 +80,53 @@ stages:
7980
buildType: current
8081
artifactName: AssetManifests
8182

83+
- task: NuGetToolInstaller@1
84+
displayName: 'Install NuGet.exe'
85+
86+
# This is necessary whenever we want to publish/restore to an AzDO private feed
87+
- task: NuGetAuthenticate@0
88+
displayName: 'Authenticate to AzDO Feeds'
89+
8290
- task: PowerShell@2
83-
displayName: Add Assets Location
91+
displayName: Publish Assets
8492
env:
85-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
93+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
8694
inputs:
8795
filePath: eng\common\sdk-task.ps1
88-
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
89-
/p:ChannelId=$(NetCore_5_Dev_Channel_Id)
96+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
9097
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
9198
/p:IsStableBuild=$(IsStableBuild)
9299
/p:IsInternalBuild=$(IsInternalBuild)
93100
/p:RepositoryName=$(Build.Repository.Name)
94101
/p:CommitSha=$(Build.SourceVersion)
95-
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
96-
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
97-
/p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
98-
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
99-
/p:BARBuildId=$(BARBuildId)
100-
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
101-
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
102-
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
103-
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
104-
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
102+
/p:StaticInternalFeed=$(StaticInternalFeed)
103+
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
104+
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
105+
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
106+
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
107+
/p:NugetPath=$(NuGetExeToolPath)
108+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
109+
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
110+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
111+
/p:BARBuildId=$(BARBuildId)
112+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
113+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
114+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
115+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
116+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
105117
/p:Configuration=Release
118+
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
106119
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
107120
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
108-
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
109121
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
110122
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
123+
/p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }}
124+
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
125+
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
126+
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
127+
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)
111128
${{ parameters.artifactsPublishingAdditionalParameters }}
112129

113-
- task: NuGetCommand@2
114-
displayName: Publish Packages to AzDO Feed
115-
condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com')
116-
inputs:
117-
command: push
118-
vstsFeed: $(AzDoFeedName)
119-
packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg
120-
publishVstsFeed: $(AzDoFeedName)
121-
122-
- task: PowerShell@2
123-
displayName: Publish Blobs to AzDO Feed
124-
inputs:
125-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1
126-
arguments: -FeedName $(AzDoFeedName)
127-
-SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/
128-
-PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw)
129-
enabled: false
130-
131130

132131
- stage: NetCore_Dev5_Publish_Validation
133132
displayName: .NET Core 5 Dev Publish Validation
@@ -156,10 +155,6 @@ stages:
156155
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
157156
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
158157

159-
- template: ../darc-gather-drop.yml
160-
parameters:
161-
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}
162-
163158
- template: ../promote-build.yml
164159
parameters:
165160
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}

0 commit comments

Comments
 (0)