Merge pull request #15544 from abpframework/auto-merge/rel-7-0/1691

Merge branch dev with rel-7.0

framework/src/Volo.Abp.Json.Newtonsoft/Volo/Abp/Json/Newtonsoft/AbpDateTimeConverter.cs

@@ -6,12 +6,13 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Reflection;
 using Volo.Abp.Timing;
 
 namespace Volo.Abp.Json.Newtonsoft;
 
-public class AbpDateTimeConverter : DateTimeConverterBase
+public class AbpDateTimeConverter : DateTimeConverterBase, ITransientDependency
 {
     private readonly string _dateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.FFFFFFFK";
     private readonly DateTimeStyles _dateTimeStyles = DateTimeStyles.RoundtripKind;

modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreTestModule.cs

@@ -28,10 +28,7 @@ public class AbpFeatureManagementEntityFrameworkCoreTestModule : AbpModule
             });
         });
 
-        Configure<AbpUnitOfWorkDefaultOptions>(options =>
-        {
-            options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
-        });
+        context.Services.AddAlwaysDisableUnitOfWorkTransaction();
     }
 
     private static SqliteConnection CreateDatabaseAndGetConnection()

modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementEntityFrameworkCoreTestModule.cs

@@ -26,9 +26,6 @@ public class AbpPermissionManagementEntityFrameworkCoreTestModule : AbpModule
             });
         });
 
-        Configure<AbpUnitOfWorkDefaultOptions>(options =>
-        {
-            options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled; //EF in-memory database does not support transactions
-            });
+        context.Services.AddAlwaysDisableUnitOfWorkTransaction();
     }
 }