From b475a81b36a758809f39cc9aa831341946616b61 Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 2 Mar 2022 13:56:12 +0300 Subject: [PATCH 1/2] Removed AutoMapper from Feature Management for Web --- .../AbpFeatureManagementWebModule.cs | 12 ++---------- .../FeatureManagementWebAutoMapperProfile.cs | 11 ----------- .../Volo.Abp.FeatureManagement.Web.csproj | 1 - 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementWebAutoMapperProfile.cs diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs index 91b60e79c9..752e966ef2 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs @@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; -using Volo.Abp.AutoMapper; using Volo.Abp.FeatureManagement.Localization; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Modularity; @@ -12,8 +11,7 @@ namespace Volo.Abp.FeatureManagement; [DependsOn( typeof(AbpFeatureManagementApplicationContractsModule), - typeof(AbpAspNetCoreMvcUiThemeSharedModule), - typeof(AbpAutoMapperModule) + typeof(AbpAspNetCoreMvcUiThemeSharedModule) )] public class AbpFeatureManagementWebModule : AbpModule { @@ -37,16 +35,10 @@ public class AbpFeatureManagementWebModule : AbpModule options.FileSets.AddEmbedded(); }); - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); - Configure(options => { //Configure authorization. - }); + }); Configure(options => { diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementWebAutoMapperProfile.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementWebAutoMapperProfile.cs deleted file mode 100644 index 802ccec550..0000000000 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/FeatureManagementWebAutoMapperProfile.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AutoMapper; - -namespace Volo.Abp.FeatureManagement; - -public class FeatureManagementWebAutoMapperProfile : Profile -{ - public FeatureManagementWebAutoMapperProfile() - { - //Create mappings. - } -} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj index 623cb2e42c..838a472ce3 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj @@ -32,7 +32,6 @@ - From 308241a2b58690a30a536df3fc3719ec2ecf143c Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 2 Mar 2022 17:21:21 +0300 Subject: [PATCH 2/2] Completed removing AutoMapper from the Feature Management module Automapper was unnecessary in the project it's why was removed. --- .../Volo.Abp.FeatureManagement.Application.csproj | 1 - .../AbpFeatureManagementApplicationModule.cs | 14 ++------------ ...eatureManagementApplicationAutoMapperProfile.cs | 11 ----------- .../AbpFeatureManagementBlazorModule.cs | 2 -- .../Volo.Abp.FeatureManagement.Blazor.csproj | 1 - 5 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementApplicationAutoMapperProfile.cs diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj index 2c4cdef320..b2f186ce71 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo.Abp.FeatureManagement.Application.csproj @@ -10,7 +10,6 @@ - diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationModule.cs index ceba576473..7c20a61a0c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationModule.cs @@ -1,6 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Application; using Volo.Abp.Modularity; namespace Volo.Abp.FeatureManagement; @@ -8,17 +6,9 @@ namespace Volo.Abp.FeatureManagement; [DependsOn( typeof(AbpFeatureManagementDomainModule), typeof(AbpFeatureManagementApplicationContractsModule), - typeof(AbpAutoMapperModule), typeof(AbpDddApplicationModule) )] public class AbpFeatureManagementApplicationModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); - } + } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementApplicationAutoMapperProfile.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementApplicationAutoMapperProfile.cs deleted file mode 100644 index 77f3218ddc..0000000000 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureManagementApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AutoMapper; - -namespace Volo.Abp.FeatureManagement; - -public class FeatureManagementApplicationAutoMapperProfile : Profile -{ - public FeatureManagementApplicationAutoMapperProfile() - { - - } -} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs index 0135cd532b..8bfee863b1 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs @@ -1,5 +1,4 @@ using Volo.Abp.AspNetCore.Components.Web.Theming; -using Volo.Abp.AutoMapper; using Volo.Abp.Features; using Volo.Abp.Modularity; @@ -7,7 +6,6 @@ namespace Volo.Abp.FeatureManagement.Blazor; [DependsOn( typeof(AbpAspNetCoreComponentsWebThemingModule), - typeof(AbpAutoMapperModule), typeof(AbpFeatureManagementApplicationContractsModule), typeof(AbpFeaturesModule) )] diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj index d5d985e482..22dab36cff 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj @@ -9,7 +9,6 @@ -