Merge branch 'mbuck/passkeys' of https://github.com/dotnet/aspnetcore into mbuck/passkeys

Author: MackinnonBuck

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.6.25272.112"
+    "version": "10.0.100-preview.6.25302.104"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.6.25272.112",
+    "dotnet": "10.0.100-preview.6.25302.104",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25303.102",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25303.102",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25303.102",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25304.106",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25304.106",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25304.106",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/Versions.props

@@ -175,11 +175,10 @@ await _renderer.InitializeStandardComponentServicesAsync(
     private async Task<RequestValidationState> ValidateRequestAsync(HttpContext context, IAntiforgery? antiforgery)
     {
         var processPost = HttpMethods.IsPost(context.Request.Method) &&
-            // Disable POST functionality during exception handling and reexecution.
+            // Disable POST functionality during exception handling.
             // The exception handler middleware will not update the request method, and we don't
             // want to run the form handling logic against the error page.
-            context.Features.Get<IExceptionHandlerFeature>() == null &&
-            context.Features.Get<IStatusCodePagesFeature>() == null;
+            context.Features.Get<IExceptionHandlerFeature>() == null;
 
         if (processPost)
         {

global.json

@@ -49,6 +49,20 @@ public void CanDispatchToTheDefaultForm(bool suppressEnhancedNavigation)
         DispatchToFormCore(dispatchToForm);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void CanDispatchToTheDefaultFormWithReExecutionMiddleware(bool suppressEnhancedNavigation)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "reexecution/forms/default-form",
+            FormCssSelector = "form",
+            SuppressEnhancedNavigation = suppressEnhancedNavigation,
+        };
+        DispatchToFormCore(dispatchToForm);
+    }
+
     [Fact]
     public void PlainFormIsNotEnhancedByDefault()
     {
@@ -891,6 +905,21 @@ public async Task CanModifyTheHttpResponseDuringEventHandling()
         Assert.Equal("ModifyHttpContext", cookie.Value);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void FormNoAntiforgeryReturnBadRequestWithReExecutionMiddleware(bool suppressEnhancedNavigation)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "reexecution/forms/no-antiforgery",
+            FormCssSelector = "form",
+            ShouldCauseBadRequest = true,
+            SuppressEnhancedNavigation = suppressEnhancedNavigation,
+        };
+        DispatchToFormCore(dispatchToForm);
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
@@ -973,6 +1002,21 @@ public void FormNoHandlerReturnBadRequest(bool suppressEnhancedNavigation)
         DispatchToFormCore(dispatchToForm);
     }
 
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void FormNoHandlerReturnBadRequestWithReExecutionMiddleware(bool suppressEnhancedNavigation)
+    {
+        var dispatchToForm = new DispatchToForm(this)
+        {
+            Url = "reexecution/forms/no-handler",
+            FormCssSelector = "form",
+            ShouldCauseBadRequest = true,
+            SuppressEnhancedNavigation = suppressEnhancedNavigation,
+        };
+        DispatchToFormCore(dispatchToForm);
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]

src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs

@@ -1,4 +1,5 @@
 @page "/forms/default-form"
+@page "/reexecution/forms/default-form"
 @using Microsoft.AspNetCore.Components.Forms
 
 <h2>Default form</h2>

src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs

@@ -1,4 +1,5 @@
 @page "/forms/no-antiforgery"
+@page "/reexecution/forms/no-antiforgery"
 @using Microsoft.AspNetCore.Components.Forms
 
 <h2>Default form</h2>

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/DefaultForm.razor

@@ -1,4 +1,5 @@
 @page "/forms/no-handler"
+@page "/reexecution/forms/no-handler"
 @using Microsoft.AspNetCore.Components.Forms
 
 <h2>Form with no handler</h2>

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoAntiforgery.razor

@@ -103,7 +103,7 @@ public virtual IServiceProvider Services
             StartServer();
             if (_useKestrel)
             {
-                return _webHost!.Services;
+                return _webHost?.Services ?? _host!.Services;
             }
 
             return _host?.Services ?? _server!.Host.Services;
@@ -263,8 +263,8 @@ public void StartServer()
         {
             var deferredHostBuilder = new DeferredHostBuilder();
             deferredHostBuilder.UseEnvironment(Environments.Development);
-            // There's no helper for UseApplicationName, but we need to 
-            // set the application name to the target entry point 
+            // There's no helper for UseApplicationName, but we need to
+            // set the application name to the target entry point
             // assembly name.
             deferredHostBuilder.ConfigureHostConfiguration(config =>
             {

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/FormNoHandler.razor

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Mvc.Testing;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
+
+public class KestrelBasedWebApplicationFactoryForMinimal : WebApplicationFactory<SimpleWebSiteWithWebApplicationBuilder.Program>
+{
+    public KestrelBasedWebApplicationFactoryForMinimal() : base()
+    {
+        // Use dynamically assigned port to avoid test conflicts in CI.
+        this.UseKestrel(0);
+    }
+}