diff --git a/eng/GenAPI.exclusions.txt b/eng/GenAPI.exclusions.txt
index 3053eb79e1..3eab882f9d 100644
--- a/eng/GenAPI.exclusions.txt
+++ b/eng/GenAPI.exclusions.txt
@@ -8,17 +8,5 @@ T:Microsoft.AspNetCore.Components.AuthorizeView
 T:Microsoft.AspNetCore.Components.AuthorizeViewCore
 T:Microsoft.AspNetCore.Components.CascadingAuthenticationState
 T:Microsoft.AspNetCore.Components.CascadingValue`1
-T:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator
-T:Microsoft.AspNetCore.Components.Forms.EditForm
-T:Microsoft.AspNetCore.Components.Forms.InputBase`1
-T:Microsoft.AspNetCore.Components.Forms.InputCheckbox
-T:Microsoft.AspNetCore.Components.Forms.InputDate`1
-T:Microsoft.AspNetCore.Components.Forms.InputNumber`1
-T:Microsoft.AspNetCore.Components.Forms.InputSelect`1
-T:Microsoft.AspNetCore.Components.Forms.InputText
-T:Microsoft.AspNetCore.Components.Forms.InputTextArea
-T:Microsoft.AspNetCore.Components.Forms.ValidationMessage`1
-T:Microsoft.AspNetCore.Components.Forms.ValidationSummary
 T:Microsoft.AspNetCore.Components.PageDisplay
-T:Microsoft.AspNetCore.Components.Routing.NavLink
 T:Microsoft.AspNetCore.Components.Routing.Router
