Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor interop usage in DirectoryServices #51325

Merged
merged 4 commits into from
Apr 19, 2021
Merged

Refactor interop usage in DirectoryServices #51325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f305630
Refactor interop usage in DirectoryServices
mthalman Apr 15, 2021
65f51aa
Use common library declaration for oleaut32
mthalman Apr 15, 2021
6329cb4
Remove extraneous kernel32 const
mthalman Apr 15, 2021
b6d0cf1
Move constants from ExternDll to Interop.Libraries
mthalman Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down
1 change: 0 additions & 1 deletion ...DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
50 changes: 0 additions & 50 deletions ...oryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/ExternDll.cs
View file
Open in desktop

This file was deleted.

Loading