diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-10-03 15:21:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 15:21:52 -0700 |
| commit | aae414026671e3dc1ccf0f308d351ac04cc746a4 (patch) | |
| tree | 7854947379c68e2b03c476f3744db1a699cf1b6a /build-test.cmd | |
| parent | 3716918ee67ea2e8d8271c9a214159e56687f043 (diff) | |
| download | coreclr-aae414026671e3dc1ccf0f308d351ac04cc746a4.tar.gz coreclr-aae414026671e3dc1ccf0f308d351ac04cc746a4.tar.bz2 coreclr-aae414026671e3dc1ccf0f308d351ac04cc746a4.zip | |
Update Buildtools and Roslyn (#14228)
* Update Buildtools and Roslyn
* Fixing importing of the roslyn files on msbuild 14.0
* Correctly looking for the latest VS Installation
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/build-test.cmd b/build-test.cmd index 2544b06e04..b247090604 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -22,6 +22,23 @@ set __BuildOS=Windows_NT :: is already configured to use that toolset. Otherwise, we will fallback to using the VS2015 :: toolset if it is installed. Finally, we will fail the script if no supported VS instance :: can be found. +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 +) +if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS% +if not exist "%_VSCOMNTOOLS%" ( + echo Error: Visual Studio 2015 or 2017 required. + echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions. + exit /b 1 +) + +call "%_VSCOMNTOOLS%\VsDevCmd.bat" + +:Run + if defined VS150COMNTOOLS ( set "__VSToolsRoot=%VS150COMNTOOLS%" set "__VCToolsRoot=%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build" |