Merge branch 'master' of https://github.com/dotnet/coreclr

diff --cc init-tools.cmd
index 4793df0,3920982..c99d743
--- 1/init-tools.cmd
--- 2/init-tools.cmd
+++ b/init-tools.cmd
@@@ -43,21 -43,21 +43,21 @@@ if NOT exist "%DOTNET_PATH%" mkdir "%DO
  set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-x64.zip
  set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
  set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
--echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
++echo %__MsgPrefix%Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
  powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%"
  if NOT exist "%DOTNET_LOCAL_PATH%" (
--  echo ERROR: Could not install dotnet cli correctly. 1>&2
++  echo %__MsgPrefix%ERROR: Could not install dotnet cli correctly. 1>&2
    goto :error
  )
  
  :afterdotnetrestore
  
  if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore
 -echo Restoring BuildTools version %BUILDTOOLS_VERSION%...
 -echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
 +echo %__MsgPrefix%Restoring BuildTools version %BUILDTOOLS_VERSION%...
- echo %__MsgPrefix%Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
- call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
++echo %__MsgPrefix%Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
+ call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
  if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" (
--  echo ERROR: Could not restore build tools correctly. 1>&2
++  %__MsgPrefix%echo ERROR: Could not restore build tools correctly. 1>&2
    goto :error
  )
  
@@@ -81,6 -81,6 +81,6 @@@ echo %__MsgPrefix%Init-Tools.cmd comple
  exit /b 0
  
  :error
--echo Please check the detailed log that follows. 1>&2
++echo %__MsgPrefix%Please check the detailed log that follows. 1>&2
  type "%INIT_TOOLS_LOG%" 1>&2
  exit /b 1