Including pre-release versions of VS for builds (#25689)

sebastienros · jkotas · commit 28a593f4257f · 2017-12-06T23:22:22.000-05:00
* Including pre-release versions of VS for builds

Fixes #25684

* Update build-native.cmd
diff --git a/run.cmd b/run.cmd
@@ -21,7 +21,7 @@ if defined VisualStudioVersion goto :Run
 
 set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if exist %_VSWHERE% (
-  for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
+  for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
 )
 if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
 if not exist "%_VSCOMNTOOLS%" (
diff --git a/src/Native/build-native.cmd b/src/Native/build-native.cmd
@@ -58,7 +58,7 @@ if defined VisualStudioVersion goto :RunVCVars
 
 set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 if exist %_VSWHERE% (
-  for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
+  for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
 )
 if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
 if not exist "%_VSCOMNTOOLS%" goto :MissingVersion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ if defined VisualStudioVersion goto :Run`
`21`	`21`
`22`	`22`	`set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
`23`	`23`	`if exist %_VSWHERE% (`
`24`		- for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
	`24`	+ for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
`25`	`25`	`)`
`26`	`26`	`if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%`
`27`	`27`	`if not exist "%_VSCOMNTOOLS%" (`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ if defined VisualStudioVersion goto :RunVCVars`
`58`	`58`
`59`	`59`	`set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
`60`	`60`	`if exist %_VSWHERE% (`
`61`		- for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
	`61`	+ for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
`62`	`62`	`)`
`63`	`63`	`if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%`
`64`	`64`	`if not exist "%_VSCOMNTOOLS%" goto :MissingVersion`