Merge pull request #406 from aspnetboilerplate/upgrade-abp-42

Upgrade abp to v4.2.0

Author: alirizaadiyahsi

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/Dto/UserMapProfile.cs

@@ -10,8 +10,7 @@ public UserMapProfile()
             CreateMap<UserDto, User>();
             CreateMap<UserDto, User>()
                 .ForMember(x => x.Roles, opt => opt.Ignore())
-                .ForMember(x => x.CreationTime, opt => opt.Ignore())
-                .ForMember(x => x.LastLoginTime, opt => opt.Ignore());
+                .ForMember(x => x.CreationTime, opt => opt.Ignore());
 
             CreateMap<CreateUserDto, User>();
             CreateMap<CreateUserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AutoMapper" Version="4.1.0" />
-    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.1.0" />
+    <PackageReference Include="Abp.AutoMapper" Version="4.2.0" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserStore.cs

@@ -2,30 +2,35 @@
 using Abp.Domain.Repositories;
 using Abp.Domain.Uow;
 using Abp.Linq;
+using Abp.Organizations;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 
 namespace AbpCompanyName.AbpProjectName.Authorization.Users
 {
     public class UserStore : AbpUserStore<Role, User>
     {
         public UserStore(
-            IUnitOfWorkManager unitOfWorkManager, 
-            IRepository<User, long> userRepository, 
-            IRepository<Role> roleRepository, 
-            IAsyncQueryableExecuter asyncQueryableExecuter, 
-            IRepository<UserRole, long> userRoleRepository, 
-            IRepository<UserLogin, long> userLoginRepository, 
-            IRepository<UserClaim, long> userClaimRepository, 
-            IRepository<UserPermissionSetting, long> userPermissionSettingRepository) 
+            IUnitOfWorkManager unitOfWorkManager,
+            IRepository<User, long> userRepository,
+            IRepository<Role> roleRepository,
+            IAsyncQueryableExecuter asyncQueryableExecuter,
+            IRepository<UserRole, long> userRoleRepository,
+            IRepository<UserLogin, long> userLoginRepository,
+            IRepository<UserClaim, long> userClaimRepository,
+            IRepository<UserPermissionSetting, long> userPermissionSettingRepository,
+            IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
+            IRepository<OrganizationUnitRole, long> organizationUnitRoleRepository)
             : base(
-                  unitOfWorkManager, 
-                  userRepository, 
-                  roleRepository, 
-                  asyncQueryableExecuter, 
-                  userRoleRepository, 
-                  userLoginRepository, 
-                  userClaimRepository,
-                  userPermissionSettingRepository)
+                unitOfWorkManager,
+                userRepository,
+                roleRepository,
+                asyncQueryableExecuter,
+                userRoleRepository,
+                userLoginRepository,
+                userClaimRepository,
+                userPermissionSettingRepository,
+                userOrganizationUnitRepository,
+                organizationUnitRoleRepository)
         {
         }
     }