Merge pull request #280 from ds5678/Feature/RedirectObjectBaseTypeWhe…

…nMemberCloning [Feature]: Redirect System.Object base type when member cloning
Washi1337 · Mar 30, 2022 · 1b8f5f1 · 1b8f5f1
2 parents fb599dc + 45e96ce
commit 1b8f5f1
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs b/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs
@@ -40,5 +40,15 @@ public override IMethodDefOrRef ImportMethod(IMethodDefOrRef method)
                 ? (IMethodDefOrRef) clonedMethod
                 : base.ImportMethod(method);
         }
+
+        /// <inheritdoc />
+        protected override ITypeDefOrRef ImportType(TypeReference type)
+        {
+            return type.Namespace == "System"
+                && type.Name == nameof(System.Object)
+                && (type.Scope?.GetAssembly()?.IsCorLib ?? false)
+                ? _context.Module.CorLibTypeFactory.Object.Type
+                : base.ImportType(type);
+        }
     }
-}
+}