Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Fix initializing BuildTools when the Platform environment variable is set #24998

Merged
merged 2 commits into from
Jun 6, 2019
Merged

Fix initializing BuildTools when the Platform environment variable is set #24998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
531aa1d
Make build-test.cmd exit if init-tools.cmd fails
elinor-fung Jun 5, 2019
38b1621
Clear Platform variable before initializing BuildTools
elinor-fung Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build-test.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ REM ===
REM =========================================================================================

call "%__ProjectDir%\init-tools.cmd"
if NOT [%ERRORLEVEL%]==[0] (
exit /b %ERRORLEVEL%
)
@if defined _echo @echo on

set "__ToolsDir=%__ProjectDir%\Tools"
Expand Down
4 changes: 4 additions & 0 deletions init-tools.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
@if not defined _echo @echo off
setlocal

:: Clear the 'Platform' environment variable for this session
:: This avoids overriding the default value from BuildTools projects used for initialization
set Platform=

set INIT_TOOLS_LOG=%~dp0init-tools.log
if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0.packages
if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
Expand Down