Merge pull request #23644 from abpframework/yekalkan-mapper-update

Convert from AutoMapeer to Mapperly for Blogging, Docs & Cms-Kit modules

modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AbpAccountApplicationMappers.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Mapperly;
 
 namespace Volo.Abp.Account;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class IdentityUserToProfileDtoMapper : MapperBase<IdentityUser, ProfileDto>
 {

modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorMappers.cs

@@ -5,7 +5,7 @@ using Volo.Abp.Identity;
 
 namespace Volo.Abp.Account.Blazor;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class ProfileDtoToPersonalInfoModelMapper : MapperBase<ProfileDto, PersonalInfoModel>
 {
@@ -18,7 +18,7 @@ public partial class ProfileDtoToPersonalInfoModelMapper : MapperBase<ProfileDto
     public override partial void Map(ProfileDto source, PersonalInfoModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class PersonalInfoModelToUpdateProfileDtoMapper : MapperBase<PersonalInfoModel, UpdateProfileDto>
 {

modules/account/src/Volo.Abp.Account.Web/AbpAccountWebMappers.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Mapperly;
 
 namespace Volo.Abp.Account.Web;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class ProfileDtoToPersonalInfoModelMapper : MapperBase<ProfileDto, AccountProfilePersonalInfoManagementGroupViewComponent.PersonalInfoModel>
 {

modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.abppkg.analyze.json

@@ -21,9 +21,9 @@
           "name": "AbpCachingModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Abp.Ddd.Application",

modules/blogging/src/Volo.Blogging.Admin.Application/Volo.Blogging.Admin.Application.csproj

@@ -17,7 +17,7 @@
     <ItemGroup>
         <ProjectReference Include="..\Volo.Blogging.Admin.Application.Contracts\Volo.Blogging.Admin.Application.Contracts.csproj" />
         <ProjectReference Include="..\Volo.Blogging.Domain\Volo.Blogging.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/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/BloggingAdminApplicationAutoMapperProfile.cs

@@ -1,15 +0,0 @@
-using AutoMapper;
-using Volo.Blogging.Admin.Blogs;
-using Volo.Blogging.Blogs;
-using Volo.Blogging.Blogs.Dtos;
-
-namespace Volo.Blogging.Admin
-{
-     public class BloggingAdminApplicationAutoMapperProfile : Profile
-    {
-        public BloggingAdminApplicationAutoMapperProfile()
-        {
-            CreateMap<Blog, BlogDto>();
-        }
-    }
-}

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

@@ -0,0 +1,14 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Blogging.Blogs;
+using Volo.Blogging.Blogs.Dtos;
+
+namespace Volo.Blogging.Admin;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class BlogToBlogDtoMapper : MapperBase<Blog, BlogDto>
+{
+    public override partial BlogDto Map(Blog source);
+
+    public override partial void Map(Blog source, BlogDto destination);
+}

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

@@ -1,11 +1,8 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.Extensions.DependencyInjection;
+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.Blogging.Comments;
-using Volo.Blogging.Posts;
 
 namespace Volo.Blogging.Admin
 {
@@ -13,18 +10,14 @@ namespace Volo.Blogging.Admin
         typeof(BloggingDomainModule),
         typeof(BloggingAdminApplicationContractsModule),
         typeof(AbpCachingModule),
-        typeof(AbpAutoMapperModule),
+        typeof(AbpMapperlyModule),
         typeof(AbpDddApplicationModule)
         )]
     public class BloggingAdminApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<BloggingAdminApplicationModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<BloggingAdminApplicationAutoMapperProfile>(validate: true);
-            });
+            context.Services.AddMapperlyObjectMapper<BloggingAdminApplicationModule>();
         }
     }
 }

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

@@ -1,18 +0,0 @@
-using AutoMapper;
-using Volo.Blogging.Admin.Blogs;
-using Volo.Blogging.Admin.Pages.Blogging.Admin.Blogs;
-using Volo.Blogging.Blogs;
-using Volo.Blogging.Blogs.Dtos;
-using EditModel = Volo.Blogging.Admin.Pages.Blogging.Admin.Blogs.EditModel;
-
-namespace Volo.Blogging.Admin
-{
-    public class AbpBloggingAdminWebAutoMapperProfile : Profile
-    {
-        public AbpBloggingAdminWebAutoMapperProfile()
-        {
-            CreateMap<CreateModel.BlogCreateModalView, CreateBlogDto>();
-            CreateMap<BlogDto, EditModel.BlogEditViewModel>();
-        }
-    }
-}

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

