Merge pull request #35 from mrpmorris/release/1.7

mrpmorris · web-flow · commit cac44315affd · 2021-05-01T11:35:07.000+01:00
Release/1.7
diff --git a/README.md b/README.md
@@ -47,6 +47,14 @@ More sample projects will be added as the framework develops.
  - [FluentValidation Sample]- Shows how to use the [FluentValidation.com] library to validate.
 
 ## What's new
+
+### New in 1.7.0
+- Upgrade to FluentValidation V10
+- Prevent ValidateObjectTree from visiting struct properties [Bug #33](https://github.com/mrpmorris/blazor-validation/issues/33)
+
+### New in 1.6.0
+- Suport FluentValidation's RuleForEach and ChildRules
+
 ### New in 1.5.0
 - Support .NET 5.0
 
diff --git a/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/App.razor b/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/App.razor
@@ -1,8 +1,10 @@
-﻿<Router AppAssembly="typeof(Program).Assembly">
-	<Found Context="routeData">
-		<RouteView RouteData="routeData" />
-	</Found>
-	<NotFound>
-		<p>Sorry, there's nothing at this address.</p>
-	</NotFound>
+﻿<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p>Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
 </Router>
diff --git a/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/DataAnnotationsValidationSample.csproj b/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/DataAnnotationsValidationSample.csproj
@@ -6,10 +6,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview4.19579.2" />
-		<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
-		<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview4.19579.2" />
-		<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
 	</ItemGroup>
 
   <ItemGroup>
diff --git a/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/Program.cs b/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/Program.cs
@@ -1,16 +1,23 @@
-﻿using Microsoft.AspNetCore.Blazor.Hosting;
+﻿using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using PeterLeslieMorris.Blazor.Validation;
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace DataAnnotationsValidationSample
 {
 	public class Program
 	{
-		public static void Main(string[] args)
+		public static async Task Main(string[] args)
 		{
-			CreateHostBuilder(args).Build().Run();
-		}
+			var builder = WebAssemblyHostBuilder.CreateDefault(args);
+			builder.RootComponents.Add<App>("app");
+
+			builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+			builder.Services.AddFormValidation(config => config.AddDataAnnotationsValidation());
 
-		public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
-				BlazorWebAssemblyHost.CreateDefaultBuilder()
-						.UseBlazorStartup<Startup>();
+			await builder.Build().RunAsync();
+		}
 	}
 }
diff --git a/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/Startup.cs b/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/Startup.cs
diff --git a/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/_Imports.razor b/samples/01-DataAnnotationsValidation/DataAnnotationsValidationSample/_Imports.razor
@@ -5,4 +5,4 @@
 @using Microsoft.JSInterop
 @using DataAnnotationsValidationSample
 @using DataAnnotationsValidationSample.Components
