diff options
| author | Chad Nedzlek <chadnedz@microsoft.com> | 2017-12-18 11:29:41 -0800 |
|---|---|---|
| committer | Chad Nedzlek <chadnedz@microsoft.com> | 2017-12-18 11:29:41 -0800 |
| commit | 437cb180b61683fc8834b5a2c82c80067f51331e (patch) | |
| tree | 86576a2d6cd853b452021fe3fe820d38a199554c | |
| parent | 46dc37a27abe79d5977a1942541b1665b61f7a17 (diff) | |
| download | coreclr-437cb180b61683fc8834b5a2c82c80067f51331e.tar.gz coreclr-437cb180b61683fc8834b5a2c82c80067f51331e.tar.bz2 coreclr-437cb180b61683fc8834b5a2c82c80067f51331e.zip | |
Put ToolDir property back on restore command
| -rw-r--r-- | init-tools.cmd | 4 | ||||
| -rwxr-xr-x | init-tools.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/init-tools.cmd b/init-tools.cmd index 7e77566199..a5750290c4 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -62,8 +62,8 @@ if NOT exist "%DOTNET_LOCAL_PATH%" ( if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore 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% >> "%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%" +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%" if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( %__MsgPrefix%echo ERROR: Could not restore build tools correctly. 1>&2 goto :error diff --git a/init-tools.sh b/init-tools.sh index 387499d832..a408b772aa 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -139,8 +139,8 @@ fi if [ ! -e $__BUILD_TOOLS_PATH ]; then echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION" >> $__init_tools_log - $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION >> $__init_tools_log + echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR" >> $__init_tools_log + $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR >> $__init_tools_log if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly." 1>&2 display_error_message |