Add ability to skip running vsdevcmd.bat.

2 files changed, 15 insertions, 1 deletions

diff --git a/appveyor.yml b/appveyor.yml
index fb415d13..142aef04 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,6 +14,7 @@ environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   NUGET_XMLDOC_MODE: skip
+  WixSkipVsDevCmd: 1
 
 build_script:
   - src\build_official.cmd
diff --git a/src/build_all.cmd b/src/build_all.cmd
index 8f7e7514..e631ed52 100644
--- a/src/build_all.cmd
+++ b/src/build_all.cmd
@@ -6,7 +6,7 @@
 @if /i "%1"=="release" set _C=Release
 @if not "%1"=="" shift & goto parse_args
 
-@if "%VCToolsVersion%"=="" call :StartDeveloperCommandPrompt
+@if "%VCToolsVersion%"=="" call :StartDeveloperCommandPrompt || exit /b
 
 @echo build %_C%
 
@@ -61,14 +61,27 @@ call test\test.cmd %_C% || exit /b
 goto LExit
 
 :StartDeveloperCommandPrompt
+if not "%WixSkipVsDevCmd%"=="" (
+  echo Skipping initializing developer command prompt
+  exit /b
+)
+
 echo Initializing developer command prompt
+
+if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
+  "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+  exit /b 2
+)
+
 for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do (
   if exist "%%i\Common7\Tools\vsdevcmd.bat" (
     call "%%i\Common7\Tools\vsdevcmd.bat" -no_logo
     exit /b
   )
+  echo developer command prompt not found in %%i
 )
 
+echo No versions of developer command prompt found
 exit /b 2
 
 :LExit