From 946e36cb84a778df7dd4c72b7777a905b3695b4d Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Tue, 1 Apr 2025 15:28:18 -0300 Subject: [PATCH] Convert to `netstandard2.0` sample --- .../FluentValidation.AutoValidation.Mvc.csproj | 10 +++++++--- .../FluentValidationAutoValidationActionFilter.cs | 11 +++++++---- ...entValidationAutoValidationObjectModelValidator.cs | 3 +++ ...FluentValidationAutoValidationValidationVisitor.cs | 5 ++++- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/FluentValidation.AutoValidation.Mvc/FluentValidation.AutoValidation.Mvc.csproj b/FluentValidation.AutoValidation.Mvc/FluentValidation.AutoValidation.Mvc.csproj index 4117c6f..0b44e3a 100644 --- a/FluentValidation.AutoValidation.Mvc/FluentValidation.AutoValidation.Mvc.csproj +++ b/FluentValidation.AutoValidation.Mvc/FluentValidation.AutoValidation.Mvc.csproj @@ -1,11 +1,11 @@ - + SharpGrip.FluentValidation.AutoValidation.Mvc - netcoreapp3.1;net6.0;net7.0;net8.0;net9.0 + netstandard2.0 SharpGrip.FluentValidation.AutoValidation.Mvc SharpGrip.FluentValidation.AutoValidation.Mvc SharpGrip FluentValidation AutoValidation MVC @@ -25,7 +25,11 @@ - + + + + + diff --git a/FluentValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs b/FluentValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs index 65408d6..c085820 100644 --- a/FluentValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs +++ b/FluentValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs @@ -34,10 +34,10 @@ public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingC { if (IsValidController(actionExecutingContext.Controller)) { - var endpoint = actionExecutingContext.HttpContext.GetEndpoint(); var controllerActionDescriptor = (ControllerActionDescriptor) actionExecutingContext.ActionDescriptor; var serviceProvider = actionExecutingContext.HttpContext.RequestServices; - +#if NET + var endpoint = actionExecutingContext.HttpContext.GetEndpoint(); if (endpoint != null && ((autoValidationMvcConfiguration.ValidationStrategy == ValidationStrategy.Annotations && !endpoint.Metadata.OfType().Any() && !endpoint.Metadata.OfType().Any()) || @@ -49,7 +49,7 @@ public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingC return; } - +#endif foreach (var parameter in controllerActionDescriptor.Parameters) { if (actionExecutingContext.ActionArguments.TryGetValue(parameter.Name, out var subject)) @@ -108,9 +108,12 @@ public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingC if (!actionExecutingContext.ModelState.IsValid) { +#if NET var problemDetailsFactory = serviceProvider.GetRequiredService(); var validationProblemDetails = problemDetailsFactory.CreateValidationProblemDetails(actionExecutingContext.HttpContext, actionExecutingContext.ModelState); - +#else + var validationProblemDetails = new ValidationProblemDetails(actionExecutingContext.ModelState); +#endif actionExecutingContext.Result = fluentValidationAutoValidationResultFactory.CreateActionResult(actionExecutingContext, validationProblemDetails); return; diff --git a/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationObjectModelValidator.cs b/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationObjectModelValidator.cs index 6c5c6b6..a02e7d4 100644 --- a/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationObjectModelValidator.cs +++ b/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationObjectModelValidator.cs @@ -1,5 +1,8 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; +#if !NET +using Microsoft.AspNetCore.Mvc.Internal; +#endif using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; diff --git a/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationValidationVisitor.cs b/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationValidationVisitor.cs index b72f240..6646996 100644 --- a/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationValidationVisitor.cs +++ b/FluentValidation.AutoValidation.Mvc/src/Validation/FluentValidationAutoValidationValidationVisitor.cs @@ -1,4 +1,7 @@ using Microsoft.AspNetCore.Mvc; +#if !NET +using Microsoft.AspNetCore.Mvc.Internal; +#endif using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; @@ -25,7 +28,7 @@ public override bool Validate(ModelMetadata? metadata, string? key, object? mode return disableBuiltInModelValidation || base.Validate(metadata, key, model, alwaysValidateAtTopLevel); } -#if !NETCOREAPP3_1 +#if NET public override bool Validate(ModelMetadata? metadata, string? key, object? model, bool alwaysValidateAtTopLevel, object? container) { // If built in model validation is disabled return true for later validation in the action filter.