From 1cb5495c55cd8601da36579bf6acc5febbb69dc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Mar 2025 05:02:58 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/extensions build 20250314.5 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.3.0-preview.1.25156.1 -> To Version 9.4.0-preview.1.25164.5 --- NuGet.config | 4 ---- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8b0b0f8f7db..66f5d2f4634d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 989cca9ca192..1ef916a25f90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/extensions - c221abef4b4f1bf3fcf0bda27490e8b26bb479f4 + 6dec70a54153646317af796ead4ffbca94c7bc52 - + https://github.com/dotnet/extensions - c221abef4b4f1bf3fcf0bda27490e8b26bb479f4 + 6dec70a54153646317af796ead4ffbca94c7bc52 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 7d377eb03252..602b8b71b609 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.3 9.0.3 - 9.3.0-preview.1.25156.1 - 9.3.0-preview.1.25156.1 + 9.4.0-preview.1.25164.5 + 9.4.0-preview.1.25164.5 9.0.3 9.0.3 From eaa0b824ce74d23d6d0229c6e707732616d8a43d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Mar 2025 05:02:47 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/extensions build 20250323.2 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.3.0-preview.1.25156.1 -> To Version 9.4.0-preview.1.25173.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ef916a25f90..03d226e7be5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/extensions - 6dec70a54153646317af796ead4ffbca94c7bc52 + 6491f22e0a194060d5a7461dacaa4dc0106852d0 - + https://github.com/dotnet/extensions - 6dec70a54153646317af796ead4ffbca94c7bc52 + 6491f22e0a194060d5a7461dacaa4dc0106852d0 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 602b8b71b609..e32a48efe22b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.3 9.0.3 - 9.4.0-preview.1.25164.5 - 9.4.0-preview.1.25164.5 + 9.4.0-preview.1.25173.2 + 9.4.0-preview.1.25173.2 9.0.3 9.0.3 From 2b6de622f539373b72f7763790edc91490d0857e Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 24 Mar 2025 18:06:48 -0400 Subject: [PATCH 3/7] Quarantine tests - Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests.FormHandlingTests.FormWithParentBindingContextTest.RadioButtonGetsResetAfterSubmittingEnhancedForm https://github.com/dotnet/aspnetcore/issues/61144 - Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests.EnhancedNavigationTest.NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWebAssembly https://github.com/dotnet/aspnetcore/issues/61143 --- .../test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs | 1 + .../FormHandlingTests/FormWithParentBindingContextTest.cs | 1 + src/submodules/googletest | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs index 94b6b80f53a1..e6fac2d528a8 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs @@ -519,6 +519,7 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_OnlyServerOrWebA [Theory] [InlineData("server")] [InlineData("wasm")] + [QuarantineTest("https://github.com/dotnet/aspnetcore/issues/61143")] public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWebAssembly(string runtimeThatInvokedNavigation) { Navigate($"{ServerPathBase}/nav"); diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index 4b35b0c5eed0..172eeed786a9 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -1340,6 +1340,7 @@ void AssertUiState(string expectedStringValue, bool expectedBoolValue) } [Fact] + [QuarantineTest("https://github.com/dotnet/aspnetcore/issues/61144")] public void RadioButtonGetsResetAfterSubmittingEnhancedForm() { GoTo("forms/form-with-checkbox-and-radio-button"); diff --git a/src/submodules/googletest b/src/submodules/googletest index 24a9e940d481..2b6b042a7744 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 24a9e940d481f992ba852599c78bb2217362847b +Subproject commit 2b6b042a77446ff322cd7522ca068d9f2a21c1d1 From 162c6ea28f867d2d0501b5af9093eb08a01c57dc Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 24 Mar 2025 18:25:49 -0400 Subject: [PATCH 4/7] Fix build --- .../E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs | 3 ++- .../FormHandlingTests/FormWithParentBindingContextTest.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs index e6fac2d528a8..83fda69b3a5f 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.E2ETesting; +using Microsoft.AspNetCore.InternalTesting using TestServer; using Xunit.Abstractions; using Components.TestServer.RazorComponents; @@ -519,7 +520,7 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_OnlyServerOrWebA [Theory] [InlineData("server")] [InlineData("wasm")] - [QuarantineTest("https://github.com/dotnet/aspnetcore/issues/61143")] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61143")] public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWebAssembly(string runtimeThatInvokedNavigation) { Navigate($"{ServerPathBase}/nav"); diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index 172eeed786a9..792e222f4183 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -1340,7 +1340,7 @@ void AssertUiState(string expectedStringValue, bool expectedBoolValue) } [Fact] - [QuarantineTest("https://github.com/dotnet/aspnetcore/issues/61144")] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61144")] public void RadioButtonGetsResetAfterSubmittingEnhancedForm() { GoTo("forms/form-with-checkbox-and-radio-button"); From 93b284add22e7de02cafac1145e7e484cb6cd987 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 24 Mar 2025 19:23:38 -0400 Subject: [PATCH 5/7] Fix build --- .../test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs index 83fda69b3a5f..0ba10d655cdf 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.E2ETesting; -using Microsoft.AspNetCore.InternalTesting +using Microsoft.AspNetCore.InternalTesting; using TestServer; using Xunit.Abstractions; using Components.TestServer.RazorComponents; From 44cf5b58f36f3f6f6a150e85b13e3a9aee0804e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Mar 2025 05:02:31 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/extensions build 20250328.3 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.3.0-preview.1.25156.1 -> To Version 9.4.0-preview.1.25178.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03d226e7be5b..aea4c9961c1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/extensions - 6491f22e0a194060d5a7461dacaa4dc0106852d0 + 56df0c4f4933909367536413dcf9c16520a37f82 - + https://github.com/dotnet/extensions - 6491f22e0a194060d5a7461dacaa4dc0106852d0 + 56df0c4f4933909367536413dcf9c16520a37f82 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index e32a48efe22b..3e13cf1441e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.3 9.0.3 - 9.4.0-preview.1.25173.2 - 9.4.0-preview.1.25173.2 + 9.4.0-preview.1.25178.3 + 9.4.0-preview.1.25178.3 9.0.3 9.0.3 From 827daf47dd1dbb26c0612edbbf640affdf3a17d7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 2 Apr 2025 12:39:35 -0700 Subject: [PATCH 7/7] Fix submod --- src/submodules/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/googletest b/src/submodules/googletest index 2b6b042a7744..52204f78f94d 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 2b6b042a77446ff322cd7522ca068d9f2a21c1d1 +Subproject commit 52204f78f94d7512df1f0f3bea1d47437a2c3a58