Skip to content

Commit b6f70bf

Browse files
committed
Fix ambiguity in initializin WellKnownMembers.Queryable members because of new IQueryable extension overloads in .NET6
1 parent f9d4d0f commit b6f70bf

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Orm/Xtensive.Orm/Orm/Linq/WellknownMembers.Queryable.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static Queryable()
205205
case 1:
206206
FirstOrDefault = methodInfo;
207207
break;
208-
case 2:
208+
case 2 when parameters[1].ParameterType.IsAssignableTo(WellKnownTypes.Expression):
209209
FirstOrDefaultWithPredicate = methodInfo;
210210
break;
211211
}
@@ -264,7 +264,7 @@ static Queryable()
264264
case 1:
265265
LastOrDefault = methodInfo;
266266
break;
267-
case 2:
267+
case 2 when parameters[1].ParameterType.IsAssignableTo(WellKnownTypes.Expression):
268268
LastOrDefaultWithPredicate = methodInfo;
269269
break;
270270
}
@@ -362,7 +362,7 @@ static Queryable()
362362
case 1:
363363
SingleOrDefault = methodInfo;
364364
break;
365-
case 2:
365+
case 2 when parameters[1].ParameterType.IsAssignableTo(WellKnownTypes.Expression):
366366
SingleOrDefaultWithPredicate = methodInfo;
367367
break;
368368
}

0 commit comments

Comments
 (0)