Fixed cherry picked commits for previous NSB version

Particular · Oct 23, 2020 · d578961 · d578961
1 parent bfaa5bf
commit d578961
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/...Bus.AcceptanceTests/Core/UnitOfWork/When_using_custom_unit_of_work_with_failed_message.cs b/...Bus.AcceptanceTests/Core/UnitOfWork/When_using_custom_unit_of_work_with_failed_message.cs
@@ -4,7 +4,6 @@ namespace NServiceBus.AcceptanceTests.UnitOfWork
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using EndpointTemplates;
-    using Microsoft.Extensions.DependencyInjection;
     using NServiceBus.UnitOfWork;
     using NUnit.Framework;
 
@@ -41,7 +40,7 @@ public EndpointWithCustomUnitOfWork()
             {
                 EndpointSetup<DefaultServer>((c, r) =>
                 {
-                    c.RegisterComponents(services => services.AddSingleton<IManageUnitsOfWork, CustomUnitOfWork>());
+                    c.RegisterComponents(container => container.ConfigureComponent<CustomUnitOfWork>(DependencyLifecycle.InstancePerCall));
                 });
             }
 
@@ -55,14 +54,14 @@ public CustomUnitOfWork(Context testContext)
                 public Task Begin()
                 {
                     testContext.BeginCalled = true;
-                    return Task.CompletedTask;
+                    return Task.FromResult(0);
                 }
 
                 public Task End(Exception ex = null)
                 {
                     testContext.EndCalled = true;
                     testContext.EndException = ex;
-                    return Task.CompletedTask;
+                    return Task.FromResult(0);
                 }
 
                 Context testContext;

diff --git a/...AcceptanceTests/Core/UnitOfWork/When_using_custom_unit_of_work_with_successful_message.cs b/...AcceptanceTests/Core/UnitOfWork/When_using_custom_unit_of_work_with_successful_message.cs
@@ -4,7 +4,6 @@ namespace NServiceBus.AcceptanceTests.UnitOfWork
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using EndpointTemplates;
-    using Microsoft.Extensions.DependencyInjection;
     using NServiceBus.UnitOfWork;
     using NUnit.Framework;
 
@@ -37,7 +36,7 @@ public EndpointWithCustomUnitOfWork()
             {
                 EndpointSetup<DefaultServer>((c, r) =>
                 {
-                    c.RegisterComponents(services => services.AddSingleton<IManageUnitsOfWork, CustomUnitOfWork>());
+                    c.RegisterComponents(container => container.ConfigureComponent<CustomUnitOfWork>(DependencyLifecycle.InstancePerCall));
                 });
             }
 
@@ -51,14 +50,14 @@ public CustomUnitOfWork(Context testContext)
                 public Task Begin()
                 {
                     testContext.BeginCalled = true;
-                    return Task.CompletedTask;
+                    return Task.FromResult(0);
                 }
 
                 public Task End(Exception ex = null)
                 {
                     testContext.EndCalled = true;
                     testContext.EndException = ex;
-                    return Task.CompletedTask;
+                    return Task.FromResult(0);
                 }
 
                 Context testContext;

diff --git a/...ptanceTests/Core/UnitOfWork/When_using_custom_unit_of_work_with_wrap_handlers_in_scope.cs b/...ptanceTests/Core/UnitOfWork/When_using_custom_unit_of_work_with_wrap_handlers_in_scope.cs
@@ -6,7 +6,6 @@ namespace NServiceBus.AcceptanceTests.UnitOfWork
     using System.Transactions;
     using AcceptanceTesting;
     using EndpointTemplates;
-    using Microsoft.Extensions.DependencyInjection;
     using NServiceBus.UnitOfWork;
     using NUnit.Framework;
 
@@ -41,7 +40,7 @@ public EndpointWithCustomUnitOfWork()
                 {
                     c.UnitOfWork().WrapHandlersInATransactionScope();
 
-                    c.RegisterComponents(services => services.AddSingleton<IManageUnitsOfWork, CustomUnitOfWork>());
+                    c.RegisterComponents(container => container.ConfigureComponent<CustomUnitOfWork>(DependencyLifecycle.InstancePerCall));
                 });
             }
 
@@ -52,19 +51,19 @@ public Task Begin()
                 {
                     // this only works because we are not using the async state machine
                     transactionScope = new TransactionScope(TransactionScopeOption.Required, TransactionScopeAsyncFlowOption.Enabled);
-                    return Task.CompletedTask;
+                    return Task.FromResult(0);
                 }
 
                 public Task End(Exception ex = null)
                 {
                     transactionScope.Complete();
-                    return Task.CompletedTask;
+                    return Task.FromResult(0);
                 }
             }
 
             class MyMessageHandler : IHandleMessages<MyMessage>
             {
-                Context testContext;
+                readonly Context testContext;
 
                 public MyMessageHandler(Context testContext)
                 {
@@ -74,7 +73,7 @@ public MyMessageHandler(Context testContext)
                 public Task Handle(MyMessage message, IMessageHandlerContext context)
                 {
                     testContext.ShouldNeverBeCalled = true;
-                    return Task.CompletedTask;
+                    return Task.FromResult(0);
                 }
             }
         }