Staying with the previously referenced LogicBuilder.Expressions.Utils.TypeExtensions.GetUnderlyingElementType in LinqExtensions.

Author: BlaiseD

AutoMapper.AspNetCore.OData.EFCore/LinqExtensions.cs

@@ -398,7 +398,7 @@ public static Expression GetSkipCall(this Expression expression, int? skip)
             (
                 expression.Type.IsIQueryable() ? typeof(Queryable) : typeof(Enumerable),
                 "Skip",
-                new[] { expression.GetUnderlyingElementType() },
+                new[] { LogicBuilder.Expressions.Utils.TypeExtensions.GetUnderlyingElementType(expression) },
                 expression,
                 Expression.Constant(skip.Value)
             );
@@ -412,7 +412,7 @@ public static Expression GetTakeCall(this Expression expression, int? top)
             (
                 expression.Type.IsIQueryable() ? typeof(Queryable) : typeof(Enumerable),
                 "Take",
-                new[] { expression.GetUnderlyingElementType() },
+                new[] { LogicBuilder.Expressions.Utils.TypeExtensions.GetUnderlyingElementType(expression) },
                 expression,
                 Expression.Constant(top.Value)
             );
@@ -433,15 +433,15 @@ public static Expression GetOrderByCountCall(this Expression expression, CountNo
 
         public static Expression GetOrderByCountCall(this Expression expression, CountNode countNode, string methodName, ODataQueryContext context, string selectorParameterName = "a")
         {
-            Type sourceType = expression.GetUnderlyingElementType();
+            Type sourceType = LogicBuilder.Expressions.Utils.TypeExtensions.GetUnderlyingElementType(expression);
             ParameterExpression param = Expression.Parameter(sourceType, selectorParameterName);
 
             Expression countSelector;
 
             if (countNode.FilterClause is not null)
             {
                 string memberFullName = countNode.GetPropertyPath();
-                Type filterType = sourceType.GetMemberInfoFromFullName(memberFullName).GetMemberType().GetUnderlyingElementType();
+                Type filterType = LogicBuilder.Expressions.Utils.TypeExtensions.GetUnderlyingElementType(sourceType.GetMemberInfoFromFullName(memberFullName).GetMemberType());
                 LambdaExpression filterExpression = countNode.FilterClause.GetFilterExpression(filterType, context);
                 countSelector = param.MakeSelector(memberFullName).GetCountCall(filterExpression);
             }
@@ -465,7 +465,7 @@ public static Expression GetOrderByCountCall(this Expression expression, CountNo
 
         public static Expression GetOrderByCall(this Expression expression, string memberFullName, string methodName, string selectorParameterName = "a")
         {
-            Type sourceType = expression.GetUnderlyingElementType();
+            Type sourceType = LogicBuilder.Expressions.Utils.TypeExtensions.GetUnderlyingElementType(expression);
             MemberInfo memberInfo = sourceType.GetMemberInfoFromFullName(memberFullName);
             return Expression.Call
             (