Don't scan System.Data.SqlClient by default

Abc-Arbitrage · Nov 20, 2023 · 335b3e9 · 335b3e9
1 parent cb72758
commit 335b3e9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Abc.Zebus/Core/BusFactory.cs b/src/Abc.Zebus/Core/BusFactory.cs
@@ -164,7 +164,18 @@ public ScanTarget(Assembly? assembly, Type? type)
         }
 
         public bool Matches(Assembly assembly)
-            => _assembly == null || _assembly == assembly;
+        {
+            if (_assembly is null)
+            {
+                // Ignore this assembly by default, since GetTypes() fails there in net8.0: https://github.com/dotnet/SqlClient/issues/1930
+                if (assembly.GetName().Name == "System.Data.SqlClient")
+                    return false;
+
+                return true;
+            }
+
+            return _assembly == assembly;
+        }
 
         public bool Matches(Type type)
         {

diff --git a/src/Abc.Zebus/Scan/TypeSource.cs b/src/Abc.Zebus/Scan/TypeSource.cs
@@ -12,7 +12,11 @@ public class TypeSource
 
     public virtual IEnumerable<Type> GetTypes()
     {
-        return AppDomain.CurrentDomain.GetAssemblies().Where(AssemblyFilter).SelectMany(x => x.GetTypes()).Where(TypeFilter);
+        return AppDomain.CurrentDomain
+                        .GetAssemblies()
+                        .Where(AssemblyFilter)
+                        .SelectMany(a => a.GetTypes())
+                        .Where(TypeFilter);
     }
 
     public static implicit operator TypeSource(Type type)