diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 767a47e50..faf819541 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -24,9 +24,9 @@ - + https://github.com/dotnet/arcade - 67384d20d310611afc1c2b4dd3b953fda182def4 + 52d4b539dd1ab771015bdf33ed4221afcaaabf3d diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 9ca150be8..96cad844b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,7 +1,11 @@ +param ( + $darcVersion = $null +) + $verbosity = "m" . $PSScriptRoot\tools.ps1 -function InstallDarcCli { +function InstallDarcCli ($darcVersion) { $darcCliPackageName = "microsoft.dotnet.darc" $dotnetRoot = InitializeDotNetCli -install:$true @@ -12,11 +16,17 @@ function InstallDarcCli { Invoke-Expression "& `"$dotnet`" tool uninstall $darcCliPackageName -g" } - $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk' + # Until we can anonymously query the BAR API for the latest arcade-services + # build applied to the PROD channel, this is hardcoded. + if (-not $darcVersion) { + $darcVersion = '1.1.0-beta.19057.9' + } + + $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json' - Write-Host "Installing Darc CLI version $toolsetVersion..." + Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - Invoke-Expression "& `"$dotnet`" tool install $darcCliPackageName --version $toolsetVersion -v $verbosity -g" + Invoke-Expression "& `"$dotnet`" tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g" } -InstallDarcCli +InstallDarcCli $darcVersion diff --git a/global.json b/global.json index fb07980d9..23a01fc88 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview-009812" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19060.8" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19061.6" } }