Merge pull request #170 from aspnetboilerplate/upgrade-to-abp-5-0-0

Upgrade to abp 5 0 0
aspnetboilerplate · Oct 24, 2019 · 197d8aa · 197d8aa
2 parents 37ab312 + cf33869
commit 197d8aa
Show file tree

Hide file tree

Showing 45 changed files with 1,072 additions and 901 deletions.
diff --git a/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
diff --git a/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs b/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs
@@ -44,7 +44,7 @@ IAbpZeroDbMigrator abpZeroDbMigrator
             _userManager = userManager;
         }
 
-        public override async Task<TenantDto> Create(CreateTenantDto input)
+        public override async Task<TenantDto> CreateAsync(CreateTenantDto input)
         {
             CheckCreatePermission();
 
@@ -99,7 +99,7 @@ protected override void MapToEntity(TenantDto updateInput, Tenant entity)
             entity.IsActive = updateInput.IsActive;
         }
 
-        public override async Task Delete(EntityDto<int> input)
+        public override async Task DeleteAsync(EntityDto<int> input)
         {
             CheckDeletePermission();
 

diff --git a/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs b/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs
@@ -41,7 +41,7 @@ public class RoleAppService : AsyncCrudAppService<Role, RoleDto, int, PagedResul
             _roleRepository = roleRepository;
         }
 
-        public override async Task<RoleDto> Create(CreateRoleDto input)
+        public override async Task<RoleDto> CreateAsync(CreateRoleDto input)
         {
             CheckCreatePermission();
 
@@ -61,7 +61,7 @@ public override async Task<RoleDto> Create(CreateRoleDto input)
             return MapToEntityDto(role);
         }
 
-        public override async Task<RoleDto> Update(RoleDto input)
+        public override async Task<RoleDto> UpdateAsync(RoleDto input)
         {
             CheckUpdatePermission();
 
@@ -81,7 +81,7 @@ public override async Task<RoleDto> Update(RoleDto input)
             return MapToEntityDto(role);
         }
 
-        public override async Task Delete(EntityDto<int> input)
+        public override async Task DeleteAsync(EntityDto<int> input)
         {
             CheckDeletePermission();
 

diff --git a/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs b/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs
@@ -25,9 +25,9 @@ public class UserAppService : AsyncCrudAppService<User, UserDto, long, PagedResu
         private readonly IRepository<Role> _roleRepository;
 
         public UserAppService(
-            IRepository<User, long> repository, 
-            UserManager userManager, 
-            IRepository<Role> roleRepository, 
+            IRepository<User, long> repository,
+            UserManager userManager,
+            IRepository<Role> roleRepository,
             RoleManager roleManager)
             : base(repository)
         {
@@ -36,15 +36,15 @@ public class UserAppService : AsyncCrudAppService<User, UserDto, long, PagedResu
             _roleManager = roleManager;
         }
 
-        public override async Task<UserDto> Get(EntityDto<long> input)
+        public override async Task<UserDto> GetAsync(EntityDto<long> input)
         {
-            var user = await base.Get(input);
+            var user = await base.GetAsync(input);
             var userRoles = await _userManager.GetRolesAsync(user.Id);
             user.Roles = userRoles.Select(ur => ur).ToArray();
             return user;
         }
 
-        public override async Task<UserDto> Create(CreateUserDto input)
+        public override async Task<UserDto> CreateAsync(CreateUserDto input)
         {
             CheckCreatePermission();
 
@@ -69,7 +69,7 @@ public override async Task<UserDto> Create(CreateUserDto input)
             return MapToEntityDto(user);
         }
 
-        public override async Task<UserDto> Update(UpdateUserDto input)
+        public override async Task<UserDto> UpdateAsync(UpdateUserDto input)
         {
             CheckUpdatePermission();
 
@@ -84,10 +84,10 @@ public override async Task<UserDto> Update(UpdateUserDto input)
                 CheckErrors(await _userManager.SetRoles(user, input.RoleNames));
             }
 
-            return await Get(input);
+            return await GetAsync(input);
         }
 
-        public override async Task Delete(EntityDto<long> input)
+        public override async Task DeleteAsync(EntityDto<long> input)
         {
             var user = await _userManager.GetUserByIdAsync(input.Id);
             await _userManager.DeleteAsync(user);

diff --git a/src/AbpCompanyName.AbpProjectName.Application/app.config b/src/AbpCompanyName.AbpProjectName.Application/app.config
@@ -216,11 +216,11 @@
 			</dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.1.0" newVersion="8.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -260,7 +260,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

diff --git a/src/AbpCompanyName.AbpProjectName.Application/packages.config b/src/AbpCompanyName.AbpProjectName.Application/packages.config
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="4.9.0" targetFramework="net461" />
-  <package id="Abp.AutoMapper" version="4.9.0" targetFramework="net461" />
-  <package id="Abp.Zero" version="4.9.0" targetFramework="net461" />
-  <package id="Abp.Zero.Common" version="4.9.0" targetFramework="net461" />
-  <package id="AutoMapper" version="8.1.1" targetFramework="net461" />
+  <package id="Abp" version="5.0.0" targetFramework="net461" />
+  <package id="Abp.AutoMapper" version="5.0.0" targetFramework="net461" />
+  <package id="Abp.Zero" version="5.0.0" targetFramework="net461" />
+  <package id="Abp.Zero.Common" version="5.0.0" targetFramework="net461" />
+  <package id="AutoMapper" version="9.0.0" targetFramework="net461" />
   <package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net461" />
-  <package id="Castle.LoggingFacility" version="5.0.0" targetFramework="net461" />
-  <package id="Castle.Windsor" version="5.0.0" targetFramework="net461" />
-  <package id="JetBrains.Annotations" version="2019.1.1" targetFramework="net461" />
+  <package id="Castle.LoggingFacility" version="5.0.1" targetFramework="net461" />
+  <package id="Castle.Windsor" version="5.0.1" targetFramework="net461" />
+  <package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net461" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="2.2.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="2.2.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="3.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="3.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="3.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="3.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Primitives" version="3.0.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.3-beta1" targetFramework="net461" />
   <package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
   <package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
   <package id="Nito.AsyncEx.Coordination" version="5.0.0" targetFramework="net461" />
@@ -28,24 +29,24 @@
   <package id="Nito.AsyncEx.Tasks" version="5.0.0" targetFramework="net461" />
   <package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
   <package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
-  <package id="Nito.Disposables" version="2.0.0" targetFramework="net461" />
+  <package id="Nito.Disposables" version="2.0.1" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
-  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
-  <package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="1.6.0" targetFramework="net461" />
+  <package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net461" />
+  <package id="System.Configuration.ConfigurationManager" version="4.6.0" targetFramework="net461" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq.Dynamic.Core" version="1.0.17" targetFramework="net461" />
+  <package id="System.Linq.Dynamic.Core" version="1.0.19" targetFramework="net461" />
   <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
   <package id="System.Memory" version="4.5.3" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net461" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
-  <package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
+  <package id="System.Security.AccessControl" version="4.6.0" targetFramework="net461" />
   <package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
-  <package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
-  <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
+  <package id="System.Security.Permissions" version="4.6.0" targetFramework="net461" />
+  <package id="System.Security.Principal.Windows" version="4.6.0" targetFramework="net461" />
   <package id="System.Threading" version="4.3.0" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
   <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />