Merge branch 'release/9.0.2xx' into AspireBrowserLaunch

Author: tmat

src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs

@@ -48,7 +48,12 @@ await Task.WhenAll(serversToDispose.Select(async server =>
             }));
         }
 
-        public async ValueTask<BrowserRefreshServer?> LaunchOrRefreshBrowserAsync(
+        /// <summary>
+        /// A single browser refresh server is created for each project that supports browser launching.
+        /// When the project is rebuilt we reuse the same refresh server and browser instance.
+        /// Reload message is sent to the browser in that case.
+        /// </summary>
+        public async ValueTask<BrowserRefreshServer?> GetOrCreateBrowserRefreshServerAsync(
             ProjectGraphNode projectNode,
             ProcessSpec processSpec,
             EnvironmentVariablesBuilder environmentBuilder,
@@ -68,12 +73,9 @@ await Task.WhenAll(serversToDispose.Select(async server =>
                 }
             }
 
-            // Attach trigger to the process that launches browser on URL found in the process output.
-            // Only do so for root projects, not for child processes.
-            if (projectOptions.IsRootProject)
-            {
-                processSpec.OnOutput += GetBrowserLaunchTrigger(projectNode, projectOptions, server, cancellationToken);
-            }
+            // Attach trigger to the process that detects when the web server reports to the output that it's listening.
+            // Launches browser on the URL found in the process output for root projects.
+            processSpec.OnOutput += GetBrowserLaunchTrigger(projectNode, projectOptions, server, cancellationToken);
 
             if (server == null)
             {
@@ -85,14 +87,10 @@ await Task.WhenAll(serversToDispose.Select(async server =>
             {
                 // Start the server we just created:
                 await server.StartAsync(cancellationToken);
-                server.SetEnvironmentVariables(environmentBuilder);
-            }
-            else
-            {
-                // Notify the browser of a project rebuild (delta applier notifies of updates):
-                await server.SendWaitMessageAsync(cancellationToken);
             }
 
+            server.SetEnvironmentVariables(environmentBuilder);
+
             return server;
         }
 
@@ -145,10 +143,10 @@ void handler(OutputLine line)
 
                 matchFound = true;
 
-                var projectAddedToAttemptedSet = ImmutableInterlocked.Update(ref _browserLaunchAttempted, static (set, projectNode) => set.Add(projectNode), projectNode);
-                if (projectAddedToAttemptedSet)
+                if (projectOptions.IsRootProject &&
+                    ImmutableInterlocked.Update(ref _browserLaunchAttempted, static (set, projectNode) => set.Add(projectNode), projectNode))
                 {
-                    // first iteration:
+                    // first build iteration of a root project:
                     var launchUrl = GetLaunchUrl(launchProfile.LaunchUrl, match.Groups["url"].Value);
                     LaunchBrowser(launchUrl, server);
                 }

src/BuiltInTools/dotnet-watch/DotNetWatcher.cs

@@ -62,7 +62,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke
                 };
 
                 var browserRefreshServer = (projectRootNode != null)
-                    ? await browserConnector.LaunchOrRefreshBrowserAsync(projectRootNode, processSpec, environmentBuilder, Context.RootProjectOptions, shutdownCancellationToken)
+                    ? await browserConnector.GetOrCreateBrowserRefreshServerAsync(projectRootNode, processSpec, environmentBuilder, Context.RootProjectOptions, shutdownCancellationToken)
                     : null;
 
                 environmentBuilder.SetProcessEnvironmentVariables(processSpec);

src/BuiltInTools/dotnet-watch/HotReload/ProjectLauncher.cs

@@ -94,7 +94,7 @@ public EnvironmentOptions EnvironmentOptions
             }
         }
 
-        var browserRefreshServer = await browserConnector.LaunchOrRefreshBrowserAsync(projectNode, processSpec, environmentBuilder, projectOptions, cancellationToken);
+        var browserRefreshServer = await browserConnector.GetOrCreateBrowserRefreshServerAsync(projectNode, processSpec, environmentBuilder, projectOptions, cancellationToken);
 
         var arguments = new List<string>()
         {