From 4cf53d7ff15fa04bfcee17fe29150624da6b3d0a Mon Sep 17 00:00:00 2001
From: noxe <ma_praxmarer@hotmail.com>
Date: Fri, 19 Nov 2021 20:57:28 +0100
Subject: [PATCH] do not create a new Scope - reuse workflowExecutionContext's
 scope (#2502)

* do not create a new Scope - reuse workflowExecutionContext's scope

* Upgrade Rebus.ServiceProvider to 7.0

Co-authored-by: Martin <mp@prakom.net>
---
 src/core/Elsa.Core/Elsa.Core.csproj                     | 2 +-
 src/core/Elsa.Core/Services/Workflows/WorkflowRunner.cs | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/Elsa.Core/Elsa.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj
index 773efdef2..7fbf7e21a 100644
--- a/src/core/Elsa.Core/Elsa.Core.csproj
+++ b/src/core/Elsa.Core/Elsa.Core.csproj
@@ -42,7 +42,7 @@
         <PackageReference Include="Storage.Net" Version="9.3.0" />
         <PackageReference Include="System.Linq.Async" Version="5.0.0" />
         <PackageReference Include="System.Threading.Channels" Version="5.0.0" />
-        <PackageReference Include="Rebus.ServiceProvider" Version="6.4.1" />
+        <PackageReference Include="Rebus.ServiceProvider" Version="7.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/core/Elsa.Core/Services/Workflows/WorkflowRunner.cs b/src/core/Elsa.Core/Services/Workflows/WorkflowRunner.cs
index 36bc813d9..43e8cb7c0 100644
--- a/src/core/Elsa.Core/Services/Workflows/WorkflowRunner.cs
+++ b/src/core/Elsa.Core/Services/Workflows/WorkflowRunner.cs
@@ -204,10 +204,8 @@ namespace Elsa.Services.Workflows
 
         private async ValueTask<bool> CanExecuteAsync(WorkflowExecutionContext workflowExecutionContext, IActivityBlueprint activityBlueprint, bool resuming, CancellationToken cancellationToken)
         {
-            using var scope = _serviceScopeFactory.CreateScope();
-
             var activityExecutionContext = new ActivityExecutionContext(
-                scope.ServiceProvider,
+                workflowExecutionContext.ServiceProvider,
                 workflowExecutionContext,
                 activityBlueprint,
                 workflowExecutionContext.Input,