Refactor interop usage in DirectoryServices (#51325)

dotnet · Apr 19, 2021 · 9f10999 · 9f10999
1 parent 5524f37
commit 9f10999
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 213 deletions.
diff --git a/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
@@ -5,16 +5,24 @@ internal static partial class Interop
 {
     internal static partial class Libraries
     {
+        internal const string Activeds = "activeds.dll";
         internal const string Advapi32 = "advapi32.dll";
+        internal const string Authz = "authz.dll";
         internal const string BCrypt = "BCrypt.dll";
+        internal const string Credui = "credui.dll";
         internal const string Crypt32 = "crypt32.dll";
         internal const string CryptUI = "cryptui.dll";
+        internal const string Dnsapi = "dnsapi.dll";
+        internal const string Dsrole = "dsrole.dll";
         internal const string Gdi32 = "gdi32.dll";
         internal const string HttpApi = "httpapi.dll";
         internal const string IpHlpApi = "iphlpapi.dll";
         internal const string Kernel32 = "kernel32.dll";
+        internal const string Logoncli = "logoncli.dll";
         internal const string Mswsock = "mswsock.dll";
         internal const string NCrypt = "ncrypt.dll";
+        internal const string Netapi32 = "netapi32.dll";
+        internal const string Netutils = "netutils.dll";
         internal const string NtDll = "ntdll.dll";
         internal const string Odbc32 = "odbc32.dll";
         internal const string Ole32 = "ole32.dll";
@@ -28,6 +36,7 @@ internal static partial class Libraries
         internal const string WebSocket = "websocket.dll";
         internal const string WinHttp = "winhttp.dll";
         internal const string WinMM = "winmm.dll";
+        internal const string Wkscli = "wkscli.dll";
         internal const string Wldap32 = "wldap32.dll";
         internal const string Ws2_32 = "ws2_32.dll";
         internal const string Wtsapi32 = "wtsapi32.dll";

diff --git a/...DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/...DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
@@ -12,7 +12,6 @@
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetFramework)' == 'netstandard2.0'">SR.DirectoryServicesAccountManagement_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
-    <Compile Include="System\DirectoryServices\AccountManagement\ExternDll.cs" />
     <Compile Include="System\DirectoryServices\AccountManagement\interopt.cs" />
     <Compile Include="System\DirectoryServices\AccountManagement\PrincipalSearcher.cs" />
     <Compile Include="System\DirectoryServices\AccountManagement\Utils.cs" />

diff --git a/...oryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/ExternDll.cs b/...oryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/ExternDll.cs