Skip to content

Commit 49c5101

Browse files
dotnet-maestro[bot]akoeplinger
dotnet-maestro[bot]
authored and
akoeplinger
committed
Update dependencies from https://github.com/dotnet/arcade build 20200112.1 (mono#18438)
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20062.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20062.1
1 parent 423192e commit 49c5101

File tree

6 files changed

+39
-55
lines changed

6 files changed

+39
-55
lines changed

‎eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
</Dependency>
1616
</ProductDependencies>
1717
<ToolsetDependencies>
18-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20055.1">
18+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20062.1">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>111d78c79ac38f596688af152779d7a39e4bf973</Sha>
20+
<Sha>250782df013aa8586e21bb225f8efd715372dcf1</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20055.1">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20062.1">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>111d78c79ac38f596688af152779d7a39e4bf973</Sha>
24+
<Sha>250782df013aa8586e21bb225f8efd715372dcf1</Sha>
2525
</Dependency>
2626
</ToolsetDependencies>
2727
</Dependencies>

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ if ($Internal) {
4949
$HelixSourcePrefix = "official"
5050
}
5151

52-
$CommonSetupArguments="--frameworks $Framework --queue $Queue --build-number $BuildNumber --build-configs $Configurations"
52+
# 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"
5354
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
5455

5556
if ($RunFromPerformanceRepo) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then
164164
fi
165165
fi
166166

167-
common_setup_arguments="--frameworks $framework --queue $queue --build-number $build_number --build-configs $configurations"
167+
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations"
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/templates/post-build/channels/generic-internal-channel.yml

+15-23
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@ stages:
3030
vmImage: 'windows-2019'
3131
steps:
3232
- task: DownloadBuildArtifacts@0
33-
displayName: Download Blob Artifacts
34-
inputs:
35-
artifactName: 'BlobArtifacts'
33+
displayName: Download Build Assets
3634
continueOnError: true
37-
38-
- task: DownloadBuildArtifacts@0
39-
displayName: Download PDB Artifacts
4035
inputs:
41-
artifactName: 'PDBArtifacts'
42-
continueOnError: true
36+
buildType: 'current'
37+
downloadType: 'specific'
38+
itemPattern: |
39+
PDBArtifacts/**
40+
BlobArtifacts/**
41+
downloadPath: '$(Build.ArtifactStagingDirectory)'
4342

4443
# This is necessary whenever we want to publish/restore to an AzDO private feed
4544
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -85,23 +84,16 @@ stages:
8584
vmImage: 'windows-2019'
8685
steps:
8786
- task: DownloadBuildArtifacts@0
88-
displayName: Download Package Artifacts
89-
inputs:
90-
buildType: current
91-
artifactName: PackageArtifacts
92-
continueOnError: true
93-
94-
- task: DownloadBuildArtifacts@0
95-
displayName: Download Blob Artifacts
96-
inputs:
97-
buildType: current
98-
artifactName: BlobArtifacts
87+
displayName: Download Build Assets
9988
continueOnError: true
100-
- task: DownloadBuildArtifacts@0
101-
displayName: Download Asset Manifests
10289
inputs:
103-
buildType: current
104-
artifactName: AssetManifests
90+
buildType: 'current'
91+
downloadType: 'specific'
92+
itemPattern: |
93+
PackageArtifacts/**
94+
BlobArtifacts/**
95+
AssetManifests/**
96+
downloadPath: '$(Build.ArtifactStagingDirectory)'
10597

10698
- task: NuGetToolInstaller@1
10799
displayName: 'Install NuGet.exe'

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

+15-24
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@ stages:
3030
vmImage: 'windows-2019'
3131
steps:
3232
- task: DownloadBuildArtifacts@0
33-
displayName: Download Blob Artifacts
34-
inputs:
35-
artifactName: 'BlobArtifacts'
33+
displayName: Download Build Assets
3634
continueOnError: true
37-
38-
- task: DownloadBuildArtifacts@0
39-
displayName: Download PDB Artifacts
4035
inputs:
41-
artifactName: 'PDBArtifacts'
42-
continueOnError: true
36+
buildType: 'current'
37+
downloadType: 'specific'
38+
itemPattern: |
39+
PDBArtifacts/**
40+
BlobArtifacts/**
41+
downloadPath: '$(Build.ArtifactStagingDirectory)'
4342

4443
# This is necessary whenever we want to publish/restore to an AzDO private feed
4544
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -84,24 +83,16 @@ stages:
8483
vmImage: 'windows-2019'
8584
steps:
8685
- task: DownloadBuildArtifacts@0
87-
displayName: Download Package Artifacts
88-
inputs:
89-
buildType: current
90-
artifactName: PackageArtifacts
86+
displayName: Download Build Assets
9187
continueOnError: true
92-
93-
- task: DownloadBuildArtifacts@0
94-
displayName: Download Blob Artifacts
95-
inputs:
96-
buildType: current
97-
artifactName: BlobArtifacts
98-
continueOnError: true
99-
100-
- task: DownloadBuildArtifacts@0
101-
displayName: Download Asset Manifests
10288
inputs:
103-
buildType: current
104-
artifactName: AssetManifests
89+
buildType: 'current'
90+
downloadType: 'specific'
91+
itemPattern: |
92+
PackageArtifacts/**
93+
BlobArtifacts/**
94+
AssetManifests/**
95+
downloadPath: '$(Build.ArtifactStagingDirectory)'
10596

10697
- task: NuGetToolInstaller@1
10798
displayName: 'Install NuGet.exe'

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "5.0.100-alpha1-015772"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20055.1",
7-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20055.1"
6+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20062.1",
7+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20062.1"
88
}
99
}

0 commit comments

Comments
 (0)