Merge pull request #216 from AArnott/fix215

Workaround/fix for libgit2sharp custom marshal type cast failure
dotnet · Aug 25, 2018 · f919d71 · f919d71
2 parents dfd2c88 + 7bf53d5
commit f919d71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/MSBuildExtensionTask/ContextAwareTask.cs b/src/MSBuildExtensionTask/ContextAwareTask.cs
@@ -80,10 +80,15 @@ internal CustomAssemblyLoader(ContextAwareTask loaderTask)
 
             protected override Assembly Load(AssemblyName assemblyName)
             {
+                // Always load libgit2sharp in the default context.
+                // Something about the p/invoke done in that library with its custom marshaler
+                // doesn't sit well with Core CLR 2.x.
+                // See https://github.com/AArnott/Nerdbank.GitVersioning/issues/215 and https://github.com/dotnet/coreclr/issues/19654
+                AssemblyLoadContext preferredContext = assemblyName.Name.Equals("libgit2sharp", StringComparison.OrdinalIgnoreCase) ? Default : this;
                 string assemblyPath = Path.Combine(this.loaderTask.ManagedDllDirectory, assemblyName.Name) + ".dll";
                 if (File.Exists(assemblyPath))
                 {
-                    return LoadFromAssemblyPath(assemblyPath);
+                    return preferredContext.LoadFromAssemblyPath(assemblyPath);
                 }
 
                 return Default.LoadFromAssemblyName(assemblyName);

diff --git a/src/Nerdbank.GitVersioning.Tasks/GetBuildVersion.cs b/src/Nerdbank.GitVersioning.Tasks/GetBuildVersion.cs
@@ -247,7 +247,7 @@ protected override bool ExecuteInner()
             }
             catch (ArgumentOutOfRangeException ex)
             {
-                Log.LogErrorFromException(ex);
+                this.Log.LogErrorFromException(ex);
                 return false;
             }
         }