Skip to content

Commit 95ca388

Browse files
dotnet-maestro[bot]baronfel
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20191108.11
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19558.11
1 parent 3acf6df commit 95ca388

File tree

6 files changed

+30
-14
lines changed

6 files changed

+30
-14
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="5.0.0-beta.19557.20">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19558.11">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>b62f1617f2c453497fd55697c04dd8021a38dc17</Sha>
8+
<Sha>be7971c98d4ad60cdf8c3d1aa41f950f42bd466a</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

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.ArtifactStagingDirectory)\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.ArtifactStagingDirectory)\artifacts\BlobArtifacts
3044
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts

eng/common/templates/post-build/channels/netcore-blazor-31-features.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ stages:
1717
- job:
1818
displayName: Symbol Publishing
1919
dependsOn: setupMaestroVars
20-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_31_Blazor_Features))
20+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_31_Blazor_Features_Channel_Id))
2121
variables:
2222
- group: DotNet-Symbol-Server-Pats
2323
pool:
@@ -68,7 +68,7 @@ stages:
6868
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
6969
- name: IsStableBuild
7070
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
71-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_31_Blazor_Features))
71+
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_31_Blazor_Features_Channel_Id))
7272
pool:
7373
vmImage: 'windows-2019'
7474
steps:
@@ -140,4 +140,4 @@ stages:
140140

141141
- template: ../../steps/promote-build.yml
142142
parameters:
143-
ChannelId: ${{ variables.NetCore_31_Blazor_Features }}
143+
ChannelId: ${{ variables.NetCore_31_Blazor_Features_Channel_Id }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ variables:
5454
value: 529
5555

5656
# .NET Core 3.1 Blazor Features
57-
- name: NetCore_31_Blazor_Features
57+
- name: NetCore_31_Blazor_Features_Channel_Id
5858
value: 531
5959

6060
# Whether the build is internal or not

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
enable: false
99
continueOnError: false
1010
params: ''
11+
artifactNames: ''
1112

1213
# These parameters let the user customize the call to sdk-task.ps1 for publishing
1314
# symbols & general artifacts as well as for signing validation
@@ -111,6 +112,7 @@ stages:
111112
parameters:
112113
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
113114
continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
115+
artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
114116

115117
- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml
116118
parameters:

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": "5.0.0-beta.19557.20",
13+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19558.11",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)