More strict GetDeclaredMethods() for FirstOrDefault(), LastOrDefault(), Cast() and Distinct()

Fix #2343

Author: enchev

Radzen.Blazor/QueryableExtension.cs

@@ -185,7 +185,7 @@ public static IQueryable OrderBy(this IQueryable source, string selector = null)
         public static dynamic FirstOrDefault(this IQueryable source)
         {
             return source.Provider.Execute(Expression.Call(null,
-                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.FirstOrDefault)).FirstOrDefault(mi => mi.IsGenericMethod).MakeGenericMethod(source.ElementType),
+                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.FirstOrDefault)).FirstOrDefault(mi => mi.IsGenericMethod && mi.GetParameters().Length == 1).MakeGenericMethod(source.ElementType),
                 source.Expression));
         }
 
@@ -197,7 +197,7 @@ public static dynamic FirstOrDefault(this IQueryable source)
         public static dynamic LastOrDefault(this IQueryable source)
         {
             return source.Provider.Execute(Expression.Call(null,
-                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.LastOrDefault)).FirstOrDefault(mi => mi.IsGenericMethod).MakeGenericMethod(source.ElementType),
+                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.LastOrDefault)).FirstOrDefault(mi => mi.IsGenericMethod && mi.GetParameters().Length == 1).MakeGenericMethod(source.ElementType),
                 source.Expression));
         }
 
@@ -210,7 +210,7 @@ public static dynamic LastOrDefault(this IQueryable source)
         public static IQueryable Cast(this IQueryable source, Type type)
         {
             return source.Provider.CreateQuery(Expression.Call(null,
-                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.Cast)).FirstOrDefault(mi => mi.IsGenericMethod).MakeGenericMethod(type),
+                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.Cast)).FirstOrDefault(mi => mi.IsGenericMethod && mi.GetParameters().Length == 1).MakeGenericMethod(type),
                 source.Expression));
         }
 
@@ -275,7 +275,7 @@ public static dynamic Max(this IQueryable source, Type type)
         public static IQueryable Distinct(this IQueryable source)
         {
             return source.Provider.CreateQuery(Expression.Call(null,
-                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.Distinct)).FirstOrDefault(mi => mi.IsGenericMethod).MakeGenericMethod(source.ElementType),
+                typeof(Queryable).GetTypeInfo().GetDeclaredMethods(nameof(Queryable.Distinct)).FirstOrDefault(mi => mi.IsGenericMethod && mi.GetParameters().Length == 1).MakeGenericMethod(source.ElementType),
                 source.Expression));
         }