\ No newline at end of file
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 d383af20a4..4cc6c32b68 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -343,6 +343,11 @@ namespace Microsoft.AspNetCore.Components.CompilerServices
 }
 namespace Microsoft.AspNetCore.Components.Forms
 {
+    public partial class DataAnnotationsValidator : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        public DataAnnotationsValidator() { }
+        protected override void OnInitialized() { }
+    }
     public sealed partial class EditContext
     {
         public EditContext(object model) { }
diff --git a/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs b/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs
index cb1c83bd0a..67aa929098 100644
--- a/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs
+++ b/src/Components/Components/src/RenderTree/RenderTreeBuilder.cs
@@ -623,7 +623,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         /// Appends a frame representing a region of frames.
         /// </summary>
         /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        public  void OpenRegion(int sequence)
+        public void OpenRegion(int sequence)
         {
             _openElementIndices.Push(_entries.Count);
             Append(RenderTreeFrame.Region(sequence));
diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
index b9e85eccc4..10beee3000 100644
--- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
+++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
@@ -279,9 +279,131 @@ namespace Microsoft.AspNetCore.Components.Forms
         public static string FieldClass(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, in Microsoft.AspNetCore.Components.Forms.FieldIdentifier fieldIdentifier) { throw null; }
         public static string FieldClass<TField>(this Microsoft.AspNetCore.Components.Forms.EditContext editContext, System.Linq.Expressions.Expression<System.Func<TField>> accessor) { throw null; }
     }
+    public partial class EditForm : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        public EditForm() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.Forms.EditContext> ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.Forms.EditContext EditContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Forms.EditContext> OnInvalidSubmit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Forms.EditContext> OnSubmit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Forms.EditContext> OnValidSubmit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override void OnParametersSet() { }
+    }
+    public abstract partial class InputBase<T> : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        protected InputBase() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected string CssClass { get { throw null; } }
+        protected T CurrentValue { get { throw null; } set { } }
+        protected string CurrentValueAsString { get { throw null; } set { } }
+        protected Microsoft.AspNetCore.Components.Forms.EditContext EditContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected string FieldClass { get { throw null; } }
+        protected Microsoft.AspNetCore.Components.Forms.FieldIdentifier FieldIdentifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public T Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.EventCallback<T> ValueChanged { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Linq.Expressions.Expression<System.Func<T>> ValueExpression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected virtual string FormatValueAsString(T value) { throw null; }
+        public override System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; }
+        protected abstract bool TryParseValueFromString(string value, out T result, out string validationErrorMessage);
+    }
+    public partial class InputCheckbox : Microsoft.AspNetCore.Components.Forms.InputBase<bool>
+    {
+        public InputCheckbox() { }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out bool result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputDate<T> : Microsoft.AspNetCore.Components.Forms.InputBase<T>
+    {
+        public InputDate() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string ParsingErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override string FormatValueAsString(T value) { throw null; }
+        protected override bool TryParseValueFromString(string value, out T result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputNumber<T> : Microsoft.AspNetCore.Components.Forms.InputBase<T>
+    {
+        public InputNumber() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string ParsingErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override string FormatValueAsString(T value) { throw null; }
+        protected override bool TryParseValueFromString(string value, out T result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputSelect<T> : Microsoft.AspNetCore.Components.Forms.InputBase<T>
+    {
+        public InputSelect() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out T result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputText : Microsoft.AspNetCore.Components.Forms.InputBase<string>
+    {
+        public InputText() { }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out string result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class InputTextArea : Microsoft.AspNetCore.Components.Forms.InputBase<string>
+    {
+        public InputTextArea() { }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override bool TryParseValueFromString(string value, out string result, out string validationErrorMessage) { throw null; }
+    }
+    public partial class ValidationMessage<T> : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
+    {
+        public ValidationMessage() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Linq.Expressions.Expression<System.Func<T>> For { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override void OnParametersSet() { }
+        void System.IDisposable.Dispose() { }
+    }
+    public partial class ValidationSummary : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
+    {
+        public ValidationSummary() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        protected override void OnParametersSet() { }
+        void System.IDisposable.Dispose() { }
+    }
 }
 namespace Microsoft.AspNetCore.Components.Routing
 {
+    public partial class NavLink : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
+    {
+        public NavLink() { }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public string ActiveClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object> AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected string CssClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public Microsoft.AspNetCore.Components.Routing.NavLinkMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { }
+        public void Dispose() { }
+        protected override void OnInitialized() { }
+        protected override void OnParametersSet() { }
+    }
     public enum NavLinkMatch
     {
         Prefix = 0,
diff --git a/src/Components/Web/src/UIMouseEventArgs.cs b/src/Components/Web/src/UIMouseEventArgs.cs
index 67303904e7..fa5327e1fd 100644
--- a/src/Components/Web/src/UIMouseEventArgs.cs
+++ b/src/Components/Web/src/UIMouseEventArgs.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Components
         public double ClientX { get; set; }
 
         /// <summary>
-        /// 	The Y coordinate of the mouse pointer in local (DOM content) coordinates.
+        /// The Y coordinate of the mouse pointer in local (DOM content) coordinates.
         /// </summary>
         public double ClientY { get; set; }
 
@@ -55,22 +55,22 @@ namespace Microsoft.AspNetCore.Components
         public long Buttons { get; set; }
 
         /// <summary>
-        /// true if the control key was down when the event was fired. false otherwise.
+        /// <c>true</c> if the control key was down when the event was fired. <c>false</c> otherwise.
         /// </summary>
         public bool CtrlKey { get; set; }
 
         /// <summary>
-        /// true if the shift key was down when the event was fired. false otherwise.
+        /// <c>true</c> if the shift key was down when the event was fired. <c>false</c> otherwise.
         /// </summary>
         public bool ShiftKey { get; set; }
 
         /// <summary>
-        /// true if the alt key was down when the event was fired. false otherwise.
+        /// <c>true</c> if the alt key was down when the event was fired. <c>false</c> otherwise.
         /// </summary>
         public bool AltKey { get; set; }
 
         /// <summary>
-        /// true if the meta key was down when the event was fired. false otherwise.
+        /// <c>true</c> if the meta key was down when the event was fired. <c>false</c> otherwise.
         /// </summary>
         public bool MetaKey { get; set; }
     }
diff --git a/src/Components/Web/src/UIPointerEventArgs.cs b/src/Components/Web/src/UIPointerEventArgs.cs
index 7c9f5c818d..348cfbefd5 100644
--- a/src/Components/Web/src/UIPointerEventArgs.cs
+++ b/src/Components/Web/src/UIPointerEventArgs.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.AspNetCore.Components
 {
     /// <summary>
-    /// Supplies information about a mouse event that is being raised.
+    /// Supplies information about a pointer event that is being raised.
     /// </summary>
     public class UIPointerEventArgs : UIMouseEventArgs
     {