feat: lower dependencies versions

sitkoru · Apr 19, 2023 · 456b2da · 456b2da
1 parent 9b80f1e
commit 456b2da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/Sitko.FluentValidation/Graph/FluentGraphValidator.cs b/src/Sitko.FluentValidation/Graph/FluentGraphValidator.cs
@@ -8,7 +8,7 @@
 
 namespace Sitko.FluentValidation.Graph;
 
-public partial class FluentGraphValidator : IFluentGraphValidator
+public class FluentGraphValidator : IFluentGraphValidator
 {
     private static readonly ConcurrentDictionary<Type, Type?> TypesValidators = new();
     private readonly ILogger<FluentGraphValidator> logger;
@@ -50,10 +50,7 @@ private ValidationContext<object> CreateValidationContext(object model, Validati
         validatorSelector ??= ValidatorOptions.Global.ValidatorSelectors.DefaultValidatorSelectorFactory();
 
         var context = parent?.CloneForChildValidator(model, true, validatorSelector) ??
-                      new ValidationContext<object>(model, new PropertyChain(), validatorSelector)
-                      {
-                          RootContextData = { ["_FV_ServiceProvider"] = serviceScope.ServiceProvider }
-                      };
+                      new ValidationContext<object>(model, new PropertyChain(), validatorSelector) { RootContextData = { ["_FV_ServiceProvider"] = serviceScope.ServiceProvider } };
 
         return context;
     }
@@ -76,7 +73,7 @@ private ValidationContext<object> CreateValidationContext(object model, Validati
         var validator = serviceScope.ServiceProvider.GetService(formValidatorType) as IValidator;
         if (validator is null)
         {
-            ValidatorIsNotRegistered(logger, model.GetType().FullName!);
+            logger.LogWarning("FluentValidation.IValidator<{ModelType}> is not registered in the application service provider", model.GetType().FullName);
             TypesValidators[model.GetType()] = null;
         }
         else
@@ -87,12 +84,6 @@ private ValidationContext<object> CreateValidationContext(object model, Validati
         return validator;
     }
 
-    [LoggerMessage(
-        EventId = 0,
-        Level = LogLevel.Warning,
-        Message = "FluentValidation.IValidator<{ModelType}> is not registered in the application service provider")]
-    public static partial void ValidatorIsNotRegistered(ILogger logger, string modelType);
-
     private async Task<ModelsValidationResult> TryValidateFieldAsync(
         ModelFieldGraphValidationContext fieldGraphValidationContext,
         ModelsValidationResult? result,

diff --git a/src/Sitko.FluentValidation/Sitko.FluentValidation.csproj b/src/Sitko.FluentValidation/Sitko.FluentValidation.csproj
@@ -27,9 +27,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>