Upgrade FluentValidation to 9.0.1

GetoXs · GetoXs · commit de7385094c9c · 2020-08-23T22:19:17.000+02:00
Add class filter possibility.
Fix issues with FluentValidation.DependencyInjectionExtensions v. 9+
diff --git a/src/MediatR.Extensions.FluentValidation.AspNetCore.Tests/MediatR.Extensions.FluentValidation.AspNetCore.Tests.csproj b/src/MediatR.Extensions.FluentValidation.AspNetCore.Tests/MediatR.Extensions.FluentValidation.AspNetCore.Tests.csproj
@@ -7,7 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="9.0.1" />
+    <PackageReference Include="FluentValidation" Version="9.1.3" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="9.1.3" />
     <PackageReference Include="MediatR" Version="8.1.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
diff --git a/src/MediatR.Extensions.FluentValidation.AspNetCore/MediatR.Extensions.FluentValidation.AspNetCore.csproj b/src/MediatR.Extensions.FluentValidation.AspNetCore/MediatR.Extensions.FluentValidation.AspNetCore.csproj
@@ -25,8 +25,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="8.2.2" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="8.2.2" />
+    <PackageReference Include="FluentValidation" Version="9.0.1" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="9.0.1" />
     <PackageReference Include="MediatR" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
   </ItemGroup>
diff --git a/src/MediatR.Extensions.FluentValidation.AspNetCore/ServiceCollectionExtensions.cs b/src/MediatR.Extensions.FluentValidation.AspNetCore/ServiceCollectionExtensions.cs
@@ -1,17 +1,23 @@
 ﻿using FluentValidation;
 using Microsoft.Extensions.DependencyInjection;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 
 namespace MediatR.Extensions.FluentValidation.AspNetCore
 {
     public static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddFluentValidation(this IServiceCollection services, IEnumerable<Assembly> assemblies, ServiceLifetime lifetime = ServiceLifetime.Transient)
+        public static IServiceCollection AddFluentValidation(
+            this IServiceCollection services, 
+            IEnumerable<Assembly> assemblies, 
+            ServiceLifetime lifetime = ServiceLifetime.Transient,
+            Func<AssemblyScanner.AssemblyScanResult, bool> filter = null
+            )
         {
             services.Add(new ServiceDescriptor(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>), lifetime));
 
-            services.AddValidatorsFromAssemblies(assemblies, lifetime);
+            services.AddValidatorsFromAssemblies(assemblies, lifetime, filter);
             
             return services;
         }

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,23 @@`
`1`	`1`	`using FluentValidation;`
`2`	`2`	`using Microsoft.Extensions.DependencyInjection;`
	`3`	`+using System;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`	`using System.Reflection;`
`5`	`6`
`6`	`7`	`namespace MediatR.Extensions.FluentValidation.AspNetCore`
`7`	`8`	`{`
`8`	`9`	`public static class ServiceCollectionExtensions`
`9`	`10`	`{`
`10`		`- public static IServiceCollection AddFluentValidation(this IServiceCollection services, IEnumerable<Assembly> assemblies, ServiceLifetime lifetime = ServiceLifetime.Transient)`
	`11`	`+ public static IServiceCollection AddFluentValidation(`
	`12`	`+ this IServiceCollection services,`
	`13`	`+ IEnumerable<Assembly> assemblies,`
	`14`	`+ ServiceLifetime lifetime = ServiceLifetime.Transient,`
	`15`	`+ Func<AssemblyScanner.AssemblyScanResult, bool> filter = null`
	`16`	`+ )`
`11`	`17`	`{`
`12`	`18`	`services.Add(new ServiceDescriptor(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>), lifetime));`
`13`	`19`
`14`		`- services.AddValidatorsFromAssemblies(assemblies, lifetime);`
	`20`	`+ services.AddValidatorsFromAssemblies(assemblies, lifetime, filter);`
`15`	`21`
`16`	`22`	`return services;`
`17`	`23`	`}`