Update build script to accept a pre-release VS & remove an unnecessary env var

ericstj · ericstj · commit 38a6bb61a0f3 · 2018-08-03T13:04:14.000-07:00
diff --git a/build.cmd b/build.cmd
@@ -10,13 +10,12 @@ IF NOT EXIST %VSWHERELOCATION% (
   goto :error
 )
 
-for /f "usebackq tokens=*" %%i in (`%VSWHERELOCATION% -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
-  set _vsDir=%%i
+for /f "usebackq tokens=*" %%i in (`%VSWHERELOCATION% -latest -prerelease -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
+  set BUILD_TOOLS_PATH="%%i\MSBuild\15.0\Bin\MSBuild.exe"
 )
 
-if exist "%_vsDir%\MSBuild\15.0\Bin\MSBuild.exe" (
-  set BUILD_TOOLS_PATH="%_vsDir%\MSBuild\15.0\Bin\MSBuild.exe"
-  goto :restore
+if exist %BUILD_TOOLS_PATH% (
+  goto :restore   
 )
 
 :error

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,12 @@ IF NOT EXIST %VSWHERELOCATION% (`
`10`	`10`	`goto :error`
`11`	`11`	`)`
`12`	`12`
`13`		-for /f "usebackq tokens=" %%i in (`%VSWHERELOCATION% -latest -products -requires Microsoft.Component.MSBuild -property installationPath`) do (
`14`		`- set _vsDir=%%i`
	`13`	+for /f "usebackq tokens=" %%i in (`%VSWHERELOCATION% -latest -prerelease -products -requires Microsoft.Component.MSBuild -property installationPath`) do (
	`14`	`+ set BUILD_TOOLS_PATH="%%i\MSBuild\15.0\Bin\MSBuild.exe"`
`15`	`15`	`)`
`16`	`16`
`17`		`-if exist "%_vsDir%\MSBuild\15.0\Bin\MSBuild.exe" (`
`18`		`- set BUILD_TOOLS_PATH="%_vsDir%\MSBuild\15.0\Bin\MSBuild.exe"`
`19`		`- goto :restore`
	`17`	`+if exist %BUILD_TOOLS_PATH% (`
	`18`	`+ goto :restore`
`20`	`19`	`)`
`21`	`20`
`22`	`21`	`:error`