Update docs module for Mapperly

modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj

@@ -14,7 +14,7 @@
     <ProjectReference Include="..\Volo.Docs.Admin.Application.Contracts\Volo.Docs.Admin.Application.Contracts.csproj" />
     <ProjectReference Include="..\Volo.Docs.Common.Application\Volo.Docs.Common.Application.csproj" />
     <ProjectReference Include="..\Volo.Docs.Domain\Volo.Docs.Domain.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BackgroundJobs.Abstractions\Volo.Abp.BackgroundJobs.Abstractions.csproj" />

modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationAutoMapperProfile.cs

@@ -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<Project, ProjectDto>();
-            CreateMap<Document, DocumentDto>().Ignore(x => x.ProjectName);
-            CreateMap<DocumentWithoutContent, DocumentDto>();
-            CreateMap<ProjectWithoutDetails, ProjectWithoutDetailsDto>();
-            CreateMap<DocumentInfo, DocumentInfoDto>();
-            CreateMap<ProjectPdfFile, ProjectPdfFileDto>();
-        }
-    }
-}

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<ProjectPdfFile, ProjectPdfFileDto>
+{
+    public override partial ProjectPdfFileDto Map(ProjectPdfFile source);
+
+    public override partial void Map(ProjectPdfFile source, ProjectPdfFileDto destination);
+}
+
+[Mapper]
+public partial class DocumentInfoToDocumentInfoDtoMapper : MapperBase<DocumentInfo, DocumentInfoDto>
+{
+    public override partial DocumentInfoDto Map(DocumentInfo source);
+
+    public override partial void Map(DocumentInfo source, DocumentInfoDto destination);
+}
+
+[Mapper]
+public partial class ProjectWithoutDetailsToProjectWithoutDetailsDtoMapper : MapperBase<ProjectWithoutDetails, ProjectWithoutDetailsDto>
+{
+    public override partial ProjectWithoutDetailsDto Map(ProjectWithoutDetails source);
+
+    public override partial void Map(ProjectWithoutDetails source, ProjectWithoutDetailsDto destination);
+}
+
+[Mapper]
+public partial class DocumentWithoutContentToDocumentDtoMapper : MapperBase<DocumentWithoutContent, DocumentDto>
+{
+    public override partial DocumentDto Map(DocumentWithoutContent source);
+
+    public override partial void Map(DocumentWithoutContent source, DocumentDto destination);
+}
+
+[Mapper]
+public partial class DocumentToDocumentDtoMapper : MapperBase<Document, DocumentDto>
+{
+    [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<Project, ProjectDto>
+{
+    public override partial ProjectDto Map(Project source);
+
+    public override partial void Map(Project source, ProjectDto destination);
+}

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<DocsAdminApplicationModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsAdminApplicationAutoMapperProfile>(validate: true);
-            });
-        }
     }
 }

modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebAutoMapperProfile.cs

@@ -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<CreateModel.CreateGithubProjectViewModel, CreateProjectDto>()
-                .Ignore(x => x.ExtraProperties);
-
-            CreateMap<EditModel.EditGithubProjectViewModel, UpdateProjectDto>()
-                .Ignore(x => x.ExtraProperties);
-
-            CreateMap<ProjectDto, EditModel.EditGithubProjectViewModel > ()
-                .Ignore(x => x.GitHubAccessToken)
-                .Ignore(x => x.GitHubRootUrl)
-                .Ignore(x => x.GitHubUserAgent)
-                .Ignore(x => x.GithubVersionProviderSource)
-                .Ignore(x => x.VersionBranchPrefix);
-
-            CreateMap<PullModel.PullDocumentViewModel, PullAllDocumentInput>();
-            CreateMap<PullModel.PullDocumentViewModel, PullDocumentInput>();
-        }
-    }
-}

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<PullModel.PullDocumentViewModel, PullAllDocumentInput>
+{
+    public override partial PullAllDocumentInput Map(PullModel.PullDocumentViewModel source);
+
+    public override partial void Map(PullModel.PullDocumentViewModel source, PullAllDocumentInput destination);
+}
+
+[Mapper]
+public partial class PullDocumentViewModelToPullDocumentInputMapper : MapperBase<PullModel.PullDocumentViewModel, PullDocumentInput>
+{
+    public override partial PullDocumentInput Map(PullModel.PullDocumentViewModel source);
+
+    public override partial void Map(PullModel.PullDocumentViewModel source, PullDocumentInput destination);
+}
+
+[Mapper]
+public partial class ProjectDtoToEditGithubProjectViewModelMapper : MapperBase<ProjectDto, EditModel.EditGithubProjectViewModel>
+{
+    [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<CreateModel.CreateGithubProjectViewModel, CreateProjectDto>
+{
+    [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<EditModel.EditGithubProjectViewModel, UpdateProjectDto>
+{
+    [MapperIgnoreTarget(nameof(UpdateProjectDto.ExtraProperties))]
+    public override partial UpdateProjectDto Map(EditModel.EditGithubProjectViewModel source);
+
+    public override partial void Map(EditModel.EditGithubProjectViewModel source, UpdateProjectDto destination);
+}

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<DocsAdminWebModule>();
             });
 
-            context.Services.AddAutoMapperObjectMapper<DocsAdminWebModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsAdminWebAutoMapperProfile>(validate: true);
-            });
-
             Configure<DynamicJavaScriptProxyOptions>(options =>
             {
                 options.DisableModule(DocsAdminRemoteServiceConsts.ModuleName);

modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Packages\Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj" />

modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj

@@ -14,7 +14,7 @@
     <ProjectReference Include="..\Volo.Docs.Application.Contracts\Volo.Docs.Application.Contracts.csproj" />
     <ProjectReference Include="..\Volo.Docs.Common.Application\Volo.Docs.Common.Application.csproj" />
     <ProjectReference Include="..\Volo.Docs.Domain\Volo.Docs.Domain.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
   </ItemGroup>

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<DocumentResource, DocumentResourceDto>
 {
-    public class DocsApplicationAutoMapperProfile : Profile
+    public override partial DocumentResourceDto Map(DocumentResource source);
-    {
+
-        public DocsApplicationAutoMapperProfile()
+    public override partial void Map(DocumentResource source, DocumentResourceDto destination);
-        {
-            CreateMap<Project, ProjectDto>();
-            CreateMap<VersionInfo, VersionInfoDto>();
-            CreateMap<Document, DocumentWithDetailsDto>().Ignore(x => x.Project).Ignore(x => x.Contributors);
-            CreateMap<DocumentContributor, DocumentContributorDto>();
-            CreateMap<DocumentResource, DocumentResourceDto>();
-        }
-    }
 }
+
+[Mapper]
+public partial class DocumentContributorToDocumentContributorDtoMapper : MapperBase<DocumentContributor, DocumentContributorDto>
+{
+    public override partial DocumentContributorDto Map(DocumentContributor source);
+
+    public override partial void Map(DocumentContributor source, DocumentContributorDto destination);
+}
+
+[Mapper]
+public partial class VersionInfoToVersionInfoDtoMapper : MapperBase<VersionInfo, VersionInfoDto>
+{
+    public override partial VersionInfoDto Map(VersionInfo source);
+
+    public override partial void Map(VersionInfo source, VersionInfoDto destination);
+}
+
+[Mapper]
+public partial class ProjectToProjectDtoMapper : MapperBase<Project, ProjectDto>
+{
+    public override partial ProjectDto Map(Project source);
+
+    public override partial void Map(Project source, ProjectDto destination);
+}
+
+[Mapper]
+public partial class DocumentToDocumentWithDetailsDtoMapper : MapperBase<Document, DocumentWithDetailsDto>
+{
+    [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Project))]
+    [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Contributors))]
+    public override partial DocumentWithDetailsDto Map(Document source);
+
+    public override partial void Map(Document source, DocumentWithDetailsDto destination);
+}

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<DocsApplicationModule>();
-            
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsApplicationAutoMapperProfile>(validate: true);
-            });
-            
             context.Services.TryAddSingleton<INavigationTreePostProcessor>(NullNavigationTreePostProcessor.Instance);
         }
     }

