[Identity] Replace AutoMapper with Mapperly.

modules/identity/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj

@@ -18,7 +18,7 @@
     <ProjectReference Include="..\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />
     <ProjectReference Include="..\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
     <ProjectReference Include="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Mapperly\Volo.Abp.Mapperly.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -0,0 +1,19 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Identity;
+using Volo.Abp.Mapperly;
+
+[Mapper]
+[MapExtraProperties]
+public partial class IdentityUserToIdentityUserDtoMapper : MapperBase<IdentityUser, IdentityUserDto>
+{
+    public override partial IdentityUserDto Map(IdentityUser source);
+    public override partial void Map(IdentityUser source, IdentityUserDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class IdentityRoleToIdentityRoleDtoMapper : MapperBase<IdentityRole, IdentityRoleDto>
+{
+    public override partial IdentityRoleDto Map(IdentityRole source);
+    public override partial void Map(IdentityRole source, IdentityRoleDto destination);
+}

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

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
 
@@ -8,18 +8,13 @@ namespace Volo.Abp.Identity;
 [DependsOn(
     typeof(AbpIdentityDomainModule),
     typeof(AbpIdentityApplicationContractsModule),
-    typeof(AbpAutoMapperModule),
+    typeof(AbpMapperlyModule),
     typeof(AbpPermissionManagementApplicationModule)
     )]
 public class AbpIdentityApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<AbpIdentityApplicationModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddProfile<AbpIdentityApplicationModuleAutoMapperProfile>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<AbpIdentityApplicationModule>();
     }
 }

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

@@ -1,15 +0,0 @@
-using AutoMapper;
-
-namespace Volo.Abp.Identity;
-
-public class AbpIdentityApplicationModuleAutoMapperProfile : Profile
-{
-    public AbpIdentityApplicationModuleAutoMapperProfile()
-    {
-        CreateMap<IdentityUser, IdentityUserDto>()
-            .MapExtraProperties();
-
-        CreateMap<IdentityRole, IdentityRoleDto>()
-            .MapExtraProperties();
-    }
-}

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

@@ -1,18 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-
-namespace Volo.Abp.Identity.Blazor;
-
-public class AbpIdentityBlazorAutoMapperProfile : Profile
-{
-    public AbpIdentityBlazorAutoMapperProfile()
-    {
-        CreateMap<IdentityUserDto, IdentityUserUpdateDto>()
-            .MapExtraProperties()
-            .Ignore(x => x.Password)
-            .Ignore(x => x.RoleNames);
-
-        CreateMap<IdentityRoleDto, IdentityRoleUpdateDto>()
-            .MapExtraProperties();
-    }
-}

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

