Switch from using AttributeAttribute::Name to `AttributeAttribute::…

…Type` (#194) * Switch from using `AttributeAttribute::Name` to `AttributeAttribute::Type` * Support backwards compatibility
BepInEx · Dec 23, 2024 · ba67c11 · ba67c11
1 parent f2b2e69
commit ba67c11
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/Il2CppInterop.Generator/Passes/Pass70GenerateProperties.cs b/Il2CppInterop.Generator/Passes/Pass70GenerateProperties.cs
@@ -42,17 +42,13 @@ public static void DoPass(RewriteGlobalContext context)
                 }
 
                 string? defaultMemberName = null;
-                var defaultMemberAttributeAttribute = type.CustomAttributes.FirstOrDefault(it =>
-                    it.AttributeType()?.Name == "AttributeAttribute" && it.Signature!.NamedArguments.Any(it =>
-                        it.MemberName == "Name" && it.Argument.GetElementAsString() == nameof(DefaultMemberAttribute)));
-                if (defaultMemberAttributeAttribute != null)
+                if (type.CustomAttributes.FirstOrDefault(IsDefaultMemberAttributeFake) != null)
                 {
                     defaultMemberName = "Item";
                 }
                 else
                 {
-                    var realDefaultMemberAttribute =
-                        type.CustomAttributes.FirstOrDefault(it => it.AttributeType()?.Name == nameof(DefaultMemberAttribute));
+                    var realDefaultMemberAttribute = type.CustomAttributes.FirstOrDefault(IsDefaultMemberAttributeReal);
                     if (realDefaultMemberAttribute != null)
                         defaultMemberName = realDefaultMemberAttribute.Signature?.FixedArguments[0].Element?.ToString() ?? "Item";
                 }
@@ -63,6 +59,21 @@ public static void DoPass(RewriteGlobalContext context)
                             assemblyContext.Imports.Module.DefaultMemberAttribute().ToTypeDefOrRef(), assemblyContext.Imports.Module.String()),
                         new CustomAttributeSignature(new CustomAttributeArgument(assemblyContext.Imports.Module.String(), defaultMemberName))));
             }
+
+        static bool IsDefaultMemberAttributeFake(CustomAttribute attribute)
+        {
+            return attribute.AttributeType()?.Name == "AttributeAttribute" && attribute.Signature!.NamedArguments.Any(it =>
+            {
+                // Name support is for backwards compatibility.
+                return (it.MemberName == "Type" && it.Argument.Element is ITypeDescriptor { Namespace: "System.Reflection", Name: nameof(DefaultMemberAttribute) })
+                    || (it.MemberName == "Name" && it.Argument.GetElementAsString() == nameof(DefaultMemberAttribute));
+            });
+        }
+
+        static bool IsDefaultMemberAttributeReal(CustomAttribute attribute)
+        {
+            return attribute.AttributeType() is { Namespace.Value: "System.Reflection", Name.Value: nameof(DefaultMemberAttribute) };
+        }
     }
 
     private static string UnmanglePropertyName(AssemblyRewriteContext assemblyContext, PropertyDefinition prop,