Browse Source
Merge pull request #11224 from abpframework/auto-merge/rel-5-0/771
Merge branch dev with rel-5.0
pull/11231/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperConventionalRegistrar.cs
|
|
|
@ -1,7 +1,6 @@ |
|
|
|
using System; |
|
|
|
using System.Linq; |
|
|
|
using AutoMapper; |
|
|
|
using AutoMapper.Internal; |
|
|
|
using Microsoft.Extensions.DependencyInjection; |
|
|
|
using Volo.Abp.DependencyInjection; |
|
|
|
|
|
|
|
@ -19,7 +18,8 @@ public class AbpAutoMapperConventionalRegistrar : DefaultConventionalRegistrar |
|
|
|
|
|
|
|
protected override bool IsConventionalRegistrationDisabled(Type type) |
|
|
|
{ |
|
|
|
return !OpenTypes.Any(type.ImplementsGenericInterface) || base.IsConventionalRegistrationDisabled(type); |
|
|
|
return !type.GetInterfaces().Any(x => x.IsGenericType && OpenTypes.Contains(x.GetGenericTypeDefinition())) || |
|
|
|
base.IsConventionalRegistrationDisabled(type); |
|
|
|
} |
|
|
|
|
|
|
|
protected override ServiceLifetime? GetDefaultLifeTimeOrNull(Type type) |
|
|
|
|
