Update dependencies from https://github.com/dotnet/arcade build 20190214.4 (#22621)

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19114.4
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19114.4

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ccc2d33..2ceec36 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,13 +2,13 @@
 <Dependencies>
   <ProductDependencies></ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19113.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19114.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9cb5f28be59a1ba9fe6bfb86449b216cfcdfb50e</Sha>
+      <Sha>03497f16b93264158c28cee4eea767b53bc750f5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19113.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19114.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9cb5f28be59a1ba9fe6bfb86449b216cfcdfb50e</Sha>
+      <Sha>03497f16b93264158c28cee4eea767b53bc750f5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview.19111.8">
       <Uri>https://github.com/dotnet/corefx</Uri>

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index d1ed296..fbcc4e3 100644 (file)
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -417,15 +417,15 @@ function InitializeToolset() {
 
   $proj = Join-Path $ToolsetDir "restore.proj"
   $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" }
-  
+
   '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
-  MSBuild $proj $bl /t:__WriteToolsetLocation /noconsolelogger /p:__ToolsetLocationOutputFile=$toolsetLocationFile
-  
+  MSBuild $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
+
   $path = Get-Content $toolsetLocationFile -TotalCount 1
   if (!(Test-Path $path)) {
     throw "Invalid toolset path: $path"
   }
-  
+
   return $global:_ToolsetBuildProj = $path
 }
 

diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 115a56a..633a816 100644 (file)
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -238,11 +238,15 @@ function InitializeToolset {
     ExitWithExitCode 2
   fi
 
-  local toolset_restore_log="$log_dir/ToolsetRestore.binlog"
   local proj="$toolset_dir/restore.proj"
 
+  local bl=""
+  if [[ "$binary_log" == true ]]; then
+    bl="/bl:$log_dir/ToolsetRestore.binlog"
+  fi
+  
   echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > "$proj"
-  MSBuild "$proj" /t:__WriteToolsetLocation /noconsolelogger /bl:"$toolset_restore_log" /p:__ToolsetLocationOutputFile="$toolset_location_file"
+  MSBuild "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file"
 
   local toolset_build_proj=`cat "$toolset_location_file"`
 

diff --git a/global.json b/global.json
index 42517b5..1f4cf0b 100644 (file)
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19113.1",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19113.1"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19114.4",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19114.4"
   }
 }