aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBerrysoft <37586447+Berrysoft@users.noreply.github.com>2018-12-11 16:31:44 +0800
committerRobert Schumacher <roschuma@microsoft.com>2018-12-11 00:31:44 -0800
commit13d1231ad4d6df3c26c846b542bcc4185615c833 (patch)
treea37b165c26588f0070729e5c9f15c864ce35f756 /scripts
parent3fb47a376f94094a5b2ffd46bb016a5955eb8530 (diff)
downloadvcpkg-13d1231ad4d6df3c26c846b542bcc4185615c833.tar.gz
vcpkg-13d1231ad4d6df3c26c846b542bcc4185615c833.zip
Adapt bootstrap to VS 2019 Preview (#4922)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap.ps110
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index ed82a6ab1..42eabd01b 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -160,6 +160,16 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
}
$majorVersion = $version.Substring(0,2);
+ if ($majorVersion -eq "16")
+ {
+ $VCFolder= "$path\VC\Tools\MSVC\"
+ if (Test-Path $VCFolder)
+ {
+ Write-Verbose "Picking: $instanceCandidate"
+ return "$path\MSBuild\Current\Bin\MSBuild.exe", "v141"
+ }
+ }
+
if ($majorVersion -eq "15")
{
$VCFolder= "$path\VC\Tools\MSVC\"