@@ -0,0 +1,24 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Blogging.Admin.Blogs;
+using Volo.Blogging.Admin.Pages.Blogging.Admin.Blogs;
+using Volo.Blogging.Blogs.Dtos;
+using EditModel = Volo.Blogging.Admin.Pages.Blogging.Admin.Blogs.EditModel;
+
+namespace Volo.Blogging.Admin;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class BlogDtoToBlogEditViewModelMapper : MapperBase<BlogDto, EditModel.BlogEditViewModel>
+{
+    public override partial EditModel.BlogEditViewModel Map(BlogDto source);
+
+    public override partial void Map(BlogDto source, EditModel.BlogEditViewModel destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class BlogCreateModalViewToCreateBlogDtoMapper : MapperBase<CreateModel.BlogCreateModalView, CreateBlogDto>
+{
+    public override partial CreateBlogDto Map(CreateModel.BlogCreateModalView source);
+
+    public override partial void Map(CreateModel.BlogCreateModalView source, CreateBlogDto destination);
+}

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

@@ -2,7 +2,7 @@
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -15,7 +15,7 @@ namespace Volo.Blogging.Admin
         typeof(BloggingAdminApplicationContractsModule),
         typeof(AbpAspNetCoreMvcUiBootstrapModule),
         typeof(AbpAspNetCoreMvcUiBundlingModule),
-        typeof(AbpAutoMapperModule)
+        typeof(AbpMapperlyModule)
     )]
     public class BloggingAdminWebModule : AbpModule
     {
@@ -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());
@@ -44,12 +46,6 @@ namespace Volo.Blogging.Admin
                 options.FileSets.AddEmbedded<BloggingAdminWebModule>();
             });
 
-            context.Services.AddAutoMapperObjectMapper<BloggingAdminWebModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<AbpBloggingAdminWebAutoMapperProfile>(validate: true);
-            });
-
             Configure<DynamicJavaScriptProxyOptions>(options =>
             {
                 options.DisableModule(BloggingAdminRemoteServiceConsts.ModuleName);

modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.abppkg.analyze.json

@@ -21,9 +21,9 @@
           "name": "AbpAspNetCoreMvcUiBundlingModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         }
       ],
       "implementingInterfaces": [

modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj

@@ -18,7 +18,7 @@
         <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" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.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.Blogging.Admin.Application.Contracts\Volo.Blogging.Admin.Application.Contracts.csproj" />
         <PackageReference Include="Markdig.Signed" />
     </ItemGroup>

modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.abppkg.analyze.json

@@ -21,9 +21,9 @@
           "name": "AbpCachingModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Abp.BlobStoring",

modules/blogging/src/Volo.Blogging.Application/Volo.Blogging.Application.csproj

@@ -17,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Blogging.Application.Contracts\Volo.Blogging.Application.Contracts.csproj" />
     <ProjectReference Include="..\Volo.Blogging.Domain\Volo.Blogging.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.BlobStoring\Volo.Abp.BlobStoring.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />

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

@@ -1,33 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Volo.Blogging.Blogs;
-using Volo.Blogging.Blogs.Dtos;
-using Volo.Blogging.Comments;
-using Volo.Blogging.Comments.Dtos;
-using Volo.Blogging.Posts;
-using Volo.Blogging.Tagging;
-using Volo.Blogging.Tagging.Dtos;
-using Volo.Blogging.Users;
-
-namespace Volo.Blogging
-{
-    public class BloggingApplicationAutoMapperProfile : Profile
-    {
-        public BloggingApplicationAutoMapperProfile()
-        {
-            CreateMap<Blog, BlogDto>();
-            CreateMap<BlogUser, BlogUserDto>();
-            CreateMap<Post, PostWithDetailsDto>().Ignore(x=>x.Writer).Ignore(x=>x.CommentCount).Ignore(x=>x.Tags);
-            CreateMap<Comment, CommentWithDetailsDto>().Ignore(x => x.Writer);
-            CreateMap<Tag, TagDto>();
-            CreateMap<Post, PostCacheItem>().Ignore(x=>x.CommentCount).Ignore(x=>x.Tags);
-            CreateMap<PostCacheItem, PostWithDetailsDto>()
-                .IgnoreModificationAuditedObjectProperties()
-                .IgnoreDeletionAuditedObjectProperties()
-                .Ignore(x => x.ConcurrencyStamp)
-                .Ignore(x => x.Writer)
-                .Ignore(x => x.CommentCount)
-                .Ignore(x => x.Tags);
-        }
-    }
-}

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

@@ -0,0 +1,98 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Blogging.Blogs;
+using Volo.Blogging.Blogs.Dtos;
+using Volo.Blogging.Comments;
+using Volo.Blogging.Comments.Dtos;
+using Volo.Blogging.Posts;
+using Volo.Blogging.Tagging;
+using Volo.Blogging.Tagging.Dtos;
+using Volo.Blogging.Users;
+
+namespace Volo.Blogging;
+    
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class PostCacheItemToPostWithDetailsDtoMapper : MapperBase<PostCacheItem, PostWithDetailsDto>
+{
+    [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 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);
+}
+    
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class PostToPostCacheItemMapper : MapperBase<Post, PostCacheItem>
+{
+    [MapperIgnoreTarget(nameof(PostCacheItem.CommentCount))]
+    [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);
+}
+    
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class CommentToCommentWithDetailsDtoMapper : MapperBase<Comment, CommentWithDetailsDto>
+{
+    [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Writer))]
+    public override partial CommentWithDetailsDto Map(Comment source);
+
+    [MapperIgnoreTarget(nameof(CommentWithDetailsDto.Writer))]
+    public override partial void Map(Comment source, CommentWithDetailsDto destination);
+}
+    
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class PostToPostWithDetailsDtoMapper : MapperBase<Post, PostWithDetailsDto>
+{
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.Tags))]
+    [MapperIgnoreTarget(nameof(PostWithDetailsDto.CommentCount))]
+    [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);
+}
+    
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class TagToTagDtoMapper : MapperBase<Tag, TagDto>
+{
+    public override partial TagDto Map(Tag source);
+
+    public override partial void Map(Tag source, TagDto destination);
+}
+    
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class BlogUserToBlogUserDtoMapper : MapperBase<BlogUser, BlogUserDto>
+{
+    public override partial BlogUserDto Map(BlogUser source);
+
+    public override partial void Map(BlogUser source, BlogUserDto destination);
+}
+    
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class BlogToBlogDtoMapper : MapperBase<Blog, BlogDto>
+{
+    public override partial BlogDto Map(Blog source);
+
+    public override partial void Map(Blog source, BlogDto destination);
+}

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

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.BlobStoring;
 using Volo.Abp.Caching;
 using Volo.Abp.Modularity;
