Skip to content

Commit 4a30972

Browse files
dotnet-maestro[bot]baronfel
dotnet-maestro[bot]
authored and
baronfel
committed
Update dependencies from https://github.com/dotnet/arcade build 20190802.16 (#7351)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19402.16
1 parent 9778955 commit 4a30972

File tree

8 files changed

+317
-5
lines changed

8 files changed

+317
-5
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="1.0.0-beta.19401.23">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19402.16">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>941d6497356e00ea6b2bc35a22a67f4ecf988fd6</Sha>
8+
<Sha>d8457f6ba527aef165ff6fb0aded44bf8123ce83</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

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

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
parameters:
2+
enableSymbolValidation: true
3+
4+
stages:
5+
- stage: NetCore_Dev5_Publish
6+
dependsOn: validate
7+
variables:
8+
- template: ../common-variables.yml
9+
displayName: .NET Core 5 Dev Channel
10+
jobs:
11+
- template: ../setup-maestro-vars.yml
12+
13+
- job:
14+
displayName: Symbol Publishing
15+
dependsOn: setupMaestroVars
16+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id))
17+
variables:
18+
- group: DotNet-Symbol-Server-Pats
19+
pool:
20+
vmImage: 'windows-2019'
21+
steps:
22+
- task: DownloadBuildArtifacts@0
23+
displayName: Download Artifacts
24+
inputs:
25+
downloadType: specific files
26+
matchingPattern: "*Artifacts*"
27+
28+
- task: PowerShell@2
29+
displayName: Publish
30+
inputs:
31+
filePath: eng\common\sdk-task.ps1
32+
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
33+
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
34+
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
35+
/p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
36+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
37+
/p:Configuration=Release
38+
39+
- job:
40+
displayName: Publish Assets
41+
dependsOn: setupMaestroVars
42+
variables:
43+
- group: DotNet-Blob-Feed
44+
- group: AzureDevOps-Artifact-Feeds-Pats
45+
- name: BARBuildId
46+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
47+
- name: IsStableBuild
48+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
49+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id))
50+
pool:
51+
vmImage: 'windows-2019'
52+
steps:
53+
- task: DownloadBuildArtifacts@0
54+
displayName: Download Package Artifacts
55+
inputs:
56+
buildType: current
57+
artifactName: PackageArtifacts
58+
59+
- task: DownloadBuildArtifacts@0
60+
displayName: Download Blob Artifacts
61+
inputs:
62+
buildType: current
63+
artifactName: BlobArtifacts
64+
65+
- task: DownloadBuildArtifacts@0
66+
displayName: Download Asset Manifests
67+
inputs:
68+
buildType: current
69+
artifactName: AssetManifests
70+
71+
- task: PowerShell@2
72+
displayName: Add Assets Location
73+
env:
74+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
75+
inputs:
76+
filePath: eng\common\sdk-task.ps1
77+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
78+
/p:ChannelId=$(NetCore_5_Dev_Channel_Id)
79+
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
80+
/p:IsStableBuild=$(IsStableBuild)
81+
/p:IsInternalBuild=$(IsInternalBuild)
82+
/p:RepositoryName=$(Build.Repository.Name)
83+
/p:CommitSha=$(Build.SourceVersion)
84+
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
85+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
86+
/p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
87+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
88+
/p:BARBuildId=$(BARBuildId)
89+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
90+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
91+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
92+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
93+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
94+
/p:Configuration=Release
95+
96+
- task: NuGetCommand@2
97+
displayName: Publish Packages to AzDO Feed
98+
condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com')
99+
inputs:
100+
command: push
101+
vstsFeed: $(AzDoFeedName)
102+
packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg
103+
publishVstsFeed: $(AzDoFeedName)
104+
105+
- task: PowerShell@2
106+
displayName: Publish Blobs to AzDO Feed
107+
inputs:
108+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1
109+
arguments: -FeedName $(AzDoFeedName)
110+
-SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/
111+
-PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw)
112+
enabled: false
113+
114+
115+
- stage: NetCore_Dev5_PublishValidation
116+
displayName: Publish Validation
117+
variables:
118+
- template: ../common-variables.yml
119+
jobs:
120+
- template: ../setup-maestro-vars.yml
121+
122+
- ${{ if eq(parameters.enableSymbolValidation, 'true') }}:
123+
- job:
124+
displayName: Symbol Availability
125+
dependsOn: setupMaestroVars
126+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id))
127+
pool:
128+
vmImage: 'windows-2019'
129+
steps:
130+
- task: DownloadBuildArtifacts@0
131+
displayName: Download Package Artifacts
132+
inputs:
133+
buildType: current
134+
artifactName: PackageArtifacts
135+
136+
- task: PowerShell@2
137+
displayName: Check Symbol Availability
138+
inputs:
139+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
140+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
141+
142+
- template: ../darc-gather-drop.yml
143+
parameters:
144+
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}
145+
146+
- template: ../promote-build.yml
147+
parameters:
148+
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}

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

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
parameters:
2+
enableSymbolValidation: true
3+
4+
stages:
5+
- stage: NetCore_Tools_Latest_Publish
6+
dependsOn: validate
7+
variables:
8+
- template: ../common-variables.yml
9+
displayName: .NET Tools - Latest
10+
jobs:
11+
- template: ../setup-maestro-vars.yml
12+
13+
- job:
14+
displayName: Symbol Publishing
15+
dependsOn: setupMaestroVars
16+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id))
17+
variables:
18+
- group: DotNet-Symbol-Server-Pats
19+
pool:
20+
vmImage: 'windows-2019'
21+
steps:
22+
- task: DownloadBuildArtifacts@0
23+
displayName: Download Artifacts
24+
inputs:
25+
downloadType: specific files
26+
matchingPattern: "*Artifacts*"
27+
28+
- task: PowerShell@2
29+
displayName: Publish
30+
inputs:
31+
filePath: eng\common\sdk-task.ps1
32+
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
33+
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
34+
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
35+
/p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
36+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
37+
/p:Configuration=Release
38+
39+
- job:
40+
displayName: Publish Assets
41+
dependsOn: setupMaestroVars
42+
variables:
43+
- group: DotNet-Blob-Feed
44+
- group: AzureDevOps-Artifact-Feeds-Pats
45+
- name: BARBuildId
46+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
47+
- name: IsStableBuild
48+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
49+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id))
50+
pool:
51+
vmImage: 'windows-2019'
52+
steps:
53+
- task: DownloadBuildArtifacts@0
54+
displayName: Download Package Artifacts
55+
inputs:
56+
buildType: current
57+
artifactName: PackageArtifacts
58+
59+
- task: DownloadBuildArtifacts@0
60+
displayName: Download Blob Artifacts
61+
inputs:
62+
buildType: current
63+
artifactName: BlobArtifacts
64+
65+
- task: DownloadBuildArtifacts@0
66+
displayName: Download Asset Manifests
67+
inputs:
68+
buildType: current
69+
artifactName: AssetManifests
70+
71+
- task: PowerShell@2
72+
displayName: Add Assets Location
73+
env:
74+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
75+
inputs:
76+
filePath: eng\common\sdk-task.ps1
77+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
78+
/p:ChannelId=$(NetCore_Tools_Latest_Channel_Id)
79+
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
80+
/p:IsStableBuild=$(IsStableBuild)
81+
/p:IsInternalBuild=$(IsInternalBuild)
82+
/p:RepositoryName=$(Build.Repository.Name)
83+
/p:CommitSha=$(Build.SourceVersion)
84+
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
85+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
86+
/p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
87+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
88+
/p:BARBuildId=$(BARBuildId)
89+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
90+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
91+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
92+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
93+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
94+
/p:Configuration=Release
95+
96+
- task: NuGetCommand@2
97+
displayName: Publish Packages to AzDO Feed
98+
condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com')
99+
inputs:
100+
command: push
101+
vstsFeed: $(AzDoFeedName)
102+
packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg
103+
publishVstsFeed: $(AzDoFeedName)
104+
105+
- task: PowerShell@2
106+
displayName: Publish Blobs to AzDO Feed
107+
inputs:
108+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1
109+
arguments: -FeedName $(AzDoFeedName)
110+
-SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/
111+
-PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw)
112+
enabled: false
113+
114+
115+
- stage: NetCore_Tools_Latest_PublishValidation
116+
displayName: Publish Validation
117+
variables:
118+
- template: ../common-variables.yml
119+
jobs:
120+
- template: ../setup-maestro-vars.yml
121+
122+
- ${{ if eq(parameters.enableSymbolValidation, 'true') }}:
123+
- job:
124+
displayName: Symbol Availability
125+
dependsOn: setupMaestroVars
126+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id))
127+
pool:
128+
vmImage: 'windows-2019'
129+
steps:
130+
- task: DownloadBuildArtifacts@0
131+
displayName: Download Package Artifacts
132+
inputs:
133+
buildType: current
134+
artifactName: PackageArtifacts
135+
136+
- task: PowerShell@2
137+
displayName: Check Symbol Availability
138+
inputs:
139+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
140+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
141+
142+
- template: ../darc-gather-drop.yml
143+
parameters:
144+
ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }}
145+
146+
- template: ../promote-build.yml
147+
parameters:
148+
ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@ variables:
55
- name: PublicDevRelease_30_Channel_Id
66
value: 3
77

