... then use that new tab for debugging.
- This should launch a new browser window with debugging enabled..
+Underlying exception:
+{ex}
+ ");
+
return;
}
@@ -144,20 +153,42 @@ There is more than one browser tab at {targetTabUrl}.
private static string GetLaunchChromeInstructions(string appRootUrl)
{
+ var profilePath = Path.Combine(Path.GetTempPath(), "blazor-edge-debug");
+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
- return $@"Close all Chrome instances, then press Win+R and enter the following:
- ""%programfiles(x86)%\Google\Chrome\Application\chrome.exe"" --remote-debugging-port=9222 {appRootUrl}
";
+ return $@"Press Win+R and enter the following:
+ chrome --remote-debugging-port=9222 --user-data-dir=""{profilePath}"" {appRootUrl}
";
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
- return $@"Close all Chrome instances, then in a terminal window execute the following:
- google-chrome --remote-debugging-port=9222 {appRootUrl}
";
+ return $@"In a terminal window execute the following:
+ google-chrome --remote-debugging-port=9222 --user-data-dir={profilePath} {appRootUrl}
";
+ }
+ else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+ {
+ return $@"Execute the following:
+ open /Applications/Google\ Chrome.app --args --remote-debugging-port=9222 --user-data-dir={profilePath} {appRootUrl}
";
+ }
+ else
+ {
+ throw new InvalidOperationException("Unknown OS platform");
+ }
+ }
+
+ private static string GetLaunchEdgeInstructions(string appRootUrl)
+ {
+ var profilePath = Path.Combine(Path.GetTempPath(), "blazor-chrome-debug");
+
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+ {
+ return $@"Press Win+R and enter the following:
+ msedge --remote-debugging-port=9222 --user-data-dir=""{profilePath}"" {appRootUrl}
";
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
- return $@"Close all Chrome instances, then in a terminal window execute the following:
- open /Applications/Google\ Chrome.app --args --remote-debugging-port=9222 {appRootUrl}
";
+ return $@"In a terminal window execute the following:
+ open /Applications/Microsoft\ Edge\ Dev.app --args --remote-debugging-port=9222 --user-data-dir={profilePath} {appRootUrl}
";
}
else
{
diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
index c91a32128d65..640d8f21d07c 100644
--- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
+++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
@@ -15,6 +15,10 @@
false
+
+
+
diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
index 70b93d725348..cde7bc4c1fdb 100644
--- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
+++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
@@ -5,11 +5,13 @@
+ packageIcon.png
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/SurveyPrompt.razor b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/SurveyPrompt.razor
index 168aafe54252..2b7b716c201e 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/SurveyPrompt.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/SurveyPrompt.razor
@@ -4,7 +4,7 @@
Please take our
- brief survey
+ brief survey
and tell us what you think.
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/css/site.css b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/css/site.css
index fa2c7f19b7d6..4e4425c9b3d0 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/css/site.css
+++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/css/site.css
@@ -4,6 +4,16 @@ html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}
+a, .btn-link {
+ color: #0366d6;
+}
+
+.btn-primary {
+ color: #fff;
+ background-color: #1b6ec2;
+ border-color: #1861ac;
+}
+
app {
position: relative;
display: flex;
@@ -21,10 +31,21 @@ app {
}
.main .top-row {
- background-color: #e6e6e6;
+ background-color: #f7f7f7;
border-bottom: 1px solid #d6d5d5;
+ justify-content: flex-end;
}
+ .main .top-row > a, .main .top-row .btn-link {
+ white-space: nowrap;
+ margin-left: 1.5rem;
+ }
+
+.main .top-row a:first-child {
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
.sidebar {
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
}
@@ -44,38 +65,38 @@ app {
top: -2px;
}
-.nav-item {
- font-size: 0.9rem;
- padding-bottom: 0.5rem;
-}
-
- .nav-item:first-of-type {
- padding-top: 1rem;
- }
-
- .nav-item:last-of-type {
- padding-bottom: 1rem;
+ .sidebar .nav-item {
+ font-size: 0.9rem;
+ padding-bottom: 0.5rem;
}
- .nav-item a {
- color: #d7d7d7;
- border-radius: 4px;
- height: 3rem;
- display: flex;
- align-items: center;
- line-height: 3rem;
- }
+ .sidebar .nav-item:first-of-type {
+ padding-top: 1rem;
+ }
- .nav-item a.active {
- background-color: rgba(255,255,255,0.25);
- color: white;
+ .sidebar .nav-item:last-of-type {
+ padding-bottom: 1rem;
}
- .nav-item a:hover {
- background-color: rgba(255,255,255,0.1);
- color: white;
+ .sidebar .nav-item a {
+ color: #d7d7d7;
+ border-radius: 4px;
+ height: 3rem;
+ display: flex;
+ align-items: center;
+ line-height: 3rem;
}
+ .sidebar .nav-item a.active {
+ background-color: rgba(255,255,255,0.25);
+ color: white;
+ }
+
+ .sidebar .nav-item a:hover {
+ background-color: rgba(255,255,255,0.1);
+ color: white;
+ }
+
.content {
padding-top: 1.1rem;
}
@@ -96,10 +117,37 @@ app {
color: red;
}
+#blazor-error-ui {
+ background: lightyellow;
+ bottom: 0;
+ box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+ display: none;
+ left: 0;
+ padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+ position: fixed;
+ width: 100%;
+ z-index: 1000;
+}
+
+#blazor-error-ui .dismiss {
+ cursor: pointer;
+ position: absolute;
+ right: 0.75rem;
+ top: 0.5rem;
+}
+
@media (max-width: 767.98px) {
- .main .top-row {
+ .main .top-row:not(.auth) {
display: none;
}
+
+ .main .top-row.auth {
+ justify-content: space-between;
+ }
+
+ .main .top-row a, .main .top-row .btn-link {
+ margin-left: 0;
+ }
}
@media (min-width: 768px) {
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html
index 5ca6c3f6e669..586253b52cb8 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html
+++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html
@@ -1,5 +1,6 @@
+
Loading...
+
+ An unhandled error has occurred.
+
Reload
+
🗙
+
- $(DefaultNetCoreTargetFramework)
+ netcoreapp3.1
7.3
diff --git a/src/Components/Blazor/Validation/src/ComparePropertyAttribute.cs b/src/Components/Blazor/Validation/src/ComparePropertyAttribute.cs
new file mode 100644
index 000000000000..3f74ce647f37
--- /dev/null
+++ b/src/Components/Blazor/Validation/src/ComparePropertyAttribute.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace System.ComponentModel.DataAnnotations
+{
+ ///
+ /// A
+ [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+ public sealed class ComparePropertyAttribute : CompareAttribute
+ {
+ ///
+ /// Initializes a new instance of
+ ///
+
+
+ netstandard2.0
+ Provides experimental support for validation using DataAnnotations.
+ true
+ false
+
+
+
+
+
+
+
+
+
diff --git a/src/Components/Blazor/Validation/src/ObjectGraphDataAnnotationsValidator.cs b/src/Components/Blazor/Validation/src/ObjectGraphDataAnnotationsValidator.cs
new file mode 100644
index 000000000000..df1971e0a200
--- /dev/null
+++ b/src/Components/Blazor/Validation/src/ObjectGraphDataAnnotationsValidator.cs
@@ -0,0 +1,125 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+
+namespace Microsoft.AspNetCore.Components.Forms
+{
+ public class ObjectGraphDataAnnotationsValidator : ComponentBase
+ {
+ private static readonly object ValidationContextValidatorKey = new object();
+ private static readonly object ValidatedObjectsKey = new object();
+ private ValidationMessageStore _validationMessageStore;
+
+ [CascadingParameter]
+ internal EditContext EditContext { get; set; }
+
+ protected override void OnInitialized()
+ {
+ _validationMessageStore = new ValidationMessageStore(EditContext);
+
+ // Perform object-level validation (starting from the root model) on request
+ EditContext.OnValidationRequested += (sender, eventArgs) =>
+ {
+ _validationMessageStore.Clear();
+ ValidateObject(EditContext.Model, new HashSet());
+ EditContext.NotifyValidationStateChanged();
+ };
+
+ // Perform per-field validation on each field edit
+ EditContext.OnFieldChanged += (sender, eventArgs) =>
+ ValidateField(EditContext, _validationMessageStore, eventArgs.FieldIdentifier);
+ }
+
+ internal void ValidateObject(object value, HashSet visited)
+ {
+ if (value is null)
+ {
+ return;
+ }
+
+ if (!visited.Add(value))
+ {
+ // Already visited this object.
+ return;
+ }
+
+ if (value is IEnumerable enumerable)
+ {
+ var index = 0;
+ foreach (var item in enumerable)
+ {
+ ValidateObject(item, visited);
+ index++;
+ }
+
+ return;
+ }
+
+ var validationResults = new List();
+ ValidateObject(value, visited, validationResults);
+
+ // Transfer results to the ValidationMessageStore
+ foreach (var validationResult in validationResults)
+ {
+ if (!validationResult.MemberNames.Any())
+ {
+ _validationMessageStore.Add(new FieldIdentifier(value, string.Empty), validationResult.ErrorMessage);
+ continue;
+ }
+
+ foreach (var memberName in validationResult.MemberNames)
+ {
+ var fieldIdentifier = new FieldIdentifier(value, memberName);
+ _validationMessageStore.Add(fieldIdentifier, validationResult.ErrorMessage);
+ }
+ }
+ }
+
+ private void ValidateObject(object value, HashSet visited, List validationResults)
+ {
+ var validationContext = new ValidationContext(value);
+ validationContext.Items.Add(ValidationContextValidatorKey, this);
+ validationContext.Items.Add(ValidatedObjectsKey, visited);
+ Validator.TryValidateObject(value, validationContext, validationResults, validateAllProperties: true);
+ }
+
+ internal static bool TryValidateRecursive(object value, ValidationContext validationContext)
+ {
+ if (validationContext.Items.TryGetValue(ValidationContextValidatorKey, out var result) && result is ObjectGraphDataAnnotationsValidator validator)
+ {
+ var visited = (HashSet)validationContext.Items[ValidatedObjectsKey];
+ validator.ValidateObject(value, visited);
+
+ return true;
+ }
+
+ return false;
+ }
+
+ private static void ValidateField(EditContext editContext, ValidationMessageStore messages, in FieldIdentifier fieldIdentifier)
+ {
+ // DataAnnotations only validates public properties, so that's all we'll look for
+ var propertyInfo = fieldIdentifier.Model.GetType().GetProperty(fieldIdentifier.FieldName);
+ if (propertyInfo != null)
+ {
+ var propertyValue = propertyInfo.GetValue(fieldIdentifier.Model);
+ var validationContext = new ValidationContext(fieldIdentifier.Model)
+ {
+ MemberName = propertyInfo.Name
+ };
+ var results = new List();
+
+ Validator.TryValidateProperty(propertyValue, validationContext, results);
+ messages.Clear(fieldIdentifier);
+ messages.Add(fieldIdentifier, results.Select(result => result.ErrorMessage));
+
+ // We have to notify even if there were no messages before and are still no messages now,
+ // because the "state" that changed might be the completion of some async validation task
+ editContext.NotifyValidationStateChanged();
+ }
+ }
+ }
+}
diff --git a/src/Components/Blazor/Validation/src/ValidateComplexTypeAttribute.cs b/src/Components/Blazor/Validation/src/ValidateComplexTypeAttribute.cs
new file mode 100644
index 000000000000..4769d84767ad
--- /dev/null
+++ b/src/Components/Blazor/Validation/src/ValidateComplexTypeAttribute.cs
@@ -0,0 +1,30 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Components.Forms;
+
+namespace System.ComponentModel.DataAnnotations
+{
+ ///
+ /// A
+ /// By default
+ ///
+ [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+ public sealed class ValidateComplexTypeAttribute : ValidationAttribute
+ {
+ ///
+
+
+ $(DefaultNetCoreTargetFramework)
+
+
+
+
+
+
diff --git a/src/Components/Blazor/Validation/test/ObjectGraphDataAnnotationsValidatorTest.cs b/src/Components/Blazor/Validation/test/ObjectGraphDataAnnotationsValidatorTest.cs
new file mode 100644
index 000000000000..6703eb35d540
--- /dev/null
+++ b/src/Components/Blazor/Validation/test/ObjectGraphDataAnnotationsValidatorTest.cs
@@ -0,0 +1,540 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Components.Forms;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Components
+{
+ public class ObjectGraphDataAnnotationsValidatorTest
+ {
+ public class SimpleModel
+ {
+ [Required]
+ public string Name { get; set; }
+
+ [Range(1, 16)]
+ public int Age { get; set; }
+ }
+
+ [Fact]
+ public void ValidateObject_SimpleObject()
+ {
+ var model = new SimpleModel
+ {
+ Age = 23,
+ };
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(() => model.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Age);
+ Assert.Single(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateObject_SimpleObject_AllValid()
+ {
+ var model = new SimpleModel { Name = "Test", Age = 5 };
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(() => model.Name);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Age);
+ Assert.Empty(messages);
+
+ Assert.Empty(editContext.GetValidationMessages());
+ }
+
+ public class ModelWithComplexProperty
+ {
+ [Required]
+ public string Property1 { get; set; }
+
+ [ValidateComplexType]
+ public SimpleModel SimpleModel { get; set; }
+ }
+
+ [Fact]
+ public void ValidateObject_NullComplexProperty()
+ {
+ var model = new ModelWithComplexProperty();
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(() => model.Property1);
+ Assert.Single(messages);
+
+ Assert.Single(editContext.GetValidationMessages());
+ }
+
+ [Fact]
+ public void ValidateObject_ModelWithComplexProperties()
+ {
+ var model = new ModelWithComplexProperty { SimpleModel = new SimpleModel() };
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(() => model.Property1);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.SimpleModel);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => model.SimpleModel.Age);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.SimpleModel.Name);
+ Assert.Single(messages);
+
+ Assert.Equal(3, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateObject_ModelWithComplexProperties_SomeValid()
+ {
+ var model = new ModelWithComplexProperty
+ {
+ Property1 = "Value",
+ SimpleModel = new SimpleModel { Name = "Some Value" },
+ };
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(() => model.Property1);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => model.SimpleModel);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => model.SimpleModel.Age);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.SimpleModel.Name);
+ Assert.Empty(messages);
+
+ Assert.Single(editContext.GetValidationMessages());
+ }
+
+ public class TestValidatableObject : IValidatableObject
+ {
+ [Required]
+ public string Name { get; set; }
+
+ public IEnumerable Validate(ValidationContext validationContext)
+ {
+ yield return new ValidationResult("Custom validation error");
+ }
+ }
+
+ public class ModelWithValidatableComplexProperty
+ {
+ [Required]
+ public string Property1 { get; set; }
+
+ [ValidateComplexType]
+ public TestValidatableObject Property2 { get; set; } = new TestValidatableObject();
+ }
+
+ [Fact]
+ public void ValidateObject_ValidatableComplexProperty()
+ {
+ var model = new ModelWithValidatableComplexProperty();
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(() => model.Property1);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Property2);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Property2.Name);
+ Assert.Single(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateObject_ValidatableComplexProperty_ValidatesIValidatableProperty()
+ {
+ var model = new ModelWithValidatableComplexProperty
+ {
+ Property2 = new TestValidatableObject { Name = "test" },
+ };
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(() => model.Property1);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(new FieldIdentifier(model.Property2, string.Empty));
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Property2.Name);
+ Assert.Empty(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateObject_ModelIsIValidatable_PropertyHasError()
+ {
+ var model = new TestValidatableObject();
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(new FieldIdentifier(model, string.Empty));
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Name);
+ Assert.Single(messages);
+
+ Assert.Single(editContext.GetValidationMessages());
+ }
+
+ [Fact]
+ public void ValidateObject_ModelIsIValidatable_ModelHasError()
+ {
+ var model = new TestValidatableObject { Name = "test" };
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(new FieldIdentifier(model, string.Empty));
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Name);
+ Assert.Empty(messages);
+
+ Assert.Single(editContext.GetValidationMessages());
+ }
+
+ [Fact]
+ public void ValidateObject_CollectionModel()
+ {
+ var model = new List
+ {
+ new SimpleModel(),
+ new SimpleModel { Name = "test", },
+ };
+
+ var editContext = Validate(model);
+
+ var item = model[0];
+ var messages = editContext.GetValidationMessages(new FieldIdentifier(model, "0"));
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => item.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => item.Age);
+ Assert.Single(messages);
+
+ item = model[1];
+ messages = editContext.GetValidationMessages(new FieldIdentifier(model, "1"));
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => item.Name);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => item.Age);
+ Assert.Single(messages);
+
+ Assert.Equal(3, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateObject_CollectionValidatableModel()
+ {
+ var model = new List
+ {
+ new TestValidatableObject(),
+ new TestValidatableObject { Name = "test", },
+ };
+
+ var editContext = Validate(model);
+
+ var item = model[0];
+ var messages = editContext.GetValidationMessages(() => item.Name);
+ Assert.Single(messages);
+
+ item = model[1];
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => item.Name);
+ Assert.Empty(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+ }
+
+ private class Level1Validation
+ {
+ [ValidateComplexType]
+ public Level2Validation Level2 { get; set; }
+ }
+
+ public class Level2Validation
+ {
+ [ValidateComplexType]
+ public SimpleModel Level3 { get; set; }
+ }
+
+ [Fact]
+ public void ValidateObject_ManyLevels()
+ {
+ var model = new Level1Validation
+ {
+ Level2 = new Level2Validation
+ {
+ Level3 = new SimpleModel
+ {
+ Age = 47,
+ }
+ }
+ };
+
+ var editContext = Validate(model);
+ var level3 = model.Level2.Level3;
+
+ var messages = editContext.GetValidationMessages(() => level3.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => level3.Age);
+ Assert.Single(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+ }
+
+ private class Person
+ {
+ [Required]
+ public string Name { get; set; }
+
+ [ValidateComplexType]
+ public Person Related { get; set; }
+ }
+
+ [Fact]
+ public void ValidateObject_RecursiveRelation()
+ {
+ var model = new Person { Related = new Person() };
+ model.Related.Related = model;
+
+ var editContext = Validate(model);
+
+ var messages = editContext.GetValidationMessages(() => model.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => model.Related.Name);
+ Assert.Single(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateObject_RecursiveRelation_OverManySteps()
+ {
+ var person1 = new Person();
+ var person2 = new Person { Name = "Valid name" };
+ var person3 = new Person();
+ var person4 = new Person();
+
+ person1.Related = person2;
+ person2.Related = person3;
+ person3.Related = person4;
+ person4.Related = person1;
+
+ var editContext = Validate(person1);
+
+ var messages = editContext.GetValidationMessages(() => person1.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => person2.Name);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => person3.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => person4.Name);
+ Assert.Single(messages);
+
+ Assert.Equal(3, editContext.GetValidationMessages().Count());
+ }
+
+ private class Node
+ {
+ [Required]
+ public string Id { get; set; }
+
+ [ValidateComplexType]
+ public List Related { get; set; } = new List();
+ }
+
+ [Fact]
+ public void ValidateObject_RecursiveRelation_ViaCollection()
+ {
+ var node1 = new Node();
+ var node2 = new Node { Id = "Valid Id" };
+ var node3 = new Node();
+ node1.Related.Add(node2);
+ node2.Related.Add(node3);
+ node3.Related.Add(node1);
+
+ var editContext = Validate(node1);
+
+ var messages = editContext.GetValidationMessages(() => node1.Id);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => node2.Id);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => node3.Id);
+ Assert.Single(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateObject_RecursiveRelation_InCollection()
+ {
+ var person1 = new Person();
+ var person2 = new Person { Name = "Valid name" };
+ var person3 = new Person();
+ var person4 = new Person();
+
+ person1.Related = person2;
+ person2.Related = person3;
+ person3.Related = person4;
+ person4.Related = person1;
+
+ var editContext = Validate(person1);
+
+ var messages = editContext.GetValidationMessages(() => person1.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => person2.Name);
+ Assert.Empty(messages);
+
+ messages = editContext.GetValidationMessages(() => person3.Name);
+ Assert.Single(messages);
+
+ messages = editContext.GetValidationMessages(() => person4.Name);
+ Assert.Single(messages);
+
+ Assert.Equal(3, editContext.GetValidationMessages().Count());
+ }
+
+ [Fact]
+ public void ValidateField_PropertyValid()
+ {
+ var model = new SimpleModel { Age = 1 };
+ var fieldIdentifier = FieldIdentifier.Create(() => model.Age);
+
+ var editContext = ValidateField(model, fieldIdentifier);
+ var messages = editContext.GetValidationMessages(fieldIdentifier);
+ Assert.Empty(messages);
+
+ Assert.Empty(editContext.GetValidationMessages());
+ }
+
+ [Fact]
+ public void ValidateField_PropertyInvalid()
+ {
+ var model = new SimpleModel { Age = 42 };
+ var fieldIdentifier = FieldIdentifier.Create(() => model.Age);
+
+ var editContext = ValidateField(model, fieldIdentifier);
+ var messages = editContext.GetValidationMessages(fieldIdentifier);
+ Assert.Single(messages);
+
+ Assert.Single(editContext.GetValidationMessages());
+ }
+
+ [Fact]
+ public void ValidateField_AfterSubmitValidation()
+ {
+ var model = new SimpleModel { Age = 42 };
+ var fieldIdentifier = FieldIdentifier.Create(() => model.Age);
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(fieldIdentifier);
+ Assert.Single(messages);
+
+ Assert.Equal(2, editContext.GetValidationMessages().Count());
+
+ model.Age = 4;
+
+ editContext.NotifyFieldChanged(fieldIdentifier);
+ messages = editContext.GetValidationMessages(fieldIdentifier);
+ Assert.Empty(messages);
+
+ Assert.Single(editContext.GetValidationMessages());
+ }
+
+ [Fact]
+ public void ValidateField_ModelWithComplexProperty()
+ {
+ var model = new ModelWithComplexProperty
+ {
+ SimpleModel = new SimpleModel { Age = 1 },
+ };
+ var fieldIdentifier = FieldIdentifier.Create(() => model.SimpleModel.Name);
+
+ var editContext = ValidateField(model, fieldIdentifier);
+ var messages = editContext.GetValidationMessages(fieldIdentifier);
+ Assert.Single(messages);
+
+ Assert.Single(editContext.GetValidationMessages());
+ }
+
+ [Fact]
+ public void ValidateField_ModelWithComplexProperty_AfterSubmitValidation()
+ {
+ var model = new ModelWithComplexProperty
+ {
+ Property1 = "test",
+ SimpleModel = new SimpleModel { Age = 29, Name = "Test" },
+ };
+ var fieldIdentifier = FieldIdentifier.Create(() => model.SimpleModel.Age);
+
+ var editContext = Validate(model);
+ var messages = editContext.GetValidationMessages(fieldIdentifier);
+ Assert.Single(messages);
+
+ model.SimpleModel.Age = 9;
+ editContext.NotifyFieldChanged(fieldIdentifier);
+
+ messages = editContext.GetValidationMessages(fieldIdentifier);
+ Assert.Empty(messages);
+ Assert.Empty(editContext.GetValidationMessages());
+ }
+
+ private static EditContext Validate(object model)
+ {
+ var editContext = new EditContext(model);
+ var validator = new TestObjectGraphDataAnnotationsValidator { EditContext = editContext, };
+ validator.OnInitialized();
+
+ editContext.Validate();
+
+ return editContext;
+ }
+
+ private static EditContext ValidateField(object model, in FieldIdentifier field)
+ {
+ var editContext = new EditContext(model);
+ var validator = new TestObjectGraphDataAnnotationsValidator { EditContext = editContext, };
+ validator.OnInitialized();
+
+ editContext.NotifyFieldChanged(field);
+
+ return editContext;
+ }
+
+ private class TestObjectGraphDataAnnotationsValidator : ObjectGraphDataAnnotationsValidator
+ {
+ public new void OnInitialized() => base.OnInitialized();
+ }
+ }
+}
diff --git a/src/Components/Blazor/testassets/StandaloneApp/wwwroot/css/site.css b/src/Components/Blazor/testassets/StandaloneApp/wwwroot/css/site.css
index fa2c7f19b7d6..c15c2e155636 100644
--- a/src/Components/Blazor/testassets/StandaloneApp/wwwroot/css/site.css
+++ b/src/Components/Blazor/testassets/StandaloneApp/wwwroot/css/site.css
@@ -1,9 +1,19 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
+@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
html, body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}
+a, .btn-link {
+ color: #0366d6;
+}
+
+.btn-primary {
+ color: #fff;
+ background-color: #1b6ec2;
+ border-color: #1861ac;
+}
+
app {
position: relative;
display: flex;
@@ -21,10 +31,21 @@ app {
}
.main .top-row {
- background-color: #e6e6e6;
+ background-color: #f7f7f7;
border-bottom: 1px solid #d6d5d5;
+ justify-content: flex-end;
}
+ .main .top-row > a, .main .top-row .btn-link {
+ white-space: nowrap;
+ margin-left: 1.5rem;
+ }
+
+.main .top-row a:first-child {
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
.sidebar {
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
}
@@ -44,38 +65,38 @@ app {
top: -2px;
}
-.nav-item {
- font-size: 0.9rem;
- padding-bottom: 0.5rem;
-}
-
- .nav-item:first-of-type {
- padding-top: 1rem;
- }
-
- .nav-item:last-of-type {
- padding-bottom: 1rem;
+ .sidebar .nav-item {
+ font-size: 0.9rem;
+ padding-bottom: 0.5rem;
}
- .nav-item a {
- color: #d7d7d7;
- border-radius: 4px;
- height: 3rem;
- display: flex;
- align-items: center;
- line-height: 3rem;
- }
+ .sidebar .nav-item:first-of-type {
+ padding-top: 1rem;
+ }
- .nav-item a.active {
- background-color: rgba(255,255,255,0.25);
- color: white;
+ .sidebar .nav-item:last-of-type {
+ padding-bottom: 1rem;
}
- .nav-item a:hover {
- background-color: rgba(255,255,255,0.1);
- color: white;
+ .sidebar .nav-item a {
+ color: #d7d7d7;
+ border-radius: 4px;
+ height: 3rem;
+ display: flex;
+ align-items: center;
+ line-height: 3rem;
}
+ .sidebar .nav-item a.active {
+ background-color: rgba(255,255,255,0.25);
+ color: white;
+ }
+
+ .sidebar .nav-item a:hover {
+ background-color: rgba(255,255,255,0.1);
+ color: white;
+ }
+
.content {
padding-top: 1.1rem;
}
@@ -96,10 +117,37 @@ app {
color: red;
}
+#blazor-error-ui {
+ background: lightyellow;
+ bottom: 0;
+ box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+ display: none;
+ left: 0;
+ padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+ position: fixed;
+ width: 100%;
+ z-index: 1000;
+}
+
+#blazor-error-ui .dismiss {
+ cursor: pointer;
+ position: absolute;
+ right: 0.75rem;
+ top: 0.5rem;
+}
+
@media (max-width: 767.98px) {
- .main .top-row {
+ .main .top-row:not(.auth) {
display: none;
}
+
+ .main .top-row.auth {
+ justify-content: space-between;
+ }
+
+ .main .top-row a, .main .top-row .btn-link {
+ margin-left: 0;
+ }
}
@media (min-width: 768px) {
diff --git a/src/Components/Components.sln b/src/Components/Components.sln
index 046fc0b7cab5..ba0b2476ffb3 100644
--- a/src/Components/Components.sln
+++ b/src/Components/Components.sln
@@ -240,6 +240,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor", "Ignitor\src\Igni
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "Ignitor\test\Ignitor.Test.csproj", "{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Validation", "Validation", "{FD9BD646-9D50-42ED-A3E1-90558BA0C6B2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.DataAnnotations.Validation", "Blazor\Validation\src\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj", "{B70F90C7-2696-4050-B24E-BF0308F4E059}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.Tests", "Blazor\Validation\test\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.Tests.csproj", "{A5617A9D-C71E-44DE-936C-27611EB40A02}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -1486,6 +1492,30 @@ Global
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|x64.Build.0 = Release|Any CPU
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|x86.ActiveCfg = Release|Any CPU
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E}.Release|x86.Build.0 = Release|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Debug|x64.Build.0 = Debug|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Debug|x86.Build.0 = Debug|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Release|x64.ActiveCfg = Release|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Release|x64.Build.0 = Release|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Release|x86.ActiveCfg = Release|Any CPU
+ {B70F90C7-2696-4050-B24E-BF0308F4E059}.Release|x86.Build.0 = Release|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Debug|x64.Build.0 = Debug|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Debug|x86.Build.0 = Debug|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Release|x64.ActiveCfg = Release|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Release|x64.Build.0 = Release|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Release|x86.ActiveCfg = Release|Any CPU
+ {A5617A9D-C71E-44DE-936C-27611EB40A02}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1596,6 +1626,9 @@ Global
{BBF37AF9-8290-4B70-8BA8-0F6017B3B620} = {46E4300C-5726-4108-B9A2-18BB94EB26ED}
{CD0EF85C-4187-4515-A355-E5A0D4485F40} = {BDE2397D-C53A-4783-8B3A-1F54F48A6926}
{F31E8118-014E-4CCE-8A48-5282F7B9BB3E} = {BDE2397D-C53A-4783-8B3A-1F54F48A6926}
+ {FD9BD646-9D50-42ED-A3E1-90558BA0C6B2} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
+ {B70F90C7-2696-4050-B24E-BF0308F4E059} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
+ {A5617A9D-C71E-44DE-936C-27611EB40A02} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CC3C47E1-AD1A-4619-9CD3-E08A0148E5CE}
diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs
index 72adf28aa70b..c4a48435b453 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs
@@ -207,7 +207,10 @@ public readonly partial struct EventCallback
public sealed partial class EventHandlerAttribute : System.Attribute
{
public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
+ public EventHandlerAttribute(string attributeName, System.Type eventArgsType, bool enableStopPropagation, bool enablePreventDefault) { }
public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public bool EnablePreventDefault { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public bool EnableStopPropagation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
}
public partial interface IComponent
diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
index 72adf28aa70b..c4a48435b453 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -207,7 +207,10 @@ public readonly partial struct EventCallback
public sealed partial class EventHandlerAttribute : System.Attribute
{
public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
+ public EventHandlerAttribute(string attributeName, System.Type eventArgsType, bool enableStopPropagation, bool enablePreventDefault) { }
public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public bool EnablePreventDefault { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public bool EnableStopPropagation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
}
public partial interface IComponent
diff --git a/src/Components/Components/src/EventHandlerAttribute.cs b/src/Components/Components/src/EventHandlerAttribute.cs
index 767b3c5b2a8d..67307fb9efe5 100644
--- a/src/Components/Components/src/EventHandlerAttribute.cs
+++ b/src/Components/Components/src/EventHandlerAttribute.cs
@@ -16,7 +16,18 @@ public sealed class EventHandlerAttribute : Attribute
///
///
+ /// Constructs an instance of
+ ///
@@ -41,5 +54,15 @@ public EventHandlerAttribute(string attributeName, Type eventArgsType)
/// Gets the event argument type.
///
public Type EventArgsType { get; }
+
+ ///
+ /// Gets the event's ability to stop propagation.
+ ///
+ public bool EnableStopPropagation { get; }
+
+ ///
+ /// Gets the event's ability to prevent default event flow.
+ ///
+ public bool EnablePreventDefault { get; }
}
}
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index 68d1e48c8e00..5fe8fe7f361a 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -23,6 +23,14 @@
+
+
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
index 3c4fee8be5c0..ada9186afa78 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
@@ -15,11 +15,13 @@
packageIcon.png
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
index 80f61e7f1770..3d1738ac21ba 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec
@@ -9,11 +9,13 @@
packageIcon.png
diff --git a/src/Components/ComponentsNoDeps.slnf b/src/Components/ComponentsNoDeps.slnf
index ce01e6468f2e..09f6a0859f95 100644
--- a/src/Components/ComponentsNoDeps.slnf
+++ b/src/Components/ComponentsNoDeps.slnf
@@ -15,6 +15,8 @@
"Blazor\\Http\\test\\Microsoft.AspNetCore.Blazor.HttpClient.Tests.csproj",
"Blazor\\Server\\src\\Microsoft.AspNetCore.Blazor.Server.csproj",
"Blazor\\Templates\\src\\Microsoft.AspNetCore.Blazor.Templates.csproj",
+ "Blazor\\Validation\\src\\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj",
+ "Blazor\\Validation\\test\\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.Tests.csproj",
"Blazor\\testassets\\HostedInAspNet.Client\\HostedInAspNet.Client.csproj",
"Blazor\\testassets\\HostedInAspNet.Server\\HostedInAspNet.Server.csproj",
"Blazor\\testassets\\Microsoft.AspNetCore.Blazor.E2EPerformance\\Microsoft.AspNetCore.Blazor.E2EPerformance.csproj",
diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
index 9fce473a415f..e7f9d5f15507 100644
--- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
+++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
@@ -52,6 +52,12 @@ private static void ValidateModel(EditContext editContext, ValidationMessageStor
messages.Clear();
foreach (var validationResult in validationResults)
{
+ if (!validationResult.MemberNames.Any())
+ {
+ messages.Add(new FieldIdentifier(editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage);
+ continue;
+ }
+
foreach (var memberName in validationResult.MemberNames)
{
messages.Add(editContext.Field(memberName), validationResult.ErrorMessage);
diff --git a/src/Components/Ignitor/src/Ignitor.csproj b/src/Components/Ignitor/src/Ignitor.csproj
index d2fce7263e3e..2b139eb30f45 100644
--- a/src/Components/Ignitor/src/Ignitor.csproj
+++ b/src/Components/Ignitor/src/Ignitor.csproj
@@ -1,7 +1,8 @@

- $(DefaultNetCoreTargetFramework)
+
+ netcoreapp3.0
true
false
false
diff --git a/src/Components/Samples/BlazorServerApp/BlazorServerApp.csproj b/src/Components/Samples/BlazorServerApp/BlazorServerApp.csproj
index 101fe45c133b..2a82b7453aa5 100644
--- a/src/Components/Samples/BlazorServerApp/BlazorServerApp.csproj
+++ b/src/Components/Samples/BlazorServerApp/BlazorServerApp.csproj
@@ -12,6 +12,7 @@
diff --git a/src/Components/Samples/BlazorServerApp/Pages/Index.razor b/src/Components/Samples/BlazorServerApp/Pages/Index.razor
index 16dac3192520..e6a33ccd4367 100644
--- a/src/Components/Samples/BlazorServerApp/Pages/Index.razor
+++ b/src/Components/Samples/BlazorServerApp/Pages/Index.razor
@@ -1,4 +1,4 @@
-@page "/"
+@page "/"
Hello, world!
diff --git a/src/Components/Samples/BlazorServerApp/Pages/_Host.cshtml b/src/Components/Samples/BlazorServerApp/Pages/_Host.cshtml
index 7818ea3afd3a..1c35c6954a47 100644
--- a/src/Components/Samples/BlazorServerApp/Pages/_Host.cshtml
+++ b/src/Components/Samples/BlazorServerApp/Pages/_Host.cshtml
@@ -13,10 +13,16 @@
- @(await Html.RenderComponentAsync(RenderMode.ServerPrerendered))
-
+