Merge pull request #16344 from abpframework/auto-merge/rel-7-1/1883

Merge branch rel-7.2 with rel-7.1

framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs

@@ -32,15 +32,14 @@ public class AbpAutoMapperModule : AbpModule
             {
                 var options = scope.ServiceProvider.GetRequiredService<IOptions<AbpAutoMapperOptions>>().Value;
 
-                var mapperConfiguration = new MapperConfiguration(mapperConfigurationExpression =>
-                {
-                    var autoMapperConfigurationContext = new AbpAutoMapperConfigurationContext(mapperConfigurationExpression, scope.ServiceProvider);
+                var mapperConfigurationExpression = sp.GetRequiredService<IOptions<MapperConfigurationExpression>>().Value;
+                var autoMapperConfigurationContext = new AbpAutoMapperConfigurationContext(mapperConfigurationExpression, scope.ServiceProvider);
 
-                    foreach (var configurator in options.Configurators)
-                    {
-                        configurator(autoMapperConfigurationContext);
-                    }
-                });
+                foreach (var configurator in options.Configurators)
+                {
+                    configurator(autoMapperConfigurationContext);
+                }
+                var mapperConfiguration = new MapperConfiguration(mapperConfigurationExpression);
 
                 foreach (var profileType in options.ValidatingProfiles)
                 {