Skip to content

Commit

Permalink
Include System Directory in search dirs for app local ICU (#38649)
Browse files Browse the repository at this point in the history
  • Loading branch information
safern authored Jul 1, 2020
1 parent b82f8f0 commit 02d182f
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private static string CreateLibraryName(ReadOnlySpan<char> baseName, ReadOnlySpa

private static IntPtr LoadLibrary(string library, bool failOnLoadFailure)
{
if (!NativeLibrary.TryLoad(library, typeof(object).Assembly, DllImportSearchPath.ApplicationDirectory, out IntPtr lib) && failOnLoadFailure)
if (!NativeLibrary.TryLoad(library, typeof(object).Assembly, DllImportSearchPath.ApplicationDirectory | DllImportSearchPath.System32, out IntPtr lib) && failOnLoadFailure)
{
Environment.FailFast($"Failed to load app-local ICU: {library}");
}
Expand Down

0 comments on commit 02d182f

Please sign in to comment.