-@using DataAnnotationsValidationSample.Shared
+@using DataAnnotationsValidationSample.Shared
diff --git a/samples/02-FluentValidation/FluentValidationSample/FluentValidationSample.csproj b/samples/02-FluentValidation/FluentValidationSample/FluentValidationSample.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\PeterLeslieMorris.Blazor.FluentValidation\PeterLeslieMorris.Blazor.FluentValidation.csproj" />
-    <ProjectReference Include="..\..\..\src\PeterLeslieMorris.Blazor.Validation\PeterLeslieMorris.Blazor.Validation.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\src\PeterLeslieMorris.Blazor.FluentValidation\PeterLeslieMorris.Blazor.FluentValidation.csproj" />
+		<ProjectReference Include="..\..\..\src\PeterLeslieMorris.Blazor.Validation\PeterLeslieMorris.Blazor.Validation.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/samples/02-FluentValidation/FluentValidationSample/FluentValidators/PersonValidator.cs b/samples/02-FluentValidation/FluentValidationSample/FluentValidators/PersonValidator.cs
@@ -11,7 +11,7 @@ public class PersonValidator : AbstractValidator<Person>
 		public PersonValidator()
 		{
 			RuleFor(x => x.Salutation)
-				.Cascade(CascadeMode.StopOnFirstFailure)
+				.Cascade(CascadeMode.Stop)
 				.NotEmpty()
 				.MustAsync(LongRunningAsyncMethod).WithMessage("Cannot be DR");
 			RuleFor(x => x.GivenName).NotEmpty();
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,9 +2,9 @@
 
     <PropertyGroup>
 
-        <Version>1.6.0</Version>
-        <AssemblyVersion>1.6.0.0</AssemblyVersion>
-        <FileVersion>1.6.0.0</FileVersion>
+        <Version>1.7.0</Version>
+        <AssemblyVersion>1.7.0.0</AssemblyVersion>
+        <FileVersion>1.7.0.0</FileVersion>
 
         <Authors>Peter Morris</Authors>
         <Company />
diff --git a/src/PeterLeslieMorris.Blazor.FluentValidation/PeterLeslieMorris.Blazor.FluentValidation.csproj b/src/PeterLeslieMorris.Blazor.FluentValidation/PeterLeslieMorris.Blazor.FluentValidation.csproj
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation" Version="9.0.1" />
+		<PackageReference Include="FluentValidation" Version="10.0.4" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/PeterLeslieMorris.Blazor.Validation/Extensions/EditContextExtensions.cs b/src/PeterLeslieMorris.Blazor.Validation/Extensions/EditContextExtensions.cs
@@ -29,9 +29,6 @@ public static bool ValidateProperty(
 			this EditContext editContext,
 			FieldIdentifier fieldIdentifier)
 		{
-			if (fieldIdentifier.Model == null)
-				return false;
-
 			var propertyInfo = fieldIdentifier.Model.GetType().GetProperty(
 				fieldIdentifier.FieldName,
 				BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static);
@@ -89,6 +86,9 @@ private static void ValidateProperty(
 			PropertyInfo property,
 			HashSet<object> validatedObjects)
 		{
+			if (property.PropertyType.IsValueType)
+				return;
+
 			NotifyPropertyChanged(editContext, instance, property.Name);
 
 			object value = property.GetValue(instance);
diff --git a/src/PeterLeslieMorris.Blazor.Validation/PeterLeslieMorris.Blazor.Validation.csproj b/src/PeterLeslieMorris.Blazor.Validation/PeterLeslieMorris.Blazor.Validation.csproj
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.6" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.3" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,23 @@`
`1`		`-using Microsoft.AspNetCore.Blazor.Hosting;`
	`1`	`+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;`
	`2`	`+using Microsoft.Extensions.DependencyInjection;`
	`3`	`+using PeterLeslieMorris.Blazor.Validation;`
	`4`	`+using System;`
	`5`	`+using System.Net.Http;`
	`6`	`+using System.Threading.Tasks;`
`2`	`7`
`3`	`8`	`namespace DataAnnotationsValidationSample`
`4`	`9`	`{`
`5`	`10`	`public class Program`
`6`	`11`	`{`
`7`		`- public static void Main(string[] args)`
	`12`	`+ public static async Task Main(string[] args)`
`8`	`13`	`{`
`9`		`- CreateHostBuilder(args).Build().Run();`
`10`		`- }`
	`14`	`+ var builder = WebAssemblyHostBuilder.CreateDefault(args);`
	`15`	`+ builder.RootComponents.Add<App>("app");`
	`16`	`+`
	`17`	`+ builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });`
	`18`	`+ builder.Services.AddFormValidation(config => config.AddDataAnnotationsValidation());`
`11`	`19`
`12`		`- public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>`
`13`		`- BlazorWebAssemblyHost.CreateDefaultBuilder()`
`14`		`- .UseBlazorStartup<Startup>();`
	`20`	`+ await builder.Build().RunAsync();`
	`21`	`+ }`
`15`	`22`	`}`
`16`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class PersonValidator : AbstractValidator<Person>`
`11`	`11`	`public PersonValidator()`
`12`	`12`	`{`
`13`	`13`	`RuleFor(x => x.Salutation)`
`14`		`- .Cascade(CascadeMode.StopOnFirstFailure)`
	`14`	`+ .Cascade(CascadeMode.Stop)`
`15`	`15`	`.NotEmpty()`
`16`	`16`	`.MustAsync(LongRunningAsyncMethod).WithMessage("Cannot be DR");`
`17`	`17`	`RuleFor(x => x.GivenName).NotEmpty();`