@@ -587,6 +587,10 @@ if "%RestorePackages%"=="" (
587587@ call src\update.cmd signonly
588588
589589:: Check prerequisites
590+ if not " %VisualStudioVersion% " == " " goto vsversionset
591+ if exist " %VS160COMNTOOLS% \..\ide\devenv.exe" set VisualStudioVersion = 16.0
592+ if not " %VisualStudioVersion% " == " " goto vsversionset
593+
590594if not " %VisualStudioVersion% " == " " goto vsversionset
591595if exist " %VS150COMNTOOLS% \..\ide\devenv.exe" set VisualStudioVersion = 15.0
592596if not " %VisualStudioVersion% " == " " goto vsversionset
@@ -607,6 +611,10 @@ if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" se
607611:vsversionset
608612if " %VisualStudioVersion% " == " " echo Error: Could not find an installation of Visual Studio&& goto :failure
609613
614+ if exist " %VS160COMNTOOLS% \..\..\MSBuild\15.0\Bin\MSBuild.exe"
615+ set _msbuildexe = " %VS160COMNTOOLS% \..\..\MSBuild\15.0\Bin\MSBuild.exe"
616+ goto :havemsbuild
617+ )
610618if exist " %VS150COMNTOOLS% \..\..\MSBuild\15.0\Bin\MSBuild.exe"
611619set _msbuildexe = " %VS150COMNTOOLS% \..\..\MSBuild\15.0\Bin\MSBuild.exe"
612620goto :havemsbuild