Merge pull request #25631 from abpframework/auto-merge/rel-10-5/4655

Merge branch dev with rel-10.5

Author: voloagent

modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestBaseModule.cs

@@ -1,8 +1,9 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Autofac;
-using Volo.Abp.Modularity;
-using Volo.Abp.Threading;
-
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Autofac;
+using Volo.Abp.Modularity;
+using Volo.Abp.Threading;
+using Volo.Abp.Uow;
+
 namespace Volo.Abp.IdentityServer;
 
 [DependsOn(
@@ -38,9 +39,17 @@ private static void SeedTestData(ApplicationInitializationContext context)
     {
         using (var scope = context.ServiceProvider.CreateScope())
         {
-            AsyncHelper.RunSync(() => scope.ServiceProvider
-                .GetRequiredService<AbpIdentityServerTestDataBuilder>()
-                .BuildAsync());
+            AsyncHelper.RunSync(async () =>
+            {
+                var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+                using (var uow = unitOfWorkManager.Begin(requiresNew: true))
+                {
+                    await scope.ServiceProvider
+                        .GetRequiredService<AbpIdentityServerTestDataBuilder>()
+                        .BuildAsync();
+                    await uow.CompleteAsync();
+                }
+            });
         }
     }
-}
+}