Update cms-kit module for Mapperly

modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/BloggingAdminApplicationModule.cs

@@ -18,5 +18,9 @@ namespace Volo.Blogging.Admin
         )]
     public class BloggingAdminApplicationModule : AbpModule
     {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddMapperlyObjectMapper<BloggingAdminApplicationModule>();
+        }
     }
 }

modules/blogging/src/Volo.Blogging.Admin.Web/BloggingAdminWebModule.cs

@@ -34,6 +34,8 @@ namespace Volo.Blogging.Admin
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<BloggingAdminWebModule>();
+            
             Configure<AbpNavigationOptions>(options =>
             {
                 options.MenuContributors.Add(new BloggingAdminMenuContributor());

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationMappers.cs

@@ -25,6 +25,15 @@ public partial class PostCacheItemToPostWithDetailsDtoMapper : MapperBase<PostCa
     [MapperIgnoreTarget(nameof(PostWithDetailsDto.Tags))]
     public override partial PostWithDetailsDto Map(PostCacheItem source);
 
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.LastModificationTime))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.LastModifierId))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.IsDeleted))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.DeletionTime))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.DeleterId))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.ConcurrencyStamp))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.Writer))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.CommentCount))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.Tags))]
     public override partial void Map(PostCacheItem source, PostWithDetailsDto destination);
 }
     
@@ -35,6 +44,8 @@ public partial class PostToPostCacheItemMapper : MapperBase<Post, PostCacheItem>
     [MapperIgnoreTarget(nameof(PostCacheItem.Tags))]
     public override partial PostCacheItem Map(Post source);
 
+    [MapperIgnoreTarget(nameof(PostCacheItem.CommentCount))]
+    [MapperIgnoreTarget(nameof(PostCacheItem.Tags))]
     public override partial void Map(Post source, PostCacheItem destination);
 }
     
@@ -44,6 +55,7 @@ public partial class CommentToCommentWithDetailsDtoMapper : MapperBase<Comment,
     [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Writer))]
     public override partial CommentWithDetailsDto Map(Comment source);
 
+    [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Writer))]
     public override partial void Map(Comment source, CommentWithDetailsDto destination);
 }
     
@@ -55,6 +67,9 @@ public partial class PostToPostWithDetailsDtoMapper : MapperBase<Post, PostWithD
     [MapperIgnoreTarget(nameof(PostWithDetailsDto.Writer))]
     public override partial PostWithDetailsDto Map(Post source);
 
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.Tags))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.CommentCount))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.Writer))]
     public override partial void Map(Post source, PostWithDetailsDto destination);
 }
     

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/BloggingApplicationModule.cs

@@ -22,6 +22,8 @@ namespace Volo.Blogging
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<BloggingApplicationModule>();
+            
             Configure<AuthorizationOptions>(options =>
             {
                 //TODO: Rename UpdatePolicy/DeletePolicy since it's candidate to conflicts with other modules!

modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDomainModule.cs

@@ -21,6 +21,8 @@ namespace Volo.Blogging
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<BloggingDomainModule>();
+            
             Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Blog, BlogEto>(typeof(BloggingDomainModule));

modules/blogging/src/Volo.Blogging.Web/AbpBloggingWebMappers.cs

@@ -11,6 +11,7 @@ public partial class PostWithDetailsDtoToEditPostViewModelMapper : MapperBase<Po
     [MapperIgnoreTarget(nameof(EditPostViewModel.Tags))]
     public override partial EditPostViewModel Map(PostWithDetailsDto source);
 
+    [MapperIgnoreTarget(nameof(EditPostViewModel.Tags))]
     public override partial void Map(PostWithDetailsDto source, EditPostViewModel destination);
 }
 

modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs

@@ -42,6 +42,8 @@ namespace Volo.Blogging
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<BloggingWebModule>();
+            
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<BloggingWebModule>();

modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebAutoMapperProfile.cs

@@ -1,11 +0,0 @@
-using AutoMapper;
-
-namespace Volo.CmsKit;
-
-public class CmsKitWebAutoMapperProfile : Profile
-{
-    public CmsKitWebAutoMapperProfile()
-    {
-        //Define your AutoMapper configuration here for the Web project.
-    }
-}

modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostModule.cs

@@ -23,7 +23,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Caching;
 using Volo.Abp.Caching.StackExchangeRedis;
 using Volo.Abp.FeatureManagement;
@@ -87,7 +87,6 @@ public class CmsKitWebHostModule : AbpModule
         ConfigureCache(configuration);
         ConfigureUrls(configuration);
         ConfigureAuthentication(context, configuration);
-        ConfigureAutoMapper();
         ConfigureVirtualFileSystem(hostingEnvironment);
         ConfigureSwaggerServices(context.Services);
         ConfigureMultiTenancy();
@@ -159,14 +158,6 @@ public class CmsKitWebHostModule : AbpModule
             });
     }
 