@@ -14,7 +14,7 @@ namespace Volo.Blogging
         typeof(BloggingDomainModule),
         typeof(BloggingApplicationContractsModule),
         typeof(AbpCachingModule),
-        typeof(AbpAutoMapperModule),
+        typeof(AbpMapperlyModule),
         typeof(AbpBlobStoringModule),
         typeof(AbpDddApplicationModule)
         )]
@@ -22,12 +22,8 @@ namespace Volo.Blogging
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<BloggingApplicationModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<BloggingApplicationAutoMapperProfile>(validate: true);
-            });
-
+            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.Domain.abppkg.analyze.json

@@ -16,9 +16,9 @@
           "name": "AbpDddDomainModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Abp.Caching",

modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Blogging.Domain.Shared\Volo.Blogging.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\users\src\Volo.Abp.Users.Domain\Volo.Abp.Users.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.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
   </ItemGroup>

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

@@ -0,0 +1,40 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Blogging.Blogs;
+using Volo.Blogging.Comments;
+using Volo.Blogging.Posts;
+using Volo.Blogging.Tagging;
+
+namespace Volo.Blogging;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class TagToTagEtoMapper : MapperBase<Tag, TagEto>
+{
+    public override partial TagEto Map(Tag source);
+
+    public override partial void Map(Tag source, TagEto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class PostToPostEtoMapper : MapperBase<Post, PostEto>
+{
+    public override partial PostEto Map(Post source);
+
+    public override partial void Map(Post source, PostEto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class CommentToCommentEtoMapper : MapperBase<Comment, CommentEto>
+{
+    public override partial CommentEto Map(Comment source);
+
+    public override partial void Map(Comment source, CommentEto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class BlogToBlogEtoMapper : MapperBase<Blog, BlogEto>
+{
+    public override partial BlogEto Map(Blog source);
+
+    public override partial void Map(Blog source, BlogEto destination);
+}

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

@@ -1,19 +0,0 @@
-using AutoMapper;
-using Volo.Blogging.Blogs;
-using Volo.Blogging.Comments;
-using Volo.Blogging.Posts;
-using Volo.Blogging.Tagging;
-
-namespace Volo.Blogging
-{
-    public class BloggingDomainMappingProfile : Profile
-    {
-        public BloggingDomainMappingProfile()
-        {
-            CreateMap<Blog, BlogEto>();
-            CreateMap<Comment, CommentEto>();
-            CreateMap<Post, PostEto>();
-            CreateMap<Tag, TagEto>();
-        }
-    }
-}

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

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Caching;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Entities.Events.Distributed;
@@ -14,20 +14,15 @@ namespace Volo.Blogging
     [DependsOn(
         typeof(BloggingDomainSharedModule),
         typeof(AbpDddDomainModule),
-        typeof(AbpAutoMapperModule),
+        typeof(AbpMapperlyModule),
         typeof(AbpCachingModule)
     )]
     public class BloggingDomainModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<BloggingDomainModule>();
-
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<BloggingDomainMappingProfile>(validate: true);
-            });
-
+            context.Services.AddMapperlyObjectMapper<BloggingDomainModule>();
+            
             Configure<AbpDistributedEntityEventOptions>(options =>
             {
                 options.EtoMappings.Add<Blog, BlogEto>(typeof(BloggingDomainModule));

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

@@ -1,16 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Volo.Blogging.Pages.Blogs.Posts;
-using Volo.Blogging.Posts;
-
-namespace Volo.Blogging
-{
-    public class AbpBloggingWebAutoMapperProfile : Profile
-    {
-        public AbpBloggingWebAutoMapperProfile()
-        {
-            CreateMap<PostWithDetailsDto, EditPostViewModel>().Ignore(x=>x.Tags);
-            CreateMap<NewModel.CreatePostViewModel, CreatePostDto>();
-        }
-    }
-}

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

@@ -0,0 +1,24 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Blogging.Pages.Blogs.Posts;
+using Volo.Blogging.Posts;
+
+namespace Volo.Blogging;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class PostWithDetailsDtoToEditPostViewModelMapper : MapperBase<PostWithDetailsDto, EditPostViewModel>
+{
+    [MapperIgnoreTarget(nameof(EditPostViewModel.Tags))]
+    public override partial EditPostViewModel Map(PostWithDetailsDto source);
+
+    [MapperIgnoreTarget(nameof(EditPostViewModel.Tags))]
+    public override partial void Map(PostWithDetailsDto source, EditPostViewModel destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class CreatePostViewModelToCreatePostDtoMapper : MapperBase<NewModel.CreatePostViewModel, CreatePostDto>
+{
+    public override partial CreatePostDto Map(NewModel.CreatePostViewModel source);
+
+    public override partial void Map(NewModel.CreatePostViewModel source, CreatePostDto destination);
+}

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

@@ -8,7 +8,7 @@ using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -23,7 +23,7 @@ namespace Volo.Blogging
         typeof(BloggingApplicationContractsModule),
         typeof(AbpAspNetCoreMvcUiBootstrapModule),
         typeof(AbpAspNetCoreMvcUiBundlingModule),
-        typeof(AbpAutoMapperModule)
+        typeof(AbpMapperlyModule)
     )]
     public class BloggingWebModule : AbpModule
     {
@@ -42,17 +42,13 @@ namespace Volo.Blogging
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<BloggingWebModule>();
+            
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<BloggingWebModule>();
             });
 
-            context.Services.AddAutoMapperObjectMapper<BloggingWebModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<AbpBloggingWebAutoMapperProfile>(validate: true);
-            });
-
             Configure<AbpBundleContributorOptions>(options =>
             {
                 options

modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg.analyze.json

@@ -21,9 +21,9 @@
           "name": "AbpAspNetCoreMvcUiBundlingModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         }
       ],
       "implementingInterfaces": [

modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj

@@ -18,7 +18,7 @@
     <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" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.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.Blogging.Application.Contracts\Volo.Blogging.Application.Contracts.csproj" />
     <PackageReference Include="Markdig.Signed" />
   </ItemGroup>

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.Application.abppkg.analyze.json

@@ -11,9 +11,9 @@
           "name": "CmsKitAdminApplicationContractsModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.CmsKit.Common.Application",

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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class TagEntityTypeDefinitonToTagDefinitionDtoMapper : MapperBase<TagEntityTypeDefiniton, TagDefinitionDto>
+{
+    public override partial TagDefinitionDto Map(TagEntityTypeDefiniton source);
+
+    public override partial void Map(TagEntityTypeDefiniton source, TagDefinitionDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class PageToPageLookupDtoMapper : MapperBase<Page, PageLookupDto>
+{
+    public override partial PageLookupDto Map(Page source);
+
+    public override partial void Map(Page source, PageLookupDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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;
@@ -48,7 +47,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.abppkg.analyze.json

@@ -21,9 +21,9 @@
           "name": "AbpDddApplicationModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         }
       ],
       "implementingInterfaces": [

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 +0,0 @@
-using AutoMapper;
-using Volo.CmsKit.Blogs;
-using Volo.CmsKit.Tags;
-using Volo.CmsKit.Users;
-
-namespace Volo.CmsKit;
-
-public class CmsKitCommonApplicationAutoMapperProfile : Profile
-{
-    public CmsKitCommonApplicationAutoMapperProfile()
-    {
-        CreateMap<Tag, TagDto>().MapExtraProperties();
-
-        CreateMap<PopularTag, PopularTagDto>();
-
-        CreateMap<CmsUser, CmsUserDto>().MapExtraProperties();
-
-        CreateMap<BlogFeature, BlogFeatureCacheItem>().MapExtraProperties();
-        CreateMap<BlogFeature, BlogFeatureDto>().MapExtraProperties();
-        CreateMap<BlogFeatureCacheItem, BlogFeatureDto>()
-            .MapExtraProperties()
-            .ReverseMap()
-            .MapExtraProperties();
-    }
-}

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

@@ -0,0 +1,62 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.CmsKit.Blogs;
+using Volo.CmsKit.Tags;
+using Volo.CmsKit.Users;
+
+namespace Volo.CmsKit;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[MapExtraProperties]
+public partial class OrganizationUnitRoleToOrganizationUnitRoleDtoMapper : TwoWayMapperBase<BlogFeatureCacheItem, BlogFeatureDto>
+{
+    public override partial BlogFeatureDto Map(BlogFeatureCacheItem source);
+    public override partial void Map(BlogFeatureCacheItem source, BlogFeatureDto destination);
+
+    public override partial BlogFeatureCacheItem ReverseMap(BlogFeatureDto destination);
+    public override partial void ReverseMap(BlogFeatureDto destination, BlogFeatureCacheItem source);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[MapExtraProperties]
+public partial class BlogFeatureToBlogFeatureDtoMapper : MapperBase<BlogFeature, BlogFeatureDto>
+{
+    public override partial BlogFeatureDto Map(BlogFeature source);
+
+    public override partial void Map(BlogFeature source, BlogFeatureDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class PopularTagToPopularTagDtoMapper : MapperBase<PopularTag, PopularTagDto>
+{
+    public override partial PopularTagDto Map(PopularTag source);
+
+    public override partial void Map(PopularTag source, PopularTagDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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.abppkg.analyze.json

@@ -16,9 +16,9 @@
           "name": "CmsKitCommonApplicationContractsModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         }
       ],
       "implementingInterfaces": [

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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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.Application.abppkg.analyze.json

@@ -26,9 +26,9 @@
           "name": "AbpCachingModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Abp.Ddd.Application",

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/DocsAdminApplicationMappers.cs

@@ -0,0 +1,58 @@
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class ProjectPdfFileToProjectPdfFileDtoMapper : MapperBase<ProjectPdfFile, ProjectPdfFileDto>
+{
+    public override partial ProjectPdfFileDto Map(ProjectPdfFile source);
+
+    public override partial void Map(ProjectPdfFile source, ProjectPdfFileDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class DocumentInfoToDocumentInfoDtoMapper : MapperBase<DocumentInfo, DocumentInfoDto>
+{
+    public override partial DocumentInfoDto Map(DocumentInfo source);
+
+    public override partial void Map(DocumentInfo source, DocumentInfoDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class ProjectWithoutDetailsToProjectWithoutDetailsDtoMapper : MapperBase<ProjectWithoutDetails, ProjectWithoutDetailsDto>
+{
+    public override partial ProjectWithoutDetailsDto Map(ProjectWithoutDetails source);
+
+    public override partial void Map(ProjectWithoutDetails source, ProjectWithoutDetailsDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class DocumentWithoutContentToDocumentDtoMapper : MapperBase<DocumentWithoutContent, DocumentDto>
+{
+    public override partial DocumentDto Map(DocumentWithoutContent source);
+
+    public override partial void Map(DocumentWithoutContent source, DocumentDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class DocumentToDocumentDtoMapper : MapperBase<Document, DocumentDto>
+{
+    [MapperIgnoreTarget(nameof(DocumentDto.ProjectName))]
+    public override partial DocumentDto Map(Document source);
+
+    [MapperIgnoreTarget(nameof(DocumentDto.ProjectName))]
+    public override partial void Map(Document source, DocumentDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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,7 +13,7 @@ namespace Volo.Docs.Admin
         typeof(DocsAdminApplicationContractsModule),
         typeof(DocsCommonApplicationModule),
         typeof(AbpCachingModule),
-        typeof(AbpAutoMapperModule),
+        typeof(AbpMapperlyModule),
         typeof(AbpDddApplicationModule),
         typeof(AbpBackgroundJobsAbstractionsModule)
     )]
@@ -21,11 +21,7 @@ namespace Volo.Docs.Admin
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<DocsAdminApplicationModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsAdminApplicationAutoMapperProfile>(validate: true);
-            });
+            context.Services.AddMapperlyObjectMapper<DocsAdminApplicationModule>();
         }
     }
 }

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,60 @@
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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);
+
+    [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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[MapExtraProperties]
+public partial class CreateGithubProjectViewModelToCreateProjectDtoMapper : MapperBase<CreateModel.CreateGithubProjectViewModel, CreateProjectDto>
+{
+    public override partial CreateProjectDto Map(CreateModel.CreateGithubProjectViewModel source);
+
+    public override partial void Map(CreateModel.CreateGithubProjectViewModel source, CreateProjectDto destination);
+}
+
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+[MapExtraProperties]
+public partial class EditGithubProjectViewModelToUpdateProjectDtoMyClassMapper : MapperBase<EditModel.EditGithubProjectViewModel, UpdateProjectDto>
+{
+    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;
@@ -32,6 +32,8 @@ namespace Volo.Docs.Admin
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<DocsAdminWebModule>();
+            
             Configure<AbpNavigationOptions>(options =>
             {
                 options.MenuContributors.Add(new DocsMenuContributor());
@@ -42,12 +44,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.abppkg.analyze.json

@@ -21,9 +21,9 @@
           "name": "AbpCachingModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Docs.Common.Application",

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 +0,0 @@
-using AutoMapper;
-using Volo.Docs.Documents;
-using Volo.Abp.AutoMapper;
-using Volo.Docs.Common.Projects;
-using Volo.Docs.Projects;
-
-namespace Volo.Docs
-{
-    public class DocsApplicationAutoMapperProfile : Profile
-    {
-        public DocsApplicationAutoMapperProfile()
-        {
-            CreateMap<Project, ProjectDto>();
-            CreateMap<VersionInfo, VersionInfoDto>();
-            CreateMap<Document, DocumentWithDetailsDto>().Ignore(x => x.Project).Ignore(x => x.Contributors);
-            CreateMap<DocumentContributor, DocumentContributorDto>();
-            CreateMap<DocumentResource, DocumentResourceDto>();
-        }
-    }
-}

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

@@ -0,0 +1,51 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Docs.Documents;
+using Volo.Abp.Mapperly;
+using Volo.Docs.Common.Projects;
+using Volo.Docs.Projects;
+
+namespace Volo.Docs;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class DocumentResourceToDocumentResourceDtoMapper : MapperBase<DocumentResource, DocumentResourceDto>
+{
+    public override partial DocumentResourceDto Map(DocumentResource source);
+
+    public override partial void Map(DocumentResource source, DocumentResourceDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class DocumentContributorToDocumentContributorDtoMapper : MapperBase<DocumentContributor, DocumentContributorDto>
+{
+    public override partial DocumentContributorDto Map(DocumentContributor source);
+
+    public override partial void Map(DocumentContributor source, DocumentContributorDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class VersionInfoToVersionInfoDtoMapper : MapperBase<VersionInfo, VersionInfoDto>
+{
+    public override partial VersionInfoDto Map(VersionInfo source);
+
+    public override partial void Map(VersionInfo source, VersionInfoDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class ProjectToProjectDtoMapper : MapperBase<Project, ProjectDto>
+{
+    public override partial ProjectDto Map(Project source);
+
+    public override partial void Map(Project source, ProjectDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class DocumentToDocumentWithDetailsDtoMapper : MapperBase<Document, DocumentWithDetailsDto>
+{
+    [MapperIgnoreTarget(nameof(DocumentWithDetailsDto.Project))]
+    [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,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 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 +13,7 @@ namespace Volo.Docs
         typeof(DocsDomainModule),
         typeof(DocsApplicationContractsModule),
         typeof(AbpCachingModule),
-        typeof(AbpAutoMapperModule),
+        typeof(AbpMapperlyModule),
         typeof(DocsCommonApplicationModule),
         typeof(AbpDddApplicationModule)
         )]
@@ -21,12 +21,7 @@ namespace Volo.Docs
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<DocsApplicationModule>();
-            
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsApplicationAutoMapperProfile>(validate: true);
-            });
+            context.Services.AddMapperlyObjectMapper<DocsApplicationModule>();
             
             context.Services.TryAddSingleton<INavigationTreePostProcessor>(NullNavigationTreePostProcessor.Instance);
         }

modules/docs/src/Volo.Docs.Common.Application/Volo.Docs.Common.Application.abppkg.analyze.json

@@ -16,9 +16,9 @@
           "name": "DocsCommonApplicationContractsModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Abp.Ddd.Application",

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 +0,0 @@
-using AutoMapper;
-using Volo.Docs.Common.Projects;
-using Volo.Docs.Projects;
-
-namespace Volo.Docs.Common
-{
-    public class DocsCommonApplicationAutoMapperProfile : Profile
-    {
-        public DocsCommonApplicationAutoMapperProfile()
-        {
-            CreateMap<Project, ProjectDto>();
-            CreateMap<VersionInfo, VersionInfoDto>();
-        }
-    }
-}

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

@@ -0,0 +1,22 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Docs.Common.Projects;
+using Volo.Docs.Projects;
+
+namespace Volo.Docs.Common;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class ProjectToProjectDtoMapper : MapperBase<Project, ProjectDto>
+{
+    public override partial ProjectDto Map(Project source);
+
+    public override partial void Map(Project source, ProjectDto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class VersionInfoToVersionInfoDtoMapper : MapperBase<VersionInfo, VersionInfoDto>
+{
+    public override partial VersionInfoDto Map(VersionInfo source);
+
+    public override partial void Map(VersionInfo source, VersionInfoDto destination);
+}

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,13 @@ 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);
-        });
+        context.Services.AddMapperlyObjectMapper<DocsCommonApplicationModule>();
     }
 }

modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.abppkg.analyze.json

@@ -16,9 +16,9 @@
           "name": "AbpDddDomainModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Abp.BlobStoring",

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(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class ProjectToProjectEtoMapper : MapperBase<Project, ProjectEto>
 {
-    public class DocsDomainMappingProfile : Profile
-    {
-        public DocsDomainMappingProfile()
-        {
-            CreateMap<Document, DocumentEto>();
-            CreateMap<Project, ProjectEto>();
-        }
-    }
+    public override partial ProjectEto Map(Project source);
+
+    public override partial void Map(Project source, ProjectEto destination);
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+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,8 @@ namespace Volo.Docs
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<DocsDomainModule>();
-
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddProfile<DocsDomainMappingProfile>(validate: true);
-            });
-
+            context.Services.AddMapperlyObjectMapper<DocsDomainModule>();
+            
             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),
@@ -46,6 +45,8 @@ namespace Volo.Docs
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMapperlyObjectMapper<DocsWebModule>();
+            
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<DocsWebModule>();
@@ -88,12 +89,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.abppkg.analyze.json

@@ -11,9 +11,9 @@
           "name": "DocsApplicationContractsModule"
         },
         {
-          "declaringAssemblyName": "Volo.Abp.AutoMapper",
-          "namespace": "Volo.Abp.AutoMapper",
-          "name": "AbpAutoMapperModule"
+          "declaringAssemblyName": "Volo.Abp.Mapperly",
+          "namespace": "Volo.Abp.Mapperly",
+          "name": "AbpMapperlyModule"
         },
         {
           "declaringAssemblyName": "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap",

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" />

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationMappers.cs

@@ -2,7 +2,7 @@
 using Volo.Abp.Identity;
 using Volo.Abp.Mapperly;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class IdentityUserToIdentityUserDtoMapper : MapperBase<IdentityUser, IdentityUserDto>
 {
@@ -10,7 +10,7 @@ public partial class IdentityUserToIdentityUserDtoMapper : MapperBase<IdentityUs
     public override partial void Map(IdentityUser source, IdentityUserDto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class IdentityRoleToIdentityRoleDtoMapper : MapperBase<IdentityRole, IdentityRoleDto>
 {

modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorMappers.cs

@@ -3,7 +3,7 @@ using Volo.Abp.Mapperly;
 
 namespace Volo.Abp.Identity.Blazor;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class IdentityUserDtoToIdentityUserUpdateDtoMapper : MapperBase<IdentityUserDto, IdentityUserUpdateDto>
 {
@@ -16,7 +16,7 @@ public partial class IdentityUserDtoToIdentityUserUpdateDtoMapper : MapperBase<I
     public override partial void Map(IdentityUserDto source, IdentityUserUpdateDto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class IdentityRoleDtoToIdentityRoleUpdateDtoMapper : MapperBase<IdentityRoleDto, IdentityRoleUpdateDto>
 {

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDomainMappers.cs

@@ -4,28 +4,28 @@ using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityUserToUserEtoMapper : MapperBase<IdentityUser, UserEto>
 {
     public override partial UserEto Map(IdentityUser source);
     public override partial void Map(IdentityUser source, UserEto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityClaimTypeToIdentityClaimTypeEtoMapper : MapperBase<IdentityClaimType, IdentityClaimTypeEto>
 {
     public override partial IdentityClaimTypeEto Map(IdentityClaimType source);
     public override partial void Map(IdentityClaimType source, IdentityClaimTypeEto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityRoleToIdentityRoleEtoMapper : MapperBase<IdentityRole, IdentityRoleEto>
 {
     public override partial IdentityRoleEto Map(IdentityRole source);
     public override partial void Map(IdentityRole source, IdentityRoleEto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class OrganizationUnitToOrganizationUnitEtoMapper : MapperBase<OrganizationUnit, OrganizationUnitEto>
 {
     public override partial OrganizationUnitEto Map(OrganizationUnit source);

modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebMappers.cs

@@ -6,7 +6,7 @@ using EditUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalM
 
 namespace Volo.Abp.Identity.Web;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityUserDtoToEditUserModalModelUserInfoViewModelMapper : MapperBase<IdentityUserDto, EditUserModalModel.UserInfoViewModel>
 {
     [MapperIgnoreTarget(nameof(EditUserModalModel.UserInfoViewModel.Password))]
@@ -16,7 +16,7 @@ public partial class IdentityUserDtoToEditUserModalModelUserInfoViewModelMapper
     public override partial void Map(IdentityUserDto source, EditUserModalModel.UserInfoViewModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class CreateUserModalModelUserInfoViewModelToIdentityUserCreateDtoMapper : MapperBase<CreateUserModalModel.UserInfoViewModel, IdentityUserCreateDto>
 {
@@ -27,7 +27,7 @@ public partial class CreateUserModalModelUserInfoViewModelToIdentityUserCreateDt
     public override partial void Map(CreateUserModalModel.UserInfoViewModel source, IdentityUserCreateDto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class IdentityRoleDtoToCreateUserModalModelAssignedRoleViewModelMapper : MapperBase<IdentityRoleDto, CreateUserModalModel.AssignedRoleViewModel>
 {
@@ -38,7 +38,7 @@ public partial class IdentityRoleDtoToCreateUserModalModelAssignedRoleViewModelM
     public override partial void Map(IdentityRoleDto source, CreateUserModalModel.AssignedRoleViewModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class EditUserModalModelUserInfoViewModelToIdentityUserUpdateDtoMapper : MapperBase<EditUserModalModel.UserInfoViewModel, IdentityUserUpdateDto>
 {
     [MapperIgnoreTarget(nameof(IdentityUserUpdateDto.RoleNames))]
@@ -48,7 +48,7 @@ public partial class EditUserModalModelUserInfoViewModelToIdentityUserUpdateDtoM
     public override partial void Map(EditUserModalModel.UserInfoViewModel source, IdentityUserUpdateDto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityRoleDtoToEditUserModalModelAssignedRoleViewModelMapper : MapperBase<IdentityRoleDto, EditUserModalModel.AssignedRoleViewModel>
 {
     [MapperIgnoreTarget(nameof(EditUserModalModel.AssignedRoleViewModel.IsAssigned))]
@@ -58,7 +58,7 @@ public partial class IdentityRoleDtoToEditUserModalModelAssignedRoleViewModelMap
     public override partial void Map(IdentityRoleDto source, EditUserModalModel.AssignedRoleViewModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityUserDtoToEditUserModalModelDetailViewModelMapper : MapperBase<IdentityUserDto, EditUserModalModel.DetailViewModel>
 {
     [MapperIgnoreTarget(nameof(EditUserModalModel.DetailViewModel.CreatedBy))]
@@ -70,14 +70,14 @@ public partial class IdentityUserDtoToEditUserModalModelDetailViewModelMapper :
     public override partial void Map(IdentityUserDto source, EditUserModalModel.DetailViewModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityRoleDtoToEditModalModelRoleInfoModelMapper : MapperBase<IdentityRoleDto, EditModalModel.RoleInfoModel>
 {
     public override partial EditModalModel.RoleInfoModel Map(IdentityRoleDto source);
     public override partial void Map(IdentityRoleDto source, EditModalModel.RoleInfoModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class CreateModalModelRoleInfoModelToIdentityRoleCreateDtoMapper : MapperBase<CreateModalModel.RoleInfoModel, IdentityRoleCreateDto>
 {
@@ -85,7 +85,7 @@ public partial class CreateModalModelRoleInfoModelToIdentityRoleCreateDtoMapper
     public override partial void Map(CreateModalModel.RoleInfoModel source, IdentityRoleCreateDto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 [MapExtraProperties]
 public partial class EditModalModelRoleInfoModelToIdentityRoleUpdateDtoMapper : MapperBase<EditModalModel.RoleInfoModel, IdentityRoleUpdateDto>
 {

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityServerMapperlyMappers.cs

@@ -12,7 +12,7 @@ using Volo.Abp.IdentityServer.IdentityResources;
 
 namespace Volo.Abp.IdentityServer;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class ClientToISClientMapper : MapperBase<Client, IdentityServer4.Models.Client>
 {
     [MapperIgnoreTarget(nameof(IdentityServer4.Models.Client.AllowedIdentityTokenSigningAlgorithms))]
@@ -81,7 +81,7 @@ public partial class ClientToISClientMapper : MapperBase<Client, IdentityServer4
     }
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class ApiResourceToISApiResourceMapper : MapperBase<ApiResource, IdentityServer4.Models.ApiResource>
 {
     [MapperIgnoreTarget(nameof(IdentityServer4.Models.ApiResource.AllowedAccessTokenSigningAlgorithms))]
@@ -120,7 +120,7 @@ public partial class ApiResourceToISApiResourceMapper : MapperBase<ApiResource,
     }
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class ApiScopeToISApiScopeMapper : MapperBase<ApiScope, IdentityServer4.Models.ApiScope>
 {
     [MapperIgnoreTarget(nameof(IdentityServer4.Models.ApiScope.UserClaims))]
@@ -144,7 +144,7 @@ public partial class ApiScopeToISApiScopeMapper : MapperBase<ApiScope, IdentityS
     }
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityResourceToISIdentityResourceMapper : MapperBase<IdentityResource, IdentityServer4.Models.IdentityResource>
 {
     [MapperIgnoreTarget(nameof(IdentityServer4.Models.IdentityResource.UserClaims))]
@@ -168,21 +168,21 @@ public partial class IdentityResourceToISIdentityResourceMapper : MapperBase<Ide
     }
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class ClientToClientEtoMapper : MapperBase<Client, ClientEto>
 {
     public override partial ClientEto Map(Client source);
     public override partial void Map(Client source, ClientEto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class IdentityResourceToIdentityResourceEtoMapper : MapperBase<IdentityResource, IdentityResourceEto>
 {
     public override partial IdentityResourceEto Map(IdentityResource source);
     public override partial void Map(IdentityResource source, IdentityResourceEto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class PersistedGrantToISPersistedGrantMapper : TwoWayMapperBase<PersistedGrant, IdentityServer4.Models.PersistedGrant>
 {
     public override partial IdentityServer4.Models.PersistedGrant Map(PersistedGrant source);
@@ -221,14 +221,14 @@ public partial class PersistedGrantToISPersistedGrantMapper : TwoWayMapperBase<P
     }
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class PersistedGrantToPersistedGrantEtoMapper : MapperBase<PersistedGrant, PersistedGrantEto>
 {
     public override partial PersistedGrantEto Map(PersistedGrant source);
     public override partial void Map(PersistedGrant source, PersistedGrantEto destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class DeviceFlowCodesToDeviceFlowCodesEtoMapper : MapperBase<DeviceFlowCodes, DeviceFlowCodesEto>
 {
     public override partial DeviceFlowCodesEto Map(DeviceFlowCodes source);

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebMappers.cs

@@ -4,7 +4,7 @@ using static Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement.Per
 
 namespace Volo.Abp.PermissionManagement.Web;
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class PermissionGroupDtoToPermissionGroupViewModelMapper : MapperBase<PermissionGroupDto, PermissionGroupViewModel>
 {
     [MapperIgnoreTarget(nameof(PermissionGroupViewModel.IsAllPermissionsGranted))]
@@ -14,7 +14,7 @@ public partial class PermissionGroupDtoToPermissionGroupViewModelMapper : Mapper
     public override partial void Map(PermissionGroupDto source, PermissionGroupViewModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class PermissionGrantInfoDtoToPermissionGrantInfoViewModelMapper : MapperBase<PermissionGrantInfoDto, PermissionGrantInfoViewModel>
 {
     [MapperIgnoreTarget(nameof(PermissionGrantInfoViewModel.Depth))]
@@ -24,7 +24,7 @@ public partial class PermissionGrantInfoDtoToPermissionGrantInfoViewModelMapper
     public override partial void Map(PermissionGrantInfoDto source, PermissionGrantInfoViewModel destination);
 }
 
-[Mapper]
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
 public partial class ProviderInfoDtoToProviderInfoViewModelMapper : MapperBase<ProviderInfoDto, ProviderInfoViewModel>
 {
     public override partial ProviderInfoViewModel Map(ProviderInfoDto source);