@@ -0,0 +1,25 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+
+namespace Volo.Abp.Identity.Blazor;
+
+[Mapper]
+[MapExtraProperties]
+public partial class IdentityUserDtoToIdentityUserUpdateDtoMapper : MapperBase<IdentityUserDto, IdentityUserUpdateDto>
+{
+    [MapperIgnoreTarget(nameof(IdentityUserUpdateDto.Password))]
+    [MapperIgnoreTarget(nameof(IdentityUserUpdateDto.RoleNames))]
+    public override partial IdentityUserUpdateDto Map(IdentityUserDto source);
+
+    [MapperIgnoreTarget(nameof(IdentityUserUpdateDto.Password))]
+    [MapperIgnoreTarget(nameof(IdentityUserUpdateDto.RoleNames))]
+    public override partial void Map(IdentityUserDto source, IdentityUserUpdateDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class IdentityRoleDtoToIdentityRoleUpdateDtoMapper : MapperBase<IdentityRoleDto, IdentityRoleUpdateDto>
+{
+    public override partial IdentityRoleUpdateDto Map(IdentityRoleDto source);
+    public override partial void Map(IdentityRoleDto source, IdentityRoleUpdateDto destination);
+}

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

@@ -1,7 +1,7 @@
 using Localization.Resources.AbpUi;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.BlazoriseUI;
 using Volo.Abp.Identity.Localization;
 using Volo.Abp.Localization;
@@ -16,7 +16,7 @@ namespace Volo.Abp.Identity.Blazor;
 
 [DependsOn(
     typeof(AbpIdentityApplicationContractsModule),
-    typeof(AbpAutoMapperModule),
+    typeof(AbpMapperlyModule),
     typeof(AbpPermissionManagementBlazorModule),
     typeof(AbpBlazoriseUIModule)
     )]
@@ -26,12 +26,7 @@ public class AbpIdentityBlazorModule : AbpModule
 
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<AbpIdentityBlazorModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddProfile<AbpIdentityBlazorAutoMapperProfile>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<AbpIdentityBlazorModule>();
 
         Configure<AbpNavigationOptions>(options =>
         {
@@ -42,7 +37,7 @@ public class AbpIdentityBlazorModule : AbpModule
         {
             options.AdditionalAssemblies.Add(typeof(AbpIdentityBlazorModule).Assembly);
         });
-        
+
         Configure<AbpLocalizationOptions>(options =>
         {
             options.Resources

modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj

@@ -8,7 +8,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="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Blazor\Volo.Abp.PermissionManagement.Blazor.csproj" />
   </ItemGroup>
 

modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj

@@ -23,7 +23,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Identity.Domain.Shared\Volo.Abp.Identity.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" />
   </ItemGroup>
 

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

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Modularity;
@@ -19,7 +19,7 @@ namespace Volo.Abp.Identity;
     typeof(AbpDddDomainModule),
     typeof(AbpIdentityDomainSharedModule),
     typeof(AbpUsersDomainModule),
-    typeof(AbpAutoMapperModule)
+    typeof(AbpMapperlyModule)
     )]
 public class AbpIdentityDomainModule : AbpModule
 {
@@ -35,12 +35,7 @@ public class AbpIdentityDomainModule : AbpModule
 
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<AbpIdentityDomainModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddProfile<IdentityDomainMappingProfile>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<AbpIdentityDomainModule>();
 
         Configure<AbpDistributedEntityEventOptions>(options =>
         {

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

@@ -0,0 +1,33 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Abp.Users;
+
+namespace Volo.Abp.Identity;
+
+[Mapper]
+public partial class IdentityUserToUserEtoMapper : MapperBase<IdentityUser, UserEto>
+{
+    public override partial UserEto Map(IdentityUser source);
+    public override partial void Map(IdentityUser source, UserEto destination);
+}
+
+[Mapper]
+public partial class IdentityClaimTypeToIdentityClaimTypeEtoMapper : MapperBase<IdentityClaimType, IdentityClaimTypeEto>
+{
+    public override partial IdentityClaimTypeEto Map(IdentityClaimType source);
+    public override partial void Map(IdentityClaimType source, IdentityClaimTypeEto destination);
+}
+
+[Mapper]
+public partial class IdentityRoleToIdentityRoleEtoMapper : MapperBase<IdentityRole, IdentityRoleEto>
+{
+    public override partial IdentityRoleEto Map(IdentityRole source);
+    public override partial void Map(IdentityRole source, IdentityRoleEto destination);
+}
+
+[Mapper]
+public partial class OrganizationUnitToOrganizationUnitEtoMapper : MapperBase<OrganizationUnit, OrganizationUnitEto>
+{
+    public override partial OrganizationUnitEto Map(OrganizationUnit source);
+    public override partial void Map(OrganizationUnit source, OrganizationUnitEto destination);
+}

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

@@ -1,15 +0,0 @@
-using AutoMapper;
-using Volo.Abp.Users;
-
-namespace Volo.Abp.Identity;
-
-public class IdentityDomainMappingProfile : Profile
-{
-    public IdentityDomainMappingProfile()
-    {
-        CreateMap<IdentityUser, UserEto>();
-        CreateMap<IdentityClaimType, IdentityClaimTypeEto>();
-        CreateMap<IdentityRole, IdentityRoleEto>();
-        CreateMap<OrganizationUnit, OrganizationUnitEto>();
-    }
-}

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

@@ -1,57 +0,0 @@
-using AutoMapper;
-using Volo.Abp.AutoMapper;
-using Volo.Abp.Identity.Web.Pages.Identity.Roles;
-using CreateUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.CreateModalModel;
-using EditUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalModel;
-
-namespace Volo.Abp.Identity.Web;
-
-public class AbpIdentityWebAutoMapperProfile : Profile
-{
-    public AbpIdentityWebAutoMapperProfile()
-    {
-        CreateUserMappings();
-        CreateRoleMappings();
-    }
-
-    protected virtual void CreateUserMappings()
-    {
-        //List
-        CreateMap<IdentityUserDto, EditUserModalModel.UserInfoViewModel>()
-            .Ignore(x => x.Password);
-
-        //CreateModal
-        CreateMap<CreateUserModalModel.UserInfoViewModel, IdentityUserCreateDto>()
-            .MapExtraProperties()
-            .ForMember(dest => dest.RoleNames, opt => opt.Ignore());
-
-        CreateMap<IdentityRoleDto, CreateUserModalModel.AssignedRoleViewModel>()
-            .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
-
-        //EditModal
-        CreateMap<EditUserModalModel.UserInfoViewModel, IdentityUserUpdateDto>()
-            .MapExtraProperties()
-            .ForMember(dest => dest.RoleNames, opt => opt.Ignore());
-
-        CreateMap<IdentityRoleDto, EditUserModalModel.AssignedRoleViewModel>()
-            .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
-
-        CreateMap<IdentityUserDto, EditUserModalModel.DetailViewModel>()
-            .ForMember(dest => dest.CreatedBy, opt => opt.Ignore())
-            .ForMember(dest => dest.ModifiedBy, opt => opt.Ignore());
-    }
-
-    protected virtual void CreateRoleMappings()
-    {
-        //List
-        CreateMap<IdentityRoleDto, EditModalModel.RoleInfoModel>();
-
-        //CreateModal
-        CreateMap<CreateModalModel.RoleInfoModel, IdentityRoleCreateDto>()
-            .MapExtraProperties();
-
-        //EditModal
-        CreateMap<EditModalModel.RoleInfoModel, IdentityRoleUpdateDto>()
-            .MapExtraProperties();
-    }
-}

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

@@ -0,0 +1,94 @@
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+using Volo.Abp.Identity.Web.Pages.Identity.Roles;
+using CreateUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.CreateModalModel;
+using EditUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalModel;
+
+namespace Volo.Abp.Identity.Web;
+
+[Mapper]
+public partial class IdentityUserDtoToEditUserModalModelUserInfoViewModelMapper : MapperBase<IdentityUserDto, EditUserModalModel.UserInfoViewModel>
+{
+    [MapperIgnoreTarget(nameof(EditUserModalModel.UserInfoViewModel.Password))]
+    public override partial EditUserModalModel.UserInfoViewModel Map(IdentityUserDto source);
+
+    [MapperIgnoreTarget(nameof(EditUserModalModel.UserInfoViewModel.Password))]
+    public override partial void Map(IdentityUserDto source, EditUserModalModel.UserInfoViewModel destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class CreateUserModalModelUserInfoViewModelToIdentityUserCreateDtoMapper : MapperBase<CreateUserModalModel.UserInfoViewModel, IdentityUserCreateDto>
+{
+    [MapperIgnoreTarget(nameof(IdentityUserCreateDto.RoleNames))]
+    public override partial IdentityUserCreateDto Map(CreateUserModalModel.UserInfoViewModel source);
+
+    [MapperIgnoreTarget(nameof(IdentityUserCreateDto.RoleNames))]
+    public override partial void Map(CreateUserModalModel.UserInfoViewModel source, IdentityUserCreateDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class IdentityRoleDtoToCreateUserModalModelAssignedRoleViewModelMapper : MapperBase<IdentityRoleDto, CreateUserModalModel.AssignedRoleViewModel>
+{
+    [MapperIgnoreTarget(nameof(CreateUserModalModel.AssignedRoleViewModel.IsAssigned))]
+    public override partial CreateUserModalModel.AssignedRoleViewModel Map(IdentityRoleDto source);
+
+    [MapperIgnoreTarget(nameof(CreateUserModalModel.AssignedRoleViewModel.IsAssigned))]
+    public override partial void Map(IdentityRoleDto source, CreateUserModalModel.AssignedRoleViewModel destination);
+}
+
+[Mapper]
+public partial class EditUserModalModelUserInfoViewModelToIdentityUserUpdateDtoMapper : MapperBase<EditUserModalModel.UserInfoViewModel, IdentityUserUpdateDto>
+{
+    [MapperIgnoreTarget(nameof(IdentityUserUpdateDto.RoleNames))]
+    public override partial IdentityUserUpdateDto Map(EditUserModalModel.UserInfoViewModel source);
+
+    [MapperIgnoreTarget(nameof(IdentityUserUpdateDto.RoleNames))]
+    public override partial void Map(EditUserModalModel.UserInfoViewModel source, IdentityUserUpdateDto destination);
+}
+
+[Mapper]
+public partial class IdentityRoleDtoToEditUserModalModelAssignedRoleViewModelMapper : MapperBase<IdentityRoleDto, EditUserModalModel.AssignedRoleViewModel>
+{
+    [MapperIgnoreTarget(nameof(EditUserModalModel.AssignedRoleViewModel.IsAssigned))]
+    public override partial EditUserModalModel.AssignedRoleViewModel Map(IdentityRoleDto source);
+
+    [MapperIgnoreTarget(nameof(EditUserModalModel.AssignedRoleViewModel.IsAssigned))]
+    public override partial void Map(IdentityRoleDto source, EditUserModalModel.AssignedRoleViewModel destination);
+}
+
+[Mapper]
+public partial class IdentityUserDtoToEditUserModalModelDetailViewModelMapper : MapperBase<IdentityUserDto, EditUserModalModel.DetailViewModel>
+{
+    [MapperIgnoreTarget(nameof(EditUserModalModel.DetailViewModel.CreatedBy))]
+    [MapperIgnoreTarget(nameof(EditUserModalModel.DetailViewModel.ModifiedBy))]
+    public override partial EditUserModalModel.DetailViewModel Map(IdentityUserDto source);
+
+    [MapperIgnoreTarget(nameof(EditUserModalModel.DetailViewModel.CreatedBy))]
+    [MapperIgnoreTarget(nameof(EditUserModalModel.DetailViewModel.ModifiedBy))]
+    public override partial void Map(IdentityUserDto source, EditUserModalModel.DetailViewModel destination);
+}
+
+[Mapper]
+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]
+[MapExtraProperties]
+public partial class CreateModalModelRoleInfoModelToIdentityRoleCreateDtoMapper : MapperBase<CreateModalModel.RoleInfoModel, IdentityRoleCreateDto>
+{
+    public override partial IdentityRoleCreateDto Map(CreateModalModel.RoleInfoModel source);
+    public override partial void Map(CreateModalModel.RoleInfoModel source, IdentityRoleCreateDto destination);
+}
+
+[Mapper]
+[MapExtraProperties]
+public partial class EditModalModelRoleInfoModelToIdentityRoleUpdateDtoMapper : MapperBase<EditModalModel.RoleInfoModel, IdentityRoleUpdateDto>
+{
+    public override partial IdentityRoleUpdateDto Map(EditModalModel.RoleInfoModel source);
+    public override partial void Map(EditModalModel.RoleInfoModel source, IdentityRoleUpdateDto destination);
+}

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

@@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 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.Identity.Localization;
 using Volo.Abp.Identity.Web.Navigation;
@@ -19,7 +19,7 @@ using Volo.Abp.Threading;
 namespace Volo.Abp.Identity.Web;
 
 [DependsOn(typeof(AbpIdentityApplicationContractsModule))]
-[DependsOn(typeof(AbpAutoMapperModule))]
+[DependsOn(typeof(AbpMapperlyModule))]
 [DependsOn(typeof(AbpPermissionManagementWebModule))]
 [DependsOn(typeof(AbpAspNetCoreMvcUiThemeSharedModule))]
 public class AbpIdentityWebModule : AbpModule
@@ -51,12 +51,7 @@ public class AbpIdentityWebModule : AbpModule
             options.FileSets.AddEmbedded<AbpIdentityWebModule>();
         });
 
-        context.Services.AddAutoMapperObjectMapper<AbpIdentityWebModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddProfile<AbpIdentityWebAutoMapperProfile>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<AbpIdentityWebModule>();
 
         Configure<RazorPagesOptions>(options =>
         {

modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj

@@ -40,7 +40,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />
     <ProjectReference Include="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Web\Volo.Abp.PermissionManagement.Web.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.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
   </ItemGroup>