Capture test output for tools tests

src/Tools/Shared/TestHelpers/TestConsole.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -15,12 +15,13 @@ public class TestConsole : IConsole
     {
         private event ConsoleCancelEventHandler _cancelKeyPress;
         private readonly TaskCompletionSource<bool> _cancelKeySubscribed = new TaskCompletionSource<bool>();
+        private readonly TestOutputWriter _testWriter;
 
         public TestConsole(ITestOutputHelper output)
         {
-            var writer = new TestOutputWriter(output);
-            Error = writer;
-            Out = writer;
+            _testWriter = new TestOutputWriter(output);
+            Error = _testWriter;
+            Out = _testWriter;
         }
 
         public event ConsoleCancelEventHandler CancelKeyPress
@@ -35,8 +36,8 @@ public event ConsoleCancelEventHandler CancelKeyPress
 
         public Task CancelKeyPressSubscribed => _cancelKeySubscribed.Task;
 
-        public TextWriter Error { get; set; }
-        public TextWriter Out { get; set; }
+        public TextWriter Error { get; }
+        public TextWriter Out { get; }
         public TextReader In { get; set; } = new StringReader(string.Empty);
         public bool IsInputRedirected { get; set; } = false;
         public bool IsOutputRedirected { get; } = false;
@@ -58,10 +59,21 @@ public void ResetColor()
         {
         }
 
+        public string GetOutput()
+        {
+            return _testWriter.GetOutput();
+        }
+
+        public void ClearOutput()
+        {
+            _testWriter.ClearOutput();
+        }
+
         private class TestOutputWriter : TextWriter
         {
             private readonly ITestOutputHelper _output;
             private readonly StringBuilder _sb = new StringBuilder();
+            private readonly StringBuilder _currentOutput = new StringBuilder();
 
             public TestOutputWriter(ITestOutputHelper output)
             {
@@ -83,8 +95,19 @@ public override void Write(char value)
                 else
                 {
                     _sb.Append(value);
+                    _currentOutput.Append(value);
                 }
             }
+
+            public string GetOutput()
+            {
+                return _currentOutput.ToString();
+            }
+
+            public void ClearOutput()
+            {
+                _currentOutput.Clear();
+            }
         }
     }
 }

src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs

@@ -66,7 +66,7 @@ public string Resolve(string project, string configuration)
                 _reporter.Verbose($"Invoking '{psi.FileName} {psi.Arguments}'");
 #endif
 
-                var process = Process.Start(psi);
+                using var process = Process.Start(psi);
                 process.WaitForExit();
 
                 if (process.ExitCode != 0)

src/Tools/dotnet-user-secrets/test/InitCommandTest.cs

@@ -19,19 +19,13 @@ public class InitCommandTests : IClassFixture<UserSecretsTestFixture>
         private UserSecretsTestFixture _fixture;
         private ITestOutputHelper _output;
         private TestConsole _console;
-        private StringBuilder _textOutput;
 
         public InitCommandTests(UserSecretsTestFixture fixture, ITestOutputHelper output)
         {
             _fixture = fixture;
             _output = output;
-            _textOutput = new StringBuilder();
 
-            _console = new TestConsole(output)
-            {
-                Error = new StringWriter(_textOutput),
-                Out = new StringWriter(_textOutput),
-            };
+            _console = new TestConsole(output);
         }
 
         private CommandContext MakeCommandContext() => new CommandContext(null, new TestReporter(_output), _console);