Skip to content

Commit 197d8aa

Browse files
ismcagdasismcagdas
authored
Merge pull request #170 from aspnetboilerplate/upgrade-to-abp-5-0-0
Upgrade to abp 5 0 0
2 parents 37ab312 + cf33869 commit 197d8aa

File tree

45 files changed

+1072
-901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1072
-901
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 47 additions & 42 deletions
Large diffs are not rendered by default.

‎src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ IAbpZeroDbMigrator abpZeroDbMigrator
4444
_userManager = userManager;
4545
}
4646

47-
public override async Task<TenantDto> Create(CreateTenantDto input)
47+
public override async Task<TenantDto> CreateAsync(CreateTenantDto input)
4848
{
4949
CheckCreatePermission();
5050

@@ -99,7 +99,7 @@ protected override void MapToEntity(TenantDto updateInput, Tenant entity)
9999
entity.IsActive = updateInput.IsActive;
100100
}
101101

102-
public override async Task Delete(EntityDto<int> input)
102+
public override async Task DeleteAsync(EntityDto<int> input)
103103
{
104104
CheckDeletePermission();
105105

‎src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public RoleAppService(
4141
_roleRepository = roleRepository;
4242
}
4343

44-
public override async Task<RoleDto> Create(CreateRoleDto input)
44+
public override async Task<RoleDto> CreateAsync(CreateRoleDto input)
4545
{
4646
CheckCreatePermission();
4747

@@ -61,7 +61,7 @@ public override async Task<RoleDto> Create(CreateRoleDto input)
6161
return MapToEntityDto(role);
6262
}
6363

64-
public override async Task<RoleDto> Update(RoleDto input)
64+
public override async Task<RoleDto> UpdateAsync(RoleDto input)
6565
{
6666
CheckUpdatePermission();
6767

@@ -81,7 +81,7 @@ public override async Task<RoleDto> Update(RoleDto input)
8181
return MapToEntityDto(role);
8282
}
8383

84-
public override async Task Delete(EntityDto<int> input)
84+
public override async Task DeleteAsync(EntityDto<int> input)
8585
{
8686
CheckDeletePermission();
8787

‎src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public class UserAppService : AsyncCrudAppService<User, UserDto, long, PagedResu
2525
private readonly IRepository<Role> _roleRepository;
2626

2727
public UserAppService(
28-
IRepository<User, long> repository,
29-
UserManager userManager,
30-
IRepository<Role> roleRepository,
28+
IRepository<User, long> repository,
29+
UserManager userManager,
30+
IRepository<Role> roleRepository,
3131
RoleManager roleManager)
3232
: base(repository)
3333
{
@@ -36,15 +36,15 @@ public UserAppService(
3636
_roleManager = roleManager;
3737
}
3838

39-
public override async Task<UserDto> Get(EntityDto<long> input)
39+
public override async Task<UserDto> GetAsync(EntityDto<long> input)
4040
{
41-
var user = await base.Get(input);
41+
var user = await base.GetAsync(input);
4242
var userRoles = await _userManager.GetRolesAsync(user.Id);
4343
user.Roles = userRoles.Select(ur => ur).ToArray();
4444
return user;
4545
}
4646

47-
public override async Task<UserDto> Create(CreateUserDto input)
47+
public override async Task<UserDto> CreateAsync(CreateUserDto input)
4848
{
4949
CheckCreatePermission();
5050

@@ -69,7 +69,7 @@ public override async Task<UserDto> Create(CreateUserDto input)
6969
return MapToEntityDto(user);
7070
}
7171

72-
public override async Task<UserDto> Update(UpdateUserDto input)
72+
public override async Task<UserDto> UpdateAsync(UpdateUserDto input)
7373
{
7474
CheckUpdatePermission();
7575

@@ -84,10 +84,10 @@ public override async Task<UserDto> Update(UpdateUserDto input)
8484
CheckErrors(await _userManager.SetRoles(user, input.RoleNames));
8585
}
8686

87-
return await Get(input);
87+
return await GetAsync(input);
8888
}
8989

90-
public override async Task Delete(EntityDto<long> input)
90+
public override async Task DeleteAsync(EntityDto<long> input)
9191
{
9292
var user = await _userManager.GetUserByIdAsync(input.Id);
9393
await _userManager.DeleteAsync(user);

‎src/AbpCompanyName.AbpProjectName.Application/app.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@
216216
</dependentAssembly>
217217
<dependentAssembly>
218218
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
219-
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
219+
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
220220
</dependentAssembly>
221221
<dependentAssembly>
222222
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
223-
<bindingRedirect oldVersion="0.0.0.0-8.1.1.0" newVersion="8.1.1.0" />
223+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
224224
</dependentAssembly>
225225
<dependentAssembly>
226226
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -260,7 +260,7 @@
260260
</dependentAssembly>
261261
<dependentAssembly>
262262
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
263-
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
263+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
264264
</dependentAssembly>
265265
<dependentAssembly>
266266
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="4.9.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="4.9.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="4.9.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="4.9.0" targetFramework="net461" />
7-
<package id="AutoMapper" version="8.1.1" targetFramework="net461" />
3+
<package id="Abp" version="5.0.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="5.0.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="5.0.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="5.0.0" targetFramework="net461" />
7+
<package id="AutoMapper" version="9.0.0" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.0" targetFramework="net461" />
10-
<package id="Castle.LoggingFacility" version="5.0.0" targetFramework="net461" />
11-
<package id="Castle.Windsor" version="5.0.0" targetFramework="net461" />
12-
<package id="JetBrains.Annotations" version="2019.1.1" targetFramework="net461" />
10+
<package id="Castle.LoggingFacility" version="5.0.1" targetFramework="net461" />
11+
<package id="Castle.Windsor" version="5.0.1" targetFramework="net461" />
12+
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net461" />
1313
<package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
1414
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
1616
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
17-
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.2.0" targetFramework="net461" />
18-
<package id="Microsoft.Extensions.Caching.Memory" version="2.2.0" targetFramework="net461" />
19-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
20-
<package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net461" />
21-
<package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
22-
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
17+
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.0.0" targetFramework="net461" />
18+
<package id="Microsoft.Extensions.Caching.Memory" version="3.0.0" targetFramework="net461" />
19+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.0.0" targetFramework="net461" />
20+
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.0.0" targetFramework="net461" />
21+
<package id="Microsoft.Extensions.Options" version="3.0.0" targetFramework="net461" />
22+
<package id="Microsoft.Extensions.Primitives" version="3.0.0" targetFramework="net461" />
23+
<package id="Newtonsoft.Json" version="12.0.3-beta1" targetFramework="net461" />
2324
<package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
2425
<package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
2526
<package id="Nito.AsyncEx.Coordination" version="5.0.0" targetFramework="net461" />
@@ -28,24 +29,24 @@
2829
<package id="Nito.AsyncEx.Tasks" version="5.0.0" targetFramework="net461" />
2930
<package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
3031
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
31-
<package id="Nito.Disposables" version="2.0.0" targetFramework="net461" />
32+
<package id="Nito.Disposables" version="2.0.1" targetFramework="net461" />
3233
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
33-
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
34-
<package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
35-
<package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
34+
<package id="System.Collections.Immutable" version="1.6.0" targetFramework="net461" />
35+
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net461" />
36+
<package id="System.Configuration.ConfigurationManager" version="4.6.0" targetFramework="net461" />
3637
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
37-
<package id="System.Linq.Dynamic.Core" version="1.0.17" targetFramework="net461" />
38+
<package id="System.Linq.Dynamic.Core" version="1.0.19" targetFramework="net461" />
3839
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
3940
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
4041
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
41-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
42+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net461" />
4243
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
4344
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
4445
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
45-
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
46+
<package id="System.Security.AccessControl" version="4.6.0" targetFramework="net461" />
4647
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
47-
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
48-
<package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
48+
<package id="System.Security.Permissions" version="4.6.0" targetFramework="net461" />
49+
<package id="System.Security.Principal.Windows" version="4.6.0" targetFramework="net461" />
4950
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
5051
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
5152
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />

0 commit comments

Comments
 (0)