Update to Mediatr 14

Author: JoeRobich

Directory.Packages.props

@@ -55,7 +55,7 @@
     <PackageVersion Include="System.Collections.Immutable" Version="10.0.3" />
     <PackageVersion Include="System.Threading.Channels" Version="10.0.3" />
     <PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
-    <PackageVersion Include="MediatR" Version="12.4.1" />
+    <PackageVersion Include="MediatR" Version="14.1.0" />
     <PackageVersion Include="Bogus" Version="35.6.5" />
     <PackageVersion Include="Snapper" Version="2.4.1" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />

src/JsonRpc.Testing/SettlePipeline.cs

@@ -16,7 +16,7 @@ async Task<TR> IPipelineBehavior<T, TR>.Handle(T request, RequestHandlerDelegate
             _settler.OnStartRequest();
             try
             {
-                return await next().ConfigureAwait(false);
+                return await next(cancellationToken).ConfigureAwait(false);
             }
             finally
             {

src/JsonRpc/JsonRpcServerServiceCollectionExtensions.cs

@@ -8,6 +8,7 @@
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace OmniSharp.Extensions.JsonRpc
@@ -98,7 +99,23 @@ internal static IContainer AddJsonRpcServerCore<T>(this IContainer container, Js
 
         internal static IContainer AddJsonRpcMediatR(this IContainer container)
         {
-            container.RegisterMany(new[] { typeof(IMediator).GetAssembly() }, Registrator.Interfaces, Reuse.ScopedOrSingleton);
+            var mediatRAssembly = typeof(IMediator).Assembly;
+            var licenseAccessorType = mediatRAssembly.GetType("MediatR.Licensing.LicenseAccessor", throwOnError: true)!;
+            var licenseValidatorType = mediatRAssembly.GetType("MediatR.Licensing.LicenseValidator", throwOnError: true)!;
+
+            container.RegisterMany(new[] { mediatRAssembly }, Registrator.Interfaces, Reuse.ScopedOrSingleton);
+            container.RegisterDelegate(
+                licenseAccessorType,
+                typeof(ILoggerFactory),
+                loggerFactory => Activator.CreateInstance(licenseAccessorType, loggerFactory)!,
+                Reuse.Singleton
+            );
+            container.RegisterDelegate(
+                licenseValidatorType,
+                typeof(ILoggerFactory),
+                loggerFactory => Activator.CreateInstance(licenseValidatorType, loggerFactory)!,
+                Reuse.Singleton
+            );
             container.RegisterMany<RequestContext>(Reuse.Scoped);
             // Select the desired constructor
             container.Register<IMediator, Mediator>(made: Made.Of(() => new Mediator(Arg.Of<IServiceProvider>())));

src/Server/Pipelines/ResolveCommandPipeline.cs

@@ -26,7 +26,7 @@ public ResolveCommandPipeline(IRequestContext context, ILogger<ResolveCommandPip
 
         public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
         {
-            var response = await next().ConfigureAwait(false);
+            var response = await next(cancellationToken).ConfigureAwait(false);
             cancellationToken.ThrowIfCancellationRequested();
 
             // Only pin the handler type, if we know the source handler (codelens) is also the resolver.

src/Server/Pipelines/SemanticTokensDeltaPipeline.cs

@@ -14,7 +14,7 @@ internal class SemanticTokensDeltaPipeline<TRequest, TResponse> : IPipelineBehav
         {
             if (request is SemanticTokensParams semanticTokensParams)
             {
-                var response = await next().ConfigureAwait(false);
+                var response = await next(cancellationToken).ConfigureAwait(false);
                 if (GetResponse(semanticTokensParams, response, out var result) && string.IsNullOrEmpty(result.ResultId))
                 {
                     result = result with { ResultId = Guid.NewGuid().ToString() };
@@ -25,7 +25,7 @@ internal class SemanticTokensDeltaPipeline<TRequest, TResponse> : IPipelineBehav
 
             if (request is SemanticTokensDeltaParams semanticTokensDeltaParams)
             {
-                var response = await next().ConfigureAwait(false);
+                var response = await next(cancellationToken).ConfigureAwait(false);
                 if (GetResponse(semanticTokensDeltaParams, response, out var result))
                 {
                     if (result is { IsFull: true, Full: { ResultId: null or { Length: 0 } } })
@@ -41,7 +41,7 @@ internal class SemanticTokensDeltaPipeline<TRequest, TResponse> : IPipelineBehav
                 return result is TResponse r ? r : response;
             }
 
-            return await next().ConfigureAwait(false);
+            return await next(cancellationToken).ConfigureAwait(false);
         }
 
         // ReSharper disable once UnusedParameter.Local

test/Lsp.Tests/Matchers/ResolveCommandMatcherTests.cs

@@ -83,7 +83,7 @@ public async Task Should_Not_Throw_Given_Another_Descriptor()
             );
 
             // When
-            Func<Task> a = async () => await handlerMatcher.Handle(new CodeLensParams(), () => Task.FromResult(new CodeLensContainer()), CancellationToken.None);
+            Func<Task> a = async () => await handlerMatcher.Handle(new CodeLensParams(), _ => Task.FromResult(new CodeLensContainer()), CancellationToken.None);
             await a.Should().NotThrowAsync();
         }
 
@@ -272,7 +272,7 @@ public async Task Should_Update_CompletionItems_With_HandlerType()
             ( list is IEnumerable<ICanBeResolved> ).Should().BeTrue();
 
             // When
-            var response = await handlerMatcher.Handle(new CompletionParams(), () => Task.FromResult(list), CancellationToken.None);
+            var response = await handlerMatcher.Handle(new CompletionParams(), _ => Task.FromResult(list), CancellationToken.None);
 
             // Then
             response.Should().BeEquivalentTo(list, x => x.UsingStructuralRecordEquality());
@@ -323,7 +323,7 @@ public async Task Should_Update_CodeLensContainer_With_HandlerType()
             ( list is IEnumerable<ICanBeResolved> ).Should().BeTrue();
 
             // When
-            var response = await handlerMatcher.Handle(new CodeLensParams(), () => Task.FromResult(list), CancellationToken.None);
+            var response = await handlerMatcher.Handle(new CodeLensParams(), _ => Task.FromResult(list), CancellationToken.None);
 
             // Then
             response.Should().BeEquivalentTo(list, x => x.UsingStructuralRecordEquality());
@@ -370,7 +370,7 @@ public async Task Should_Update_CodeLens_Removing_HandlerType()
             };
 
             // When
-            var response = await handlerMatcher.Handle(item, () => Task.FromResult(item), CancellationToken.None);
+            var response = await handlerMatcher.Handle(item, _ => Task.FromResult(item), CancellationToken.None);
 
             // Then
             response.Should().BeEquivalentTo(item, x => x.UsingStructuralRecordEquality());