Merge pull request #408 from tannergooding/main

Small fixes for the dotnet tool
dotnet · Nov 7, 2022 · 9d084eb · 9d084eb
2 parents bbf343f + f93ceba
commit 9d084eb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/sources/ClangSharp.Interop/Extensions/clang.ResolveLibrary.cs b/sources/ClangSharp.Interop/Extensions/clang.ResolveLibrary.cs
@@ -18,13 +18,17 @@ static @clang()
 
     private static IntPtr OnDllImport(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
     {
-        return TryResolveLibrary(libraryName, assembly, searchPath, out var nativeLibrary)
-            ? nativeLibrary
-            : libraryName.Equals("libclang") && TryResolveClang(assembly, searchPath, out nativeLibrary)
-            ? nativeLibrary
-            : libraryName.Equals("libClangSharp") && TryResolveClangSharp(assembly, searchPath, out nativeLibrary)
-            ? nativeLibrary
-            : IntPtr.Zero;
+        var result = TryResolveLibrary(libraryName, assembly, searchPath, out var nativeLibrary) ? nativeLibrary
+                   : libraryName.Equals("libclang") && TryResolveClang(assembly, searchPath, out nativeLibrary) ? nativeLibrary
+                   : libraryName.Equals("libClangSharp") && TryResolveClangSharp(assembly, searchPath, out nativeLibrary) ? nativeLibrary
+                   : IntPtr.Zero;
+
+        if (result == IntPtr.Zero)
+        {
+            Console.WriteLine("Failed to resolve libClang or libClangSharp.");
+            Console.WriteLine("If you are running as a dotnet tool, you may need to manually copy the appropriate DLLs from NuGet due to limitations in the dotnet tool support.");
+        }
+        return result;
     }
 
     private static bool TryResolveClang(Assembly assembly, DllImportSearchPath? searchPath, out IntPtr nativeLibrary)
@@ -47,7 +51,14 @@ private static bool TryResolveLibrary(string libraryName, Assembly assembly, Dll
 
             foreach (DllImportResolver resolver in resolvers.Cast<DllImportResolver>())
             {
-                nativeLibrary = resolver(libraryName, assembly, searchPath);
+                try
+                {
+                    nativeLibrary = resolver(libraryName, assembly, searchPath);
+                }
+                catch
+                {
+                    nativeLibrary = IntPtr.Zero;
+                }
 
                 if (nativeLibrary != IntPtr.Zero)
                 {

diff --git a/sources/ClangSharpPInvokeGenerator/ClangSharpPInvokeGenerator.csproj b/sources/ClangSharpPInvokeGenerator/ClangSharpPInvokeGenerator.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
+    <PackAsToolShimRuntimeIdentifiers>win-x64</PackAsToolShimRuntimeIdentifiers>
     <RuntimeIdentifier></RuntimeIdentifier>
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>