Add output forwarding for .NET (#4988)

* Add output forwarding for .NET

* Fix tests

Author: nohwnd

src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs

@@ -409,8 +409,10 @@ public bool TryGetDotnetPathByArchitecture(
             using var headerReader = _fileHelper.GetStream(path, FileMode.Open, FileAccess.Read);
             var magicBytes = new byte[4];
             var cpuInfoBytes = new byte[4];
+#pragma warning disable CA2022 // Avoid inexact read with 'Stream.Read'
             headerReader.Read(magicBytes, 0, magicBytes.Length);
             headerReader.Read(cpuInfoBytes, 0, cpuInfoBytes.Length);
+#pragma warning restore CA2022 // Avoid inexact read with 'Stream.Read'
 
             var magic = BitConverter.ToUInt32(magicBytes, 0);
             var cpuInfo = BitConverter.ToUInt32(cpuInfoBytes, 0);

src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs

@@ -67,7 +67,7 @@ public class DefaultTestHostManager : ITestRuntimeProvider2
     private StringBuilder? _testHostProcessStdOut;
     private IMessageLogger? _messageLogger;
     private bool _hostExitedEventRaised;
-    private TestHostManagerCallbacks? _testhostManagerCallbacks;
+    private TestHostManagerCallbacks? _testHostManagerCallbacks;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DefaultTestHostManager"/> class.
@@ -124,7 +124,7 @@ internal DefaultTestHostManager(
     private Action<object?> ExitCallBack => process =>
     {
         TPDebug.Assert(_testHostProcessStdError is not null, "LaunchTestHostAsync must have been called before ExitCallBack");
-        TPDebug.Assert(_testhostManagerCallbacks is not null, "Initialize must have been called before ExitCallBack");
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before ExitCallBack");
         TestHostManagerCallbacks.ExitCallBack(_processHelper, process, _testHostProcessStdError, OnHostExited);
     };
 
@@ -134,18 +134,18 @@ internal DefaultTestHostManager(
     private Action<object?, string?> ErrorReceivedCallback => (process, data) =>
     {
         TPDebug.Assert(_testHostProcessStdError is not null, "LaunchTestHostAsync must have been called before ErrorReceivedCallback");
-        TPDebug.Assert(_testhostManagerCallbacks is not null, "Initialize must have been called before ErrorReceivedCallback");
-        _testhostManagerCallbacks.ErrorReceivedCallback(_testHostProcessStdError, data);
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before ErrorReceivedCallback");
+        _testHostManagerCallbacks.ErrorReceivedCallback(_testHostProcessStdError, data);
     };
 
     /// <summary>
-    /// Gets callback to read from process error stream
+    /// Gets callback to read from process standard stream
     /// </summary>
     private Action<object?, string?> OutputReceivedCallback => (process, data) =>
     {
         TPDebug.Assert(_testHostProcessStdOut is not null, "LaunchTestHostAsync must have been called before OutputReceivedCallback");
-        TPDebug.Assert(_testhostManagerCallbacks is not null, "Initialize must have been called before OutputReceivedCallback");
-        _testhostManagerCallbacks.StandardOutputReceivedCallback(_testHostProcessStdOut, data);
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before OutputReceivedCallback");
+        _testHostManagerCallbacks.StandardOutputReceivedCallback(_testHostProcessStdOut, data);
     };
 
     /// <inheritdoc/>
@@ -371,7 +371,7 @@ public void Initialize(IMessageLogger? logger, string runsettingsXml)
         var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
 
         _messageLogger = logger;
-        _testhostManagerCallbacks = new TestHostManagerCallbacks(_environmentVariableHelper.GetEnvironmentVariable("VSTEST_EXPERIMENTAL_FORWARD_OUTPUT_FEATURE") == "1", logger);
+        _testHostManagerCallbacks = new TestHostManagerCallbacks(_environmentVariableHelper.GetEnvironmentVariable("VSTEST_EXPERIMENTAL_FORWARD_OUTPUT_FEATURE") == "1", logger);
         _architecture = runConfiguration.TargetPlatform;
         _targetFramework = runConfiguration.TargetFramework;
         _testHostProcess = null;

src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs

@@ -67,13 +67,16 @@ public class DotnetTestHostManager : ITestRuntimeProvider2
     private ITestHostLauncher? _customTestHostLauncher;
     private Process? _testHostProcess;
     private StringBuilder? _testHostProcessStdError;
+    private StringBuilder? _testHostProcessStdOut;
     private bool _hostExitedEventRaised;
     private string _hostPackageVersion = "15.0.0";
     private Architecture _architecture;
     private Framework? _targetFramework;
     private bool _isVersionCheckRequired = true;
     private string? _dotnetHostPath;
 
+    private protected TestHostManagerCallbacks? _testHostManagerCallbacks;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="DotnetTestHostManager"/> class.
     /// </summary>
@@ -169,13 +172,25 @@ private set
     private Action<object?, string?> ErrorReceivedCallback => (process, data) =>
     {
         TPDebug.Assert(_testHostProcessStdError is not null, "_testHostProcessStdError is null");
-        new TestHostManagerCallbacks(false, null).ErrorReceivedCallback(_testHostProcessStdError, data);
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before ExitCallBack");
+        _testHostManagerCallbacks.ErrorReceivedCallback(_testHostProcessStdError, data);
+    };
+
+    /// <summary>
+    /// Gets callback to read from process standard stream
+    /// </summary>
+    private Action<object?, string?> OutputReceivedCallback => (process, data) =>
+    {
+        TPDebug.Assert(_testHostProcessStdOut is not null, "LaunchTestHostAsync must have been called before OutputReceivedCallback");
+        TPDebug.Assert(_testHostManagerCallbacks is not null, "Initialize must have been called before OutputReceivedCallback");
+        _testHostManagerCallbacks.StandardOutputReceivedCallback(_testHostProcessStdOut, data);
     };
 
     /// <inheritdoc/>
     public void Initialize(IMessageLogger? logger, string runsettingsXml)
     {
         _hostExitedEventRaised = false;
+        _testHostManagerCallbacks = new TestHostManagerCallbacks(_environmentVariableHelper.GetEnvironmentVariable("VSTEST_EXPERIMENTAL_FORWARD_OUTPUT_FEATURE") == "1", logger);
 
         var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(runsettingsXml);
         _architecture = runConfiguration.TargetPlatform;
@@ -706,6 +721,7 @@ private void OnHostExited(HostProviderEventArgs e)
     private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToken cancellationToken)
     {
         _testHostProcessStdError = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
+        _testHostProcessStdOut = new StringBuilder(0, CoreUtilities.Constants.StandardErrorMaxLength);
 
         // We launch the test host process here if we're on the normal test running workflow.
         // If we're debugging and we have access to the newest version of the testhost launcher
@@ -729,7 +745,7 @@ private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToke
                 testHostStartInfo.EnvironmentVariables,
                 ErrorReceivedCallback,
                 ExitCallBack,
-                null) as Process;
+                OutputReceivedCallback) as Process;
         }
         else
         {

test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs

@@ -21,6 +21,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -357,6 +358,8 @@ public void SetupChannelForDotnetHostManagerWithIsVersionCheckRequiredFalseShoul
     {
         SetUpMocksForDotNetTestHost();
         var testHostManager = new TestableDotnetTestHostManager(false, _mockProcessHelper.Object, _mockFileHelper.Object, _mockEnvironment.Object, _mockRunsettingHelper.Object, _mockWindowsRegistry.Object, _mockEnvironmentVariableHelper.Object);
+        testHostManager.Initialize(new NullMessageLogger(), DefaultRunSettings);
+
         var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, testHostManager);
 
         operationManager.SetupChannel(Enumerable.Empty<string>(), DefaultRunSettings);
@@ -369,6 +372,7 @@ public void SetupChannelForDotnetHostManagerWithIsVersionCheckRequiredTrueShould
     {
         SetUpMocksForDotNetTestHost();
         var testHostManager = new TestableDotnetTestHostManager(true, _mockProcessHelper.Object, _mockFileHelper.Object, _mockEnvironment.Object, _mockRunsettingHelper.Object, _mockWindowsRegistry.Object, _mockEnvironmentVariableHelper.Object);
+        testHostManager.Initialize(new NullMessageLogger(), DefaultRunSettings);
         var operationManager = new TestableProxyOperationManager(_mockRequestData.Object, _mockRequestSender.Object, testHostManager);
 
         operationManager.SetupChannel(Enumerable.Empty<string>(), DefaultRunSettings);
@@ -587,3 +591,10 @@ public override TestProcessStartInfo GetTestHostProcessStartInfo(
         }
     }
 }
+
+internal class NullMessageLogger : IMessageLogger
+{
+    public void SendMessage(TestMessageLevel testMessageLevel, string message)
+    {
+    }
+}