Skip to content

Commit d8cf13e

Browse files
authored
Use lib prefix for native library names for consistency (#39717)
1 parent 9e846df commit d8cf13e

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

src/coreclr/src/vm/reflectioninvocation.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,6 @@ FCIMPL1(INT32, ReflectionEnum::InternalGetCorElementType, Object *pRefThis) {
23912391
return pMT->GetClass_NoLogging()->GetInternalCorElementType();
23922392
}
23932393
FCIMPLEND
2394-
#include <optdefault.h>
23952394

23962395
//*******************************************************************************
23972396
struct TempEnumValue

src/libraries/Common/src/Interop/FreeBSD/Interop.Libraries.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ internal static partial class Interop
66
internal static partial class Libraries
77
{
88
internal const string Odbc32 = "libodbc.so.2";
9-
internal const string MsQuic = "msquic";
9+
internal const string MsQuic = "libmsquic.so";
1010
}
1111
}

src/libraries/Common/src/Interop/Linux/Interop.Libraries.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ internal static partial class Libraries
77
{
88
internal const string Odbc32 = "libodbc.so.2";
99
internal const string OpenLdap = "libldap-2.4.so.2";
10-
internal const string MsQuic = "msquic";
10+
internal const string MsQuic = "libmsquic.so";
1111
}
1212
}

src/libraries/Common/src/Interop/OSX/Interop.Libraries.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ internal static partial class Libraries
1010
internal const string CFNetworkLibrary = "/System/Library/Frameworks/CFNetwork.framework/CFNetwork";
1111
internal const string libobjc = "/usr/lib/libobjc.dylib";
1212
internal const string libproc = "/usr/lib/libproc.dylib";
13-
internal const string LibSystemCommonCrypto = "/usr/lib/system/libcommonCrypto";
14-
internal const string LibSystemKernel = "/usr/lib/system/libsystem_kernel";
13+
internal const string LibSystemCommonCrypto = "/usr/lib/system/libcommonCrypto.dylib";
14+
internal const string LibSystemKernel = "/usr/lib/system/libsystem_kernel.dylib";
1515
internal const string Odbc32 = "libodbc.2.dylib";
16-
internal const string OpenLdap = "libldap";
16+
internal const string OpenLdap = "libldap.dylib";
1717
internal const string SystemConfigurationLibrary = "/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration";
18-
internal const string AppleCryptoNative = "System.Security.Cryptography.Native.Apple";
19-
internal const string MsQuic = "msquic";
18+
internal const string AppleCryptoNative = "libSystem.Security.Cryptography.Native.Apple.dylib";
19+
internal const string MsQuic = "libmsquic.dylib";
2020
}
2121
}

src/libraries/Common/tests/TestUtilities/Interop/Interop.Libraries.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ internal static partial class Interop
66
internal static partial class Libraries
77
{
88
// Shims
9-
public const string CryptoNative = "System.Security.Cryptography.Native.OpenSsl";
10-
public const string SystemNative = "System.Native";
9+
public const string CryptoNative = "libSystem.Security.Cryptography.Native.OpenSsl";
10+
public const string SystemNative = "libSystem.Native";
1111
}
1212
}

0 commit comments

Comments
 (0)