Fix GetAddrInfoExSupportsOverlapped UAP build break

`System.Net.NameResolutionPal.GetAddrInfoExSupportsOverlapped` uses LoadLibraryExW which is not compatible with UAP (which only supports LoadLibrary of DLLs within a container). Refactor the helper so UAP returns false.
dotnet · Feb 28, 2018 · f3a86db · stephentoub · Feb 28, 2018 · stephentoub
1 parent 30d10f5
commit f3a86db
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 15 deletions.
diff --git a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj
@@ -54,6 +54,8 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="System\Net\NameResolutionPal.Windows.cs" />
+    <Compile Include="System\Net\NameResolutionPal.Windows.NetCoreApp.cs" Condition="'$(TargetGroup)' != 'uap'"/>
+    <Compile Include="System\Net\NameResolutionPal.Windows.Uap.cs" Condition="'$(TargetGroup)' == 'uap'"/>
     <Compile Include="$(CommonPath)\System\Net\ContextAwareResult.Windows.cs">
       <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>
     </Compile>
@@ -132,7 +134,7 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
       <Link>Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
+    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs" Condition="'$(TargetGroup)' != 'uap'">
       <Link>Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">

diff --git a/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.NetCoreApp.cs b/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.NetCoreApp.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Win32.SafeHandles;
+
+namespace System.Net
+{
+    internal static partial class NameResolutionPal
+    {
+
+        private static bool GetAddrInfoExSupportsOverlapped()
+        {
+            using (SafeLibraryHandle libHandle = Interop.Kernel32.LoadLibraryExW(Interop.Libraries.Ws2_32, IntPtr.Zero, Interop.Kernel32.LOAD_LIBRARY_SEARCH_SYSTEM32))
+            {
+                if (libHandle.IsInvalid)
+                    return false;
+
+                // We can't just check that 'GetAddrInfoEx' exists, because it existed before supporting overlapped.
+                // The existance of 'GetAddrInfoExCancel' indicates that overlapped is supported.
+                return Interop.Kernel32.GetProcAddress(libHandle, Interop.Winsock.GetAddrInfoExCancelFunctionName) != IntPtr.Zero;
+            }
+        }
+    }
+}
diff --git a/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.Uap.cs b/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.Uap.cs
@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace System.Net
+{
+    internal static partial class NameResolutionPal
+    {
+
+        private static bool GetAddrInfoExSupportsOverlapped()
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs b/src/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs
@@ -13,7 +13,7 @@
 
 namespace System.Net
 {
-    internal static class NameResolutionPal
+    internal static partial class NameResolutionPal
     {
         //
         // used by GetHostName() to preallocate a buffer for the call to gethostname.
@@ -339,19 +339,6 @@ public static void EnsureSocketsAreInitialized()
             }
         }
 
-        private static bool GetAddrInfoExSupportsOverlapped()
-        {
-            using (SafeLibraryHandle libHandle = Interop.Kernel32.LoadLibraryExW(Interop.Libraries.Ws2_32, IntPtr.Zero, Interop.Kernel32.LOAD_LIBRARY_SEARCH_SYSTEM32))
-            {
-                if (libHandle.IsInvalid)
-                    return false;
-
-                // We can't just check that 'GetAddrInfoEx' exists, because it existed before supporting overlapped.
-                // The existance of 'GetAddrInfoExCancel' indicates that overlapped is supported.
-                return Interop.Kernel32.GetProcAddress(libHandle, Interop.Winsock.GetAddrInfoExCancelFunctionName) != IntPtr.Zero;
-            }
-        }
-
         public static unsafe void GetAddrInfoAsync(DnsResolveAsyncResult asyncResult)
         {
             GetAddrInfoExContext* context = GetAddrInfoExContext.AllocateContext();