-    private void ConfigureAutoMapper()
-    {
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<CmsKitWebHostModule>();
-        });
-    }
-
     private void ConfigureVirtualFileSystem(IWebHostEnvironment hostingEnvironment)
     {
         if (hostingEnvironment.IsDevelopment())

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs

@@ -1,54 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Volo.CmsKit.Admin.Blogs;
-using Volo.CmsKit.Admin.Comments;
-using Volo.CmsKit.Admin.MediaDescriptors;
-using Volo.CmsKit.Admin.Pages;
-using Volo.CmsKit.Blogs;
-using Volo.CmsKit.Admin.Tags;
-using Volo.CmsKit.Comments;
-using Volo.CmsKit.MediaDescriptors;
-using Volo.CmsKit.Pages;
-using Volo.CmsKit.Tags;
-using Volo.CmsKit.Users;
-using Volo.CmsKit.Menus;
-using Volo.CmsKit.Admin.Menus;
-
-namespace Volo.CmsKit.Admin;
-
-public class CmsKitAdminApplicationAutoMapperProfile : Profile
-{
-    public CmsKitAdminApplicationAutoMapperProfile()
-    {
-        CreateMap<CmsUser, Comments.CmsUserDto>().MapExtraProperties();
-
-        CreateMap<Comment, CommentDto>().MapExtraProperties();
-        CreateMap<Comment, CommentWithAuthorDto>()
-            .Ignore(x => x.Author)
-            .MapExtraProperties();
-
-        CreateMap<Page, PageDto>().MapExtraProperties();
-        CreateMap<Page, PageLookupDto>();
-
-        CreateMap<BlogPost, BlogPostDto>(MemberList.Destination).MapExtraProperties();
-        CreateMap<BlogPost, BlogPostListDto>()
-            .Ignore(d => d.BlogName)
-            .MapExtraProperties();
-        
-        CreateMap<CreateBlogPostDto, BlogPost>(MemberList.Source).MapExtraProperties();
-        CreateMap<UpdateBlogPostDto, BlogPost>(MemberList.Source).MapExtraProperties();
-
-        CreateMap<Blog, BlogDto>().Ignore(b => b.BlogPostCount).MapExtraProperties();
-
-        CreateMap<TagEntityTypeDefiniton, TagDefinitionDto>(MemberList.Destination);
-
-        CreateMap<Tag, TagDto>().MapExtraProperties();
-
-        CreateMap<MediaDescriptor, MediaDescriptorDto>().MapExtraProperties();
-
-        CreateMap<MenuItem, MenuItemDto>().MapExtraProperties();
-        CreateMap<MenuItem, MenuItemWithDetailsDto>()
-            .Ignore(x => x.PageTitle)
-            .MapExtraProperties();
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationMappers.cs

@@ -0,0 +1,140 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.CmsKit.Admin.Blogs;
+using Volo.CmsKit.Admin.Comments;
+using Volo.CmsKit.Admin.MediaDescriptors;
+using Volo.CmsKit.Admin.Pages;
+using Volo.CmsKit.Blogs;
+using Volo.CmsKit.Admin.Tags;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.MediaDescriptors;
+using Volo.CmsKit.Pages;
+using Volo.CmsKit.Tags;
+using Volo.CmsKit.Users;
+using Volo.CmsKit.Menus;
+using Volo.CmsKit.Admin.Menus;
+
+namespace Volo.CmsKit.Admin;
+
+[Mapper]
+public partial class TagEntityTypeDefinitonToTagDefinitionDtoMapper : MapperBase<TagEntityTypeDefiniton, TagDefinitionDto>
+{
+    public override partial TagDefinitionDto Map(TagEntityTypeDefiniton source);
+
+    public override partial void Map(TagEntityTypeDefiniton source, TagDefinitionDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class BlogPostToBlogPostDtoMapper : MapperBase<BlogPost, BlogPostDto>
+{
+    public override partial BlogPostDto Map(BlogPost source);
+
+    public override partial void Map(BlogPost source, BlogPostDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class BlogPostToBlogPostListDtoMapper : MapperBase<BlogPost, BlogPostListDto>
+{
+    [MapperIgnoreTarget(nameof(BlogPostListDto.BlogName))]
+    public override partial BlogPostListDto Map(BlogPost source);
+
+    [MapperIgnoreTarget(nameof(BlogPostListDto.BlogName))]
+    public override partial void Map(BlogPost source, BlogPostListDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class MenuItemToMenuItemWithDetailsDtoMapper : MapperBase<MenuItem, MenuItemWithDetailsDto>
+{
+    [MapperIgnoreTarget(nameof(MenuItemWithDetailsDto.PageTitle))]
+    public override partial MenuItemWithDetailsDto Map(MenuItem source);
+
+    [MapperIgnoreTarget(nameof(MenuItemWithDetailsDto.PageTitle))]
+    public override partial void Map(MenuItem source, MenuItemWithDetailsDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class MenuItemToMenuItemMapper : MapperBase<MenuItem, MenuItemDto>
+{
+    public override partial MenuItemDto Map(MenuItem source);
+
+    public override partial void Map(MenuItem source, MenuItemDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class MediaDescriptorToMediaDescriptorDtoMapper : MapperBase<MediaDescriptor, MediaDescriptorDto>
+{
+    public override partial MediaDescriptorDto Map(MediaDescriptor source);
+
+    public override partial void Map(MediaDescriptor source, MediaDescriptorDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class TagToTagDtoMapper : MapperBase<Tag, TagDto>
+{
+    public override partial TagDto Map(Tag source);
+
+    public override partial void Map(Tag source, TagDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class BlogToBlogDtoMapper : MapperBase<Blog, BlogDto>
+{
+    [MapperIgnoreTarget(nameof(BlogDto.BlogPostCount))]
+    public override partial BlogDto Map(Blog source);
+
+    [MapperIgnoreTarget(nameof(BlogDto.BlogPostCount))]
+    public override partial void Map(Blog source, BlogDto destination);
+}
+
+[Mapper]
+public partial class PageToPageLookupDtoMapper : MapperBase<Page, PageLookupDto>
+{
+    public override partial PageLookupDto Map(Page source);
+
+    public override partial void Map(Page source, PageLookupDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class PageToPageDtoMapper : MapperBase<Page, PageDto>
+{
+    public override partial PageDto Map(Page source);
+
+    public override partial void Map(Page source, PageDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CommentToCommentWithAuthorDtoMapper : MapperBase<Comment, CommentWithAuthorDto>
+{
+    [MapperIgnoreTarget(nameof(CommentWithAuthorDto.Author))]
+    public override partial CommentWithAuthorDto Map(Comment source);
+
+    [MapperIgnoreTarget(nameof(CommentWithAuthorDto.Author))]
+    public override partial void Map(Comment source, CommentWithAuthorDto destination);
+}
+    
+[Mapper]
+[MapExtraProperties]
+public partial class CommentToCommentDtoMapper : MapperBase<Comment, CommentDto>
+{
+    public override partial CommentDto Map(Comment source);
+
+    public override partial void Map(Comment source, CommentDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CmsUserToCommentsCmsUserDtoMapper : MapperBase<CmsUser, Comments.CmsUserDto>
+{
+    public override partial Comments.CmsUserDto Map(CmsUser source);
+
+    public override partial void Map(CmsUser source, Comments.CmsUserDto destination);
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Generic;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.GlobalFeatures;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
@@ -17,23 +17,18 @@ namespace Volo.CmsKit.Admin;
 
 [DependsOn(
     typeof(CmsKitAdminApplicationContractsModule),
-    typeof(AbpAutoMapperModule),
+    typeof(AbpMapperlyModule),
     typeof(CmsKitCommonApplicationModule)
     )]
 public class CmsKitAdminApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<CmsKitAdminApplicationModule>();
+        context.Services.AddMapperlyObjectMapper<CmsKitAdminApplicationModule>();
 
         ConfigureTagOptions();
 
         ConfigureCommentOptions();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<CmsKitAdminApplicationModule>(validate: true);
-        });
     }
 
     private void ConfigureTagOptions()

modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebAutoMapperProfile.cs

@@ -1,57 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Volo.CmsKit.Admin.Blogs;
-using Volo.CmsKit.Admin.Menus;
-using Volo.CmsKit.Admin.Pages;
-using Volo.CmsKit.Admin.Tags;
-using Volo.CmsKit.Menus;
-using Volo.CmsKit.Tags;
-
-namespace Volo.CmsKit.Admin.Web;
-
-public class CmsKitAdminWebAutoMapperProfile : Profile
-{
-    public CmsKitAdminWebAutoMapperProfile()
-    {
-        CreateBlogPostMappings();
-        CreateBlogMappings();
-        CreateMenuMappings();
-        CreatePageMappings();
-        CreateTagMappings();
-    }
-
-    protected virtual void CreateBlogPostMappings()
-    {
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts.CreateModel.CreateBlogPostViewModel, CreateBlogPostDto>().MapExtraProperties();
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts.UpdateModel.UpdateBlogPostViewModel, UpdateBlogPostDto>().MapExtraProperties();
-        CreateMap<BlogPostDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts.UpdateModel.UpdateBlogPostViewModel>().MapExtraProperties();
-    }
-    
-    protected virtual void CreateBlogMappings()
-    {
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.CreateModalModel.CreateBlogViewModel, CreateBlogDto>().MapExtraProperties();
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel, UpdateBlogDto>().MapExtraProperties();
-        CreateMap<BlogDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel>().MapExtraProperties();
-    }
-
-    protected virtual void CreateMenuMappings()
-    {
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel, MenuItemCreateInput>().MapExtraProperties();
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel, MenuItemUpdateInput>().MapExtraProperties();
-        CreateMap<MenuItemWithDetailsDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel>().MapExtraProperties();
-    }
-
-    protected virtual void CreatePageMappings()
-    {
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.CreateModel.CreatePageViewModel, CreatePageInputDto>().MapExtraProperties();
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel, UpdatePageInputDto>().MapExtraProperties();
-        CreateMap<PageDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel>().MapExtraProperties();
-    }
-
-    protected virtual void CreateTagMappings()
-    {
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Tags.CreateModalModel.TagCreateViewModel, TagCreateDto>().MapExtraProperties();
-        CreateMap<Volo.CmsKit.Admin.Web.Pages.CmsKit.Tags.EditModalModel.TagEditViewModel, TagUpdateDto>().MapExtraProperties();
-        CreateMap<TagDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.Tags.EditModalModel.TagEditViewModel>().MapExtraProperties();
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebMappers.cs

@@ -0,0 +1,214 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.CmsKit.Admin.Blogs;
+using Volo.CmsKit.Admin.Menus;
+using Volo.CmsKit.Admin.Pages;
+using Volo.CmsKit.Admin.Tags;
+using Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts;
+using Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs;
+using Volo.CmsKit.Admin.Web.Pages.CmsKit.Tags;
+using Volo.CmsKit.Blogs;
+using Volo.CmsKit.Tags;
+using CreateModalModel = Volo.CmsKit.Admin.Web.Pages.CmsKit.Tags.CreateModalModel;
+
+namespace Volo.CmsKit.Admin.Web;
+
+[Mapper]
+public partial class BlogFeatureInputDtoToBlogFeatureViewModelMapper : TwoWayMapperBase<BlogFeatureInputDto, FeaturesModalModel.BlogFeatureViewModel>
+{
+    public override partial FeaturesModalModel.BlogFeatureViewModel Map(BlogFeatureInputDto source);
+    public override partial void Map(BlogFeatureInputDto source, FeaturesModalModel.BlogFeatureViewModel destination);
+
+    public override partial BlogFeatureInputDto ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination);
+    public override partial void ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination, BlogFeatureInputDto source);
+}
+
+[Mapper]
+public partial class BlogFeatureDtoToBlogFeatureViewModelMapper : TwoWayMapperBase<BlogFeatureDto, FeaturesModalModel.BlogFeatureViewModel>
+{
+    public override partial FeaturesModalModel.BlogFeatureViewModel Map(BlogFeatureDto source);
+    public override partial void Map(BlogFeatureDto source, FeaturesModalModel.BlogFeatureViewModel destination);
+
+    public override partial BlogFeatureDto ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination);
+    public override partial void ReverseMap(FeaturesModalModel.BlogFeatureViewModel destination, BlogFeatureDto source);
+}
+
+[Mapper]
+public partial class CreateBlogPostDtoToCreateBlogPostViewModelMapper : TwoWayMapperBase<CreateBlogPostDto, CreateModel.CreateBlogPostViewModel>
+{
+    public override partial CreateModel.CreateBlogPostViewModel Map(CreateBlogPostDto source);
+    public override partial void Map(CreateBlogPostDto source, CreateModel.CreateBlogPostViewModel destination);
+
+    public override partial CreateBlogPostDto ReverseMap(CreateModel.CreateBlogPostViewModel destination);
+    public override partial void ReverseMap(CreateModel.CreateBlogPostViewModel destination, CreateBlogPostDto source);
+}
+
+[Mapper]
+public partial class TagUpdateDtoToTagEditViewModelMapper : TwoWayMapperBase<TagUpdateDto, EditModalModel.TagEditViewModel>
+{
+    public override partial EditModalModel.TagEditViewModel Map(TagUpdateDto source);
+    public override partial void Map(TagUpdateDto source, EditModalModel.TagEditViewModel destination);
+
+    public override partial TagUpdateDto ReverseMap(EditModalModel.TagEditViewModel destination);
+    public override partial void ReverseMap(EditModalModel.TagEditViewModel destination, TagUpdateDto source);
+}
+
+[Mapper]
+public partial class TagDtoToCreateBlogPostDtoMapper : MapperBase<TagDto, EditModalModel.TagEditViewModel>
+{
+    public override partial EditModalModel.TagEditViewModel Map(TagDto source);
+
+    public override partial void Map(TagDto source, EditModalModel.TagEditViewModel destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CreateBlogPostViewModelToCreateBlogPostDtoMapper : MapperBase<CreateModel.CreateBlogPostViewModel, CreateBlogPostDto>
+{
+    public override partial CreateBlogPostDto Map(CreateModel.CreateBlogPostViewModel source);
+
+    public override partial void Map(CreateModel.CreateBlogPostViewModel source, CreateBlogPostDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class UpdateBlogPostViewModelToUpdateBlogPostDtoMapper : TwoWayMapperBase<UpdateModel.UpdateBlogPostViewModel, UpdateBlogPostDto>
+{
+    public override partial UpdateBlogPostDto Map(UpdateModel.UpdateBlogPostViewModel source);
+
+    public override partial void Map(UpdateModel.UpdateBlogPostViewModel source, UpdateBlogPostDto destination);
+
+    public override partial UpdateModel.UpdateBlogPostViewModel ReverseMap(UpdateBlogPostDto destination);
+
+    public override partial void ReverseMap(UpdateBlogPostDto destination, UpdateModel.UpdateBlogPostViewModel source);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class BlogPostDtoToUpdateBlogPostViewModelMapper : MapperBase<BlogPostDto, UpdateModel.UpdateBlogPostViewModel>
+{
+    public override partial UpdateModel.UpdateBlogPostViewModel Map(BlogPostDto source);
+
+    public override partial void Map(BlogPostDto source, UpdateModel.UpdateBlogPostViewModel destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class BlogDtoUpdateToBlogViewModelMapper : MapperBase<BlogDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel>
+{
+    public override partial Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel Map(BlogDto source);
+
+    public override partial void Map(BlogDto source, Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CreateBlogViewModelToCreateBlogDtoMapper : MapperBase<Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.CreateModalModel.CreateBlogViewModel, CreateBlogDto>
+{
+    public override partial CreateBlogDto Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.CreateModalModel.CreateBlogViewModel source);
+
+    public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.CreateModalModel.CreateBlogViewModel source, CreateBlogDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class UpdateBlogViewModelToUpdateBlogDtoMapper : MapperBase<Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel, UpdateBlogDto>
+{
+    public override partial UpdateBlogDto Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel source);
+
+    public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs.UpdateModalModel.UpdateBlogViewModel source, UpdateBlogDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class MenuItemUpdateViewModelToMenuItemCreateInputMapper : TwoWayMapperBase<Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel, MenuItemCreateInput>
+{
+    public override partial MenuItemCreateInput Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel source);
+
+    public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel source, MenuItemCreateInput destination);
+    public override partial Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel ReverseMap(MenuItemCreateInput destination);
+
+    public override partial void ReverseMap(MenuItemCreateInput destination, Pages.CmsKit.Menus.MenuItems.CreateModalModel.MenuItemCreateViewModel source);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class MenuItemUpdateViewModelToMenuItemUpdateInputMapper : MapperBase<Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel, MenuItemUpdateInput>
+{
+    public override partial MenuItemUpdateInput Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel source);
+
+    public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel source, MenuItemUpdateInput destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class MenuItemWithDetailsDtoToMenuItemUpdateViewModelMapper : MapperBase<MenuItemWithDetailsDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel>
+{
+    public override partial Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel Map(MenuItemWithDetailsDto source);
+
+    public override partial void Map(MenuItemWithDetailsDto source, Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems.UpdateModalModel.MenuItemUpdateViewModel destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class PageDtoToCreatePageInputDtoMapper : MapperBase<PageDto, Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel>
+{
+    public override partial Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel Map(PageDto source);
+
+    public override partial void Map(PageDto source, Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CreatePageViewModelToCreatePageInputDtoMapper : TwoWayMapperBase<Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.CreateModel.CreatePageViewModel, CreatePageInputDto>
+{
+    public override partial CreatePageInputDto Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.CreateModel.CreatePageViewModel source);
+
+    public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.CreateModel.CreatePageViewModel source, CreatePageInputDto destination);
+    public override partial Pages.CmsKit.Pages.CreateModel.CreatePageViewModel ReverseMap(CreatePageInputDto destination);
+
+    public override partial void ReverseMap(CreatePageInputDto destination, Pages.CmsKit.Pages.CreateModel.CreatePageViewModel source);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class UpdatePageViewModelToUpdatePageInputDtoMapper : TwoWayMapperBase<Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel, UpdatePageInputDto>
+{
+    public override partial UpdatePageInputDto Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel source);
+
+    public override partial void Map(Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel source, UpdatePageInputDto destination);
+
+    public override partial Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel ReverseMap(UpdatePageInputDto destination);
+
+    public override partial void ReverseMap(UpdatePageInputDto destination, Pages.CmsKit.Pages.UpdateModel.UpdatePageViewModel source);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class TagCreateViewModelToTagCreateDtoMapper : TwoWayMapperBase<CreateModalModel.TagCreateViewModel, TagCreateDto>
+{
+    public override partial TagCreateDto Map(CreateModalModel.TagCreateViewModel source);
+
+    public override partial void Map(CreateModalModel.TagCreateViewModel source, TagCreateDto destination);
+    public override partial CreateModalModel.TagCreateViewModel ReverseMap(TagCreateDto destination);
+
+    public override partial void ReverseMap(TagCreateDto destination, CreateModalModel.TagCreateViewModel source);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class TagEditViewModelToTagUpdateDtoMapper : MapperBase<EditModalModel.TagEditViewModel, TagUpdateDto>
+{
+    public override partial TagUpdateDto Map(EditModalModel.TagEditViewModel source);
+
+    public override partial void Map(EditModalModel.TagEditViewModel source, TagUpdateDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class TagDtoToTagEditViewModelMapper : MapperBase<TagDto, EditModalModel.TagEditViewModel>
+{
+    public override partial EditModalModel.TagEditViewModel Map(TagDto source);
+
+    public override partial void Map(TagDto source, EditModalModel.TagEditViewModel destination);
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs

@@ -7,7 +7,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Packages.MarkdownIt;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
@@ -82,8 +82,7 @@ public class CmsKitAdminWebModule : AbpModule
             options.FileSets.AddEmbedded<CmsKitAdminWebModule>("Volo.CmsKit.Admin.Web");
         });
 
-        context.Services.AddAutoMapperObjectMapper<CmsKitAdminWebModule>();
-        Configure<AbpAutoMapperOptions>(options => { options.AddMaps<CmsKitAdminWebModule>(validate: true); });
+        context.Services.AddMapperlyObjectMapper<CmsKitAdminWebModule>();
 
         Configure<RazorPagesOptions>(options =>
         {

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System;
 using System.Collections.Generic;
@@ -50,7 +49,6 @@ public class CreateModel : CmsKitAdminPageModel
         return new OkObjectResult(createResult);
     }
 
-    [AutoMap(typeof(CreateBlogPostDto), ReverseMap = true)]
     public class CreateBlogPostViewModel : ExtensibleObject
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System;
 using System.Collections.Generic;
@@ -56,8 +55,6 @@ public class UpdateModel : CmsKitAdminPageModel
         return NoContent();
     }
 
-    [AutoMap(typeof(BlogPostDto))]
-    [AutoMap(typeof(UpdateBlogPostDto), ReverseMap = true)]
     public class UpdateBlogPostViewModel : ExtensibleObject, IHasConcurrencyStamp
     {
         [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxTitleLength))]

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/CreateModal.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Volo.Abp.ObjectExtending;

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/FeaturesModal.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -47,8 +46,6 @@ public class FeaturesModalModel : CmsKitAdminPageModel
         return NoContent();
     }
 
-    [AutoMap(typeof(BlogFeatureDto), ReverseMap = true)]
-    [AutoMap(typeof(BlogFeatureInputDto), ReverseMap = true)]
     public class BlogFeatureViewModel
     {
         private string featureName;

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/CreateModal.cshtml.cs

@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using AutoMapper;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Features;
@@ -46,7 +45,6 @@ public class CreateModalModel : CmsKitAdminPageModel
         return new OkObjectResult(dto);
     }
 
-    [AutoMap(typeof(MenuItemCreateInput), ReverseMap = true)]
     public class MenuItemCreateViewModel : ExtensibleObject
     {
         [HiddenInput]

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/UpdateModal.cshtml.cs

@@ -2,9 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using AutoMapper;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Features;
 using Volo.Abp.GlobalFeatures;
@@ -12,7 +10,6 @@ using Volo.Abp.ObjectExtending;
 using Volo.CmsKit.Admin.Menus;
 using Volo.CmsKit.Features;
 using Volo.CmsKit.GlobalFeatures;
-using Volo.CmsKit.Menus;
 
 namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Menus.MenuItems;
 

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
@@ -32,7 +31,6 @@ public class CreateModel : CmsKitAdminPageModel
         return new OkObjectResult(created);
     }
 
-    [AutoMap(typeof(CreatePageInputDto), ReverseMap = true)]
     public class CreatePageViewModel : ExtensibleObject
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
@@ -44,8 +43,6 @@ public class UpdateModel : CmsKitAdminPageModel
         return NoContent();
     }
 
-    [AutoMap(typeof(PageDto))]
-    [AutoMap(typeof(UpdatePageInputDto), ReverseMap = true)]
     public class UpdatePageViewModel : ExtensibleObject, IHasConcurrencyStamp
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/CreateModal.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -44,7 +43,6 @@ public class CreateModalModel : CmsKitAdminPageModel
         return NoContent();
     }
 
-    [AutoMap(typeof(TagCreateDto), ReverseMap = true)]
     public class TagCreateViewModel : ExtensibleObject
     {
         [DynamicMaxLength(typeof(TagConsts), nameof(TagConsts.MaxEntityTypeLength))]

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/EditModal.cshtml.cs

@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -44,8 +43,6 @@ public class EditModalModel : CmsKitAdminPageModel
         return NoContent();
     }
 
-    [AutoMap(typeof(TagDto))]
-    [AutoMap(typeof(TagUpdateDto), ReverseMap = true)]
     public class TagEditViewModel : ExtensibleObject, IHasConcurrencyStamp
     {
         [Required]

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.csproj

@@ -9,7 +9,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.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationAutoMapperProfile.cs

@@ -1,25 +1,62 @@
-using AutoMapper;
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
 using Volo.CmsKit.Blogs;
 using Volo.CmsKit.Tags;
 using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit;
 
-public class CmsKitCommonApplicationAutoMapperProfile : Profile
+[Mapper]
+[MapExtraProperties]
+public partial class OrganizationUnitRoleToOrganizationUnitRoleDtoMapper : TwoWayMapperBase<BlogFeatureCacheItem, BlogFeatureDto>
 {
-    public CmsKitCommonApplicationAutoMapperProfile()
-    {
-        CreateMap<Tag, TagDto>().MapExtraProperties();
+    public override partial BlogFeatureDto Map(BlogFeatureCacheItem source);
+    public override partial void Map(BlogFeatureCacheItem source, BlogFeatureDto destination);
 
-        CreateMap<PopularTag, PopularTagDto>();
+    public override partial BlogFeatureCacheItem ReverseMap(BlogFeatureDto destination);
+    public override partial void ReverseMap(BlogFeatureDto destination, BlogFeatureCacheItem source);
+}
 
-        CreateMap<CmsUser, CmsUserDto>().MapExtraProperties();
+[Mapper]
+[MapExtraProperties]
+public partial class BlogFeatureToBlogFeatureDtoMapper : MapperBase<BlogFeature, BlogFeatureDto>
+{
+    public override partial BlogFeatureDto Map(BlogFeature source);
 
-        CreateMap<BlogFeature, BlogFeatureCacheItem>().MapExtraProperties();
-        CreateMap<BlogFeature, BlogFeatureDto>().MapExtraProperties();
-        CreateMap<BlogFeatureCacheItem, BlogFeatureDto>()
-            .MapExtraProperties()
-            .ReverseMap()
-            .MapExtraProperties();
-    }
+    public override partial void Map(BlogFeature source, BlogFeatureDto destination);
 }
+
+[Mapper]
+[MapExtraProperties]
+public partial class BlogFeatureToBlogFeatureCacheItemMapper : MapperBase<BlogFeature, BlogFeatureCacheItem>
+{
+    public override partial BlogFeatureCacheItem Map(BlogFeature source);
+
+    public override partial void Map(BlogFeature source, BlogFeatureCacheItem destination);
+}
+
+[Mapper]
+public partial class PopularTagToPopularTagDtoMapper : MapperBase<PopularTag, PopularTagDto>
+{
+    public override partial PopularTagDto Map(PopularTag source);
+
+    public override partial void Map(PopularTag source, PopularTagDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CmsUserToCmsUserDtoMapper : MapperBase<CmsUser, CmsUserDto>
+{
+    public override partial CmsUserDto Map(CmsUser source);
+
+    public override partial void Map(CmsUser source, CmsUserDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class TagToTagDtoMapper : MapperBase<Tag, TagDto>
+{
+    public override partial TagDto Map(Tag source);
+
+    public override partial void Map(Tag source, TagDto destination);
+}

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationModule.cs

@@ -1,11 +1,7 @@
-using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
-using Volo.Abp.GlobalFeatures;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Application;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
-using Volo.CmsKit.Blogs;
-using Volo.CmsKit.GlobalFeatures;
-using Volo.CmsKit.MediaDescriptors;
-using Volo.CmsKit.Permissions;
 
 namespace Volo.CmsKit;
 
@@ -13,15 +9,12 @@ namespace Volo.CmsKit;
     typeof(CmsKitCommonApplicationContractsModule),
     typeof(CmsKitDomainModule),
     typeof(AbpDddApplicationModule),
-    typeof(AbpAutoMapperModule)
+    typeof(AbpMapperlyModule)
 )]
 public class CmsKitCommonApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<CmsKitCommonApplicationModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<CmsKitCommonApplicationModule>();
     }
 }

modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs

@@ -1,5 +1,5 @@
 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;
@@ -13,12 +13,14 @@ namespace Volo.CmsKit.Web;
 [DependsOn(
     typeof(AbpAspNetCoreMvcUiThemeSharedModule),
     typeof(CmsKitCommonApplicationContractsModule),
-    typeof(AbpAutoMapperModule)
+    typeof(AbpMapperlyModule)
     )]
 public class CmsKitCommonWebModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
+        context.Services.AddMapperlyObjectMapper<CmsKitCommonWebModule>();
+        
         Configure<CmsKitUiOptions>(options =>
         {
             options.ReactionIcons[StandardReactions.Smile] = new LocalizableIconDictionary("fas fa-smile text-warning");

modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.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="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
   </ItemGroup>
 

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationMappers.cs

@@ -0,0 +1,111 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.CmsKit.Blogs;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Contents;
+using Volo.CmsKit.GlobalResources;
+using Volo.CmsKit.Menus;
+using Volo.CmsKit.Pages;
+using Volo.CmsKit.Public.Comments;
+using Volo.CmsKit.Public.GlobalResources;
+using Volo.CmsKit.Public.Ratings;
+using Volo.CmsKit.Ratings;
+using Volo.CmsKit.Users;
+
+namespace Volo.CmsKit.Public;
+
+[Mapper]
+[MapExtraProperties]
+public partial class CmsUserToCmsUserDtoMapper : MapperBase<CmsUser, Comments.CmsUserDto>
+{
+    public override partial Comments.CmsUserDto Map(CmsUser source);
+
+    public override partial void Map(CmsUser source, Comments.CmsUserDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CommentToCommentDtoMapper : MapperBase<Comment, CommentDto>
+{
+    [MapperIgnoreTarget(nameof(CommentDto.Author))]
+    public override partial CommentDto Map(Comment source);
+
+    [MapperIgnoreTarget(nameof(CommentDto.Author))]
+    public override partial void Map(Comment source, CommentDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CommentToCommentWithDetailsDtoMapper : MapperBase<Comment, CommentWithDetailsDto>
+{
+    [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Replies))]
+    [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Author))]
+    public override partial CommentWithDetailsDto Map(Comment source);
+
+    [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Replies))]
+    [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Author))]
+    public override partial void Map(Comment source, CommentWithDetailsDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class RatingToRatingDtoMapper : MapperBase<Rating, RatingDto>
+{
+    public override partial RatingDto Map(Rating source);
+
+    public override partial void Map(Rating source, RatingDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class PageToPageCacheItemMapper : MapperBase<Page, PageCacheItem>
+{
+    public override partial PageCacheItem Map(Page source);
+
+    public override partial void Map(Page source, PageCacheItem destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class PageCacheItemToPageDtoMapper : MapperBase<PageCacheItem, PageDto>
+{
+    public override partial PageDto Map(PageCacheItem source);
+
+    public override partial void Map(PageCacheItem source, PageDto destination);
+}
+        
+[Mapper]
+[MapExtraProperties]
+public partial class BlogPostToPageDtoMapper : MapperBase<Page, PageDto>
+{
+    public override partial PageDto Map(Page source);
+
+    public override partial void Map(Page source, PageDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class BlogPostToBlogPostCommonDtoMapper : MapperBase<BlogPost, BlogPostCommonDto>
+{
+    public override partial BlogPostCommonDto Map(BlogPost source);
+
+    public override partial void Map(BlogPost source, BlogPostCommonDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class MenuItemToMenuItemDtoMapper : MapperBase<MenuItem, MenuItemDto>
+{
+    public override partial MenuItemDto Map(MenuItem source);
+
+    public override partial void Map(MenuItem source, MenuItemDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class GlobalResourceToGlobalResourceDtoMapper : MapperBase<GlobalResource, GlobalResourceDto>
+{
+    public override partial GlobalResourceDto Map(GlobalResource source);
+
+    public override partial void Map(GlobalResource source, GlobalResourceDto destination);
+}

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AutoMapper;
 using Volo.Abp.Caching;
 using Volo.Abp.Modularity;
 
@@ -14,11 +13,6 @@ public class CmsKitPublicApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<CmsKitPublicApplicationModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<CmsKitPublicApplicationModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<CmsKitPublicApplicationModule>();
     }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs

@@ -1,46 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Volo.CmsKit.Blogs;
-using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
-using Volo.CmsKit.GlobalResources;
-using Volo.CmsKit.Menus;
-using Volo.CmsKit.Pages;
-using Volo.CmsKit.Public.Blogs;
-using Volo.CmsKit.Public.Comments;
-using Volo.CmsKit.Public.GlobalResources;
-using Volo.CmsKit.Public.Ratings;
-using Volo.CmsKit.Ratings;
-using Volo.CmsKit.Users;
-
-namespace Volo.CmsKit.Public;
-
-public class PublicApplicationAutoMapperProfile : Profile
-{
-    public PublicApplicationAutoMapperProfile()
-    {
-        CreateMap<CmsUser, Comments.CmsUserDto>().MapExtraProperties();
-
-        CreateMap<Comment, CommentDto>()
-            .Ignore(x => x.Author).MapExtraProperties();
-
-        CreateMap<Comment, CommentWithDetailsDto>()
-            .Ignore(x => x.Replies)
-            .Ignore(x => x.Author)
-            .MapExtraProperties();
-
-        CreateMap<Rating, RatingDto>();
-
-        CreateMap<Page, PageCacheItem>().MapExtraProperties();
-
-        CreateMap<PageCacheItem, PageDto>().MapExtraProperties();
-
-        CreateMap<Page, PageDto>().MapExtraProperties();
-        
-        CreateMap<BlogPost, BlogPostCommonDto>().MapExtraProperties();
-
-        CreateMap<MenuItem, MenuItemDto>().MapExtraProperties();
-
-        CreateMap<GlobalResource, GlobalResourceDto>().MapExtraProperties();
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs

@@ -1,15 +1,38 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Volo.CmsKit.Menus;
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.Public.Comments;
+using Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs;
+using Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Pages;
 
 namespace Volo.CmsKit.Public.Web;
 
-public class CmsKitPublicWebAutoMapperProfile : Profile
+[Mapper]
+public partial class PageDtoToPageViewModelMapper : TwoWayMapperBase<PageDto, PageViewModel>
 {
-    public CmsKitPublicWebAutoMapperProfile()
-    {
-        CreateMap<CreateCommentWithParametersInput, CreateCommentInput>()
-            .Ignore(x=> x.ExtraProperties);
-    }
+    public override partial PageViewModel Map(PageDto source);
+    public override partial void Map(PageDto source, PageViewModel destination);
+
+    public override partial PageDto ReverseMap(PageViewModel destination);
+    public override partial void ReverseMap(PageViewModel destination, PageDto source);
+}
+
+[Mapper]
+public partial class BlogPostCommonDtoToBlogPostViewModelMapper : TwoWayMapperBase<BlogPostCommonDto, BlogPostViewModel>
+{
+    public override partial BlogPostViewModel Map(BlogPostCommonDto source);
+    public override partial void Map(BlogPostCommonDto source, BlogPostViewModel destination);
+
+    public override partial BlogPostCommonDto ReverseMap(BlogPostViewModel destination);
+    public override partial void ReverseMap(BlogPostViewModel destination, BlogPostCommonDto source);
 }
+
+[Mapper]
+public partial class CreateCommentWithParametersInputToCommentDtoMapper : MapperBase<CreateCommentWithParametersInput, CreateCommentInput>
+{
+    [MapperIgnoreTarget(nameof(CreateCommentInput.ExtraProperties))]
+    public override partial CreateCommentInput Map(CreateCommentWithParametersInput source);
+
+    [MapperIgnoreTarget(nameof(CreateCommentInput.ExtraProperties))]
+    public override partial void Map(CreateCommentWithParametersInput source, CreateCommentInput destination);
+}

modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Caching;
 using Volo.Abp.GlobalFeatures;
 using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
@@ -67,12 +67,7 @@ public class CmsKitPublicWebModule : AbpModule
             options.FileSets.AddEmbedded<CmsKitPublicWebModule>("Volo.CmsKit.Public.Web");
         });
 
-        context.Services.AddAutoMapperObjectMapper<CmsKitPublicWebModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<CmsKitPublicWebModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<CmsKitPublicWebModule>();
 
         Configure<DynamicJavaScriptProxyOptions>(options =>
         {

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPostViewModel.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using AutoMapper;
 using Volo.Abp.Application.Dtos;
 using Volo.CmsKit.Contents;
 using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs;
 
-[AutoMap(typeof(BlogPostCommonDto), ReverseMap = true)]
 public class BlogPostViewModel : AuditedEntityDto<Guid>
 {
     public Guid BlogId { get; set; }

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/PageViewModel.cs

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using AutoMapper;
 using Volo.CmsKit.Contents;
-using Volo.CmsKit.Public.Pages;
 
 namespace Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Pages;
 
-[AutoMap(typeof(PageDto), ReverseMap = true)]
 public class PageViewModel
 {
     public Guid Id { get; set; }

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

@@ -45,6 +45,7 @@ public partial class DocumentToDocumentDtoMapper : MapperBase<Document, Document
     [MapperIgnoreTarget(nameof(DocumentDto.ProjectName))]
     public override partial DocumentDto Map(Document source);
 
+    [MapperIgnoreTarget(nameof(DocumentDto.ProjectName))]
     public override partial void Map(Document source, DocumentDto destination);
 }
 

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

@@ -19,6 +19,9 @@ namespace Volo.Docs.Admin
     )]
     public class DocsAdminApplicationModule : AbpModule
     {
-        
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddMapperlyObjectMapper<DocsAdminApplicationModule>();
+        }
     }
 }

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

@@ -32,13 +32,18 @@ public partial class ProjectDtoToEditGithubProjectViewModelMapper : MapperBase<P
     [MapperIgnoreTarget(nameof(EditModel.EditGithubProjectViewModel.VersionBranchPrefix))]
     public override partial EditModel.EditGithubProjectViewModel Map(ProjectDto source);
 
+    [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 void Map(ProjectDto source, EditModel.EditGithubProjectViewModel destination);
 }
 
 [Mapper]
+[MapExtraProperties]
 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);
@@ -46,9 +51,9 @@ public partial class CreateGithubProjectViewModelToCreateProjectDtoMapper : Mapp
 
 
 [Mapper]
+[MapExtraProperties]
 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.Application/Volo/Docs/DocsApplicationMappers.cs

@@ -45,5 +45,7 @@ public partial class DocumentToDocumentWithDetailsDtoMapper : MapperBase<Documen
     [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Contributors))]
     public override partial DocumentWithDetailsDto Map(Document source);
 
+    [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Project))]
+    [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Contributors))]
     public override partial void Map(Document source, DocumentWithDetailsDto destination);
 }

modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationModule.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Volo.Abp.Application;
 using Volo.Abp.Mapperly;
 using Volo.Abp.Caching;
@@ -20,6 +21,8 @@ namespace Volo.Docs
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<DocsApplicationModule>();
+            
             context.Services.TryAddSingleton<INavigationTreePostProcessor>(NullNavigationTreePostProcessor.Instance);
         }
     }

modules/docs/src/Volo.Docs.Common.Application/Volo/Docs/Common/DocsCommonApplicationModule.cs

@@ -13,4 +13,8 @@ namespace Volo.Docs.Common;
 )]
 public class DocsCommonApplicationModule : AbpModule
 {
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        context.Services.AddMapperlyObjectMapper<DocsCommonApplicationModule>();
+    }
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs

@@ -35,6 +35,8 @@ namespace Volo.Docs
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<DocsDomainModule>();
+            
             Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Document, DocumentEto>(typeof(DocsDomainModule));

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

@@ -45,6 +45,8 @@ namespace Volo.Docs
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<DocsWebModule>();
+            
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<DocsWebModule>();