diff options
| author | Eric Mittelette <ericmitt@hotmail.com> | 2017-10-09 17:02:36 -0700 |
|---|---|---|
| committer | Eric Mittelette <ericmitt@hotmail.com> | 2017-10-09 17:02:36 -0700 |
| commit | 4d837a99b110067f4f724a883a1e42f12f0f3d1f (patch) | |
| tree | 59bb196744bcaa82042deaf5464de5f0efae2adf /scripts | |
| parent | 40bec91c0b19e90e63aec104178c14076259a233 (diff) | |
| parent | b6512bace19d6c28cce71a0c2e8e28ab77d3ef56 (diff) | |
| download | vcpkg-4d837a99b110067f4f724a883a1e42f12f0f3d1f.tar.gz vcpkg-4d837a99b110067f4f724a883a1e42f12f0f3d1f.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fetchDependency.ps1 | 8 | ||||
| -rw-r--r-- | scripts/findVisualStudioInstallationInstances.ps1 | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 665376baf..bc58f4436 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -126,11 +126,11 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) } elseif($Dependency -eq "vswhere") { - $requiredVersion = "2.1.4" - $downloadVersion = "2.1.4" - $url = "https://github.com/Microsoft/vswhere/releases/download/2.1.4/vswhere.exe" + $requiredVersion = "2.2.3" + $downloadVersion = "2.2.3" + $url = "https://github.com/Microsoft/vswhere/releases/download/2.2.3/vswhere.exe" $downloadPath = "$downloadsDir\vswhere-$downloadVersion\vswhere.exe" - $expectedDownloadedFileHash = "548fb9dfeed59bc4ddcce739a5729e9c8dd5932cd60ff6f74727ee069e7da458" + $expectedDownloadedFileHash = "5f19066ac91635ad17d33fe0f79fc63c672a46f98c0358589a90163bcb2733e8" $executableFromDownload = $downloadPath $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED } diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1 index 8c67ef6d6..b2f186478 100644 --- a/scripts/findVisualStudioInstallationInstances.ps1 +++ b/scripts/findVisualStudioInstallationInstances.ps1 @@ -6,7 +6,7 @@ param( $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition $vswhereExe = & $scriptsDir\fetchDependency.ps1 "vswhere" -$output = & $vswhereExe -prerelease -legacy -format xml +$output = & $vswhereExe -prerelease -legacy -products * -format xml [xml]$asXml = $output $results = New-Object System.Collections.ArrayList |