chore: upgrade mediatR to v12

ikesnowy · ikesnowy · commit c5efdaf2800c · 2023-02-19T19:25:30.000+08:00
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/InvalidCacheRequestHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/InvalidCacheRequestHandler.cs
@@ -56,7 +56,7 @@ public InvalidCacheRequestHandler(
     }
 
     /// <inheritdoc />
-    public async Task<Unit> Handle(InvalidCacheRequest request, CancellationToken cancellationToken)
+    public async Task Handle(InvalidCacheRequest request, CancellationToken cancellationToken)
     {
         try
         {
@@ -94,7 +94,5 @@ public async Task<Unit> Handle(InvalidCacheRequest request, CancellationToken ca
                 throw;
             }
         }
-
-        return Unit.Value;
     }
-}
+}
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs
@@ -3,7 +3,6 @@
 using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 using Cnblogs.Architecture.Ddd.EventBus.Dapr;
 using Dapr.Client;
-using MediatR;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection;
@@ -32,7 +31,7 @@ public static IServiceCollection AddDaprEventBus(
 
         if (assemblies.Length > 0)
         {
-            services.AddMediatR(assemblies);
+            services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));
         }
 
         return services;
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj
@@ -4,8 +4,4 @@
         <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.Abstractions\Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection/ServiceCollectionInjector.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection/ServiceCollectionInjector.cs
@@ -22,7 +22,7 @@ public static CqrsInjector AddCqrs(this IServiceCollection services, params Asse
     {
         services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
         services.AddTransient(typeof(IPipelineBehavior<,>), typeof(LoggingBehavior<,>));
-        services.AddMediatR(assemblies);
+        services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));
         return new CqrsInjector(services);
     }
-}
+}
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="MongoDB.Analyzer" Version="1.1.0" PrivateAssets="None" />
+        <PackageReference Include="MongoDB.Analyzer" Version="1.2.0" PrivateAssets="None" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="11.1.0" />
+        <PackageReference Include="MediatR" Version="12.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="11.1.0" />
+        <PackageReference Include="MediatR" Version="12.0.0" />
     </ItemGroup>
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="Dapper" Version="2.0.123" />
-      <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <PackageReference Include="Cnblogs.Serilog.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.3" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public InvalidCacheRequestHandler(`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/// <inheritdoc />`
`59`		`- public async Task<Unit> Handle(InvalidCacheRequest request, CancellationToken cancellationToken)`
	`59`	`+ public async Task Handle(InvalidCacheRequest request, CancellationToken cancellationToken)`
`60`	`60`	`{`
`61`	`61`	`try`
`62`	`62`	`{`
`@@ -94,7 +94,5 @@ public async Task<Unit> Handle(InvalidCacheRequest request, CancellationToken ca`
`94`	`94`	`throw;`
`95`	`95`	`}`
`96`	`96`	`}`
`97`		`-`
`98`		`- return Unit.Value;`
`99`	`97`	`}`
`100`		`-}`
	`98`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using Cnblogs.Architecture.Ddd.EventBus.Abstractions;`
`4`	`4`	`using Cnblogs.Architecture.Ddd.EventBus.Dapr;`
`5`	`5`	`using Dapr.Client;`
`6`		`-using MediatR;`
`7`	`6`
`8`	`7`	`// ReSharper disable once CheckNamespace`
`9`	`8`	`namespace Microsoft.Extensions.DependencyInjection;`
`@@ -32,7 +31,7 @@ public static IServiceCollection AddDaprEventBus(`
`32`	`31`
`33`	`32`	`if (assemblies.Length > 0)`
`34`	`33`	`{`
`35`		`- services.AddMediatR(assemblies);`
	`34`	`+ services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`return services;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public static CqrsInjector AddCqrs(this IServiceCollection services, params Asse`
`22`	`22`	`{`
`23`	`23`	`services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));`
`24`	`24`	`services.AddTransient(typeof(IPipelineBehavior<,>), typeof(LoggingBehavior<,>));`
`25`		`- services.AddMediatR(assemblies);`
	`25`	`+ services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(assemblies));`
`26`	`26`	`return new CqrsInjector(services);`
`27`	`27`	`}`
`28`		`-}`
	`28`	`+}`