Skip to content

Commit bc806f4

Browse files
author
alirizaadiyahsi
authored
Merge pull request #406 from aspnetboilerplate/upgrade-abp-42
Upgrade abp to v4.2.0
2 parents c019a15 + 245deb4 commit bc806f4

File tree

11 files changed

+1419
-34
lines changed

11 files changed

+1419
-34
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ public UserMapProfile()
1010
CreateMap<UserDto, User>();
1111
CreateMap<UserDto, User>()
1212
.ForMember(x => x.Roles, opt => opt.Ignore())
13-
.ForMember(x => x.CreationTime, opt => opt.Ignore())
14-
.ForMember(x => x.LastLoginTime, opt => opt.Ignore());
13+
.ForMember(x => x.CreationTime, opt => opt.Ignore());
1514

1615
CreateMap<CreateUserDto, User>();
1716
CreateMap<CreateUserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="4.1.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.1.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="4.2.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.2.0" />
2323
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />

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

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,35 @@
22
using Abp.Domain.Repositories;
33
using Abp.Domain.Uow;
44
using Abp.Linq;
5+
using Abp.Organizations;
56
using AbpCompanyName.AbpProjectName.Authorization.Roles;
67

78
namespace AbpCompanyName.AbpProjectName.Authorization.Users
89
{
910
public class UserStore : AbpUserStore<Role, User>
1011
{
1112
public UserStore(
12-
IUnitOfWorkManager unitOfWorkManager,
13-
IRepository<User, long> userRepository,
14-
IRepository<Role> roleRepository,
15-
IAsyncQueryableExecuter asyncQueryableExecuter,
16-
IRepository<UserRole, long> userRoleRepository,
17-
IRepository<UserLogin, long> userLoginRepository,
18-
IRepository<UserClaim, long> userClaimRepository,
19-
IRepository<UserPermissionSetting, long> userPermissionSettingRepository)
13+
IUnitOfWorkManager unitOfWorkManager,
14+
IRepository<User, long> userRepository,
15+
IRepository<Role> roleRepository,
16+
IAsyncQueryableExecuter asyncQueryableExecuter,
17+
IRepository<UserRole, long> userRoleRepository,
18+
IRepository<UserLogin, long> userLoginRepository,
19+
IRepository<UserClaim, long> userClaimRepository,
20+
IRepository<UserPermissionSetting, long> userPermissionSettingRepository,
21+
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
22+
IRepository<OrganizationUnitRole, long> organizationUnitRoleRepository)
2023
: base(
21-
unitOfWorkManager,
22-
userRepository,
23-
roleRepository,
24-
asyncQueryableExecuter,
25-
userRoleRepository,
26-
userLoginRepository,
27-
userClaimRepository,
28-
userPermissionSettingRepository)
24+
unitOfWorkManager,
25+
userRepository,
26+
roleRepository,
27+
asyncQueryableExecuter,
28+
userRoleRepository,
29+
userLoginRepository,
30+
userClaimRepository,
31+
userPermissionSettingRepository,
32+
userOrganizationUnitRepository,
33+
organizationUnitRoleRepository)
2934
{
3035
}
3136
}

0 commit comments

Comments
 (0)