[vcpkg-scripts] Detect and prompt for proxy in more cases

2 files changed, 11 insertions, 13 deletions

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index fa51de404..b7bc5afab 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -4,10 +4,6 @@ param(
     [string]$disableMetrics = "0"
 )
 
-$webclient=New-Object System.Net.WebClient
-$creds=Get-Credential
-$webclient.Proxy.Credentials=$creds
-
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
 $vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
 
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index b6144d581..2ee87bcff 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -82,17 +82,19 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
             New-Item -ItemType directory -Path $downloadDir | Out-Null
         }
 
+        $WC = New-Object System.Net.WebClient
+        $ProxyAuth = !$WC.Proxy.IsBypassed($url)
+        if ($ProxyAuth)
+        {
+            $ProxyCred = Get-Credential -Message "Enter credentials for Proxy Authentication"
+            $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyAuthentication","Basic")
+            $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyCredential",$ProxyCred)
+            $WC.Proxy.Credentials=$ProxyCred
+        }
+
         if (($PSVersionTable.PSEdition -ne "Core") -and ($Dependency -ne "git")) # git fails with BITS
         {
             try {
-                $WC = New-Object System.Net.WebClient
-                $ProxyAuth = !$WC.Proxy.IsBypassed($url)
-                If($ProxyAuth){
-                    $ProxyCred = Get-Credential -Message "Enter credentials for Proxy Authentication"
-                    $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyAuthentication","Basic")
-                    $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyCredential",$ProxyCred)
-                }
-
                 Start-BitsTransfer -Source $url -Destination $downloadPath -ErrorAction Stop
             }
             catch [System.Exception] {
@@ -106,7 +108,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
         if (!(Test-Path $downloadPath))
         {
             Write-Verbose("Downloading $Dependency...")
-            (New-Object System.Net.WebClient).DownloadFile($url, $downloadPath)
+            $WC.DownloadFile($url, $downloadPath)
         }
     }