diff --git a/framework/Volo.Abp.slnx b/framework/Volo.Abp.slnx
index cc0a1dcf8e..133fd89eed 100644
--- a/framework/Volo.Abp.slnx
+++ b/framework/Volo.Abp.slnx
@@ -251,6 +251,7 @@
+
diff --git a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
index cf8162148a..6a81f648bd 100644
--- a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
+++ b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
@@ -74,7 +74,7 @@ public class AbpQuartzModule : AbpModule
public async override Task OnApplicationShutdownAsync(ApplicationShutdownContext context)
{
- if (_scheduler.IsStarted)
+ if (!_scheduler.IsShutdown)
{
await _scheduler.Shutdown();
}
diff --git a/framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.abppkg b/framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.abppkg
new file mode 100644
index 0000000000..a686451fbc
--- /dev/null
+++ b/framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.abppkg
@@ -0,0 +1,3 @@
+{
+ "role": "lib.test"
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.csproj b/framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.csproj
new file mode 100644
index 0000000000..209dd997ec
--- /dev/null
+++ b/framework/test/Volo.Abp.Quartz.Tests/Volo.Abp.Quartz.Tests.csproj
@@ -0,0 +1,18 @@
+
+
+
+
+
+ net10.0
+ Volo.Abp.Quartz.Tests
+ Volo.Abp.Quartz.Tests
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/test/Volo.Abp.Quartz.Tests/Volo/Abp/Quartz/AbpQuartzModule_Shutdown_Tests.cs b/framework/test/Volo.Abp.Quartz.Tests/Volo/Abp/Quartz/AbpQuartzModule_Shutdown_Tests.cs
new file mode 100644
index 0000000000..43a1f9b611
--- /dev/null
+++ b/framework/test/Volo.Abp.Quartz.Tests/Volo/Abp/Quartz/AbpQuartzModule_Shutdown_Tests.cs
@@ -0,0 +1,66 @@
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Quartz;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Xunit;
+
+namespace Volo.Abp.Quartz;
+
+public class AbpQuartzModule_Shutdown_Tests
+{
+ [Fact]
+ public async Task Should_Shutdown_Started_Scheduler()
+ {
+ using var application = await AbpApplicationFactory.CreateAsync();
+ await application.InitializeAsync();
+
+ var scheduler = application.ServiceProvider.GetRequiredService();
+ scheduler.IsStarted.ShouldBeTrue();
+
+ await application.ShutdownAsync();
+
+ scheduler.IsShutdown.ShouldBeTrue();
+ }
+
+ [Fact]
+ public async Task Should_Shutdown_Scheduler_That_Was_Never_Started()
+ {
+ using var application = await AbpApplicationFactory.CreateAsync();
+ await application.InitializeAsync();
+
+ var scheduler = application.ServiceProvider.GetRequiredService();
+ scheduler.IsStarted.ShouldBeFalse();
+
+ await application.ShutdownAsync();
+
+ scheduler.IsShutdown.ShouldBeTrue();
+ }
+
+ [Fact]
+ public void Should_Shutdown_Scheduler_That_Was_Never_Started_On_Sync_Shutdown()
+ {
+ using var application = AbpApplicationFactory.Create();
+ application.Initialize();
+
+ var scheduler = application.ServiceProvider.GetRequiredService();
+ scheduler.IsStarted.ShouldBeFalse();
+
+ application.Shutdown();
+
+ scheduler.IsShutdown.ShouldBeTrue();
+ }
+}
+
+[DependsOn(typeof(AbpQuartzModule))]
+public class AbpQuartzNotStartedTestModule : AbpModule
+{
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ // Same as disabling background workers or jobs: the scheduler is created but not started.
+ Configure(options =>
+ {
+ options.StartSchedulerFactory = _ => Task.CompletedTask;
+ });
+ }
+}