Merge pull request #632 from aspnetboilerplate/pr/6385

Upgrade to Abp v7.1.0

Author: ismcagdas

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

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AutoMapper" Version="7.0.0" />
-    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="7.0.0" />
+    <PackageReference Include="Abp.AutoMapper" Version="7.1.0" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="7.1.0" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.4.0" />
   </ItemGroup>
 

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

@@ -11,47 +11,50 @@
 using Abp.Organizations;
 using Abp.Runtime.Caching;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
+using Abp.Authorization.Roles;
 
 namespace AbpCompanyName.AbpProjectName.Authorization.Users
 {
     public class UserManager : AbpUserManager<Role, User>
     {
         public UserManager(
-            RoleManager roleManager,
-            UserStore store, 
-            IOptions<IdentityOptions> optionsAccessor, 
-            IPasswordHasher<User> passwordHasher, 
-            IEnumerable<IUserValidator<User>> userValidators, 
-            IEnumerable<IPasswordValidator<User>> passwordValidators,
-            ILookupNormalizer keyNormalizer, 
-            IdentityErrorDescriber errors, 
-            IServiceProvider services, 
-            ILogger<UserManager<User>> logger, 
-            IPermissionManager permissionManager, 
-            IUnitOfWorkManager unitOfWorkManager, 
-            ICacheManager cacheManager, 
-            IRepository<OrganizationUnit, long> organizationUnitRepository, 
-            IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository, 
-            IOrganizationUnitSettings organizationUnitSettings, 
-            ISettingManager settingManager)
-            : base(
-                roleManager, 
-                store, 
-                optionsAccessor, 
-                passwordHasher, 
-                userValidators, 
-                passwordValidators, 
-                keyNormalizer, 
-                errors, 
-                services, 
-                logger, 
-                permissionManager, 
-                unitOfWorkManager, 
-                cacheManager,
-                organizationUnitRepository, 
-                userOrganizationUnitRepository, 
-                organizationUnitSettings, 
-                settingManager)
+          RoleManager roleManager,
+          UserStore store,
+          IOptions<IdentityOptions> optionsAccessor,
+          IPasswordHasher<User> passwordHasher,
+          IEnumerable<IUserValidator<User>> userValidators,
+          IEnumerable<IPasswordValidator<User>> passwordValidators,
+          ILookupNormalizer keyNormalizer,
+          IdentityErrorDescriber errors,
+          IServiceProvider services,
+          ILogger<UserManager<User>> logger,
+          IPermissionManager permissionManager,
+          IUnitOfWorkManager unitOfWorkManager,
+          ICacheManager cacheManager,
+          IRepository<OrganizationUnit, long> organizationUnitRepository,
+          IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
+          IOrganizationUnitSettings organizationUnitSettings,
+          ISettingManager settingManager, 
+          IRepository<UserLogin, long> userLoginRepository)
+          : base(
+              roleManager,
+              store,
+              optionsAccessor,
+              passwordHasher,
+              userValidators,
+              passwordValidators,
+              keyNormalizer,
+              errors,
+              services,
+              logger,
+              permissionManager,
+              unitOfWorkManager,
+              cacheManager,
+              organizationUnitRepository,
+              userOrganizationUnitRepository,
+              organizationUnitSettings,
+              settingManager,
+              userLoginRepository)
         {
         }
     }

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

@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="7.0.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="7.1.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -28,9 +28,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="Abp.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Abp.ZeroCore" Version="7.0.0" />
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="7.0.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="7.1.0" />
+    <PackageReference Include="Abp.ZeroCore" Version="7.1.0" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="7.1.0" />
   </ItemGroup>
 
 </Project>

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

@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="7.0.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="7.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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

@@ -42,9 +42,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.2" />
-    <PackageReference Include="Abp.HangFire" Version="7.0.0" />
-    <PackageReference Include="Abp.RedisCache" Version="7.0.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="7.0.0" />
+    <PackageReference Include="Abp.HangFire" Version="7.1.0" />
+    <PackageReference Include="Abp.RedisCache" Version="7.1.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="7.1.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -27,7 +27,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Abp.TestBase" Version="7.0.0" />
+    <PackageReference Include="Abp.TestBase" Version="7.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
   </ItemGroup>

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

@@ -28,7 +28,7 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       </PackageReference>
       <PackageReference Include="AngleSharp" Version="0.16.1" />
-      <PackageReference Include="Abp.AspNetCore.TestBase" Version="7.0.0" />
+      <PackageReference Include="Abp.AspNetCore.TestBase" Version="7.1.0" />
     </ItemGroup>
 
 </Project>