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

Run VsDevCmd.bat as part of init-tools #7220

Closed
maririos wants to merge 1 commit into from
Closed

Run VsDevCmd.bat as part of init-tools #7220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@ set "__args=%*"
if /i [%1] == [native] (set __buildSpec=native&&set "__args=%__args:~6%"&&shift&&goto Tools)
if /i [%1] == [managed] (set __buildSpec=managed&&set "__args=%__args:~7%"&&shift&&goto Tools)

:Tools
:: Setup VS
if not defined VisualStudioVersion (
if defined VS140COMNTOOLS (
call "%VS140COMNTOOLS%\VsDevCmd.bat"
goto :Build
)

echo Error: build.cmd requires Visual Studio 2015.
echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions.
exit /b 1
)

:Build
:: Restore the Tools directory
call %~dp0init-tools.cmd
Expand Down
13 changes: 13 additions & 0 deletions init-tools.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
@echo off

:Tools
:: Setup VS
if not defined VisualStudioVersion (
if defined VS140COMNTOOLS (
call "%VS140COMNTOOLS%\VsDevCmd.bat"
) else (
echo Error: We require Visual Studio 2015.
echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions.
exit /b 1
)
)

setlocal

REM Workaround https://github.com/dotnet/coreclr/issues/2153
Expand Down