Merge pull request #48 from js6pak/dont-interop-overrides

Don't generate interop methods for interface overrides
BepInEx · Oct 4, 2022 · 857a8a0 · 857a8a0
2 parents adbad51 + b80b20c
commit 857a8a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Il2CppInterop.Generator/Contexts/TypeRewriteContext.cs b/Il2CppInterop.Generator/Contexts/TypeRewriteContext.cs
@@ -99,6 +99,7 @@ public void AddMembers()
             if (originalTypeMethod.Name == ".cctor") continue;
             if (originalTypeMethod.Name == ".ctor" && originalTypeMethod.Parameters.Count == 1 &&
                 originalTypeMethod.Parameters[0].ParameterType.FullName == "System.IntPtr") continue;
+            if (originalTypeMethod.HasOverrides) continue;
 
             var methodRewriteContext = new MethodRewriteContext(this, originalTypeMethod);
             myMethodContexts[originalTypeMethod] = methodRewriteContext;

diff --git a/Il2CppInterop.Generator/Passes/Pass70GenerateProperties.cs b/Il2CppInterop.Generator/Passes/Pass70GenerateProperties.cs
@@ -20,6 +20,8 @@ public static void DoPass(RewriteGlobalContext context)
 
                 foreach (var oldProperty in type.Properties)
                 {
+                    if ((oldProperty.GetMethod?.HasOverrides ?? false) || (oldProperty.SetMethod?.HasOverrides ?? false)) continue;
+
                     var unmangledPropertyName = UnmanglePropertyName(assemblyContext, oldProperty, typeContext.NewType,
                         propertyCountsByName);