Merge branch 'master' into codicodi-ninja-support

1 files changed, 4 insertions, 12 deletions

diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index a2ce66522..951975758 100644
--- a/scripts/findVisualStudioInstallationInstances.ps1
+++ b/scripts/findVisualStudioInstallationInstances.ps1
@@ -13,17 +13,8 @@ $downloadsDir = "$vcpkgRootDir\downloads"
 $nugetexe = & $scriptsDir\fetchDependency.ps1 "nuget"
 $nugetPackageDir = "$downloadsDir\nuget-packages"
 
-$SetupAPIVersion = "1.3.269-rc"
-$url = "https://api.nuget.org/packages/microsoft.visualstudio.setup.configuration.native.$SetupAPIVersion.nupkg"
-$downloadName = "microsoft.visualstudio.setup.configuration.native.$SetupAPIVersion.nupkg"
-$downloadPath = "$downloadsDir\$downloadName"
-
-if (!(Test-Path $downloadPath))
-{
-    Start-BitsTransfer -Source $url -Destination $downloadPath #-ErrorAction SilentlyContinue
-}
-
-$nugetOutput = & $nugetexe install Microsoft.VisualStudio.Setup.Configuration.Native -Pre -Source $downloadsDir -OutputDirectory $nugetPackageDir 2>&1
+$SetupAPIVersion = "1.5.125-rc"
+$nugetOutput = & $nugetexe install Microsoft.VisualStudio.Setup.Configuration.Native -Version $SetupAPIVersion -OutputDirectory $nugetPackageDir -nocache 2>&1
 
 $SetupConsoleExe = "$nugetPackageDir\Microsoft.VisualStudio.Setup.Configuration.Native.$SetupAPIVersion\tools\x86\Microsoft.VisualStudio.Setup.Configuration.Console.exe"
 
@@ -34,8 +25,9 @@ if (!(Test-Path $SetupConsoleExe))
 
 $instances = & $SetupConsoleExe -nologo -value InstallationPath 2>&1
 $instanceCount = $instances.Length
+
 # The last item can be empty
-if ($instances[$entryCount - 1] -eq "")
+if ($instanceCount -gt 0 -and $instances[$instanceCount - 1] -eq "")
 {
     $instances = $instances[0..($instanceCount - 2)]
 }