Skip to content

Commit ea987f1

Browse files
jonsequiturjonsequitur
authored
Merge pull request #776 from dotnet/darc-master-a2790086-6ac2-4617-b0e9-1cab694065a5
[master] Update dependencies from dotnet/arcade
2 parents b38cb1a + e863de8 commit ea987f1

16 files changed

+328
-170
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.20076.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20109.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>cc8fe69635c7c6e791c87540851aea75946945fa</Sha>
8+
<Sha>b0e8d3944155f94f83deea8afe025debe369e69f</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/darc-init.ps1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ function InstallDarcCli ($darcVersion) {
2424
$darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
2525
}
2626

27-
$arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
27+
$arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
2828

2929
Write-Host "Installing Darc CLI version $darcVersion..."
3030
Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.'
3131
if (-not $toolpath) {
32+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
3233
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
3334
}else {
35+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g --tool-path '$toolpath'"
3436
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
3537
}
3638
}

‎eng/common/generate-graph-files.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Param(
33
[Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
44
[Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
55
[Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created
6-
[string] $darcVersion = '1.1.0-beta.19175.6', # darc's version
6+
[string] $darcVersion, # darc's version
77
[string] $graphvizVersion = '2.38', # GraphViz version
88
[switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
99
# toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies

‎eng/common/performance/performance-setup.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Param(
99
[string] $Branch=$env:BUILD_SOURCEBRANCH,
1010
[string] $CommitSha=$env:BUILD_SOURCEVERSION,
1111
[string] $BuildNumber=$env:BUILD_BUILDNUMBER,
12-
[string] $RunCategories="coreclr corefx",
12+
[string] $RunCategories="Libraries Runtime",
1313
[string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj",
1414
[string] $Kind="micro",
1515
[switch] $Internal,
1616
[switch] $Compare,
17-
[string] $Configurations="CompilationMode=$CompilationMode"
17+
[string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind"
1818
)
1919

2020
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance")
@@ -50,7 +50,7 @@ if ($Internal) {
5050
}
5151

5252
# FIX ME: This is a workaround until we get this from the actual pipeline
53-
$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations"
53+
$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture"
5454
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
5555

5656
if ($RunFromPerformanceRepo) {

‎eng/common/performance/performance-setup.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ build_number=$BUILD_BUILDNUMBER
1313
internal=false
1414
compare=false
1515
kind="micro"
16-
run_categories="coreclr corefx"
16+
run_categories="Libraries Runtime"
1717
csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
18-
configurations=
18+
configurations="CompliationMode=$compilation_mode RunKind=$kind"
1919
run_from_perf_repo=false
2020
use_core_run=true
2121
use_baseline_core_run=true
@@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then
164164
fi
165165
fi
166166

167-
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations"
167+
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
168168
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
169169

170170
if [[ "$run_from_perf_repo" = true ]]; then

eng/common/post-build/promote-build.ps1 renamed to eng/common/post-build/add-build-to-channel.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ try {
1717
ExitWithExitCode 1
1818
}
1919

20-
# Get info about which channels the build has already been promoted to
20+
# Get info about which channel(s) the build has already been promoted to
2121
$buildInfo = Get-MaestroBuild -BuildId $BuildId
2222

2323
if (!$buildInfo) {

‎eng/common/templates/job/execute-sdl.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
enable: 'false' # Whether the SDL validation job should execute or not
23
overrideParameters: '' # Optional: to override values for parameters.
34
additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
45
# There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
@@ -16,8 +17,15 @@ jobs:
1617
- job: Run_SDL
1718
dependsOn: ${{ parameters.dependsOn }}
1819
displayName: Run SDL tool
20+
condition: eq( ${{ parameters.enable }}, 'true')
1921
variables:
2022
- group: DotNet-VSTS-Bot
23+
- name: AzDOProjectName
24+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
25+
- name: AzDOPipelineId
26+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
27+
- name: AzDOBuildId
28+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
2129
pool:
2230
name: Hosted VS2017
2331
steps:
@@ -28,14 +36,22 @@ jobs:
2836
- task: DownloadBuildArtifacts@0
2937
displayName: Download Build Artifacts
3038
inputs:
31-
buildType: current
39+
buildType: specific
40+
buildVersionToDownload: specific
41+
project: $(AzDOProjectName)
42+
pipeline: $(AzDOPipelineId)
43+
buildId: $(AzDOBuildId)
3244
artifactName: ${{ artifactName }}
3345
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
3446
- ${{ if eq(parameters.artifactNames, '') }}:
3547
- task: DownloadBuildArtifacts@0
3648
displayName: Download Build Artifacts
3749
inputs:
38-
buildType: current
50+
buildType: specific
51+
buildVersionToDownload: specific
52+
project: $(AzDOProjectName)
53+
pipeline: $(AzDOPipelineId)
54+
buildId: $(AzDOBuildId)
3955
downloadType: specific files
4056
itemPattern: "**"
4157
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts

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

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,30 @@ stages:
2323
- job: publish_symbols
2424
displayName: Symbol Publishing
2525
dependsOn: setupMaestroVars
26-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
26+
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
2727
variables:
2828
- group: DotNet-Symbol-Server-Pats
29+
- name: AzDOProjectName
30+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
31+
- name: AzDOPipelineId
32+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
33+
- name: AzDOBuildId
34+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
2935
pool:
3036
vmImage: 'windows-2019'
3137
steps:
3238
- task: DownloadBuildArtifacts@0
3339
displayName: Download Build Assets
3440
continueOnError: true
3541
inputs:
36-
buildType: 'current'
42+
buildType: specific
43+
buildVersionToDownload: specific
44+
project: $(AzDOProjectName)
45+
pipeline: $(AzDOPipelineId)
46+
buildId: $(AzDOBuildId)
3747
downloadType: 'specific'
3848
itemPattern: |
39-
PDBArtifacts/**
49+
PdbArtifacts/**
4050
BlobArtifacts/**
4151
downloadPath: '$(Build.ArtifactStagingDirectory)'
4252

@@ -79,15 +89,25 @@ stages:
7989
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
8090
- name: IsStableBuild
8191
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
82-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
92+
- name: AzDOProjectName
93+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
94+
- name: AzDOPipelineId
95+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
96+
- name: AzDOBuildId
97+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
98+
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
8399
pool:
84100
vmImage: 'windows-2019'
85101
steps:
86102
- task: DownloadBuildArtifacts@0
87103
displayName: Download Build Assets
88104
continueOnError: true
89105
inputs:
90-
buildType: 'current'
106+
buildType: specific
107+
buildVersionToDownload: specific
108+
project: $(AzDOProjectName)
109+
pipeline: $(AzDOPipelineId)
110+
buildId: $(AzDOBuildId)
91111
downloadType: 'specific'
92112
itemPattern: |
93113
PackageArtifacts/**
@@ -146,6 +166,6 @@ stages:
146166
StageLabel: '${{ parameters.stageName }}'
147167
JobLabel: 'AssetsPublishing'
148168

149-
- template: ../../steps/promote-build.yml
169+
- template: ../../steps/add-build-to-channel.yml
150170
parameters:
151171
ChannelId: ${{ parameters.channelId }}

‎eng/common/templates/post-build/channels/generic-public-channel.yml‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,30 @@ stages:
2323
- job: publish_symbols
2424
displayName: Symbol Publishing
2525
dependsOn: setupMaestroVars
26-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
26+
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
2727
variables:
2828
- group: DotNet-Symbol-Server-Pats
29+
- name: AzDOProjectName
30+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
31+
- name: AzDOPipelineId
32+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
33+
- name: AzDOBuildId
34+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
2935
pool:
3036
vmImage: 'windows-2019'
3137
steps:
3238
- task: DownloadBuildArtifacts@0
3339
displayName: Download Build Assets
3440
continueOnError: true
3541
inputs:
36-
buildType: 'current'
42+
buildType: specific
43+
buildVersionToDownload: specific
44+
project: $(AzDOProjectName)
45+
pipeline: $(AzDOPipelineId)
46+
buildId: $(AzDOBuildId)
3747
downloadType: 'specific'
3848
itemPattern: |
39-
PDBArtifacts/**
49+
PdbArtifacts/**
4050
BlobArtifacts/**
4151
downloadPath: '$(Build.ArtifactStagingDirectory)'
4252

@@ -78,15 +88,25 @@ stages:
7888
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
7989
- name: IsStableBuild
8090
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
81-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
91+
- name: AzDOProjectName
92+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
93+
- name: AzDOPipelineId
94+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
95+
- name: AzDOBuildId
96+
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
97+
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
8298
pool:
8399
vmImage: 'windows-2019'
84100
steps:
85101
- task: DownloadBuildArtifacts@0
86102
displayName: Download Build Assets
87103
continueOnError: true
88104
inputs:
89-
buildType: 'current'
105+
buildType: specific
106+
buildVersionToDownload: specific
107+
project: $(AzDOProjectName)
108+
pipeline: $(AzDOPipelineId)
109+
buildId: $(AzDOBuildId)
90110
downloadType: 'specific'
91111
itemPattern: |
92112
PackageArtifacts/**
@@ -145,6 +165,6 @@ stages:
145165
StageLabel: '${{ parameters.stageName }}'
146166
JobLabel: 'AssetsPublishing'
147167

148-
- template: ../../steps/promote-build.yml
168+
- template: ../../steps/add-build-to-channel.yml
149169
parameters:
150170
ChannelId: ${{ parameters.channelId }}

0 commit comments

Comments
 (0)