Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/AutoMapper/Internal/TypeDetails.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,29 @@ select extensionMethod
from extensionMethod in sourceExtensionMethodSearch
where extensionMethod.IsGenericMethodDefinition
&& extensionMethod.GetGenericArguments().Length == genericInterfaceArguments.Length
select extensionMethod.MakeGenericMethod(genericInterfaceArguments)
let constructedGeneric = MakeGenericMethod(extensionMethod, genericInterfaceArguments)
where constructedGeneric != null
select constructedGeneric
)
from methodMatch in matchedMethods
where methodMatch.GetParameters()[0].ParameterType.IsAssignableFrom(genericInterface)
select methodMatch
);

// Use method.MakeGenericMethod(genericArguments) wrapped in a try/catch(ArgumentException)
// in order to catch exceptions resulting from the generic arguments not being compatible
// with any constraints that may be on the generic method's generic parameters.
static MethodInfo MakeGenericMethod(MethodInfo genericMethod, Type[] genericArguments)
{
try
{
return genericMethod.MakeGenericMethod(genericArguments);
}
catch (ArgumentException)
{
return null;
}
}
}
private MemberInfo[] BuildReadAccessors()
{
Expand Down