Removed Volo.Abp.EventBus.Boxes package and re-arranged the dependencies.

framework/Volo.Abp.sln

@@ -391,8 +391,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.IdentityModel.Test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Threading.Tests", "test\Volo.Abp.Threading.Tests\Volo.Abp.Threading.Tests.csproj", "{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Boxes", "src\Volo.Abp.EventBus.Boxes\Volo.Abp.EventBus.Boxes.csproj", "{6E289F31-7924-418B-9DAC-62A7CFADF916}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.DistributedLocking", "src\Volo.Abp.DistributedLocking\Volo.Abp.DistributedLocking.csproj", "{9A7EEA08-15BE-476D-8168-53039867038E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Auditing.Contracts", "src\Volo.Abp.Auditing.Contracts\Volo.Abp.Auditing.Contracts.csproj", "{508B6355-AD28-4E60-8549-266D21DBF2CF}"
@@ -1179,10 +1177,6 @@ Global
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E289F31-7924-418B-9DAC-62A7CFADF916}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A7EEA08-15BE-476D-8168-53039867038E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A7EEA08-15BE-476D-8168-53039867038E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A7EEA08-15BE-476D-8168-53039867038E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1404,7 +1398,6 @@ Global
 		{90B1866A-EF99-40B9-970E-B898E5AA523F} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{40C6740E-BFCA-4D37-8344-3D84E2044BB2} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{7B2FCAD6-86E6-49C8-ADBE-A61B4F4B101B} = {447C8A77-E5F0-4538-8687-7383196D04EA}
-		{6E289F31-7924-418B-9DAC-62A7CFADF916} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{9A7EEA08-15BE-476D-8168-53039867038E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{508B6355-AD28-4E60-8549-266D21DBF2CF} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{F7407459-8AFA-45E4-83E9-9BB01412CC08} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}

framework/src/Volo.Abp.BackgroundJobs/Volo.Abp.BackgroundJobs.csproj

@@ -17,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.BackgroundJobs.Abstractions\Volo.Abp.BackgroundJobs.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.BackgroundWorkers\Volo.Abp.BackgroundWorkers.csproj" />
-    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <ProjectReference Include="..\Volo.Abp.DistributedLocking.Abstractions\Volo.Abp.DistributedLocking.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.Guids\Volo.Abp.Guids.csproj" />
     <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
   </ItemGroup>

framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.BackgroundWorkers;
+using Volo.Abp.DistributedLocking;
 using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
 using Volo.Abp.Timing;
@@ -11,7 +12,8 @@ namespace Volo.Abp.BackgroundJobs
         typeof(AbpBackgroundJobsAbstractionsModule),
         typeof(AbpBackgroundWorkersModule),
         typeof(AbpTimingModule),
-        typeof(AbpGuidsModule)
+        typeof(AbpGuidsModule),
+        typeof(AbpDistributedLockingAbstractionsModule)
         )]
     public class AbpBackgroundJobsModule : AbpModule
     {

framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs

@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Volo.Abp.BackgroundWorkers;
+using Volo.Abp.DistributedLocking;
 using Volo.Abp.Threading;
 using Volo.Abp.Timing;
 
@@ -16,15 +17,19 @@ namespace Volo.Abp.BackgroundJobs
 
         protected AbpBackgroundJobWorkerOptions WorkerOptions { get; }
 
+        protected IAbpDistributedLock DistributedLock { get; }
+
         public BackgroundJobWorker(
             AbpAsyncTimer timer,
             IOptions<AbpBackgroundJobOptions> jobOptions,
             IOptions<AbpBackgroundJobWorkerOptions> workerOptions,
-            IServiceScopeFactory serviceScopeFactory)
+            IServiceScopeFactory serviceScopeFactory,
+            IAbpDistributedLock distributedLock)
             : base(
                 timer,
                 serviceScopeFactory)
         {
+            DistributedLock = distributedLock;
             WorkerOptions = workerOptions.Value;
             JobOptions = jobOptions.Value;
             Timer.Period = WorkerOptions.JobPollPeriod;
@@ -32,57 +37,74 @@ namespace Volo.Abp.BackgroundJobs
 
         protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
         {
-            var store = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobStore>();
-
-            var waitingJobs = await store.GetWaitingJobsAsync(WorkerOptions.MaxJobFetchCount);
-
-            if (!waitingJobs.Any())
+            await using (var handler = await DistributedLock.TryAcquireAsync(""))
             {
-                return;
-            }
-
-            var jobExecuter = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobExecuter>();
-            var clock = workerContext.ServiceProvider.GetRequiredService<IClock>();
-            var serializer = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobSerializer>();
-
-            foreach (var jobInfo in waitingJobs)
-            {
-                jobInfo.TryCount++;
-                jobInfo.LastTryTime = clock.Now;
-
-                try
+                if (handler != null)
                 {
-                    var jobConfiguration = JobOptions.GetJob(jobInfo.JobName);
-                    var jobArgs = serializer.Deserialize(jobInfo.JobArgs, jobConfiguration.ArgsType);
-                    var context = new JobExecutionContext(workerContext.ServiceProvider, jobConfiguration.JobType, jobArgs);
+                    var store = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobStore>();
 
-                    try
-                    {
-                        await jobExecuter.ExecuteAsync(context);
+                    var waitingJobs = await store.GetWaitingJobsAsync(WorkerOptions.MaxJobFetchCount);
 
-                        await store.DeleteAsync(jobInfo.Id);
+                    if (!waitingJobs.Any())
+                    {
+                        return;
                     }
-                    catch (BackgroundJobExecutionException)
+
+                    var jobExecuter = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobExecuter>();
+                    var clock = workerContext.ServiceProvider.GetRequiredService<IClock>();
+                    var serializer = workerContext.ServiceProvider.GetRequiredService<IBackgroundJobSerializer>();
+
+                    foreach (var jobInfo in waitingJobs)
                     {
-                        var nextTryTime = CalculateNextTryTime(jobInfo, clock);
+                        jobInfo.TryCount++;
+                        jobInfo.LastTryTime = clock.Now;
 
-                        if (nextTryTime.HasValue)
+                        try
                         {
-                            jobInfo.NextTryTime = nextTryTime.Value;
+                            var jobConfiguration = JobOptions.GetJob(jobInfo.JobName);
+                            var jobArgs = serializer.Deserialize(jobInfo.JobArgs, jobConfiguration.ArgsType);
+                            var context = new JobExecutionContext(
+                                workerContext.ServiceProvider,
+                                jobConfiguration.JobType,
+                                jobArgs);
+
+                            try
+                            {
+                                await jobExecuter.ExecuteAsync(context);
+
+                                await store.DeleteAsync(jobInfo.Id);
+                            }
+                            catch (BackgroundJobExecutionException)
+                            {
+                                var nextTryTime = CalculateNextTryTime(jobInfo, clock);
+
+                                if (nextTryTime.HasValue)
+                                {
+                                    jobInfo.NextTryTime = nextTryTime.Value;
+                                }
+                                else
+                                {
+                                    jobInfo.IsAbandoned = true;
+                                }
+
+                                await TryUpdateAsync(store, jobInfo);
+                            }
                         }
-                        else
+                        catch (Exception ex)
                         {
+                            Logger.LogException(ex);
                             jobInfo.IsAbandoned = true;
+                            await TryUpdateAsync(store, jobInfo);
                         }
-
-                        await TryUpdateAsync(store, jobInfo);
                     }
                 }
-                catch (Exception ex)
+                else
                 {
-                    Logger.LogException(ex);
-                    jobInfo.IsAbandoned = true;
-                    await TryUpdateAsync(store, jobInfo);
+                    try
+                    {
+                        await Task.Delay(WorkerOptions.JobPollPeriod * 12, StoppingToken);
+                    }
+                    catch (TaskCanceledException) { }
                 }
             }
         }
@@ -101,7 +123,8 @@ namespace Volo.Abp.BackgroundJobs
 
         protected virtual DateTime? CalculateNextTryTime(BackgroundJobInfo jobInfo, IClock clock)
         {
-            var nextWaitDuration = WorkerOptions.DefaultFirstWaitDuration * (Math.Pow(WorkerOptions.DefaultWaitFactor, jobInfo.TryCount - 1));
+            var nextWaitDuration = WorkerOptions.DefaultFirstWaitDuration *
+                                   (Math.Pow(WorkerOptions.DefaultWaitFactor, jobInfo.TryCount - 1));
             var nextTryDate = jobInfo.LastTryTime?.AddSeconds(nextWaitDuration) ??
                               clock.Now.AddSeconds(nextWaitDuration);
 
@@ -113,4 +136,4 @@ namespace Volo.Abp.BackgroundJobs
             return nextTryDate;
         }
     }
-}
+}

framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs

@@ -21,6 +21,15 @@ namespace Volo.Abp.BackgroundWorkers
         protected ILoggerFactory LoggerFactory => LazyServiceProvider.LazyGetRequiredService<ILoggerFactory>();
 
         protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance);
+        
+        protected CancellationTokenSource StoppingTokenSource { get; }
+        protected CancellationToken StoppingToken { get; }
+
+        public BackgroundWorkerBase()
+        {
+            StoppingTokenSource = new CancellationTokenSource();
+            StoppingToken = StoppingTokenSource.Token;
+        }
 
         public virtual Task StartAsync(CancellationToken cancellationToken = default)
         {
@@ -31,6 +40,8 @@ namespace Volo.Abp.BackgroundWorkers
         public virtual Task StopAsync(CancellationToken cancellationToken = default)
         {
             Logger.LogDebug("Stopped background worker: " + ToString());
+            StoppingTokenSource.Cancel();
+            StoppingTokenSource.Dispose();
             return Task.CompletedTask;
         }
 

framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj

@@ -17,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Auditing\Volo.Abp.Auditing.csproj" />
     <ProjectReference Include="..\Volo.Abp.Data\Volo.Abp.Data.csproj" />
-    <ProjectReference Include="..\Volo.Abp.EventBus.Boxes\Volo.Abp.EventBus.Boxes.csproj" />
+    <ProjectReference Include="..\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
     <ProjectReference Include="..\Volo.Abp.ExceptionHandling\Volo.Abp.ExceptionHandling.csproj" />
     <ProjectReference Include="..\Volo.Abp.Guids\Volo.Abp.Guids.csproj" />
     <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />

framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj.DotSettings

@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp71</s:String></wpf:ResourceDictionary>

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs

@@ -3,7 +3,6 @@ using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.EventBus;
-using Volo.Abp.EventBus.Boxes;
 using Volo.Abp.ExceptionHandling;
 using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
@@ -19,7 +18,7 @@ namespace Volo.Abp.Domain
     [DependsOn(
         typeof(AbpAuditingModule),
         typeof(AbpDataModule),
-        typeof(AbpEventBusBoxesModule),
+        typeof(AbpEventBusModule),
         typeof(AbpGuidsModule),
         typeof(AbpMultiTenancyModule),
         typeof(AbpThreadingModule),

framework/src/Volo.Abp.EventBus.Boxes/FodyWeavers.xml

@@ -1,3 +0,0 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait ContinueOnCapturedContext="false" />
-</Weavers>

framework/src/Volo.Abp.EventBus.Boxes/FodyWeavers.xsd

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
-  <xs:element name="Weavers">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
-          </xs:complexType>
-        </xs:element>
-      </xs:all>
-      <xs:attribute name="VerifyAssembly" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="GenerateXsd" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>

framework/src/Volo.Abp.EventBus.Boxes/Volo.Abp.EventBus.Boxes.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <Import Project="..\..\..\configureawait.props" />
-    <Import Project="..\..\..\common.props" />
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AssemblyName>Volo.Abp.EventBus.Boxes</AssemblyName>
-        <PackageId>Volo.Abp.EventBus.Boxes</PackageId>
-        <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
-        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-        <RootNamespace />
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Volo.Abp.BackgroundWorkers\Volo.Abp.BackgroundWorkers.csproj" />
-        <ProjectReference Include="..\Volo.Abp.DistributedLocking\Volo.Abp.DistributedLocking.csproj" />
-        <ProjectReference Include="..\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
-    </ItemGroup>
-
-</Project>

framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/AbpEventBusBoxesModule.cs

@@ -1,20 +0,0 @@
-using Volo.Abp.BackgroundWorkers;
-using Volo.Abp.DistributedLocking;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.EventBus.Boxes
-{
-    [DependsOn(
-        typeof(AbpEventBusModule),
-        typeof(AbpBackgroundWorkersModule),
-        typeof(AbpDistributedLockingModule)
-        )]
-    public class AbpEventBusBoxesModule : AbpModule
-    {
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            context.AddBackgroundWorker<OutboxSenderManager>();
-            context.AddBackgroundWorker<InboxProcessManager>();
-        }
-    }
-}

framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/TaskHelper.cs

@@ -1,20 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Volo.Abp.EventBus.Boxes
-{
-    internal static class TaskDelayHelper
-    {
-        public static async Task DelayAsync(int milliseconds, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await Task.Delay(milliseconds, cancellationToken);
-            }
-            catch (TaskCanceledException)
-            {
-                return;
-            }
-        }
-    }
-}

framework/src/Volo.Abp.EventBus/Volo.Abp.EventBus.csproj

@@ -15,6 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.BackgroundWorkers\Volo.Abp.BackgroundWorkers.csproj" />
+    <ProjectReference Include="..\Volo.Abp.DistributedLocking.Abstractions\Volo.Abp.DistributedLocking.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.EventBus.Abstractions\Volo.Abp.EventBus.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.Guids\Volo.Abp.Guids.csproj" />
     <ProjectReference Include="..\Volo.Abp.Json\Volo.Abp.Json.csproj" />

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs

@@ -1,7 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
+using Volo.Abp.BackgroundWorkers;
+using Volo.Abp.DistributedLocking;
 using Volo.Abp.EventBus.Abstractions;
+using Volo.Abp.EventBus.Boxes;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Guids;
@@ -16,7 +19,9 @@ namespace Volo.Abp.EventBus
         typeof(AbpEventBusAbstractionsModule),
         typeof(AbpMultiTenancyModule),
         typeof(AbpJsonModule),
-        typeof(AbpGuidsModule)
+        typeof(AbpGuidsModule),
+        typeof(AbpBackgroundWorkersModule),
+        typeof(AbpDistributedLockingAbstractionsModule)
         )]
     public class AbpEventBusModule : AbpModule
     {
@@ -24,6 +29,12 @@ namespace Volo.Abp.EventBus
         {
             AddEventHandlers(context.Services);
         }
+        
+        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            context.AddBackgroundWorker<OutboxSenderManager>();
+            context.AddBackgroundWorker<InboxProcessManager>();
+        }
 
         private static void AddEventHandlers(IServiceCollection services)
         {

framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/InboxProcessor.cs → framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/InboxProcessor.cs

@@ -120,9 +120,11 @@ namespace Volo.Abp.EventBus.Boxes
                 else
                 {
                     Logger.LogDebug("Could not obtain the distributed lock: " + DistributedLockName);
-                    await TaskDelayHelper.DelayAsync(
-                        Convert.ToInt32(EventBusBoxesOptions.DistributedLockWaitDuration.TotalMilliseconds), 
-                        StoppingToken);
+                    try
+                    {
+                        await Task.Delay(EventBusBoxesOptions.DistributedLockWaitDuration, StoppingToken);
+                    }
+                    catch (TaskCanceledException) { }
                 }
             }
         }

framework/src/Volo.Abp.EventBus.Boxes/Volo/Abp/EventBus/Boxes/OutboxSender.cs → framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/OutboxSender.cs

@@ -100,9 +100,11 @@ namespace Volo.Abp.EventBus.Boxes
                 else
                 {
                     Logger.LogDebug("Could not obtain the distributed lock: " + DistributedLockName);
-                    await TaskDelayHelper.DelayAsync(
-                        Convert.ToInt32(EventBusBoxesOptions.DistributedLockWaitDuration.TotalMilliseconds), 
-                        StoppingToken);
+                    try
+                    {
+                        await Task.Delay(EventBusBoxesOptions.DistributedLockWaitDuration, StoppingToken);
+                    }
+                    catch (TaskCanceledException) { }
                 }
             }
         }

nupkg/common.ps1

@@ -105,7 +105,6 @@ $projects = (
     "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer",
     "framework/src/Volo.Abp.EventBus.Abstractions",
     "framework/src/Volo.Abp.EventBus",
-    "framework/src/Volo.Abp.EventBus.Boxes",
     "framework/src/Volo.Abp.EventBus.RabbitMQ",
     "framework/src/Volo.Abp.EventBus.Kafka",
     "framework/src/Volo.Abp.EventBus.Rebus",