Merge pull request #277 from dotnet/darc-master-0c42e040-000f-48f3-aec3-9e8f5daee197

Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -24,9 +24,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19060.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19061.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>67384d20d310611afc1c2b4dd3b953fda182def4</Sha>
+      <Sha>52d4b539dd1ab771015bdf33ed4221afcaaabf3d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

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'
-
-  Write-Host "Installing Darc CLI version $toolsetVersion..."
-  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"
+  # 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'
   }
   
-InstallDarcCli
+  $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json'
+
+  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 $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
+}
+
+InstallDarcCli $darcVersion

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"
   }
 }