Upgrade MediatR to 12.0.1 fixing issue #3775 (#3790)

elsa-workflows · Mar 14, 2023 · bc8235a · bc8235a
1 parent 5ac53a2
commit bc8235a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj
@@ -16,7 +16,7 @@
     <ItemGroup>
         <PackageReference Include="DistributedLock.Core" Version="1.0.4" />
         <PackageReference Include="LinqKit.Core" Version="1.1.27" />
-        <PackageReference Include="MediatR" Version="10.0.1" />
+        <PackageReference Include="MediatR" Version="12.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />

diff --git a/src/core/Elsa.Core/Elsa.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj
@@ -20,8 +20,7 @@
         <PackageReference Include="DistributedLock.Core" Version="1.0.4" />
         <PackageReference Include="DistributedLock.FileSystem" Version="1.0.1" />
         <PackageReference Include="Humanizer.Core" Version="2.13.14" />
-        <PackageReference Include="MediatR" Version="10.0.1" />
-        <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
+        <PackageReference Include="MediatR" Version="12.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />

diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
@@ -36,7 +36,6 @@
 using Elsa.Services.Workflows;
 using Elsa.Services.WorkflowStorage;
 using Elsa.StartupTasks;
-using MediatR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Newtonsoft.Json;
@@ -254,8 +253,12 @@ private static ElsaOptionsBuilder AddWorkflowsCore(this ElsaOptionsBuilder elsaO
                 .AddBookmarkProvider<RunWorkflowBookmarkProvider>();
 
             // Mediator.
-            services
-                .AddMediatR(mediatr => mediatr.AsScoped(), typeof(IActivity), typeof(LogWorkflowExecution));
+            services.AddMediatR(cfg =>
+            {
+                cfg.Lifetime = ServiceLifetime.Scoped;
+                cfg.RegisterServicesFromAssemblyContaining<IActivity>();
+                cfg.RegisterServicesFromAssemblyContaining<LogWorkflowExecution>();
+            });
 
             // Service Bus.
             services

diff --git a/src/core/Elsa.Core/Extensions/MessageHandlerServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/MessageHandlerServiceCollectionExtensions.cs
@@ -20,8 +20,10 @@ public static IServiceCollection AddNotificationHandler<T, THandler>(this IServi
 
         public static IServiceCollection AddNotificationHandlers(this IServiceCollection services, params Type[] markerTypes)
         {
-            var assemblies = markerTypes.Select(x => x.GetTypeInfo().Assembly);
-            ServiceRegistrar.AddMediatRClasses(services, assemblies, new MediatRServiceConfiguration());
+            var assemblies = markerTypes.Select(x => x.GetTypeInfo().Assembly).ToArray();
+            var serviceConfiguration = new MediatRServiceConfiguration();
+            serviceConfiguration.RegisterServicesFromAssemblies(assemblies);
+            ServiceRegistrar.AddMediatRClasses(services, serviceConfiguration);
             return services;
         }
     }

diff --git a/src/indexing/Elsa.Indexing.Abstractions/Extensions/ElsaIndexingOptionsExtensions.cs b/src/indexing/Elsa.Indexing.Abstractions/Extensions/ElsaIndexingOptionsExtensions.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Reflection;
 using Elsa.Options;
-using MediatR;
 using MediatR.Registration;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Elsa.Indexing.Extensions
 {
@@ -13,7 +13,9 @@ public static ElsaOptionsBuilder UseIndexing(this ElsaOptionsBuilder options, Ac
             var indexingOptions = new ElsaIndexingOptions(options.Services);
             configure.Invoke(indexingOptions);
 
-            ServiceRegistrar.AddMediatRClasses(options.Services, new[] { Assembly.GetExecutingAssembly() }, new MediatRServiceConfiguration());
+            var serviceConfiguration = new MediatRServiceConfiguration();
+            serviceConfiguration.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
+            ServiceRegistrar.AddMediatRClasses(options.Services, serviceConfiguration);
 
             return options;
         }

diff --git a/.../Elsa.Samples.InProcessBackgroundMediator/Elsa.Samples.InProcessBackgroundMediator.csproj b/.../Elsa.Samples.InProcessBackgroundMediator/Elsa.Samples.InProcessBackgroundMediator.csproj
@@ -5,9 +5,9 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
-    
+
     <ItemGroup>
-        <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
+      <PackageReference Include="MediatR" Version="12.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/aspnet/Elsa.Samples.InProcessBackgroundMediator/Program.cs b/src/samples/aspnet/Elsa.Samples.InProcessBackgroundMediator/Program.cs
@@ -8,7 +8,7 @@
 var services = builder.Services;
 
 services
-    .AddMediatR(typeof(DependencyInjectionExtensions))
+    .AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(DependencyInjectionExtensions).Assembly))
     .AddSingleton<IBackgroundEventPublisher, BackgroundEventPublisher>()
     .AddHostedService<BackgroundEventPublisherHostedService>()
     .CreateChannel<INotification>();