Skip to content

Commit 5287c59

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20190626.2 (#300)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19326.2
1 parent 2e2f74b commit 5287c59

11 files changed

+427
-43
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.19324.24">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19326.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>062febd818fa51e82c7192782a6b6e6429cc81c8</Sha>
8+
<Sha>4b3d46cc75969c4e2de5786ec2b10a430b26dd9f</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
script: |
6767
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
6868
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
69-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsInternalBuild)
7069
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
7170
- task: PublishBuildArtifacts@1
7271
displayName: Publish ReleaseConfigs Artifact

‎eng/common/templates/post-build/channels/internal-servicing.yml

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
parameters:
2+
enableSymbolValidation: true
3+
4+
stages:
5+
- stage: IS_Publish
6+
dependsOn: validate
7+
variables:
8+
- template: ../common-variables.yml
9+
displayName: Internal Servicing
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'], variables.InternalServicing_30_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: Publish-Build-Assets
45+
- group: AzureDevOps-Artifact-Feeds-Pats
46+
- name: BARBuildId
47+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
48+
- name: IsStableBuild
49+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
50+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id)
51+
pool:
52+
vmImage: 'windows-2019'
53+
steps:
54+
- task: DownloadBuildArtifacts@0
55+
displayName: Download Package Artifacts
56+
inputs:
57+
buildType: current
58+
artifactName: PackageArtifacts
59+
60+
- task: DownloadBuildArtifacts@0
61+
displayName: Download Blob Artifacts
62+
inputs:
63+
buildType: current
64+
artifactName: BlobArtifacts
65+
66+
- task: DownloadBuildArtifacts@0
67+
displayName: Download Asset Manifests
68+
inputs:
69+
buildType: current
70+
artifactName: AssetManifests
71+
72+
- task: PowerShell@2
73+
displayName: Add Assets Location
74+
env:
75+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
76+
inputs:
77+
filePath: eng\common\sdk-task.ps1
78+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
79+
/p:ChannelId=$(InternalServicing_30_Channel_Id)
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='https://maestro-prod.westus2.cloudapp.azure.com'
90+
/p:BuildAssetRegistryToken='$(MaestroAccessToken)'
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: IS_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'], variables.InternalServicing_30_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+
- job:
143+
displayName: Gather Drop
144+
dependsOn: setupMaestroVars
145+
variables:
146+
BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
147+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id)
148+
pool:
149+
vmImage: 'windows-2019'
150+
steps:
151+
- task: PowerShell@2
152+
displayName: Setup Darc CLI
153+
inputs:
154+
targetType: filePath
155+
filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1'
156+
157+
- task: PowerShell@2
158+
displayName: Run Darc gather-drop
159+
inputs:
160+
targetType: inline
161+
script: |
162+
darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location
163+
enabled: false
164+
165+
- template: ../promote-build.yml
166+
parameters:
167+
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}

‎eng/common/templates/post-build/channels/public-dev-release.yml

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,10 @@ stages:
2020
vmImage: 'windows-2019'
2121
steps:
2222
- task: DownloadBuildArtifacts@0
23-
displayName: Download PDB Artifacts
23+
displayName: Download Artifacts
2424
inputs:
25-
buildType: current
26-
artifactName: PDBArtifacts
27-
continueOnError: true
28-
29-
- task: DownloadBuildArtifacts@0
30-
displayName: Download Blob Artifacts
31-
inputs:
32-
buildType: current
33-
artifactName: BlobArtifacts
25+
downloadType: specific files
26+
matchingPattern: "*Artifacts*"
3427

3528
- task: PowerShell@2
3629
displayName: Publish
@@ -44,13 +37,16 @@ stages:
4437
/p:Configuration=Release
4538

4639
- job:
47-
displayName: Publish to Static Feed
40+
displayName: Publish Assets
4841
dependsOn: setupMaestroVars
4942
variables:
5043
- group: DotNet-Blob-Feed
5144
- group: Publish-Build-Assets
45+
- group: AzureDevOps-Artifact-Feeds-Pats
5246
- name: BARBuildId
5347
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
48+
- name: IsStableBuild
49+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
5450
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id)
5551
pool:
5652
vmImage: 'windows-2019'
@@ -74,22 +70,47 @@ stages:
7470
artifactName: AssetManifests
7571

7672
- task: PowerShell@2
77-
displayName: Publish
73+
displayName: Add Assets Location
74+
env:
75+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
7876
inputs:
7977
filePath: eng\common\sdk-task.ps1
80-
arguments: -task PublishToPackageFeed -restore -msbuildEngine dotnet
81-
/p:AccountKeyToStaticFeed='$(dotnetfeed-storage-access-key-1)'
78+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
79+
/p:ChannelId=$(PublicDevRelease_30_Channel_Id)
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)'
8288
/p:BARBuildId=$(BARBuildId)
8389
/p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com'
8490
/p:BuildAssetRegistryToken='$(MaestroAccessToken)'
8591
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
8692
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
8793
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
88-
/p:ArtifactsCategory='$(_DotNetArtifactsCategory)'
89-
/p:OverrideAssetsWithSameName=true
90-
/p:PassIfExistingItemIdentical=true
9194
/p:Configuration=Release
9295

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+
93114

94115
- stage: PublishValidation
95116
displayName: Publish Validation
@@ -139,7 +160,3 @@ stages:
139160
targetType: inline
140161
script: |
141162
darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location
142-
143-
- template: ../promote-build.yml
144-
parameters:
145-
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

0 commit comments

Comments
 (0)