From f2ac7a32aaf9e0f374cf3025f6f86561780951eb Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 24 Jan 2017 12:36:46 -0800
Subject: FetchDependency.ps1 now returns the downloaded exe's path

---
 scripts/fetchDependency.ps1                       | 2 ++
 scripts/findVisualStudioInstallationInstances.ps1 | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index d05d16bea..b56bf1087 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -202,6 +202,8 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
     {
         throw [System.IO.FileNotFoundException] ("Could not detect or download " + $Dependency)
     }
+
+    return $downloadPath
 }
 
 SelectProgram $Dependency
\ No newline at end of file
diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index 241b05bc1..d5faa57d3 100644
--- a/scripts/findVisualStudioInstallationInstances.ps1
+++ b/scripts/findVisualStudioInstallationInstances.ps1
@@ -10,8 +10,7 @@ $vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
 
 $downloadsDir = "$vcpkgRootDir\downloads"
 
-& $scriptsDir\fetchDependency.ps1 "nuget"
-$nugetexe = "$downloadsDir\nuget-3.5.0\nuget.exe"
+$nugetexe = & $scriptsDir\fetchDependency.ps1 "nuget"
 $nugetPackageDir = "$downloadsDir\nuget-packages"
 
 $SetupAPIVersion = "1.3.269-rc"
-- 
cgit v1.2.3