Upgrade to Abp 6.4.0-rc-1

demirmusa · demirmusa · commit 360f6dd32b9d · 2021-06-28T13:30:56.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AutoMapper" Version="6.3.0" />
-    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="6.3.0" />
+    <PackageReference Include="Abp.AutoMapper" Version="6.4.0-rc1" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="6.4.0-rc1" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
   </ItemGroup>
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserClaimsPrincipalFactory.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserClaimsPrincipalFactory.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Options;
 using Abp.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
+using Abp.Domain.Uow;
 
 namespace AbpCompanyName.AbpProjectName.Authorization.Users
 {
@@ -10,11 +11,13 @@ public class UserClaimsPrincipalFactory : AbpUserClaimsPrincipalFactory<User, Ro
         public UserClaimsPrincipalFactory(
             UserManager userManager,
             RoleManager roleManager,
-            IOptions<IdentityOptions> optionsAccessor)
+            IOptions<IdentityOptions> optionsAccessor,
+            IUnitOfWorkManager unitOfWorkManager)
             : base(
                   userManager,
                   roleManager,
-                  optionsAccessor)
+                  optionsAccessor,
+                  unitOfWorkManager)
         {
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Editions/EditionManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Editions/EditionManager.cs
@@ -1,6 +1,7 @@
 ﻿using Abp.Application.Editions;
 using Abp.Application.Features;
 using Abp.Domain.Repositories;
+using Abp.Domain.Uow;
 
 namespace AbpCompanyName.AbpProjectName.Editions
 {
@@ -9,11 +10,10 @@ public class EditionManager : AbpEditionManager
         public const string DefaultEditionName = "Standard";
 
         public EditionManager(
-            IRepository<Edition> editionRepository, 
-            IAbpZeroFeatureValueStore featureValueStore)
-            : base(
-                editionRepository,
-                featureValueStore)
+            IRepository<Edition> editionRepository,
+            IAbpZeroFeatureValueStore featureValueStore,
+            IUnitOfWorkManager unitOfWorkManager) 
+            : base(editionRepository, featureValueStore, unitOfWorkManager)
         {
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/SecurityStampValidator.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/SecurityStampValidator.cs
@@ -6,6 +6,7 @@
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
 using Microsoft.Extensions.Logging;
+using Abp.Domain.Uow;
 
 namespace AbpCompanyName.AbpProjectName.Identity
 {
@@ -15,8 +16,9 @@ public SecurityStampValidator(
             IOptions<SecurityStampValidatorOptions> options,
             SignInManager signInManager,
             ISystemClock systemClock,
-            ILoggerFactory loggerFactory) 
-            : base(options, signInManager, systemClock, loggerFactory)
+            ILoggerFactory loggerFactory,
+            IUnitOfWorkManager unitOfWorkManager)
+            : base(options, signInManager, systemClock, loggerFactory, unitOfWorkManager)
         {
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="6.3.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="6.4.0-rc1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -28,9 +28,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
-    <PackageReference Include="Abp.AspNetCore" Version="6.3.0" />
-    <PackageReference Include="Abp.ZeroCore" Version="6.3.0" />
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="6.3.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="6.4.0-rc1" />
+    <PackageReference Include="Abp.ZeroCore" Version="6.4.0-rc1" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="6.4.0-rc1" />
   </ItemGroup>
 
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="6.3.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="6.4.0-rc1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/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="6.3.0" />
-    <PackageReference Include="Abp.RedisCache" Version="6.3.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="6.3.0" />
+    <PackageReference Include="Abp.HangFire" Version="6.4.0-rc1" />
+    <PackageReference Include="Abp.RedisCache" Version="6.4.0-rc1" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="6.4.0-rc1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/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="6.3.0" />
+    <PackageReference Include="Abp.TestBase" Version="6.4.0-rc1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
   </ItemGroup>
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj b/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.14.0" />
-      <PackageReference Include="Abp.AspNetCore.TestBase" Version="6.3.0" />
+      <PackageReference Include="Abp.AspNetCore.TestBase" Version="6.4.0-rc1" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Microsoft.Extensions.Options;`
`3`	`3`	`using Abp.Authorization;`
`4`	`4`	`using AbpCompanyName.AbpProjectName.Authorization.Roles;`
	`5`	`+using Abp.Domain.Uow;`
`5`	`6`
`6`	`7`	`namespace AbpCompanyName.AbpProjectName.Authorization.Users`
`7`	`8`	`{`
`@@ -10,11 +11,13 @@ public class UserClaimsPrincipalFactory : AbpUserClaimsPrincipalFactory<User, Ro`
`10`	`11`	`public UserClaimsPrincipalFactory(`
`11`	`12`	`UserManager userManager,`
`12`	`13`	`RoleManager roleManager,`
`13`		`- IOptions<IdentityOptions> optionsAccessor)`
	`14`	`+ IOptions<IdentityOptions> optionsAccessor,`
	`15`	`+ IUnitOfWorkManager unitOfWorkManager)`
`14`	`16`	`: base(`
`15`	`17`	`userManager,`
`16`	`18`	`roleManager,`
`17`		`- optionsAccessor)`
	`19`	`+ optionsAccessor,`
	`20`	`+ unitOfWorkManager)`
`18`	`21`	`{`
`19`	`22`	`}`
`20`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using Abp.Application.Editions;`
`2`	`2`	`using Abp.Application.Features;`
`3`	`3`	`using Abp.Domain.Repositories;`
	`4`	`+using Abp.Domain.Uow;`
`4`	`5`
`5`	`6`	`namespace AbpCompanyName.AbpProjectName.Editions`
`6`	`7`	`{`
`@@ -9,11 +10,10 @@ public class EditionManager : AbpEditionManager`
`9`	`10`	`public const string DefaultEditionName = "Standard";`
`10`	`11`
`11`	`12`	`public EditionManager(`
`12`		`- IRepository<Edition> editionRepository,`
`13`		`- IAbpZeroFeatureValueStore featureValueStore)`
`14`		`- : base(`
`15`		`- editionRepository,`
`16`		`- featureValueStore)`
	`13`	`+ IRepository<Edition> editionRepository,`
	`14`	`+ IAbpZeroFeatureValueStore featureValueStore,`
	`15`	`+ IUnitOfWorkManager unitOfWorkManager)`
	`16`	`+ : base(editionRepository, featureValueStore, unitOfWorkManager)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using AbpCompanyName.AbpProjectName.Authorization.Users;`
`7`	`7`	`using AbpCompanyName.AbpProjectName.MultiTenancy;`
`8`	`8`	`using Microsoft.Extensions.Logging;`
	`9`	`+using Abp.Domain.Uow;`
`9`	`10`
`10`	`11`	`namespace AbpCompanyName.AbpProjectName.Identity`
`11`	`12`	`{`
`@@ -15,8 +16,9 @@ public SecurityStampValidator(`
`15`	`16`	`IOptions<SecurityStampValidatorOptions> options,`
`16`	`17`	`SignInManager signInManager,`
`17`	`18`	`ISystemClock systemClock,`
`18`		`- ILoggerFactory loggerFactory)`
`19`		`- : base(options, signInManager, systemClock, loggerFactory)`
	`19`	`+ ILoggerFactory loggerFactory,`
	`20`	`+ IUnitOfWorkManager unitOfWorkManager)`
	`21`	`+ : base(options, signInManager, systemClock, loggerFactory, unitOfWorkManager)`
`20`	`22`	`{`
`21`	`23`	`}`
`22`	`24`	`}`