modules/docs/src/Volo.Docs.Common.Application/Volo.Docs.Common.Application.csproj

@@ -13,7 +13,7 @@
     <ItemGroup>
         <ProjectReference Include="..\Volo.Docs.Common.Application.Contracts\Volo.Docs.Common.Application.Contracts.csproj" />
         <ProjectReference Include="..\Volo.Docs.Domain\Volo.Docs.Domain.csproj" />
-        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
     </ItemGroup>

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<Project, ProjectDto>
+{
+    public override partial ProjectDto Map(Project source);
+
+    public override partial void Map(Project source, ProjectDto destination);
+}
+
+[Mapper]
+public partial class VersionInfoToVersionInfoDtoMapper : MapperBase<VersionInfo, VersionInfoDto>
 {
-    public class DocsCommonApplicationAutoMapperProfile : Profile
+    public override partial VersionInfoDto Map(VersionInfo source);
-    {
+
-        public DocsCommonApplicationAutoMapperProfile()
+    public override partial void Map(VersionInfo source, VersionInfoDto destination);
-        {
-            CreateMap<Project, ProjectDto>();
-            CreateMap<VersionInfo, VersionInfoDto>();
-        }
-    }
 }

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<DocsCommonApplicationModule>();
-            
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddProfile<DocsCommonApplicationAutoMapperProfile>(validate: true);
-        });
-    }
 }

modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj

@@ -31,7 +31,7 @@
     <ProjectReference Include="..\Volo.Docs.Domain.Shared\Volo.Docs.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BlobStoring\Volo.Abp.BlobStoring.csproj" />
   </ItemGroup>
 

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<Project, ProjectEto>
 {
-    public class DocsDomainMappingProfile : Profile
+    public override partial ProjectEto Map(Project source);
-    {
+
-        public DocsDomainMappingProfile()
+    public override partial void Map(Project source, ProjectEto destination);
-        {
+}
-            CreateMap<Document, DocumentEto>();
+
-            CreateMap<Project, ProjectEto>();
+[Mapper]
-        }
+public partial class DocumentToDocumentEtoMapper : MapperBase<Document, DocumentEto>
-    }
+{
+    public override partial DocumentEto Map(Document source);
+
+    public override partial void Map(Document source, DocumentEto destination);
 }

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<DocsDomainModule>();
-
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsDomainMappingProfile>(validate: true);
-            });
-
             Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Document, DocumentEto>(typeof(DocsDomainModule));

modules/docs/src/Volo.Docs.Web/DocsWebAutoMapperProfile.cs

@@ -1,11 +0,0 @@
-using AutoMapper;
-
-namespace Volo.Docs
-{
-    public class DocsWebAutoMapperProfile : Profile
-    {
-        public DocsWebAutoMapperProfile()
-        {
-        }
-    }
-}

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<DocsWebModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsWebAutoMapperProfile>(validate: true);
-            });
-
             Configure<DocumentToHtmlConverterOptions>(options =>
             {
                 options.Converters[MarkdownDocumentToHtmlConverter.Type] = typeof(MarkdownDocumentToHtmlConverter);

modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Packages\Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj" />