Skip to content

Commit 57c6e93

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Merging main into darc-main-ef29bc72-9838-44ca-a2d8-555a4267b9fd
2 parents 6a96694 + 0dd28ac commit 57c6e93

File tree

112 files changed

+1643
-907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1643
-907
lines changed

‎eng/Version.Details.xml‎

Lines changed: 181 additions & 181 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 87 additions & 87 deletions
Large diffs are not rendered by default.

‎eng/targets/Helix.Common.props‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<!-- This file is shared between Helix.proj and .csproj files. -->
33
<PropertyGroup>
44
<HelixQueueAlmaLinux>(AlmaLinux.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64</HelixQueueAlmaLinux>
5-
<HelixQueueAlpine>(Alpine.322.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64</HelixQueueAlpine>
5+
<HelixQueueAlpine>(Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64</HelixQueueAlpine>
66
<HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
77
<HelixQueueDebian>(Debian.13.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
88
<HelixQueueFedora>(Fedora.42.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-42-helix-amd64</HelixQueueFedora>
9-
<HelixQueueUbuntu>(Ubuntu.2404.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-24.04-helix-amd64</HelixQueueUbuntu>
109
<!-- Arm64 -->
1110
<HelixQueueArmDebian>(Debian.13.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm64v8</HelixQueueArmDebian>
1211

@@ -30,8 +29,7 @@
3029
<!-- aspnetcore-ci[-official] (ci.yml) -->
3130
<!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
3231
<ItemGroup>
33-
<HelixAvailableTargetQueue Include="Ubuntu.2204.Amd64.Open" Platform="Linux" />
34-
<HelixAvailableTargetQueue Include="AzureLinux.3.Amd64.Open" Platform="Linux" />
32+
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
3533
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
3634
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
3735
</ItemGroup>
@@ -45,10 +43,9 @@
4543

4644
<!-- Containers -->
4745
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine)" Platform="Linux" />
48-
<HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
4946
<HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
47+
<HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
5048
<HelixAvailableTargetQueue Include="$(HelixQueueFedora)" Platform="Linux" />
51-
<HelixAvailableTargetQueue Include="$(HelixQueueUbuntu)" Platform="Linux" />
5249
<!-- Arm64 -->
5350
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />
5451

‎eng/targets/Helix.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<SkipHelixQueues>
1919
$(HelixQueueAlmaLinux);
2020
$(HelixQueueAlpine);
21+
$(HelixQueueAzureLinux);
2122
$(HelixQueueDebian);
2223
$(HelixQueueFedora40);
23-
$(HelixQueueUbuntu);
24-
AzureLinux.3.Amd64.Open;
24+
Ubuntu.2004.Amd64.Open;
2525
</SkipHelixQueues>
2626
<SkipHelixArm>true</SkipHelixArm>
2727
</PropertyGroup>

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.6.25272.112"
3+
"version": "10.0.100-preview.6.25302.104"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-preview.6.25272.112",
6+
"dotnet": "10.0.100-preview.6.25302.104",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25303.102",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25303.102",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25303.102",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25304.106",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25304.106",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25304.106",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

‎src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,10 @@ await _renderer.InitializeStandardComponentServicesAsync(
175175
private async Task<RequestValidationState> ValidateRequestAsync(HttpContext context, IAntiforgery? antiforgery)
176176
{
177177
var processPost = HttpMethods.IsPost(context.Request.Method) &&
178-
// Disable POST functionality during exception handling and reexecution.
178+
// Disable POST functionality during exception handling.
179179
// The exception handler middleware will not update the request method, and we don't
180180
// want to run the form handling logic against the error page.
181-
context.Features.Get<IExceptionHandlerFeature>() == null &&
182-
context.Features.Get<IStatusCodePagesFeature>() == null;
181+
context.Features.Get<IExceptionHandlerFeature>() == null;
183182

184183
if (processPost)
185184
{

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,20 @@ public void CanDispatchToTheDefaultForm(bool suppressEnhancedNavigation)
4949
DispatchToFormCore(dispatchToForm);
5050
}
5151

52+
[Theory]
53+
[InlineData(true)]
54+
[InlineData(false)]
55+
public void CanDispatchToTheDefaultFormWithReExecutionMiddleware(bool suppressEnhancedNavigation)
56+
{
57+
var dispatchToForm = new DispatchToForm(this)
58+
{
59+
Url = "reexecution/forms/default-form",
60+
FormCssSelector = "form",
61+
SuppressEnhancedNavigation = suppressEnhancedNavigation,
62+
};
63+
DispatchToFormCore(dispatchToForm);
64+
}
65+
5266
[Fact]
5367
public void PlainFormIsNotEnhancedByDefault()
5468
{
@@ -891,6 +905,21 @@ public async Task CanModifyTheHttpResponseDuringEventHandling()
891905
Assert.Equal("ModifyHttpContext", cookie.Value);
892906
}
893907

908+
[Theory]
909+
[InlineData(true)]
910+
[InlineData(false)]
911+
public void FormNoAntiforgeryReturnBadRequestWithReExecutionMiddleware(bool suppressEnhancedNavigation)
912+
{
913+
var dispatchToForm = new DispatchToForm(this)
914+
{
915+
Url = "reexecution/forms/no-antiforgery",
916+
FormCssSelector = "form",
917+
ShouldCauseBadRequest = true,
918+
SuppressEnhancedNavigation = suppressEnhancedNavigation,
919+
};
920+
DispatchToFormCore(dispatchToForm);
921+
}
922+
894923
[Theory]
895924
[InlineData(true)]
896925
[InlineData(false)]
@@ -973,6 +1002,21 @@ public void FormNoHandlerReturnBadRequest(bool suppressEnhancedNavigation)
9731002
DispatchToFormCore(dispatchToForm);
9741003
}
9751004

1005+
[Theory]
1006+
[InlineData(true)]
1007+
[InlineData(false)]
1008+
public void FormNoHandlerReturnBadRequestWithReExecutionMiddleware(bool suppressEnhancedNavigation)
1009+
{
1010+
var dispatchToForm = new DispatchToForm(this)
1011+
{
1012+
Url = "reexecution/forms/no-handler",
1013+
FormCssSelector = "form",
1014+
ShouldCauseBadRequest = true,
1015+
SuppressEnhancedNavigation = suppressEnhancedNavigation,
1016+
};
1017+
DispatchToFormCore(dispatchToForm);
1018+
}
1019+
9761020
[Theory]
9771021
[InlineData(true)]
9781022
[InlineData(false)]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@page "/forms/default-form"
2+
@page "/reexecution/forms/default-form"
23
@using Microsoft.AspNetCore.Components.Forms
34

45
<h2>Default form</h2>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@page "/forms/no-antiforgery"
2+
@page "/reexecution/forms/no-antiforgery"
23
@using Microsoft.AspNetCore.Components.Forms
34

45
<h2>Default form</h2>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@page "/forms/no-handler"
2+
@page "/reexecution/forms/no-handler"
23
@using Microsoft.AspNetCore.Components.Forms
34

45
<h2>Form with no handler</h2>

0 commit comments

Comments
 (0)