Read system proxy information on macOS

src/Common/src/Interop/OSX/Interop.CoreFoundation.CFArray.cs

@@ -38,7 +38,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFArrayHandle : SafeHandle
     {
-        internal SafeCFArrayHandle()
+        private SafeCFArrayHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

src/Common/src/Interop/OSX/Interop.CoreFoundation.CFDictionary.cs

@@ -21,7 +21,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFDictionaryHandle : SafeHandle
     {
-        internal SafeCFDictionaryHandle()
+        private SafeCFDictionaryHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

src/Common/src/Interop/OSX/Interop.CoreFoundation.CFProxy.cs

@@ -67,7 +67,7 @@ internal class CFProxy
 
             static CFProxy()
             {
-                IntPtr lib = Interop.Libdl.dlopen(Interop.Libraries.CFNetworkLibrary, Interop.Libdl.RTLD_LAZY);
+                IntPtr lib = NativeLibrary.Load(Interop.Libraries.CFNetworkLibrary);
                 if (lib != IntPtr.Zero)
                 {
                     kCFProxyTypeAutoConfigurationURL = LoadCFStringSymbol(lib, "kCFProxyTypeAutoConfigurationURL");
@@ -94,7 +94,7 @@ public CFProxy(SafeCFDictionaryHandle dictionary)
 
             private static IntPtr LoadSymbol(IntPtr lib, string name)
             {
-                IntPtr indirect = Interop.Libdl.dlsym(lib, name);
+                IntPtr indirect = NativeLibrary.GetExport(lib, name);
                 return indirect == IntPtr.Zero ? IntPtr.Zero : Marshal.ReadIntPtr(indirect);
             }
 

src/System.Net.Http/src/System.Net.Http.csproj

@@ -214,6 +214,7 @@
   </ItemGroup>
   <!-- SocketsHttpHandler platform parts -->
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetGroup)' == 'netcoreapp'">
+    <Compile Include="System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs" />
     <Compile Include="$(CommonPath)\System\Net\ContextAwareResult.Unix.cs">
       <Link>Common\System\Net\ContextAwareResult.Unix.cs</Link>
     </Compile>
@@ -256,7 +257,6 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetsOSX)' != 'true' And '$(TargetGroup)' == 'netcoreapp'">
     <Compile Include="System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs" />
-    <Compile Include="System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' And '$(TargetGroup)' == 'netcoreapp'">
     <Compile Include="System\Net\Http\SocketsHttpHandler\SystemProxyInfo.OSX.cs" />
@@ -294,12 +294,6 @@
     <Compile Include="$(CommonPath)\Interop\OSX\Interop.Libraries.cs">
       <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Unix\libdl\Interop.dlopen.cs">
-      <Link>Common\Interop\Unix\libdl\Interop.dlopen.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\Interop\Unix\libdl\Interop.dlsym.cs">
-      <Link>Common\Interop\Unix\libdl\Interop.dlsym.cs</Link>
-    </Compile>
     <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
       <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
     </Compile>

src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/MacProxy.cs

@@ -11,6 +11,7 @@
 using static Interop.RunLoop;
 
 using CFRunLoopRef = System.IntPtr;
+using CFRunLoopSourceRef = System.IntPtr;
 
 namespace System.Net.Http
 {
@@ -22,9 +23,9 @@ public ICredentials Credentials
             set => throw new NotSupportedException();
         }
 
-        static Uri GetProxyUri(string scheme, CFProxy proxy)
+        private static Uri GetProxyUri(string scheme, CFProxy proxy)
         {
-            var uriBuilder = new UriBuilder(
+            UriBuilder uriBuilder = new UriBuilder(
                 scheme,
                 proxy.HostName,
                 proxy.PortNumber);
@@ -65,20 +66,22 @@ public Uri ExecuteProxyAutoConfiguration(SafeCreateHandle cfurl, CFProxy proxy)
                 CFRunLoopStop(runLoop);
             };
 
-            var clientContext = new CFStreamClientContext();
-            var loopSource =
+            CFStreamClientContext clientContext = new CFStreamClientContext();
+            CFRunLoopSourceRef loopSource =
                 proxy.ProxyType == CFProxy.kCFProxyTypeAutoConfigurationURL ?
                 CFNetworkExecuteProxyAutoConfigurationURL(proxy.AutoConfigurationURL, cfurl, cb, ref clientContext) :
                 CFNetworkExecuteProxyAutoConfigurationScript(proxy.AutoConfigurationJavaScript, cfurl, cb, ref clientContext);
 
-            using (var mode = CFStringCreateWithCString("System.Net.Http.MacProxy"))
+            using (var mode = CFStringCreateWithCString(typeof(MacProxy).FullName))
             {
                 IntPtr modeHandle = mode.DangerousGetHandle();
                 CFRunLoopAddSource(runLoop, loopSource, modeHandle);
-                int resultz = CFRunLoopRunInMode(modeHandle, double.MaxValue, 0);
+                CFRunLoopRunInMode(modeHandle, double.MaxValue, 0);
                 CFRunLoopSourceInvalidate(loopSource);
             }
 
+            GC.KeepAlive(cb);
+
             return result;
         }
 
@@ -116,7 +119,7 @@ public Uri GetProxy(Uri targetUri)
         public bool IsBypassed(Uri targetUri)
         {
             if (targetUri == null)
-                throw new ArgumentNullException ("targetUri");
+                throw new ArgumentNullException(nameof(targetUri));
 
             Uri proxyUri = GetProxy(targetUri);
             return Equals(proxyUri, targetUri) || proxyUri == null;

src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SystemProxyInfo.OSX.cs

@@ -9,7 +9,7 @@ internal static class SystemProxyInfo
         // On Unix we get default proxy configuration from environment variables
         public static IWebProxy ConstructSystemProxy()
         {
-            return new MacProxy();
+            return HttpEnvironmentProxy.TryCreate(out IWebProxy proxy) ? proxy : new MacProxy();
         }
     }
 }