NativeMethods.ResolveDll: Avoid exceptions #1741
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On .NET Core 3.0, LibGit2Sharp registers a per-assembly resolver using via
NativeLibrary.SetDllImportResolver
.The per-assembly resolver is the first attempt to resolve native library loads initiated by an assembly and takes precedence over other mechanisms, such as
AssemblyLoadContext
.The current implementation throws an exception if the
{assemblyDirectory}/runtimes
directory does not exist. In that case, the native load mechanism aborts, andAssemblyLoadContext
never gets a chance to locate the native library.This PR adds a
Directory.Exists
check to avoid that exception.ResolveDll
will returnIntPtr.Zero
, and theAssemblyLoadContext
is invoked next.