Better error message when a weaver assembly load fails

Fody · May 8, 2024 · 5057b82 · 5057b82
1 parent 21bcb7e
commit 5057b82
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/FodyIsolated/AssemblyLoader.cs b/FodyIsolated/AssemblyLoader.cs
@@ -14,14 +14,20 @@ public Assembly LoadWeaverAssembly(string assemblyPath)
         return assemblies[assemblyPath] = LoadFromFile(assemblyPath);
     }
 
-    // ReSharper disable once MemberCanBeMadeStatic.Local
     Assembly LoadFromFile(string assemblyPath)
     {
-        #if(NETSTANDARD)
-        return LoadContext.LoadNotLocked(assemblyPath);
-        #else
-        var rawAssembly = File.ReadAllBytes(assemblyPath);
-        return Assembly.Load(rawAssembly);
-        #endif
+        try
+        {
+#if NETSTANDARD
+            return LoadContext.LoadNotLocked(assemblyPath);
+#else
+            var rawAssembly = File.ReadAllBytes(assemblyPath);
+            return Assembly.Load(rawAssembly);
+#endif
+        }
+        catch (Exception ex)
+        {
+            throw new WeavingException($"Could not load weaver assembly from {assemblyPath}: {ex.Message}");
+        }
     }
-}
+}