diff --git a/samples/BlazorServer/BlazorServer.csproj b/samples/BlazorServer/BlazorServer.csproj index 2855d1f..13a2b79 100644 --- a/samples/BlazorServer/BlazorServer.csproj +++ b/samples/BlazorServer/BlazorServer.csproj @@ -1,14 +1,10 @@  - netcoreapp3.0 + netcoreapp3.1 7.3 - - - - diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj index 96d4fc1..a84229a 100644 --- a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj +++ b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj @@ -6,7 +6,6 @@ - diff --git a/samples/BlazorWebAssembly/Pages/Index.razor b/samples/BlazorWebAssembly/Pages/Index.razor index 942d391..2e53fa5 100644 --- a/samples/BlazorWebAssembly/Pages/Index.razor +++ b/samples/BlazorWebAssembly/Pages/Index.razor @@ -5,7 +5,7 @@
- +

@@ -72,7 +72,7 @@ @code { Person Person { get; set; } = new Person(); - private FluentValidationValidator fluentValidationValidator; + private FluentValidationValidator _fluentValidationValidator; void SubmitValidForm() { @@ -81,6 +81,6 @@ void PartialValidate() { - Console.WriteLine($"Partial validation result : {fluentValidationValidator.Validate(options => options.IncludeRuleSets("Names"))}"); + Console.WriteLine($"Partial validation result : {_fluentValidationValidator.Validate(options => options.IncludeRuleSets("Names"))}"); } } \ No newline at end of file diff --git a/samples/Shared/SharedModels/SharedModels.csproj b/samples/Shared/SharedModels/SharedModels.csproj index c6400a3..3fb9686 100644 --- a/samples/Shared/SharedModels/SharedModels.csproj +++ b/samples/Shared/SharedModels/SharedModels.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Blazored.FluentValidation/Blazored.FluentValidation.csproj b/src/Blazored.FluentValidation/Blazored.FluentValidation.csproj index 768a2bf..49c4b38 100644 --- a/src/Blazored.FluentValidation/Blazored.FluentValidation.csproj +++ b/src/Blazored.FluentValidation/Blazored.FluentValidation.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs b/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs index 5522d85..cf4a756 100644 --- a/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs +++ b/src/Blazored.FluentValidation/EditContextFluentValidationExtensions.cs @@ -11,11 +11,9 @@ namespace Blazored.FluentValidation { public static class EditContextFluentValidationExtensions { - private readonly static char[] separators = new[] { '.', '[' }; - - private static List scannedAssembly = new List(); - - private static List assemblyScanResults = new List(); + private static readonly char[] Separators = { '.', '[' }; + private static readonly List ScannedAssembly = new List(); + private static readonly List AssemblyScanResults = new List(); public static EditContext AddFluentValidation(this EditContext editContext, IServiceProvider serviceProvider, bool disableAssemblyScanning, IValidator validator, FluentValidationValidator fluentValidationValidator) @@ -47,7 +45,7 @@ private static async void ValidateModel(EditContext editContext, if (validator is object) { - var context = ValidationContext.CreateWithOptions(editContext.Model, fluentValidationValidator.options ?? (opt => opt.IncludeAllRuleSets())); + var context = ValidationContext.CreateWithOptions(editContext.Model, fluentValidationValidator.Options ?? (opt => opt.IncludeAllRuleSets())); var validationResults = await validator.ValidateAsync(context); @@ -107,23 +105,23 @@ private static IValidator GetValidatorForModel(IServiceProvider serviceProvider, return null; } - foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Where(i => !scannedAssembly.Contains(i.FullName))) + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Where(i => !ScannedAssembly.Contains(i.FullName))) { try { - assemblyScanResults.AddRange(FindValidatorsInAssembly(assembly)); + AssemblyScanResults.AddRange(FindValidatorsInAssembly(assembly)); } catch (Exception) { } - scannedAssembly.Add(assembly.FullName); + ScannedAssembly.Add(assembly.FullName); } var interfaceValidatorType = typeof(IValidator<>).MakeGenericType(model.GetType()); - Type modelValidatorType = assemblyScanResults.FirstOrDefault(i => interfaceValidatorType.IsAssignableFrom(i.InterfaceType))?.ValidatorType; + Type modelValidatorType = AssemblyScanResults.FirstOrDefault(i => interfaceValidatorType.IsAssignableFrom(i.InterfaceType))?.ValidatorType; if (modelValidatorType == null) { @@ -147,7 +145,7 @@ private static FieldIdentifier ToFieldIdentifier(EditContext editContext, string while (true) { - var nextTokenEnd = propertyPath.IndexOfAny(separators); + var nextTokenEnd = propertyPath.IndexOfAny(Separators); if (nextTokenEnd < 0) { return new FieldIdentifier(obj, propertyPath); diff --git a/src/Blazored.FluentValidation/FluentValidationsValidator.cs b/src/Blazored.FluentValidation/FluentValidationsValidator.cs index 96a8202..17100fa 100644 --- a/src/Blazored.FluentValidation/FluentValidationsValidator.cs +++ b/src/Blazored.FluentValidation/FluentValidationsValidator.cs @@ -8,18 +8,18 @@ namespace Blazored.FluentValidation { public class FluentValidationValidator : ComponentBase { - [Inject] IServiceProvider ServiceProvider { get; set; } + [Inject] private IServiceProvider ServiceProvider { get; set; } - [CascadingParameter] EditContext CurrentEditContext { get; set; } + [CascadingParameter] private EditContext CurrentEditContext { get; set; } [Parameter] public IValidator Validator { get; set; } [Parameter] public bool DisableAssemblyScanning { get; set; } - internal Action> options; + internal Action> Options; public bool Validate(Action> options) { - this.options = options; + Options = options; try { @@ -27,7 +27,7 @@ public bool Validate(Action> options) } finally { - this.options = null; + Options = null; } }