From 5c620978c124c928862f3221ad6be9bbf4eab802 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Mon, 18 Sep 2017 11:54:20 -0700
Subject: [PATCH 1/2] https://github.com/dotnet/cli/issues/6747

---
 scripts/obtain/dotnet-install.ps1 | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1
index 1b8e575e0..ee3ed04f7 100644
--- a/scripts/obtain/dotnet-install.ps1
+++ b/scripts/obtain/dotnet-install.ps1
@@ -172,33 +172,34 @@ function GetHTTPResponse([Uri] $Uri)
             # HttpClient is used vs Invoke-WebRequest in order to support Nano Server which doesn't support the Invoke-WebRequest cmdlet.
             Load-Assembly -Assembly System.Net.Http
 
-            if(-not $ProxyAddress)
-            {
-                # Despite no proxy being explicitly specified, we may still be behind a default proxy
-                $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy;
-                if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))){
-                    $ProxyAddress =  $DefaultProxy.GetProxy($Uri).OriginalString
-                    $ProxyUseDefaultCredentials = $true
-                }
-            }
-
-            if($ProxyAddress){
+            if($ProxyAddress) {
                 $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler
                 $HttpClientHandler.Proxy =  New-Object System.Net.WebProxy -Property @{Address=$ProxyAddress;UseDefaultCredentials=$ProxyUseDefaultCredentials}
                 $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler
             }
             else {
+                try {
+                    # Despite no proxy being explicitly specified, we may still be behind a default proxy
+                    $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy;
+                    if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))) {
+                        $ProxyAddress =  $DefaultProxy.GetProxy($Uri).OriginalString
+                        $ProxyUseDefaultCredentials = $true
+                    }
+                } catch {
+                    # Eat the exception and move forward as the above code is an attempt
+                    #    at resolving the DefaultProxy that may not have been a problem.
+                    Say-Verbose("Exception ignored: $_.Exception.Message - moving forward...")
+                }
+
                 $HttpClient = New-Object System.Net.Http.HttpClient
             }
             # Default timeout for HttpClient is 100s.  For a 50 MB download this assumes 500 KB/s average, any less will time out
             # 10 minutes allows it to work over much slower connections.
             $HttpClient.Timeout = New-TimeSpan -Minutes 10
             $Response = $HttpClient.GetAsync($Uri).Result
-            if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode)))
-            {
+            if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode))) {
                 $ErrorMsg = "Failed to download $Uri."
-                if ($Response -ne $null)
-                {
+                if ($Response -ne $null) {
                     $ErrorMsg += "  $Response"
                 }
 

From a5c2cf4faa792841ab5aa1fabd7d510edf81839a Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Mon, 18 Sep 2017 13:05:43 -0700
Subject: [PATCH 2/2] Logic error...fixing.

---
 scripts/obtain/dotnet-install.ps1 | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1
index ee3ed04f7..0f7b0984b 100644
--- a/scripts/obtain/dotnet-install.ps1
+++ b/scripts/obtain/dotnet-install.ps1
@@ -172,24 +172,28 @@ function GetHTTPResponse([Uri] $Uri)
             # HttpClient is used vs Invoke-WebRequest in order to support Nano Server which doesn't support the Invoke-WebRequest cmdlet.
             Load-Assembly -Assembly System.Net.Http
 
+            if( -not $ProxyAddress) {
+                try {
+                    # Despite no proxy being explicitly specified, we may still be behind a default proxy
+                    $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy;
+                    if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))) {
+                        $ProxyAddress = $DefaultProxy.GetProxy($Uri).OriginalString
+                        $ProxyUseDefaultCredentials = $true
+                    }
+                } catch {
+                    # Eat the exception and move forward as the above code is an attempt
+                    #    at resolving the DefaultProxy that may not have been a problem.
+                    $ProxyAddress = $null
+                    Say-Verbose("Exception ignored: $_.Exception.Message - moving forward...")
+                }
+            }
+
             if($ProxyAddress) {
                 $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler
                 $HttpClientHandler.Proxy =  New-Object System.Net.WebProxy -Property @{Address=$ProxyAddress;UseDefaultCredentials=$ProxyUseDefaultCredentials}
                 $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler
             }
             else {
-                try {
-                    # Despite no proxy being explicitly specified, we may still be behind a default proxy
-                    $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy;
-                    if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))) {
-                        $ProxyAddress =  $DefaultProxy.GetProxy($Uri).OriginalString
-                        $ProxyUseDefaultCredentials = $true
-                    }
-                } catch {
-                    # Eat the exception and move forward as the above code is an attempt
-                    #    at resolving the DefaultProxy that may not have been a problem.
-                    Say-Verbose("Exception ignored: $_.Exception.Message - moving forward...")
-                }
 
                 $HttpClient = New-Object System.Net.Http.HttpClient
             }