8+
# .NET Core 5 Dev
9+
- name: NetCore_5_Dev_Channel_Id
10+
value: 131
11+
812
# .NET Tools - Validation
913
- name: PublicValidationRelease_30_Channel_Id
1014
value: 9
1115

16+
# .NET Tools - Latest
17+
- name: NetCore_Tools_Latest_Channel_Id
18+
value: 2
19+
1220
# .NET Core 3.0 Internal Servicing
1321
- name: InternalServicing_30_Channel_Id
1422
value: 184

‎eng/common/templates/post-build/darc-gather-drop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
- job: gatherDrop
66
displayName: Gather Drop
77
dependsOn: setupMaestroVars
8-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }})
8+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.ChannelId }}))
99
variables:
1010
- name: BARBuildId
1111
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,18 @@ stages:
8383
parameters:
8484
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
8585

86+
- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml
87+
parameters:
88+
enableSymbolValidation: ${{ parameters.enableSymbolValidation }}
89+
8690
- template: \eng\common\templates\post-build\channels\public-dev-release.yml
8791
parameters:
8892
enableSymbolValidation: ${{ parameters.enableSymbolValidation }}
8993

94+
- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml
95+
parameters:
96+
enableSymbolValidation: ${{ parameters.enableSymbolValidation }}
97+
9098
- template: \eng\common\templates\post-build\channels\public-validation-release.yml
9199

92100
- template: \eng\common\templates\post-build\channels\public-release.yml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
- job:
66
displayName: Promote Build
77
dependsOn: setupMaestroVars
8-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }})
8+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.ChannelId }}))
99
variables:
1010
- name: BARBuildId
1111
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19401.23",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19402.16",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)