Inherit patcher types

BepInEx.Core/Bootstrap/BaseChainloader.cs

@@ -12,10 +12,10 @@
 
 namespace BepInEx.Bootstrap;
 
 public abstract class BaseChainloader<TPlugin>
 {
     protected static readonly string CurrentAssemblyName = Assembly.GetExecutingAssembly().GetName().Name;
     protected static readonly Version CurrentAssemblyVersion = Assembly.GetExecutingAssembly().GetName().Version;
     private static readonly Dictionary<string, bool> RefCache = new();
     private static Regex allowedGuidRegex { get; } = new(@"^[a-zA-Z0-9\._\-]+$");
 
@@ -88,7 +88,7 @@
             Location = assemblyLocation
         };
     }
-    static bool ReferencesThisAssembly(AssemblyDefinition ass, HashSet<string> seen = null)
+    internal static bool ReferencesThisAssembly(AssemblyDefinition ass, HashSet<string> seen = null)
     {
         seen ??= new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
@@ -107,7 +107,7 @@
         }
         return RefCache[key] = false;
     }
     protected static bool HasBepinPlugins(AssemblyDefinition ass)
     {
         if (!ReferencesThisAssembly(ass))
             return false;

BepInEx.Preloader.Core/Patching/AssemblyPatcher.cs

@@ -115,12 +115,15 @@ private PatcherPluginMetadata ToPatcherPlugin(TypeDefinition type, string assemb
 
     private bool HasPatcherPlugins(AssemblyDefinition ass)
     {
-        if (ass.MainModule.AssemblyReferences.All(r => r.Name != CurrentAssemblyName) &&
-            ass.Name.Name != CurrentAssemblyName)
-            return false;
+        if (!BepInEx.Bootstrap.BaseChainloader<BepInPlugin>.ReferencesThisAssembly(ass)) return false;
         if (ass.MainModule.GetTypeReferences().All(r => r.FullName != typeof(BasePatcher).FullName))
+        {
+            if (ass.MainModule.GetTypeReferences().Any((TypeReference r) => MetadataHelper.TypeInheretsFrom(r, typeof(BasePatcher))))
+            {
+                return true;
+            }
             return false;
-
+        }
         return true;
     }
 

BepInEx.Preloader.Core/Patching/Attributes.cs

@@ -58,7 +58,7 @@ private static Version TryParseLongVersion(string version)
 
     internal static PatcherPluginInfoAttribute FromCecilType(TypeDefinition td)
     {
-        var attr = MetadataHelper.GetCustomAttributes<PatcherPluginInfoAttribute>(td, false).FirstOrDefault();
+        var attr = MetadataHelper.GetCustomAttributes<PatcherPluginInfoAttribute>(td, false, true).FirstOrDefault();
 
         if (attr == null)
             return null;