Fix stdout suppression in dotnet watch with --no-hot-reload (#52836)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: tmat <41759+tmat@users.noreply.github.com>

Fix

Author: Copilot

src/Dotnet.Watch/dotnet-watch/Watch/DotNetWatcher.cs

@@ -58,7 +58,8 @@ public static async Task WatchAsync(DotNetWatchContext context, CancellationToke
                     {
                         [EnvironmentVariables.Names.DotnetWatch] = "1",
                         [EnvironmentVariables.Names.DotnetWatchIteration] = (iteration + 1).ToString(CultureInfo.InvariantCulture),
-                    }
+                    },
+                    OnOutput = line => context.ProcessOutputReporter.ReportOutput(line)
                 };
 
                 var browserRefreshServer = projectRootNode != null && HotReloadAppModel.InferFromProject(context, projectRootNode) is WebApplicationAppModel webAppModel

test/ArgumentForwarding.Tests/ArgumentForwardingTests.cs

@@ -250,7 +250,7 @@ private string[] RawEvaluateArgumentString(string testUserArgument)
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = TestContext.Current.ToolsetUnderTest.DotNetHostPath,
+                    FileName = SdkTestContext.Current.ToolsetUnderTest.DotNetHostPath,
                     Arguments = $"{ReflectorPath} {testUserArgument}",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,

test/Common/Program.cs

@@ -68,7 +68,7 @@ private static int ShowSdkInfo()
     {
         var log = new StringTestLogger();
         var command = new DotnetCommand(log, "--info");
-        var testDirectory = TestDirectory.Create(Path.Combine(TestContext.Current.TestExecutionDirectory, "sdkinfo"));
+        var testDirectory = TestDirectory.Create(Path.Combine(SdkTestContext.Current.TestExecutionDirectory, "sdkinfo"));
 
         command.WorkingDirectory = testDirectory.Path;
 

test/EndToEnd.Tests/GivenDotNetUsesMSBuild.cs

@@ -59,7 +59,7 @@ public void ItCanRunToolsInACSProj()
                     project.Root.Add(itemGroup);
                 });
 
-            NuGetConfigWriter.Write(testInstance.Path, TestContext.Current.TestPackages);
+            NuGetConfigWriter.Write(testInstance.Path, SdkTestContext.Current.TestPackages);
 
             new RestoreCommand(testInstance)
                 .Execute()
@@ -93,7 +93,7 @@ public void ItCanRunToolsThatPrefersTheCliRuntimeEvenWhenTheToolItselfDeclaresAD
                     project.Root.Add(itemGroup);
                 });
 
-            NuGetConfigWriter.Write(testInstance.Path, TestContext.Current.TestPackages);
+            NuGetConfigWriter.Write(testInstance.Path, SdkTestContext.Current.TestPackages);
 
             new RestoreCommand(testInstance)
                 .Execute()

test/EndToEnd.Tests/ProjectBuildTests.cs

@@ -402,7 +402,7 @@ public void ItCanCreateAndBuildTemplatesWithDefaultFramework_DisableBuildOnLinux
 
         private static string DetectExpectedDefaultFramework(string template = "")
         {
-            string dotnetFolder = Path.GetDirectoryName(TestContext.Current.ToolsetUnderTest.DotNetHostPath);
+            string dotnetFolder = Path.GetDirectoryName(SdkTestContext.Current.ToolsetUnderTest.DotNetHostPath);
             string[] runtimeFolders = Directory.GetDirectories(Path.Combine(dotnetFolder, "shared", "Microsoft.NETCore.App"));
             int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max();
             if (latestMajorVersion == 10)
@@ -468,7 +468,7 @@ XDocument GetProjectXml()
                     $"/bl:{templateName}-{(selfContained ? "selfcontained" : "fdd")}-{language}-{framework}-{{}}.binlog"
                 ];
 
-                string dotnetRoot = Path.GetDirectoryName(TestContext.Current.ToolsetUnderTest.DotNetHostPath);
+                string dotnetRoot = Path.GetDirectoryName(SdkTestContext.Current.ToolsetUnderTest.DotNetHostPath);
                 new DotnetBuildCommand(Log, projectDirectory)
                      .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet
                      .WithWorkingDirectory(projectDirectory)

test/EndToEnd.Tests/ValidateInsertedManifests.cs

@@ -12,7 +12,7 @@ public class ValidateInsertedManifests(ITestOutputHelper log) : SdkTest(log)
         [Fact]
         public void ManifestReaderCanReadManifests()
         {
-            var sdkManifestDir = Path.Combine(Path.GetDirectoryName(TestContext.Current.ToolsetUnderTest.DotNetHostPath), "sdk-manifests");
+            var sdkManifestDir = Path.Combine(Path.GetDirectoryName(SdkTestContext.Current.ToolsetUnderTest.DotNetHostPath), "sdk-manifests");
             var sdkversionDir = new DirectoryInfo(sdkManifestDir).EnumerateDirectories().First();
             foreach (var manifestVersionDir in sdkversionDir.EnumerateDirectories())
             {

test/EndToEnd.Tests/VersionTests.cs

@@ -13,7 +13,7 @@ public void DotnetVersionReturnsCorrectVersion()
             var result = new DotnetCommand(Log).Execute("--version");
             result.Should().Pass();
 
-            var dotnetFolder = Path.GetDirectoryName(TestContext.Current.ToolsetUnderTest.DotNetHostPath);
+            var dotnetFolder = Path.GetDirectoryName(SdkTestContext.Current.ToolsetUnderTest.DotNetHostPath);
             var sdkFolders = Directory.GetDirectories(Path.Combine(dotnetFolder, "sdk"));
             sdkFolders.Length.Should().Be(1, "Only one SDK folder is expected in the layout");
 

test/Microsoft.DotNet.HotReload.Test.Utilities/WatchableApp.cs

@@ -19,7 +19,7 @@ internal sealed class WatchableApp(
         : IAsyncDisposable
     {
         public static WatchableApp CreateDotnetWatchApp(ITestOutputHelper logger)
-            => new(logger, TestContext.Current.ToolsetUnderTest.DotNetHostPath, "watch", ["-bl"]);
+            => new(logger, SdkTestContext.Current.ToolsetUnderTest.DotNetHostPath, "watch", ["-bl"]);
 
         public DebugTestOutputLogger Logger { get; } = new DebugTestOutputLogger(logger);
 
@@ -217,7 +217,7 @@ public ProcessStartInfo GetProcessStartInfo(string workingDirectory, string test
                 info.Environment[name] = value;
             }
 
-            TestContext.Current.AddTestEnvironmentVariables(info.Environment);
+            SdkTestContext.Current.AddTestEnvironmentVariables(info.Environment);
 
             return info;
         }

test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireLauncherTests.cs

@@ -17,14 +17,14 @@ private WatchableApp CreateHostApp()
             Logger,
             executablePath: Path.ChangeExtension(typeof(AspireLauncher).Assembly.Location, PathUtilities.ExecutableExtension).TrimEnd('.'),
             commandName: "host",
-            commandArguments: ["--sdk", TestContext.Current.ToolsetUnderTest.SdkFolderUnderTest]);
+            commandArguments: ["--sdk", SdkTestContext.Current.ToolsetUnderTest.SdkFolderUnderTest]);
 
     private WatchableApp CreateServerApp(string serverPipe)
         => new(
             Logger,
             executablePath: Path.ChangeExtension(typeof(AspireLauncher).Assembly.Location, PathUtilities.ExecutableExtension).TrimEnd('.'),
             commandName: "server",
-            commandArguments: ["--sdk", TestContext.Current.ToolsetUnderTest.SdkFolderUnderTest, "--server", serverPipe]);
+            commandArguments: ["--sdk", SdkTestContext.Current.ToolsetUnderTest.SdkFolderUnderTest, "--server", serverPipe]);
 
     private WatchableApp CreateResourceApp(string serverPipe)
         => new(

test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs

@@ -100,7 +100,7 @@ public string GetIdentifier() {
 
         public string CreateTestTool(ITestOutputHelper log, TestToolSettings toolSettings, bool collectBinlogs = true)
         {
-            var targetDirectory = Path.Combine(TestContext.Current.TestExecutionDirectory, "TestTools", toolSettings.GetIdentifier());
+            var targetDirectory = Path.Combine(SdkTestContext.Current.TestExecutionDirectory, "TestTools", toolSettings.GetIdentifier());
 
             var testProject = new TestProject(toolSettings.ToolPackageId)
             {