#28 Converted Core and Application layer to .netcoreapp1.1.

hikalkan · hikalkan · commit 2b00cc02258d · 2017-04-24T13:58:34.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -16,17 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="3.3.3" />
-    <PackageReference Include="Castle.LoggingFacility" Version="3.4.0" />
-    <PackageReference Include="Castle.Windsor" Version="3.4.0" />
-    <PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
-    <PackageReference Include="Nito.AsyncEx" Version="4.0.1" />
-    <PackageReference Include="AutoMapper" Version="6.0.2" />
     <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
     <PackageReference Include="Abp.AutoMapper" Version="2.0.1" />
-    <PackageReference Include="Abp.EntityFramework" Version="2.0.1" />
-    <PackageReference Include="Abp.Zero" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs
@@ -2,10 +2,10 @@
 using System.Threading.Tasks;
 using Abp.Application.Services;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
-using Microsoft.AspNet.Identity;
 using Abp.Runtime.Session;
 using Abp.IdentityFramework;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
+using Microsoft.AspNetCore.Identity;
 
 namespace AbpCompanyName.AbpProjectName
 {
@@ -25,10 +25,10 @@ protected AbpProjectNameAppServiceBase()
 
         protected virtual Task<User> GetCurrentUserAsync()
         {
-            var user = UserManager.FindByIdAsync(AbpSession.GetUserId());
+            var user = UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());
             if (user == null)
             {
-                throw new ApplicationException("There is no current user!");
+                throw new Exception("There is no current user!");
             }
 
             return user;
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs
@@ -1,6 +1,7 @@
 ﻿using System.Reflection;
 using Abp.AutoMapper;
 using Abp.Modules;
+using Abp.Reflection.Extensions;
 using AbpCompanyName.AbpProjectName.Authorization;
 
 namespace AbpCompanyName.AbpProjectName
@@ -17,7 +18,7 @@ public override void PreInitialize()
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameApplicationModule).GetAssembly());
         }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/AbpLoginResultTypeHelper.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Authorization/AbpLoginResultTypeHelper.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using Abp;
 using Abp.Authorization;
-using Abp.Authorization.Users;
 using Abp.Dependency;
 using Abp.UI;
 
