@joebigelow / wix / commits / 1499daf1

Add ability to skip running vsdevcmd.bat.

Sean Hall committed Nov 1, 2021 at 15:30 UTC 1499daf155d1ffa048fb7f27cb739ea268653862
2 files changed +15 -1
appveyor.yml
+1
@@ -14,6 +14,7 @@ environment:
14 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
15 DOTNET_CLI_TELEMETRY_OPTOUT: 1
16 NUGET_XMLDOC_MODE: skip
17 + WixSkipVsDevCmd: 1
18
19 build_script:
20 - src\build_official.cmd
src/build_all.cmd
+14 -1
@@ -6,7 +6,7 @@
6 @if /i "%1"=="release" set _C=Release
7 @if not "%1"=="" shift & goto parse_args
8
9 -@if "%VCToolsVersion%"=="" call :StartDeveloperCommandPrompt
9 +@if "%VCToolsVersion%"=="" call :StartDeveloperCommandPrompt || exit /b
10
11 @echo build %_C%
12
@@ -61,14 +61,27 @@ call test\test.cmd %_C% || exit /b
61 goto LExit
62
63 :StartDeveloperCommandPrompt
64 +if not "%WixSkipVsDevCmd%"=="" (
65 + echo Skipping initializing developer command prompt
66 + exit /b
67 +)
68 +
69 echo Initializing developer command prompt
70 +
71 +if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
72 + "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
73 + exit /b 2
74 +)
75 +
76 for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do (
77 if exist "%%i\Common7\Tools\vsdevcmd.bat" (
78 call "%%i\Common7\Tools\vsdevcmd.bat" -no_logo
79 exit /b
80 )
81 + echo developer command prompt not found in %%i
82 )
83
84 +echo No versions of developer command prompt found
85 exit /b 2
86
87 :LExit