Skip to content

Commit 81aafc2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200602.3 (dotnet#22652)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20302.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9b98da3 commit 81aafc2

File tree

5 files changed

+43
-17
lines changed

5 files changed

+43
-17
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20269.3">
22+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20302.3">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>ccfddb60fbd3de13463298334f00610edb5f63c6</Sha>
24+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20269.3">
26+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20302.3">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>ccfddb60fbd3de13463298334f00610edb5f63c6</Sha>
28+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20269.3">
30+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20302.3">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>ccfddb60fbd3de13463298334f00610edb5f63c6</Sha>
32+
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
3333
</Dependency>
3434
</ToolsetDependencies>
3535
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
-->
6060
<PropertyGroup Label="Automated">
6161
<!-- Packages from dotnet/arcade -->
62-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20269.3</MicrosoftDotNetGenAPIPackageVersion>
62+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20302.3</MicrosoftDotNetGenAPIPackageVersion>
6363
<!-- Packages from dotnet/roslyn -->
6464
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
6565
<!-- Packages from dotnet/core-setup -->

‎eng/common/darc-init.ps1

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16",
4-
$verbosity = "m"
3+
$versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
4+
$verbosity = 'minimal',
5+
$toolpath = $null
56
)
67

78
. $PSScriptRoot\tools.ps1
89

9-
function InstallDarcCli ($darcVersion) {
10-
$darcCliPackageName = "microsoft.dotnet.darc"
10+
function InstallDarcCli ($darcVersion, $toolpath) {
11+
$darcCliPackageName = 'microsoft.dotnet.darc'
1112

1213
$dotnetRoot = InitializeDotNetCli -install:$true
1314
$dotnet = "$dotnetRoot\dotnet.exe"
@@ -23,11 +24,24 @@ function InstallDarcCli ($darcVersion) {
2324
$darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
2425
}
2526

26-
$arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json'
27+
$arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
2728

2829
Write-Host "Installing Darc CLI version $darcVersion..."
29-
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
30-
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1
30+
Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.'
31+
if (-not $toolpath) {
32+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
33+
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
34+
}else {
35+
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity --tool-path '$toolpath'"
36+
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
37+
}
3138
}
3239

33-
InstallDarcCli $darcVersion
40+
try {
41+
InstallDarcCli $darcVersion $toolpath
42+
}
43+
catch {
44+
Write-Host $_.ScriptStackTrace
45+
Write-PipelineTelemetryError -Category 'Darc' -Message $_
46+
ExitWithExitCode 1
47+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,3 +354,15 @@ stages:
354354
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
355355
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
356356
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
357+
358+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
359+
parameters:
360+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
361+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
362+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
363+
stageName: 'VS_Master_Publishing'
364+
channelName: 'VS Master'
365+
channelId: 1012
366+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
367+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
368+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3",
29-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20269.3"
28+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20302.3",
29+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20302.3"
3030
}
3131
}

0 commit comments

Comments
 (0)