Merge pull request #24209 from MarkCiliaVincenti/AsyncKeyedLock

maliming · web-flow · commit e5c07ed46aa2 · 2025-12-09T18:52:34.000+08:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <PackageVersion Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="4.0.0" />
     <PackageVersion Include="aliyun-net-sdk-sts" Version="3.1.3" />
     <PackageVersion Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-    <PackageVersion Include="AsyncKeyedLock" Version="7.1.6" />
+    <PackageVersion Include="AsyncKeyedLock" Version="7.1.8" />
     <PackageVersion Include="Autofac" Version="8.4.0" />
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
@@ -196,4 +196,4 @@
     <PackageVersion Include="Fody" Version="6.9.3" />
     <PackageVersion Include="System.Management" Version="10.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs
@@ -30,6 +30,7 @@ public class AbpEntityFrameworkCoreTestModule : AbpModule
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
         TestEntityExtensionConfigurator.Configure();
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
     }
 
     public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingEntityFrameworkCoreTestModule.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingEntityFrameworkCoreTestModule.cs
@@ -16,6 +16,11 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore;
 )]
 public class AbpAuditLoggingEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreTestModule.cs
@@ -16,6 +16,11 @@ namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore;
     )]
 public class AbpBackgroundJobsEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/BlobStoringDatabaseEntityFrameworkCoreTestModule.cs b/modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/BlobStoringDatabaseEntityFrameworkCoreTestModule.cs
@@ -15,6 +15,11 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
     )]
 public class BlobStoringDatabaseEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreTestModule.cs b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo/Blogging/EntityFrameworkCore/BloggingEntityFrameworkCoreTestModule.cs
@@ -18,6 +18,11 @@ public class BloggingEntityFrameworkCoreTestModule : AbpModule
     {
         private SqliteConnection _sqliteConnection;
 
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             _sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/CmsKitEntityFrameworkCoreTestModule.cs
@@ -20,6 +20,7 @@ public class CmsKitEntityFrameworkCoreTestModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
         context.Services.AddDataMigrationEnvironment();
     }
 
diff --git a/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo/Docs/EntityFrameworkCore/DocsEntityFrameworkCoreTestModule.cs b/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo/Docs/EntityFrameworkCore/DocsEntityFrameworkCoreTestModule.cs
@@ -15,6 +15,11 @@ namespace Volo.Docs.EntityFrameworkCore
         )]
     public class DocsEntityFrameworkCoreTestModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo/Abp/FeatureManagement/EntityFrameworkCore/AbpFeatureManagementEntityFrameworkCoreTestModule.cs
@@ -19,6 +19,11 @@ namespace Volo.Abp.FeatureManagement.EntityFrameworkCore;
     )]
 public class AbpFeatureManagementEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreTestModule.cs b/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreTestModule.cs
@@ -18,6 +18,11 @@ namespace Volo.Abp.Identity.EntityFrameworkCore;
     )]
 public class AbpIdentityEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo/Abp/OpenIddict/EntityFrameworkCore/OpenIddictEntityFrameworkCoreTestModule.cs b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo/Abp/OpenIddict/EntityFrameworkCore/OpenIddictEntityFrameworkCoreTestModule.cs
@@ -20,6 +20,11 @@ namespace Volo.Abp.OpenIddict.EntityFrameworkCore;
     )]
 public class OpenIddictEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo/Abp/SettingManagement/EntityFrameworkCore/AbpSettingManagementEntityFrameworkCoreTestModule.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo/Abp/SettingManagement/EntityFrameworkCore/AbpSettingManagementEntityFrameworkCoreTestModule.cs
@@ -17,6 +17,11 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore;
     )]
 public class AbpSettingManagementEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();
diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementEntityFrameworkCoreTestModule.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementEntityFrameworkCoreTestModule.cs
@@ -17,6 +17,11 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore;
     )]
 public class AbpTenantManagementEntityFrameworkCoreTestModule : AbpModule
 {
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);
+    }
+
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         var sqliteConnection = CreateDatabaseAndGetConnection();

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public class AbpEntityFrameworkCoreTestModule : AbpModule`
`30`	`30`	`public override void PreConfigureServices(ServiceConfigurationContext context)`
`31`	`31`	`{`
`32`	`32`	`TestEntityExtensionConfigurator.Configure();`
	`33`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`public override void ConfigureServices(ServiceConfigurationContext context)`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore;`
`16`	`16`	`)]`
`17`	`17`	`public class AbpAuditLoggingEntityFrameworkCoreTestModule : AbpModule`
`18`	`18`	`{`
	`19`	`+ public override void PreConfigureServices(ServiceConfigurationContext context)`
	`20`	`+ {`
	`21`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`public override void ConfigureServices(ServiceConfigurationContext context)`
`20`	`25`	`{`
`21`	`26`	`var sqliteConnection = CreateDatabaseAndGetConnection();`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore;`
`16`	`16`	`)]`
`17`	`17`	`public class AbpBackgroundJobsEntityFrameworkCoreTestModule : AbpModule`
`18`	`18`	`{`
	`19`	`+ public override void PreConfigureServices(ServiceConfigurationContext context)`
	`20`	`+ {`
	`21`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`public override void ConfigureServices(ServiceConfigurationContext context)`
`20`	`25`	`{`
`21`	`26`	`var sqliteConnection = CreateDatabaseAndGetConnection();`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore;`
`15`	`15`	`)]`
`16`	`16`	`public class BlobStoringDatabaseEntityFrameworkCoreTestModule : AbpModule`
`17`	`17`	`{`
	`18`	`+ public override void PreConfigureServices(ServiceConfigurationContext context)`
	`19`	`+ {`
	`20`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
	`21`	`+ }`
	`22`	`+`
`18`	`23`	`public override void ConfigureServices(ServiceConfigurationContext context)`
`19`	`24`	`{`
`20`	`25`	`var sqliteConnection = CreateDatabaseAndGetConnection();`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ public class BloggingEntityFrameworkCoreTestModule : AbpModule`
`18`	`18`	`{`
`19`	`19`	`private SqliteConnection _sqliteConnection;`
`20`	`20`
	`21`	`+ public override void PreConfigureServices(ServiceConfigurationContext context)`
	`22`	`+ {`
	`23`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
	`24`	`+ }`
	`25`	`+`
`21`	`26`	`public override void ConfigureServices(ServiceConfigurationContext context)`
`22`	`27`	`{`
`23`	`28`	`_sqliteConnection = CreateDatabaseAndGetConnection();`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public class CmsKitEntityFrameworkCoreTestModule : AbpModule`
`20`	`20`	`{`
`21`	`21`	`public override void PreConfigureServices(ServiceConfigurationContext context)`
`22`	`22`	`{`
	`23`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
`23`	`24`	`context.Services.AddDataMigrationEnvironment();`
`24`	`25`	`}`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@ namespace Volo.Docs.EntityFrameworkCore`
`15`	`15`	`)]`
`16`	`16`	`public class DocsEntityFrameworkCoreTestModule : AbpModule`
`17`	`17`	`{`
	`18`	`+ public override void PreConfigureServices(ServiceConfigurationContext context)`
	`19`	`+ {`
	`20`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
	`21`	`+ }`
	`22`	`+`
`18`	`23`	`public override void ConfigureServices(ServiceConfigurationContext context)`
`19`	`24`	`{`
`20`	`25`	`var sqliteConnection = CreateDatabaseAndGetConnection();`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@ namespace Volo.Abp.FeatureManagement.EntityFrameworkCore;`
`19`	`19`	`)]`
`20`	`20`	`public class AbpFeatureManagementEntityFrameworkCoreTestModule : AbpModule`
`21`	`21`	`{`
	`22`	`+ public override void PreConfigureServices(ServiceConfigurationContext context)`
	`23`	`+ {`
	`24`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
	`25`	`+ }`
	`26`	`+`
`22`	`27`	`public override void ConfigureServices(ServiceConfigurationContext context)`
`23`	`28`	`{`
`24`	`29`	`var sqliteConnection = CreateDatabaseAndGetConnection();`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ namespace Volo.Abp.Identity.EntityFrameworkCore;`
`18`	`18`	`)]`
`19`	`19`	`public class AbpIdentityEntityFrameworkCoreTestModule : AbpModule`
`20`	`20`	`{`
	`21`	`+ public override void PreConfigureServices(ServiceConfigurationContext context)`
	`22`	`+ {`
	`23`	`+ PreConfigure<AbpSqliteOptions>(x => x.BusyTimeout = null);`
	`24`	`+ }`
	`25`	`+`
`21`	`26`	`public override void ConfigureServices(ServiceConfigurationContext context)`
`22`	`27`	`{`
`23`	`28`	`var sqliteConnection = CreateDatabaseAndGetConnection();`