Merge pull request #44193 from dotnet-maestro-bot/merge/release/7.0-to-main

[automated] Merge branch 'release/7.0' => 'main'

.azure/pipelines/components-e2e-tests.yml

@@ -76,4 +76,5 @@ jobs:
     artifacts:
     - name: Components_E2E_Test_Logs
       path: '$(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)'
+      includeForks: true
       publishOnError: true

.azure/pipelines/jobs/default-build.yml

@@ -110,10 +110,10 @@ jobs:
         ${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
             name: NetCore-Public
-            demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
           ${{ if eq(variables['System.TeamProject'], 'internal') }}:
             name: NetCore1ESPool-Internal
-            demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
       ${{ if eq(parameters.agentOs, 'Windows') }}:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: NetCore-Public

src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs

@@ -5,9 +5,9 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Testing;
+using Microsoft.AspNetCore.Testing;
 using OpenQA.Selenium;
 using TestServer;
 using Xunit.Abstractions;
@@ -62,7 +62,7 @@ public class CircuitGracefulTerminationTests : ServerTestBase<BasicTestAppServer
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/44017")]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/44185")]
     public async Task ClosingTheBrowserWindow_GracefullyDisconnects_TheCurrentCircuit()
     {
         // Arrange & Act