aboutsummaryrefslogtreecommitdiff
path: root/scripts/bootstrap.ps1
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-01-25 14:56:05 -0800
committerRobert Schumacher <roschuma@microsoft.com>2019-01-30 14:27:10 -0800
commitfd56ffcf5c9a7ace36c8d4e0dc9785605b0fbd45 (patch)
tree20464b2b2c7e031bbf5afb4da4864db8bf4d7eed /scripts/bootstrap.ps1
parent397e1a5d6c7d6a694650e3455969060005b9a6f7 (diff)
downloadvcpkg-fd56ffcf5c9a7ace36c8d4e0dc9785605b0fbd45.tar.gz
vcpkg-fd56ffcf5c9a7ace36c8d4e0dc9785605b0fbd45.zip
[vcpkg] Enable bootstrapping with VS2019
Diffstat (limited to 'scripts/bootstrap.ps1')
-rw-r--r--scripts/bootstrap.ps16
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 42eabd01b..0a24afa05 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -166,7 +166,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
if (Test-Path $VCFolder)
{
Write-Verbose "Picking: $instanceCandidate"
- return "$path\MSBuild\Current\Bin\MSBuild.exe", "v141"
+ return "$path\MSBuild\Current\Bin\MSBuild.exe", "v142"
}
}
@@ -192,7 +192,7 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
}
}
- throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed."
+ throw "Could not find MSBuild version with C++ support. VS2015, VS2017, or VS2019 (with C++) needs to be installed."
}
function getWindowsSDK( [Parameter(Mandatory=$False)][switch]$DisableWin10SDK = $False,
[Parameter(Mandatory=$False)][switch]$DisableWin81SDK = $False,
@@ -396,7 +396,7 @@ if ($ec -ne 0)
}
Write-Host "`nBuilding vcpkg.exe... done.`n"
-Write-Verbose("Placing vcpkg.exe in the correct location")
+Write-Verbose "Placing vcpkg.exe in the correct location"
Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe"