Fix process cleanup timeout causing port binding errors in no-hot-reload mode

src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs

@@ -61,9 +61,8 @@ internal sealed record EnvironmentOptions(
         );
 
         public TimeSpan GetProcessCleanupTimeout(bool isHotReloadEnabled)
-            // If Hot Reload mode is disabled the process is restarted on every file change.
-            // Waiting for graceful termination would slow down the turn around.
-            => ProcessCleanupTimeout ?? (isHotReloadEnabled ? TimeSpan.FromSeconds(5) : TimeSpan.FromSeconds(0));
+            // Allow sufficient time for the process to exit gracefully and release resources (e.g., network ports).
+            => ProcessCleanupTimeout ?? TimeSpan.FromSeconds(5);
 
         private int _uniqueLogId;
 

test/dotnet-watch.Tests/CommandLine/EnvironmentOptionsTests.cs

@@ -3,6 +3,40 @@
 
 namespace Microsoft.DotNet.Watch.UnitTests;
 
+public class EnvironmentOptionsTests
+{
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void GetProcessCleanupTimeout_WithoutEnvironmentVariable_ReturnsDefaultTimeout(bool isHotReloadEnabled)
+    {
+        var envOptions = new EnvironmentOptions(
+            WorkingDirectory: "/test",
+            MuxerPath: "dotnet",
+            ProcessCleanupTimeout: null);
+
+        var timeout = envOptions.GetProcessCleanupTimeout(isHotReloadEnabled);
+
+        Assert.Equal(TimeSpan.FromSeconds(5), timeout);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void GetProcessCleanupTimeout_WithEnvironmentVariable_ReturnsSpecifiedTimeout(bool isHotReloadEnabled)
+    {
+        var customTimeout = TimeSpan.FromSeconds(10);
+        var envOptions = new EnvironmentOptions(
+            WorkingDirectory: "/test",
+            MuxerPath: "dotnet",
+            ProcessCleanupTimeout: customTimeout);
+
+        var timeout = envOptions.GetProcessCleanupTimeout(isHotReloadEnabled);
+
+        Assert.Equal(customTimeout, timeout);
+    }
+}
+
 public class BuildReporterTests
 {
     [Fact]

test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs

@@ -969,7 +969,7 @@ public async Task BlazorWasmHosted()
             App.AssertOutputContains($"dotnet watch ⌚ [blazorhosted ({tfm})] Capabilities: 'Baseline AddMethodToExistingType AddStaticFieldToExistingType AddInstanceFieldToExistingType NewTypeDefinition ChangeCustomAttributes UpdateParameters GenericUpdateMethod GenericAddMethodToExistingType GenericAddFieldToExistingType AddFieldRva'");
         }
 
-        [PlatformSpecificFact(TestPlatforms.Windows)] // https://github.com/dotnet/aspnetcore/issues/63759
+        [Fact]
         public async Task Razor_Component_ScopedCssAndStaticAssets()
         {
             var testAsset = TestAssets.CopyTestAsset("WatchRazorWithDeps")
@@ -1017,7 +1017,7 @@ public async Task Razor_Component_ScopedCssAndStaticAssets()
         /// Currently only works on Windows.
         /// Add TestPlatforms.OSX once https://github.com/dotnet/sdk/issues/45521 is fixed.
         /// </summary>
-        [PlatformSpecificFact(TestPlatforms.Windows, Skip = "https://github.com/dotnet/sdk/issues/40006")]
+        [PlatformSpecificFact(TestPlatforms.Windows)]
         public async Task MauiBlazor()
         {
             var testAsset = TestAssets.CopyTestAsset("WatchMauiBlazor")