From 7304491d21578cc098820db06c98b2b76a6d4bd5 Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 10 Aug 2025 09:25:46 +0800 Subject: [PATCH] Revert "Disable `MapperlyAutoObjectMappingProvider` if AutoMapper used in app." --- .../Volo/Abp/Mapperly/AbpMapperlyModule.cs | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyModule.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyModule.cs index f879354ed3..60381163eb 100644 --- a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyModule.cs +++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/AbpMapperlyModule.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Auditing; using Volo.Abp.Modularity; using Volo.Abp.ObjectExtending; @@ -22,23 +20,6 @@ public class AbpMapperlyModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { - // This is the temporary solution, We will remove it in when all apps are migrated to Mapperly. - var disableMapperlyAutoObjectMappingProvider = false; - - var modules = context.Services.GetSingletonInstance().Modules.ToList(); - var autoMapperModuleIndex = modules.FindIndex(x => x.Type.FullName!.Equals("Volo.Abp.AutoMapper.AbpAutoMapperModule", StringComparison.OrdinalIgnoreCase)); - if (autoMapperModuleIndex >= 0) - { - var mapperlyModuleIndex = modules.FindIndex(x => x.Type == typeof(AbpMapperlyModule)); - if (mapperlyModuleIndex > autoMapperModuleIndex) - { - disableMapperlyAutoObjectMappingProvider = true; - } - } - - if (!disableMapperlyAutoObjectMappingProvider) - { - context.Services.AddMapperlyObjectMapper(); - } + context.Services.AddMapperlyObjectMapper(); } }