Skip to content

Commit 18dee11

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200528.5
Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20269.3 -> To Version 1.0.0-beta.20278.5
1 parent 3d19992 commit 18dee11

4 files changed

Lines changed: 35 additions & 11 deletions

File tree

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="1.0.0-beta.20269.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20278.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>ccfddb60fbd3de13463298334f00610edb5f63c6</Sha>
8+
<Sha>77bfd5a60e0691b0cebd180a0fd85eb65fa7f362</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

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/dotnet-install.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1414
version='Latest'
1515
architecture=''
1616
runtime='dotnet'
17+
runtimeSourceFeed=''
18+
runtimeSourceFeedKey=''
1719
while [[ $# > 0 ]]; do
1820
opt="$(echo "$1" | awk '{print tolower($0)}')"
1921
case "$opt" in
@@ -29,6 +31,14 @@ while [[ $# > 0 ]]; do
2931
shift
3032
runtime="$1"
3133
;;
34+
-runtimesourcefeed)
35+
shift
36+
runtimeSourceFeed="$1"
37+
;;
38+
-runtimesourcefeedkey)
39+
shift
40+
runtimeSourceFeedKey="$1"
41+
;;
3242
*)
3343
echo "Invalid argument: $1"
3444
exit 1

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)