Forms streamline (#49261)

Author: SteveSandersonMS

src/Components/Authorization/test/AuthorizeRouteViewTest.cs

@@ -1,10 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Binding;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
@@ -67,26 +65,10 @@ public void WhenAuthorized_RendersPageInsideLayout()
             edit =>
             {
                 Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type);
-                AssertFrame.Component<CascadingModelBinder>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
+                AssertFrame.Component<TestPageRequiringAuthorization>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
             },
             edit => AssertPrependText(batch, edit, "Layout ends here"));
 
-        var cascadingModelBinderDiff = batch.GetComponentDiffs<CascadingModelBinder>().Single();
-        Assert.Collection(cascadingModelBinderDiff.Edits,
-            edit =>
-            {
-                Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type);
-                AssertFrame.Component<CascadingValue<ModelBindingContext>>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
-            });
-
-        var cascadingValueDiff = batch.GetComponentDiffs<CascadingValue<ModelBindingContext>>().Single();
-        Assert.Collection(cascadingValueDiff.Edits,
-            edit =>
-            {
-                Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type);
-                AssertFrame.Component<TestPageRequiringAuthorization>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
-            });
-
         // Assert: renders page
         var pageDiff = batch.GetComponentDiffs<TestPageRequiringAuthorization>().Single();
         Assert.Collection(pageDiff.Edits,
@@ -120,26 +102,10 @@ public void AuthorizesWhenResourceIsSet()
             edit =>
             {
                 Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type);
-                AssertFrame.Component<CascadingModelBinder>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
+                AssertFrame.Component<TestPageRequiringAuthorization>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
             },
             edit => AssertPrependText(batch, edit, "Layout ends here"));
 
-        var cascadingModelBinderDiff = batch.GetComponentDiffs<CascadingModelBinder>().Single();
-        Assert.Collection(cascadingModelBinderDiff.Edits,
-            edit =>
-            {
-                Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type);
-                AssertFrame.Component<CascadingValue<ModelBindingContext>>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
-            });
-
-        var cascadingValueDiff = batch.GetComponentDiffs<CascadingValue<ModelBindingContext>>().Single();
-        Assert.Collection(cascadingValueDiff.Edits,
-            edit =>
-            {
-                Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type);
-                AssertFrame.Component<TestPageRequiringAuthorization>(batch.ReferenceFrames[edit.ReferenceFrameIndex]);
-            });
-
         // Assert: renders page
         var pageDiff = batch.GetComponentDiffs<TestPageRequiringAuthorization>().Single();
         Assert.Collection(pageDiff.Edits,
@@ -327,8 +293,6 @@ public void WithoutCascadedAuthenticationState_WrapsOutputInCascadingAuthenticat
             component => Assert.IsType<CascadingValue<Task<AuthenticationState>>>(component),
             component => Assert.IsAssignableFrom<AuthorizeViewCore>(component),
             component => Assert.IsType<LayoutView>(component),
-            component => Assert.IsType<CascadingModelBinder>(component),
-            component => Assert.IsType<CascadingValue<ModelBindingContext>>(component),
             component => Assert.IsType<TestPageWithNoAuthorization>(component));
     }
 
@@ -360,8 +324,6 @@ public void WithCascadedAuthenticationState_DoesNotWrapOutputInCascadingAuthenti
             // further CascadingAuthenticationState
             component => Assert.IsAssignableFrom<AuthorizeViewCore>(component),
             component => Assert.IsType<LayoutView>(component),
-            component => Assert.IsType<CascadingModelBinder>(component),
-            component => Assert.IsType<CascadingValue<ModelBindingContext>>(component),
             component => Assert.IsType<TestPageWithNoAuthorization>(component));
     }
 
@@ -469,10 +431,4 @@ public TestNavigationManager()
             Initialize("https://localhost:85/subdir/", "https://localhost:85/subdir/path?query=value#hash");
         }
     }
-
-    private class TestFormValueSupplier : IFormValueSupplier
-    {
-        public bool CanBind(Type valueType, string formName = null) => false;
-        public void Bind(FormValueSupplierContext context) { }
-    }
 }

src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>