Skip to content

Use lib prefix for native library names for consistency #39717

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

Merged
merged 3 commits into from
Jul 22, 2020
Merged

Use lib prefix for native library names for consistency #39717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1564fa2
Use lib prefix for native library names for consistency
jkotas Jul 21, 2020
55191e1
CR feedback
jkotas Jul 21, 2020
b99bfc6
Revert .dylib on frameworks
jkotas Jul 22, 2020
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
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/FreeBSD/Interop.Libraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ internal static partial class Interop
internal static partial class Libraries
{
internal const string Odbc32 = "libodbc.so.2";
internal const string MsQuic = "msquic";
internal const string MsQuic = "libmsquic.so";
Copy link
Member Author

@jkotas jkotas Jul 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have fixed up msquic just for consistency

}
}
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Linux/Interop.Libraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ internal static partial class Libraries
{
internal const string Odbc32 = "libodbc.so.2";
internal const string OpenLdap = "libldap-2.4.so.2";
internal const string MsQuic = "msquic";
internal const string MsQuic = "libmsquic.so";
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/OSX/Interop.Libraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static partial class Libraries
internal const string Odbc32 = "libodbc.2.dylib";
internal const string OpenLdap = "libldap";
internal const string SystemConfigurationLibrary = "/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration";
internal const string AppleCryptoNative = "System.Security.Cryptography.Native.Apple";
internal const string MsQuic = "msquic";
internal const string AppleCryptoNative = "libSystem.Security.Cryptography.Native.Apple";
internal const string MsQuic = "libmsquic";
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/tests/TestUtilities/Interop/Interop.Libraries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ internal static partial class Interop
internal static partial class Libraries
{
// Shims
public const string CryptoNative = "System.Security.Cryptography.Native.OpenSsl";
public const string SystemNative = "System.Native";
public const string CryptoNative = "libSystem.Security.Cryptography.Native.OpenSsl";
public const string SystemNative = "libSystem.Native";
}
}