Merge pull request #292 from Microsoft/users/ersciple/m102proxy

Web proxy variable and default creds.
microsoft · Jun 13, 2016 · 07ac961 · 07ac961
2 parents 8a08dee + 951c593
commit 07ac961
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Microsoft.VisualStudio.Services.Agent/WebProxy.cs b/src/Microsoft.VisualStudio.Services.Agent/WebProxy.cs
@@ -37,15 +37,17 @@ public static void ApplyProxySettings()
             {
                 return;
             }
-            _proxySettingsApplied = true;
-            var proxyFilePath = IOUtil.GetProxyConfigFilePath();
-            bool proxyConfigured = (new FileInfo(proxyFilePath)).Exists;
-            if (!proxyConfigured)
+
+            string proxy = Environment.GetEnvironmentVariable("VSTS_HTTP_PROXY");
+            if (!string.IsNullOrEmpty(proxy))
             {
-                return;
+                VssHttpMessageHandler.DefaultWebProxy = new WebProxy(new Uri(proxy))
+                {
+                    Credentials = CredentialCache.DefaultNetworkCredentials
+                };
             }
-            string proxyURI = File.ReadAllText(proxyFilePath);
-            VssHttpMessageHandler.DefaultWebProxy = new WebProxy(new Uri(proxyURI));
+
+            _proxySettingsApplied = true;
         }
     }
 }
diff --git a/src/Misc/layoutroot/env.sh b/src/Misc/layoutroot/env.sh
@@ -9,6 +9,7 @@ varCheckList=(
     'GRADLE_HOME' 
     'NVM_BIN' 
     'NVM_PATH'
+    'VSTS_HTTP_PROXY'
     )
 
 envContents=""