Update src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs

Co-authored-by: Ankit Jain <radical@gmail.com>
dotnet · Nov 1, 2022 · c64c6f7 · c64c6f7
1 parent 23b1dca
commit c64c6f7
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs b/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
@@ -79,7 +79,7 @@ private void CollectPInvokes(List<PInvoke> pinvokes, List<PInvokeCallback> callb
             }
         }
 
-        if (HasAttribute(type, new string[] {"System.Runtime.InteropServices.UnmanagedFunctionPointerAttribute"}))
+        if (HasAttribute(type, "System.Runtime.InteropServices.UnmanagedFunctionPointerAttribute"))
         {
             var method = type.GetMethod("Invoke");
 
@@ -167,15 +167,20 @@ static bool MethodHasCallbackAttributes(MethodInfo method)
         }
     }
 
-    private static bool HasAttribute(Type type, string[] attributeNames)
+    private static bool HasAttribute(MemberInfo element, params string[] attributeNames)
     {
-        foreach (CustomAttributeData cattr in CustomAttributeData.GetCustomAttributes(type))
+        foreach (CustomAttributeData cattr in CustomAttributeData.GetCustomAttributes(element))
         {
             try
             {
                 for (int i = 0; i < attributeNames.Length; ++i)
-                    if (cattr.AttributeType.FullName == attributeNames [i])
+                {
+                    if (cattr.AttributeType.FullName == attributeNames [i] ||
+                        cattr.AttributeType.Name == attributeNames[i])
+                    {
                         return true;
+                    }
+                }
             }
             catch
             {