Skip to content

Commit ff80a5a

Browse files
Upgrade ABP to v4.4. Resolved: #421
1 parent ae68b77 commit ff80a5a

File tree

7 files changed

+29
-23
lines changed

7 files changed

+29
-23
lines changed

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.3.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.3.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="4.4.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="4.4.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/Roles/RoleManager.cs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
using Microsoft.Extensions.Logging;
44
using Abp.Authorization;
55
using Abp.Authorization.Roles;
6+
using Abp.Domain.Repositories;
67
using Abp.Domain.Uow;
8+
using Abp.Organizations;
79
using Abp.Runtime.Caching;
810
using Abp.Zero.Configuration;
911
using AbpCompanyName.AbpProjectName.Authorization.Users;
@@ -13,24 +15,28 @@ namespace AbpCompanyName.AbpProjectName.Authorization.Roles
1315
public class RoleManager : AbpRoleManager<Role, User>
1416
{
1517
public RoleManager(
16-
RoleStore store,
17-
IEnumerable<IRoleValidator<Role>> roleValidators,
18-
ILookupNormalizer keyNormalizer,
19-
IdentityErrorDescriber errors,
18+
RoleStore store,
19+
IEnumerable<IRoleValidator<Role>> roleValidators,
20+
ILookupNormalizer keyNormalizer,
21+
IdentityErrorDescriber errors,
2022
ILogger<AbpRoleManager<Role, User>> logger,
21-
IPermissionManager permissionManager,
22-
ICacheManager cacheManager,
23+
IPermissionManager permissionManager,
24+
ICacheManager cacheManager,
2325
IUnitOfWorkManager unitOfWorkManager,
24-
IRoleManagementConfig roleManagementConfig)
26+
IRoleManagementConfig roleManagementConfig,
27+
IRepository<OrganizationUnit, long> organizationUnitRepository,
28+
IRepository<OrganizationUnitRole, long> organizationUnitRoleRepository)
2529
: base(
2630
store,
27-
roleValidators,
28-
keyNormalizer,
29-
errors, logger,
31+
roleValidators,
32+
keyNormalizer,
33+
errors, logger,
3034
permissionManager,
31-
cacheManager,
35+
cacheManager,
3236
unitOfWorkManager,
33-
roleManagementConfig)
37+
roleManagementConfig,
38+
organizationUnitRepository,
39+
organizationUnitRoleRepository)
3440
{
3541
}
3642
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="4.3.0" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="4.4.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
2727
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
2828
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
29-
<PackageReference Include="Abp.AspNetCore" Version="4.3.0" />
30-
<PackageReference Include="Abp.ZeroCore" Version="4.3.0" />
29+
<PackageReference Include="Abp.AspNetCore" Version="4.4.0" />
30+
<PackageReference Include="Abp.ZeroCore" Version="4.4.0" />
3131
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
32-
<PackageReference Include="Abp.AspNetCore.SignalR" Version="4.3.0" />
32+
<PackageReference Include="Abp.AspNetCore.SignalR" Version="4.4.0" />
3333
</ItemGroup>
3434

3535
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
4646
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
4747
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
48-
<PackageReference Include="Abp.Castle.Log4Net" Version="4.3.0" />
48+
<PackageReference Include="Abp.Castle.Log4Net" Version="4.4.0" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
4848
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
4949
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
50-
<PackageReference Include="Abp.HangFire" Version="4.3.0" />
51-
<PackageReference Include="Abp.RedisCache" Version="4.3.0" />
52-
<PackageReference Include="Abp.Castle.Log4Net" Version="4.3.0" />
50+
<PackageReference Include="Abp.HangFire" Version="4.4.0" />
51+
<PackageReference Include="Abp.RedisCache" Version="4.4.0" />
52+
<PackageReference Include="Abp.Castle.Log4Net" Version="4.4.0" />
5353
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.2.0" PrivateAssets="All" />
5454
</ItemGroup>
5555

aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="Abp.TestBase" Version="4.3.0" />
30+
<PackageReference Include="Abp.TestBase" Version="4.4.0" />
3131
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.1" />
3232
<PackageReference Include="Castle.Core" Version="4.3.1" />
3333
</ItemGroup>

0 commit comments

Comments
 (0)