Skip to content
This repository was archived by the owner on Aug 2, 2023. It is now read-only.

Commit 54d3f56

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200903.7 (#2964)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.GenAPI: from 5.0.0-beta.20452.19 to 5.0.0-beta.20453.7 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20452.19 to 5.0.0-beta.20453.7 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20452.19 to 5.0.0-beta.20453.7
1 parent bdc975c commit 54d3f56

File tree

9 files changed

+28
-19
lines changed

9 files changed

+28
-19
lines changed

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20452.19">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20453.7">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>fd104228e5b97494a4ab0896a979b69928257ef9</Sha>
8+
<Sha>16b71a2f216c3c5be5860977c4cb03a95ee2f0e3</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20452.19">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20453.7">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>fd104228e5b97494a4ab0896a979b69928257ef9</Sha>
12+
<Sha>16b71a2f216c3c5be5860977c4cb03a95ee2f0e3</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20452.19">
14+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20453.7">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>fd104228e5b97494a4ab0896a979b69928257ef9</Sha>
16+
<Sha>16b71a2f216c3c5be5860977c4cb03a95ee2f0e3</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<SnVersion>1.0.0</SnVersion>
1919
<VSWhereVersion>2.5.2</VSWhereVersion>
2020
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
21-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20452.19</MicrosoftDotNetGenAPIVersion>
21+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20453.7</MicrosoftDotNetGenAPIVersion>
2222
</PropertyGroup>
2323
</Project>

‎eng/common/internal/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
1+
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
22
<Project>
33
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44
</Project>

‎eng/common/post-build/publish-using-darc.ps1

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ param(
88
[Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
99
[Parameter(Mandatory=$false)][string] $EnableSigningValidation,
1010
[Parameter(Mandatory=$false)][string] $EnableNugetValidation,
11-
[Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums,
11+
[Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
1212
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
1313
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
1414
)
1515

1616
try {
1717
. $PSScriptRoot\post-build-utils.ps1
1818
# Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel
19-
. $PSScriptRoot\..\darc-init.ps1 -darcVersion "1.1.0-beta.20418.1"
19+
$darc = Get-Darc "1.1.0-beta.20418.1"
2020

2121
$optionalParams = [System.Collections.ArrayList]::new()
2222

@@ -29,7 +29,7 @@ try {
2929
$optionalParams.Add("--no-wait") | Out-Null
3030
}
3131

32-
if ("true" -eq $PublishInstallersAndChecksums) {
32+
if ("false" -ne $PublishInstallersAndChecksums) {
3333
$optionalParams.Add("--publish-installers-and-checksums") | Out-Null
3434
}
3535

@@ -50,12 +50,11 @@ try {
5050
}
5151
}
5252

53-
& darc add-build-to-channel `
53+
& $darc add-build-to-channel `
5454
--id $buildId `
5555
--publishing-infra-version $PublishingInfraVersion `
5656
--default-channels `
5757
--source-branch master `
58-
--publish-installers-and-checksums `
5958
--azdev-pat $AzdoToken `
6059
--bar-uri $MaestroApiEndPoint `
6160
--password $MaestroToken `

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
artifactsPublishingAdditionalParameters: ''
55
dependsOn:
66
- Validate
7-
publishInstallersAndChecksums: false
7+
publishInstallersAndChecksums: true
88
symbolPublishingAdditionalParameters: ''
99
stageName: ''
1010
channelName: ''
@@ -158,7 +158,7 @@ stages:
158158
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
159159
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
160160
/p:Configuration=Release
161-
/p:PublishInstallersAndChecksums=true
161+
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
162162
/p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
163163
/p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
164164
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
artifactsPublishingAdditionalParameters: ''
55
dependsOn:
66
- Validate
7-
publishInstallersAndChecksums: false
7+
publishInstallersAndChecksums: true
88
symbolPublishingAdditionalParameters: ''
99
stageName: ''
1010
channelName: ''

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parameters:
1919
enableSigningValidation: true
2020
enableSymbolValidation: false
2121
enableNugetValidation: true
22-
publishInstallersAndChecksums: false
22+
publishInstallersAndChecksums: true
2323
SDLValidationParameters:
2424
enable: false
2525
continueOnError: false

‎eng/common/tools.ps1

+10
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,16 @@ function IsWindowsPlatform() {
718718
return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
719719
}
720720

721+
function Get-Darc($version) {
722+
$darcPath = "$TempDir\darc\$(New-Guid)"
723+
if ($version -ne $null) {
724+
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
725+
} else {
726+
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath | Out-Host
727+
}
728+
return "$darcPath\darc.exe"
729+
}
730+
721731
. $PSScriptRoot\pipeline-logging-functions.ps1
722732

723733
$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..')

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20452.19",
13-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20452.19"
12+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20453.7",
13+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20453.7"
1414
}
1515
}

0 commit comments

Comments
 (0)