From dc44198275de82ee0ec46f4a3811a9db235ec5e5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 15 Feb 2019 08:10:14 -0800
Subject: 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
---
 eng/common/tools.ps1 | 8 ++++----
 eng/common/tools.sh  | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'eng/common')

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index d1ed296dd6..fbcc4e3ba0 100644
--- 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 115a56a827..633a8167b0 100644
--- 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"`
 
-- 
cgit v1.2.3