diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2018-07-18 10:42:00 -0700 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2018-07-18 10:42:00 -0700 |
| commit | 63cbbaf3810e0268d80a5f2d3d55145b7b599c3d (patch) | |
| tree | 5d8b040dde8684db870ad21f30107b83dbe3a590 /src | |
| parent | cc52c67f5a0a26194c42fbd1b59e284d6727635a (diff) | |
| download | coreclr-63cbbaf3810e0268d80a5f2d3d55145b7b599c3d.tar.gz coreclr-63cbbaf3810e0268d80a5f2d3d55145b7b599c3d.tar.bz2 coreclr-63cbbaf3810e0268d80a5f2d3d55145b7b599c3d.zip | |
Use api-set instead of combase.dll (#18981)
Diffstat (limited to 'src')
| -rw-r--r-- | src/System.Private.CoreLib/PinvokeAnalyzerExceptionList.analyzerdata | 1 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/src/Microsoft/Win32/UnsafeNativeMethods.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/System.Private.CoreLib/PinvokeAnalyzerExceptionList.analyzerdata b/src/System.Private.CoreLib/PinvokeAnalyzerExceptionList.analyzerdata index 656d95a144..4bbdccae19 100644 --- a/src/System.Private.CoreLib/PinvokeAnalyzerExceptionList.analyzerdata +++ b/src/System.Private.CoreLib/PinvokeAnalyzerExceptionList.analyzerdata @@ -1,4 +1,3 @@ <!-- Not a bug, these APIs are in the allowed list but under kernel32 and we need it under normaliz.dll --> normaliz.dll!IsNormalizedString normaliz.dll!NormalizeString -combase.dll!RoGetActivationFactory
\ No newline at end of file diff --git a/src/System.Private.CoreLib/src/Microsoft/Win32/UnsafeNativeMethods.cs b/src/System.Private.CoreLib/src/Microsoft/Win32/UnsafeNativeMethods.cs index 0c6fb93a9d..2f904e2e20 100644 --- a/src/System.Private.CoreLib/src/Microsoft/Win32/UnsafeNativeMethods.cs +++ b/src/System.Private.CoreLib/src/Microsoft/Win32/UnsafeNativeMethods.cs @@ -189,7 +189,7 @@ namespace Microsoft.Win32 } #if FEATURE_COMINTEROP - [DllImport("combase.dll", PreserveSig = true)] + [DllImport("api-ms-win-core-winrt-l1-1-0.dll", PreserveSig = true)] internal static extern int RoGetActivationFactory( [MarshalAs(UnmanagedType.HString)] string activatableClassId, [In] ref Guid iid, |