Skip to content

Commit fc607e9

Browse files
committed
!try out! Update Arcade dependencies from build '20200519.3'
- 'Microsoft.DotNet.Arcade.Sdk': '5.0.0-beta.20261.9' => '1.0.0-beta.20269.3' - 'Microsoft.DotNet.GenAPI': '5.0.0-beta.20261.9' => '1.0.0-beta.20269.3' - 'Microsoft.DotNet.Helix.Sdk': '5.0.0-beta.20261.9' => '2.0.0-beta.20269.3'
1 parent 7cc1f8a commit fc607e9

File tree

13 files changed

+659
-480
lines changed

13 files changed

+659
-480
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,17 +288,17 @@
288288
<Uri>https://github.com/dotnet/runtime</Uri>
289289
<Sha>c44dc40b763b7c74012622a0a6120cd8ffa35ce4</Sha>
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20261.9">
291+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20277.12">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
293+
<Sha>fc3b1e63de02e2ab97e638959728c9a98dfbac11</Sha>
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20261.9">
295+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20277.12">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
297+
<Sha>fc3b1e63de02e2ab97e638959728c9a98dfbac11</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20261.9">
299+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20277.12">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
301+
<Sha>fc3b1e63de02e2ab97e638959728c9a98dfbac11</Sha>
302302
</Dependency>
303303
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.7.0-3.20271.4">
304304
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20261.9</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20277.12</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.7.0-3.20271.4</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/runtime -->

eng/common/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ catch {
154154
ExitWithExitCode 1
155155
}
156156

157-
ExitWithExitCode 0
157+
ExitWithExitCode 0

eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,4 +220,4 @@ if [[ "$restore" == true ]]; then
220220
InitializeNativeTools
221221
fi
222222

223-
Build
223+
Build

eng/common/pipeline-logging-functions.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,21 @@ function Write-PipelineTelemetryError {
3131
return
3232
fi
3333

34-
message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message"
35-
function_args+=("$message")
3634
if [[ $force == true ]]; then
3735
function_args+=("-force")
3836
fi
39-
40-
Write-PipelineTaskError $function_args
37+
message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message"
38+
function_args+=("$message")
39+
Write-PipelineTaskError ${function_args[@]}
4140
}
4241

4342
function Write-PipelineTaskError {
44-
if [[ $force != true ]] && [[ "$ci" != true ]]; then
45-
echo "$@" >&2
46-
return
47-
fi
48-
4943
local message_type="error"
5044
local sourcepath=''
5145
local linenumber=''
5246
local columnnumber=''
5347
local error_code=''
48+
local force=false
5449

5550
while [[ $# -gt 0 ]]; do
5651
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
@@ -75,6 +70,9 @@ function Write-PipelineTaskError {
7570
error_code=$2
7671
shift
7772
;;
73+
-force|-f)
74+
force=true
75+
;;
7876
*)
7977
break
8078
;;
@@ -83,6 +81,11 @@ function Write-PipelineTaskError {
8381
shift
8482
done
8583

84+
if [[ $force != true ]] && [[ "$ci" != true ]]; then
85+
echo "$@" >&2
86+
return
87+
fi
88+
8689
local message="##vso[task.logissue"
8790

8891
message="$message type=$message_type"
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
param(
2+
[Parameter(Mandatory=$true)][int] $BuildId,
3+
[Parameter(Mandatory=$true)][string] $AzdoToken,
4+
[Parameter(Mandatory=$true)][string] $MaestroToken,
5+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
6+
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
7+
[Parameter(Mandatory=$true)][string] $EnableSourceLinkValidation,
8+
[Parameter(Mandatory=$true)][string] $EnableSigningValidation,
9+
[Parameter(Mandatory=$true)][string] $EnableNugetValidation,
10+
[Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums,
11+
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
12+
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
13+
)
14+
15+
try {
16+
. $PSScriptRoot\post-build-utils.ps1
17+
. $PSScriptRoot\..\darc-init.ps1
18+
19+
$optionalParams = [System.Collections.ArrayList]::new()
20+
21+
if ("" -ne $ArtifactsPublishingAdditionalParameters) {
22+
$optionalParams.Add("artifact-publishing-parameters") | Out-Null
23+
$optionalParams.Add($ArtifactsPublishingAdditionalParameters) | Out-Null
24+
}
25+
26+
if ("false" -eq $WaitPublishingFinish) {
27+
$optionalParams.Add("--no-wait") | Out-Null
28+
}
29+
30+
if ("true" -eq $PublishInstallersAndChecksums) {
31+
$optionalParams.Add("--publish-installers-and-checksums") | Out-Null
32+
}
33+
34+
if ("true" -eq $EnableNugetValidation) {
35+
$optionalParams.Add("--validate-nuget") | Out-Null
36+
}
37+
38+
if ("true" -eq $EnableSourceLinkValidation) {
39+
$optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
40+
}
41+
42+
if ("true" -eq $EnableSigningValidation) {
43+
$optionalParams.Add("--validate-signingchecksums") | Out-Null
44+
45+
if ("" -ne $SigningValidationAdditionalParameters) {
46+
$optionalParams.Add("--signing-validation-parameters") | Out-Null
47+
$optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
48+
}
49+
}
50+
51+
& darc add-build-to-channel `
52+
--id $buildId `
53+
--default-channels `
54+
--source-branch master `
55+
--azdev-pat $AzdoToken `
56+
--bar-uri $MaestroApiEndPoint `
57+
--password $MaestroToken `
58+
@optionalParams
59+
60+
if ($LastExitCode -ne 0) {
61+
Write-Host "Problems using Darc to promote build ${buildId} to default channels. Stopping execution..."
62+
exit 1
63+
}
64+
65+
Write-Host 'done.'
66+
}
67+
catch {
68+
Write-Host $_
69+
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
70+
ExitWithExitCode 1
71+
}

0 commit comments

Comments
 (0)