@@ -19,7 +18,7 @@ public Exception CreateExceptionForFailedLoginAttempt(AbpLoginResultType result,
             switch (result)
             {
                 case AbpLoginResultType.Success:
-                    return new ApplicationException("Don't call this method with a success result!");
+                    return new Exception("Don't call this method with a success result!");
                 case AbpLoginResultType.InvalidUserNameOrEmailAddress:
                 case AbpLoginResultType.InvalidPassword:
                     return new UserFriendlyException(L("LoginFailed"), L("InvalidUserNameOrPassword"));
@@ -44,7 +43,7 @@ public string CreateLocalizedMessageForFailedLoginAttempt(AbpLoginResultType res
             switch (result)
             {
                 case AbpLoginResultType.Success:
-                    throw new ApplicationException("Don't call this method with a success result!");
+                    throw new Exception("Don't call this method with a success result!");
                 case AbpLoginResultType.InvalidUserNameOrEmailAddress:
                 case AbpLoginResultType.InvalidPassword:
                     return L("InvalidUserNameOrPassword");
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs
@@ -12,7 +12,6 @@
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.Editions;
 using AbpCompanyName.AbpProjectName.MultiTenancy.Dto;
-using AbpCompanyName.AbpProjectName.Users;
 
 namespace AbpCompanyName.AbpProjectName.MultiTenancy
 {
@@ -70,7 +69,7 @@ public async Task CreateTenant(CreateTenantInput input)
             using (CurrentUnitOfWork.SetTenantId(tenant.Id))
             {
                 //Create static roles for new tenant
-                CheckErrors(await _roleManager.CreateStaticRoles(tenant.Id));
+                await _roleManager.CreateStaticRoles(tenant.Id);
 
                 await CurrentUnitOfWork.SaveChangesAsync(); //To get static role ids
 
@@ -80,11 +79,11 @@ public async Task CreateTenant(CreateTenantInput input)
 
                 //Create admin user for the tenant
                 var adminUser = User.CreateTenantAdminUser(tenant.Id, input.AdminEmailAddress, User.DefaultPassword);
-                CheckErrors(await UserManager.CreateAsync(adminUser));
+                await UserManager.CreateAsync(adminUser);
                 await CurrentUnitOfWork.SaveChangesAsync(); //To get admin user's id
 
                 //Assign admin user to role!
-                CheckErrors(await UserManager.AddToRoleAsync(adminUser.Id, adminRole.Name));
+                await UserManager.AddToRoleAsync(adminUser, adminRole.Name);
                 await CurrentUnitOfWork.SaveChangesAsync();
             }
         }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs
@@ -7,7 +7,7 @@
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.Users.Dto;
-using Microsoft.AspNet.Identity;
+using Microsoft.AspNetCore.Identity;
 
 namespace AbpCompanyName.AbpProjectName.Users
 {
@@ -17,11 +17,16 @@ public class UserAppService : AbpProjectNameAppServiceBase, IUserAppService
     {
         private readonly IRepository<User, long> _userRepository;
         private readonly IPermissionManager _permissionManager;
+        private readonly IPasswordHasher<User> _passwordHasher;
 
-        public UserAppService(IRepository<User, long> userRepository, IPermissionManager permissionManager)
+        public UserAppService(
+            IRepository<User, long> userRepository, 
+            IPermissionManager permissionManager,
+            IPasswordHasher<User> passwordHasher)
         {
             _userRepository = userRepository;
             _permissionManager = permissionManager;
+            _passwordHasher = passwordHasher;
         }
 
         public async Task ProhibitPermission(ProhibitPermissionInput input)
@@ -35,7 +40,8 @@ public async Task ProhibitPermission(ProhibitPermissionInput input)
         //Example for primitive method parameters.
         public async Task RemoveFromRole(long userId, string roleName)
         {
-            CheckErrors(await UserManager.RemoveFromRoleAsync(userId, roleName));
+            var user = await UserManager.FindByIdAsync(userId.ToString());
+            await UserManager.RemoveFromRoleAsync(user, roleName);
         }
 
         public async Task<ListResultDto<UserListDto>> GetUsers()
@@ -52,10 +58,10 @@ public async Task CreateUser(CreateUserInput input)
             var user = input.MapTo<User>();
 
             user.TenantId = AbpSession.TenantId;
-            user.Password = new PasswordHasher().HashPassword(input.Password);
+            user.Password = _passwordHasher.HashPassword(user, input.Password);
             user.IsEmailConfirmed = true;
 
-            CheckErrors(await UserManager.CreateAsync(user));
+            await UserManager.CreateAsync(user);
         }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -19,8 +19,8 @@
   <ItemGroup>
     <PackageReference Include="Abp" Version="2.0.1" />
     <PackageReference Include="Abp.AutoMapper" Version="2.0.1" />
-    <PackageReference Include="Abp.EntityFramework" Version="2.0.1" />
-    <PackageReference Include="Abp.Zero" Version="2.0.1" />
+    <PackageReference Include="Abp.ZeroCore" Version="2.0.1" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.1" />
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs
@@ -1,5 +1,5 @@
-﻿using System.Reflection;
-using Abp.Modules;
+﻿using Abp.Modules;
+using Abp.Reflection.Extensions;
 using Abp.Timing;
 using Abp.Zero;
 using AbpCompanyName.AbpProjectName.Localization;
@@ -34,7 +34,7 @@ public override void PreInitialize()
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameCoreModule).GetAssembly());
         }
 
         public override void PostInitialize()
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AppVersionHelper.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AppVersionHelper.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.IO;
+using Abp.Reflection.Extensions;
 
 namespace AbpCompanyName.AbpProjectName
 {
@@ -20,7 +21,7 @@ public class AppVersionHelper
         /// </summary>
         public static DateTime ReleaseDate
         {
-            get { return new FileInfo(typeof(AppVersionHelper).Assembly.Location).LastWriteTime; }
+            get { return new FileInfo(typeof(AppVersionHelper).GetAssembly().Location).LastWriteTime; }
         }
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/LoginManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/LoginManager.cs
@@ -1,4 +1,5 @@
 ﻿using Abp.Authorization;
+using Abp.Authorization.Roles;
 using Abp.Authorization.Users;
 using Abp.Configuration;
 using Abp.Configuration.Startup;
@@ -9,30 +10,35 @@
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
+using Microsoft.AspNetCore.Identity;
 
 namespace AbpCompanyName.AbpProjectName.Authorization
 {
     public class LogInManager : AbpLogInManager<Tenant, Role, User>
     {
-        public LogInManager(
-            UserManager userManager,
+        public LogInManager(AbpUserManager<Role, User> userManager, 
             IMultiTenancyConfig multiTenancyConfig,
             IRepository<Tenant> tenantRepository,
             IUnitOfWorkManager unitOfWorkManager,
-            ISettingManager settingManager,
-            IRepository<UserLoginAttempt, long> userLoginAttemptRepository,
-            IUserManagementConfig userManagementConfig, IIocResolver iocResolver,
-            RoleManager roleManager)
+            ISettingManager settingManager, 
+            IRepository<UserLoginAttempt, long> userLoginAttemptRepository, 
+            IUserManagementConfig userManagementConfig,
+            IIocResolver iocResolver,
+            IPasswordHasher<User> passwordHasher, 
+            RoleManager roleManager,
+            UserClaimsPrincipalFactory claimsPrincipalFactory) 
             : base(
-                  userManager,
+                  userManager, 
                   multiTenancyConfig,
-                  tenantRepository,
-                  unitOfWorkManager,
-                  settingManager,
-                  userLoginAttemptRepository,
-                  userManagementConfig,
-                  iocResolver,
-                  roleManager)
+                  tenantRepository, 
+                  unitOfWorkManager, 
+                  settingManager, 
+                  userLoginAttemptRepository, 
+                  userManagementConfig, 
+                  iocResolver, 
+                  passwordHasher, 
+                  roleManager, 
+                  claimsPrincipalFactory)
         {
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleManager.cs
@@ -1,26 +1,39 @@
+using System.Collections.Generic;
 using Abp.Authorization;
 using Abp.Authorization.Roles;
 using Abp.Domain.Uow;
 using Abp.Runtime.Caching;
 using Abp.Zero.Configuration;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Logging;
 
 namespace AbpCompanyName.AbpProjectName.Authorization.Roles
 {
     public class RoleManager : AbpRoleManager<Role, User>
     {
         public RoleManager(
-            RoleStore store,
-            IPermissionManager permissionManager,
-            IRoleManagementConfig roleManagementConfig,
-            ICacheManager cacheManager,
-            IUnitOfWorkManager unitOfWorkManager)
+            RoleStore store, 
+            IEnumerable<IRoleValidator<Role>> roleValidators, 
+            ILookupNormalizer keyNormalizer, 
+            IdentityErrorDescriber errors, 
+            ILogger<AbpRoleManager<Role, User>> logger,
+            IHttpContextAccessor contextAccessor, 
+            IPermissionManager permissionManager, 
+            ICacheManager cacheManager, 
+            IUnitOfWorkManager unitOfWorkManager,
+            IRoleManagementConfig roleManagementConfig)
             : base(
-                store,
-                permissionManager,
-                roleManagementConfig,
-                cacheManager,
-                unitOfWorkManager)
+                  store,
+                  roleValidators, 
+                  keyNormalizer, 
+                  errors, logger, 
+                  contextAccessor, 
+                  permissionManager,
+                  cacheManager, 
+                  unitOfWorkManager,
+                  roleManagementConfig)
         {
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleStore.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleStore.cs
@@ -1,19 +1,19 @@
 using Abp.Authorization.Roles;
-using Abp.Authorization.Users;
 using Abp.Domain.Repositories;
+using Abp.Domain.Uow;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 
 namespace AbpCompanyName.AbpProjectName.Authorization.Roles
 {
     public class RoleStore : AbpRoleStore<Role, User>
     {
         public RoleStore(
+            IUnitOfWorkManager unitOfWorkManager,
             IRepository<Role> roleRepository,
-            IRepository<UserRole, long> userRoleRepository,
             IRepository<RolePermissionSetting, long> rolePermissionSettingRepository)
             : base(
+                unitOfWorkManager,
                 roleRepository,
-                userRoleRepository,
                 rolePermissionSettingRepository)
         {
         }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/User.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/User.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using Abp.Authorization.Users;
 using Abp.Extensions;
-using Microsoft.AspNet.Identity;
 
 namespace AbpCompanyName.AbpProjectName.Authorization.Users
 {
@@ -23,7 +22,7 @@ public static User CreateTenantAdminUser(int tenantId, string emailAddress, stri
                 Name = AdminUserName,
                 Surname = AdminUserName,
                 EmailAddress = emailAddress,
-                Password = new PasswordHasher().HashPassword(password)
+                //Password = new PasswordHasher<>().HashPassword(password) //TODO: Set Password from out of this class!
             };
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserClaimsPrincipalFactory.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserClaimsPrincipalFactory.cs
@@ -0,0 +1,21 @@
+﻿using Abp.Authorization;
+using AbpCompanyName.AbpProjectName.Authorization.Roles;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Options;
+
+namespace AbpCompanyName.AbpProjectName.Authorization.Users
+{
+    public class UserClaimsPrincipalFactory : AbpUserClaimsPrincipalFactory<User, Role>
+    {
+        public UserClaimsPrincipalFactory(
+            UserManager userManager,
+            RoleManager roleManager,
+            IOptions<IdentityOptions> optionsAccessor)
+            : base(
+                  userManager,
+                  roleManager,
+                  optionsAccessor)
+        {
+        }
+    }
+}
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserManager.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserRegistrationManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserRegistrationManager.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserStore.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserStore.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Configuration/AppConfigurations.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Configuration/AppConfigurations.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/AbpProjectNameLocalizationConfigurer.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/AbpProjectNameLocalizationConfigurer.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Web/WebContentFolderHelper.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Web/WebContentFolderHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using Abp.Application.Services;`
`4`	`4`	`using AbpCompanyName.AbpProjectName.MultiTenancy;`
`5`		`-using Microsoft.AspNet.Identity;`
`6`	`5`	`using Abp.Runtime.Session;`
`7`	`6`	`using Abp.IdentityFramework;`
`8`	`7`	`using AbpCompanyName.AbpProjectName.Authorization.Users;`
	`8`	`+using Microsoft.AspNetCore.Identity;`
`9`	`9`
`10`	`10`	`namespace AbpCompanyName.AbpProjectName`
`11`	`11`	`{`
`@@ -25,10 +25,10 @@ protected AbpProjectNameAppServiceBase()`
`25`	`25`
`26`	`26`	`protected virtual Task<User> GetCurrentUserAsync()`
`27`	`27`	`{`
`28`		`- var user = UserManager.FindByIdAsync(AbpSession.GetUserId());`
	`28`	`+ var user = UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());`
`29`	`29`	`if (user == null)`
`30`	`30`	`{`
`31`		`- throw new ApplicationException("There is no current user!");`
	`31`	`+ throw new Exception("There is no current user!");`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`return user;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Reflection;`
`2`	`2`	`using Abp.AutoMapper;`
`3`	`3`	`using Abp.Modules;`
	`4`	`+using Abp.Reflection.Extensions;`
`4`	`5`	`using AbpCompanyName.AbpProjectName.Authorization;`
`5`	`6`
`6`	`7`	`namespace AbpCompanyName.AbpProjectName`
`@@ -17,7 +18,7 @@ public override void PreInitialize()`
`17`	`18`
`18`	`19`	`public override void Initialize()`
`19`	`20`	`{`
`20`		`- IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());`
	`21`	`+ IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameApplicationModule).GetAssembly());`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`using AbpCompanyName.AbpProjectName.Authorization.Users;`
`13`	`13`	`using AbpCompanyName.AbpProjectName.Editions;`
`14`	`14`	`using AbpCompanyName.AbpProjectName.MultiTenancy.Dto;`
`15`		`-using AbpCompanyName.AbpProjectName.Users;`
`16`	`15`
`17`	`16`	`namespace AbpCompanyName.AbpProjectName.MultiTenancy`
`18`	`17`	`{`
`@@ -70,7 +69,7 @@ public async Task CreateTenant(CreateTenantInput input)`
`70`	`69`	`using (CurrentUnitOfWork.SetTenantId(tenant.Id))`
`71`	`70`	`{`
`72`	`71`	`//Create static roles for new tenant`
`73`		`- CheckErrors(await _roleManager.CreateStaticRoles(tenant.Id));`
	`72`	`+ await _roleManager.CreateStaticRoles(tenant.Id);`
`74`	`73`
`75`	`74`	`await CurrentUnitOfWork.SaveChangesAsync(); //To get static role ids`
`76`	`75`
`@@ -80,11 +79,11 @@ public async Task CreateTenant(CreateTenantInput input)`
`80`	`79`
`81`	`80`	`//Create admin user for the tenant`
`82`	`81`	`var adminUser = User.CreateTenantAdminUser(tenant.Id, input.AdminEmailAddress, User.DefaultPassword);`
`83`		`- CheckErrors(await UserManager.CreateAsync(adminUser));`
	`82`	`+ await UserManager.CreateAsync(adminUser);`
`84`	`83`	`await CurrentUnitOfWork.SaveChangesAsync(); //To get admin user's id`
`85`	`84`
`86`	`85`	`//Assign admin user to role!`
`87`		`- CheckErrors(await UserManager.AddToRoleAsync(adminUser.Id, adminRole.Name));`
	`86`	`+ await UserManager.AddToRoleAsync(adminUser, adminRole.Name);`
`88`	`87`	`await CurrentUnitOfWork.SaveChangesAsync();`
`89`	`88`	`}`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using AbpCompanyName.AbpProjectName.Authorization;`
`8`	`8`	`using AbpCompanyName.AbpProjectName.Authorization.Users;`
`9`	`9`	`using AbpCompanyName.AbpProjectName.Users.Dto;`
`10`		`-using Microsoft.AspNet.Identity;`
	`10`	`+using Microsoft.AspNetCore.Identity;`
`11`	`11`
`12`	`12`	`namespace AbpCompanyName.AbpProjectName.Users`
`13`	`13`	`{`
`@@ -17,11 +17,16 @@ public class UserAppService : AbpProjectNameAppServiceBase, IUserAppService`
`17`	`17`	`{`
`18`	`18`	`private readonly IRepository<User, long> _userRepository;`
`19`	`19`	`private readonly IPermissionManager _permissionManager;`
	`20`	`+ private readonly IPasswordHasher<User> _passwordHasher;`
`20`	`21`
`21`		`- public UserAppService(IRepository<User, long> userRepository, IPermissionManager permissionManager)`
	`22`	`+ public UserAppService(`
	`23`	`+ IRepository<User, long> userRepository,`
	`24`	`+ IPermissionManager permissionManager,`
	`25`	`+ IPasswordHasher<User> passwordHasher)`
`22`	`26`	`{`
`23`	`27`	`_userRepository = userRepository;`
`24`	`28`	`_permissionManager = permissionManager;`
	`29`	`+ _passwordHasher = passwordHasher;`
`25`	`30`	`}`
`26`	`31`
`27`	`32`	`public async Task ProhibitPermission(ProhibitPermissionInput input)`
`@@ -35,7 +40,8 @@ public async Task ProhibitPermission(ProhibitPermissionInput input)`
`35`	`40`	`//Example for primitive method parameters.`
`36`	`41`	`public async Task RemoveFromRole(long userId, string roleName)`
`37`	`42`	`{`
`38`		`- CheckErrors(await UserManager.RemoveFromRoleAsync(userId, roleName));`
	`43`	`+ var user = await UserManager.FindByIdAsync(userId.ToString());`
	`44`	`+ await UserManager.RemoveFromRoleAsync(user, roleName);`
`39`	`45`	`}`
`40`	`46`
`41`	`47`	`public async Task<ListResultDto<UserListDto>> GetUsers()`
`@@ -52,10 +58,10 @@ public async Task CreateUser(CreateUserInput input)`
`52`	`58`	`var user = input.MapTo<User>();`
`53`	`59`
`54`	`60`	`user.TenantId = AbpSession.TenantId;`
`55`		`- user.Password = new PasswordHasher().HashPassword(input.Password);`
	`61`	`+ user.Password = _passwordHasher.HashPassword(user, input.Password);`
`56`	`62`	`user.IsEmailConfirmed = true;`
`57`	`63`
`58`		`- CheckErrors(await UserManager.CreateAsync(user));`
	`64`	`+ await UserManager.CreateAsync(user);`
`59`	`65`	`}`
`60`	`66`	`}`
`61`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using System.Reflection;`
`2`		`-using Abp.Modules;`
	`1`	`+using Abp.Modules;`
	`2`	`+using Abp.Reflection.Extensions;`
`3`	`3`	`using Abp.Timing;`
`4`	`4`	`using Abp.Zero;`
`5`	`5`	`using AbpCompanyName.AbpProjectName.Localization;`
`@@ -34,7 +34,7 @@ public override void PreInitialize()`
`34`	`34`
`35`	`35`	`public override void Initialize()`
`36`	`36`	`{`
`37`		`- IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());`
	`37`	`+ IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameCoreModule).GetAssembly());`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public override void PostInitialize()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using Abp.Reflection.Extensions;`
`3`	`4`
`4`	`5`	`namespace AbpCompanyName.AbpProjectName`
`5`	`6`	`{`
`@@ -20,7 +21,7 @@ public class AppVersionHelper`
`20`	`21`	`/// </summary>`
`21`	`22`	`public static DateTime ReleaseDate`
`22`	`23`	`{`
`23`		`- get { return new FileInfo(typeof(AppVersionHelper).Assembly.Location).LastWriteTime; }`
	`24`	`+ get { return new FileInfo(typeof(AppVersionHelper).GetAssembly().Location).LastWriteTime; }`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`	`}`