From 1f98e99475ef959ceb2eef889593e5625f11e4c9 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 1 Aug 2025 14:41:48 +0300 Subject: [PATCH] Update docs module for Mapperly --- .../Volo.Docs.Admin.Application.csproj | 2 +- .../DocsAdminApplicationAutoMapperProfile.cs | 22 ------- .../Admin/DocsAdminApplicationAutoMappers.cs | 57 +++++++++++++++++++ .../Docs/Admin/DocsAdminApplicationModule.cs | 13 +---- .../DocsAdminWebAutoMapperProfile.cs | 30 ---------- .../DocsAdminWebAutoMappers.cs | 55 ++++++++++++++++++ .../Volo.Docs.Admin.Web/DocsAdminWebModule.cs | 8 +-- .../Volo.Docs.Admin.Web.csproj | 2 +- .../Volo.Docs.Application.csproj | 2 +- .../Docs/DocsApplicationAutoMapperProfile.cs | 57 ++++++++++++++----- .../Volo/Docs/DocsApplicationModule.cs | 14 +---- .../Volo.Docs.Common.Application.csproj | 2 +- .../DocsCommonApplicationAutoMapperProfile.cs | 27 +++++---- .../Common/DocsCommonApplicationModule.cs | 13 +---- .../Volo.Docs.Domain/Volo.Docs.Domain.csproj | 2 +- .../Volo/Docs/DocsDomainMappingProfile.cs | 27 +++++---- .../Volo/Docs/DocsDomainModule.cs | 11 +--- .../Volo.Docs.Web/DocsWebAutoMapperProfile.cs | 11 ---- .../docs/src/Volo.Docs.Web/DocsWebModule.cs | 11 +--- .../src/Volo.Docs.Web/Volo.Docs.Web.csproj | 2 +- 20 files changed, 208 insertions(+), 160 deletions(-) delete mode 100644 modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMappers.cs delete mode 100644 modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs create mode 100644 modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMappers.cs delete mode 100644 modules/docs/src/Volo.Docs.Web/DocsWebAutoMapperProfile.cs diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj index 725c70bc2b..f1eb4e09f3 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs deleted file mode 100644 index 366c0ab27b..0000000000 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,22 +0,0 @@ -using AutoMapper; -using Volo.Abp.AutoMapper; -using Volo.Docs.Admin.Documents; -using Volo.Docs.Admin.Projects; -using Volo.Docs.Documents; -using Volo.Docs.Projects; - -namespace Volo.Docs.Admin -{ - public class DocsAdminApplicationAutoMapperProfile : Profile - { - public DocsAdminApplicationAutoMapperProfile() - { - CreateMap(); - CreateMap().Ignore(x => x.ProjectName); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - } -} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMappers.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMappers.cs new file mode 100644 index 0000000000..c1eaca595f --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMappers.cs @@ -0,0 +1,57 @@ +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; +using Volo.Docs.Admin.Documents; +using Volo.Docs.Admin.Projects; +using Volo.Docs.Documents; +using Volo.Docs.Projects; + +namespace Volo.Docs.Admin; + +[Mapper] +public partial class ProjectPdfFileToProjectPdfFileDtoMapper : MapperBase +{ + public override partial ProjectPdfFileDto Map(ProjectPdfFile source); + + public override partial void Map(ProjectPdfFile source, ProjectPdfFileDto destination); +} + +[Mapper] +public partial class DocumentInfoToDocumentInfoDtoMapper : MapperBase +{ + public override partial DocumentInfoDto Map(DocumentInfo source); + + public override partial void Map(DocumentInfo source, DocumentInfoDto destination); +} + +[Mapper] +public partial class ProjectWithoutDetailsToProjectWithoutDetailsDtoMapper : MapperBase +{ + public override partial ProjectWithoutDetailsDto Map(ProjectWithoutDetails source); + + public override partial void Map(ProjectWithoutDetails source, ProjectWithoutDetailsDto destination); +} + +[Mapper] +public partial class DocumentWithoutContentToDocumentDtoMapper : MapperBase +{ + public override partial DocumentDto Map(DocumentWithoutContent source); + + public override partial void Map(DocumentWithoutContent source, DocumentDto destination); +} + +[Mapper] +public partial class DocumentToDocumentDtoMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(DocumentDto.ProjectName))] + public override partial DocumentDto Map(Document source); + + public override partial void Map(Document source, DocumentDto destination); +} + +[Mapper] +public partial class ProjectToProjectDtoMapper : MapperBase +{ + public override partial ProjectDto Map(Project source); + + public override partial void Map(Project source, ProjectDto destination); +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationModule.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationModule.cs index 2491bf5fb6..2935cbfe06 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationModule.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Caching; using Volo.Abp.Modularity; using Volo.Docs.Common; @@ -13,19 +13,12 @@ namespace Volo.Docs.Admin typeof(DocsAdminApplicationContractsModule), typeof(DocsCommonApplicationModule), typeof(AbpCachingModule), - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(AbpDddApplicationModule), typeof(AbpBackgroundJobsAbstractionsModule) )] public class DocsAdminApplicationModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); - } + } } diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs deleted file mode 100644 index d6a1d2230a..0000000000 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs +++ /dev/null @@ -1,30 +0,0 @@ -using AutoMapper; -using Volo.Abp.AutoMapper; -using Volo.Docs.Admin.Documents; -using Volo.Docs.Admin.Pages.Docs.Admin.Projects; -using Volo.Docs.Admin.Projects; - -namespace Volo.Docs.Admin -{ - public class DocsAdminWebAutoMapperProfile : Profile - { - public DocsAdminWebAutoMapperProfile() - { - CreateMap() - .Ignore(x => x.ExtraProperties); - - CreateMap() - .Ignore(x => x.ExtraProperties); - - CreateMap () - .Ignore(x => x.GitHubAccessToken) - .Ignore(x => x.GitHubRootUrl) - .Ignore(x => x.GitHubUserAgent) - .Ignore(x => x.GithubVersionProviderSource) - .Ignore(x => x.VersionBranchPrefix); - - CreateMap(); - CreateMap(); - } - } -} diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMappers.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMappers.cs new file mode 100644 index 0000000000..9d4a6b4849 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMappers.cs @@ -0,0 +1,55 @@ +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; +using Volo.Docs.Admin.Documents; +using Volo.Docs.Admin.Pages.Docs.Admin.Projects; +using Volo.Docs.Admin.Projects; + +namespace Volo.Docs.Admin; + +[Mapper] +public partial class PullDocumentViewModelToPullAllDocumentInputMapper : MapperBase +{ + public override partial PullAllDocumentInput Map(PullModel.PullDocumentViewModel source); + + public override partial void Map(PullModel.PullDocumentViewModel source, PullAllDocumentInput destination); +} + +[Mapper] +public partial class PullDocumentViewModelToPullDocumentInputMapper : MapperBase +{ + public override partial PullDocumentInput Map(PullModel.PullDocumentViewModel source); + + public override partial void Map(PullModel.PullDocumentViewModel source, PullDocumentInput destination); +} + +[Mapper] +public partial class ProjectDtoToEditGithubProjectViewModelMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(EditModel.EditGithubProjectViewModel.GitHubAccessToken))] + [MapperIgnoreTarget(nameof(EditModel.EditGithubProjectViewModel.GitHubRootUrl))] + [MapperIgnoreTarget(nameof(EditModel.EditGithubProjectViewModel.GitHubUserAgent))] + [MapperIgnoreTarget(nameof(EditModel.EditGithubProjectViewModel.GithubVersionProviderSource))] + [MapperIgnoreTarget(nameof(EditModel.EditGithubProjectViewModel.VersionBranchPrefix))] + public override partial EditModel.EditGithubProjectViewModel Map(ProjectDto source); + + public override partial void Map(ProjectDto source, EditModel.EditGithubProjectViewModel destination); +} + +[Mapper] +public partial class CreateGithubProjectViewModelToCreateProjectDtoMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(CreateProjectDto.ExtraProperties))] + public override partial CreateProjectDto Map(CreateModel.CreateGithubProjectViewModel source); + + public override partial void Map(CreateModel.CreateGithubProjectViewModel source, CreateProjectDto destination); +} + + +[Mapper] +public partial class EditGithubProjectViewModelToUpdateProjectDtoMyClassMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(UpdateProjectDto.ExtraProperties))] + public override partial UpdateProjectDto Map(EditModel.EditGithubProjectViewModel source); + + public override partial void Map(EditModel.EditGithubProjectViewModel source, UpdateProjectDto destination); +} diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs index 3e0d548487..f416715d1c 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; @@ -42,12 +42,6 @@ namespace Volo.Docs.Admin options.FileSets.AddEmbedded(); }); - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); - Configure(options => { options.DisableModule(DocsAdminRemoteServiceConsts.ModuleName); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj index b706561d9d..3142de4e32 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj +++ b/modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj @@ -19,7 +19,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj index b7530d7fe8..ade9347ac4 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj +++ b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs index f2cb5476f7..cc4a99c82c 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs @@ -1,20 +1,49 @@ -using AutoMapper; +using Riok.Mapperly.Abstractions; using Volo.Docs.Documents; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Docs.Common.Projects; using Volo.Docs.Projects; -namespace Volo.Docs +namespace Volo.Docs; + +[Mapper] +public partial class DocumentResourceToDocumentResourceDtoMapper : MapperBase { - public class DocsApplicationAutoMapperProfile : Profile - { - public DocsApplicationAutoMapperProfile() - { - CreateMap(); - CreateMap(); - CreateMap().Ignore(x => x.Project).Ignore(x => x.Contributors); - CreateMap(); - CreateMap(); - } - } + public override partial DocumentResourceDto Map(DocumentResource source); + + public override partial void Map(DocumentResource source, DocumentResourceDto destination); } + +[Mapper] +public partial class DocumentContributorToDocumentContributorDtoMapper : MapperBase +{ + public override partial DocumentContributorDto Map(DocumentContributor source); + + public override partial void Map(DocumentContributor source, DocumentContributorDto destination); +} + +[Mapper] +public partial class VersionInfoToVersionInfoDtoMapper : MapperBase +{ + public override partial VersionInfoDto Map(VersionInfo source); + + public override partial void Map(VersionInfo source, VersionInfoDto destination); +} + +[Mapper] +public partial class ProjectToProjectDtoMapper : MapperBase +{ + public override partial ProjectDto Map(Project source); + + public override partial void Map(Project source, ProjectDto destination); +} + +[Mapper] +public partial class DocumentToDocumentWithDetailsDtoMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Project))] + [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Contributors))] + public override partial DocumentWithDetailsDto Map(Document source); + + public override partial void Map(Document source, DocumentWithDetailsDto destination); +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationModule.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationModule.cs index f6d60099ad..85f95925e0 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationModule.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationModule.cs @@ -1,7 +1,6 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.DependencyInjection.Extensions; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Caching; using Volo.Abp.Modularity; using Volo.Docs.Common; @@ -13,7 +12,7 @@ namespace Volo.Docs typeof(DocsDomainModule), typeof(DocsApplicationContractsModule), typeof(AbpCachingModule), - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(DocsCommonApplicationModule), typeof(AbpDddApplicationModule) )] @@ -21,13 +20,6 @@ namespace Volo.Docs { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddProfile(validate: true); - }); - context.Services.TryAddSingleton(NullNavigationTreePostProcessor.Instance); } } diff --git a/modules/docs/src/Volo.Docs.Common.Application/Volo.Docs.Common.Application.csproj b/modules/docs/src/Volo.Docs.Common.Application/Volo.Docs.Common.Application.csproj index 545995b902..0e1570ddea 100644 --- a/modules/docs/src/Volo.Docs.Common.Application/Volo.Docs.Common.Application.csproj +++ b/modules/docs/src/Volo.Docs.Common.Application/Volo.Docs.Common.Application.csproj @@ -13,7 +13,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationAutoMapperProfile.cs index 8175654743..fd147962d9 100644 --- a/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationAutoMapperProfile.cs +++ b/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationAutoMapperProfile.cs @@ -1,15 +1,22 @@ -using AutoMapper; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; using Volo.Docs.Common.Projects; using Volo.Docs.Projects; -namespace Volo.Docs.Common +namespace Volo.Docs.Common; + +[Mapper] +public partial class ProjectToProjectDtoMapper : MapperBase +{ + public override partial ProjectDto Map(Project source); + + public override partial void Map(Project source, ProjectDto destination); +} + +[Mapper] +public partial class VersionInfoToVersionInfoDtoMapper : MapperBase { - public class DocsCommonApplicationAutoMapperProfile : Profile - { - public DocsCommonApplicationAutoMapperProfile() - { - CreateMap(); - CreateMap(); - } - } + public override partial VersionInfoDto Map(VersionInfo source); + + public override partial void Map(VersionInfo source, VersionInfoDto destination); } diff --git a/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationModule.cs b/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationModule.cs index b7eb350930..99d5564e23 100644 --- a/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationModule.cs +++ b/modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationModule.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Modularity; namespace Volo.Docs.Common; @@ -8,18 +8,9 @@ namespace Volo.Docs.Common; [DependsOn( typeof(DocsDomainModule), typeof(DocsCommonApplicationContractsModule), - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(AbpDddApplicationModule) )] public class DocsCommonApplicationModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddProfile(validate: true); - }); - } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index e57312e16b..25c6b9bb83 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -31,7 +31,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs index 74f7224ea6..56a90a7ee2 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainMappingProfile.cs @@ -1,15 +1,22 @@ -using AutoMapper; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; using Volo.Docs.Documents; using Volo.Docs.Projects; -namespace Volo.Docs +namespace Volo.Docs; + +[Mapper] +public partial class ProjectToProjectEtoMapper : MapperBase { - public class DocsDomainMappingProfile : Profile - { - public DocsDomainMappingProfile() - { - CreateMap(); - CreateMap(); - } - } + public override partial ProjectEto Map(Project source); + + public override partial void Map(Project source, ProjectEto destination); +} + +[Mapper] +public partial class DocumentToDocumentEtoMapper : MapperBase +{ + public override partial DocumentEto Map(Document source); + + public override partial void Map(Document source, DocumentEto destination); } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs index 502b2f9065..8d0b4372d7 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.BlobStoring; using Volo.Abp.Caching; using Volo.Abp.Domain; @@ -27,7 +27,7 @@ namespace Volo.Docs [DependsOn( typeof(DocsDomainSharedModule), typeof(AbpDddDomainModule), - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(AbpBlobStoringModule), typeof(AbpCachingModule) )] @@ -35,13 +35,6 @@ namespace Volo.Docs { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddProfile(validate: true); - }); - Configure(options => { options.EtoMappings.Add(typeof(DocsDomainModule)); diff --git a/modules/docs/src/Volo.Docs.Web/DocsWebAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Web/DocsWebAutoMapperProfile.cs deleted file mode 100644 index e0a383e691..0000000000 --- a/modules/docs/src/Volo.Docs.Web/DocsWebAutoMapperProfile.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AutoMapper; - -namespace Volo.Docs -{ - public class DocsWebAutoMapperProfile : Profile - { - public DocsWebAutoMapperProfile() - { - } - } -} diff --git a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs index dc9993dea6..d45236ee08 100644 --- a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs +++ b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs @@ -1,4 +1,3 @@ -using System; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; @@ -9,7 +8,7 @@ using Volo.Abp.Ui.LayoutHooks; using Volo.Abp.AspNetCore.Mvc.UI.Packages; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; @@ -23,7 +22,7 @@ namespace Volo.Docs { [DependsOn( typeof(DocsApplicationContractsModule), - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(AbpAspNetCoreMvcUiBootstrapModule), typeof(AbpAspNetCoreMvcUiThemeSharedModule), typeof(AbpAspNetCoreMvcUiPackagesModule), @@ -88,12 +87,6 @@ namespace Volo.Docs } }); - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); - Configure(options => { options.Converters[MarkdownDocumentToHtmlConverter.Type] = typeof(MarkdownDocumentToHtmlConverter); diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj index 2c36600107..353f15811c 100644 --- a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj +++ b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj @@ -15,7 +15,7 @@ - +