dotnet test output with color

NuGet.config

@@ -5,7 +5,7 @@
     <clear />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="vstest" value="https://dotnet.myget.org/F/vstest/auth/967ad631-d24c-4c0e-bece-922de3064956/api/v3/index.json" />
+    <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
     <add key="dotnet.myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
   </packageSources>
   <activePackageSource>

netci.groovy

@@ -17,7 +17,7 @@ def branch = GithubBranchName
         def testString = """call test.cmd -c ${configuration}"""
         def platformtestString = """call test.cmd -c ${configuration} -p platformtests"""
         def smoketestString = """call test.cmd -c ${configuration} -p smoke"""
-        def acceptancetestString = """call test.cmd -c ${configuration} -p AcceptanceTests"""
+        def acceptancetestString = """call test.cmd -c ${configuration} -p AcceptanceTests -v"""
 
         // Create a new job for windows build
         def newJob = job(newJobName) {

scripts/build.ps1

@@ -51,7 +51,6 @@ $env:TP_TOOLS_DIR = Join-Path $env:TP_ROOT_DIR "tools"
 $env:TP_PACKAGES_DIR = Join-Path $env:TP_ROOT_DIR "packages"
 $env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts"
 $env:TP_PACKAGE_PROJ_DIR = Join-Path $env:TP_ROOT_DIR "src\package"
-$env:TP_SRC_DIR = Join-Path $env:TP_ROOT_DIR "src"
 
 #
 # Dotnet configuration
@@ -539,7 +538,7 @@ function Build-SpecificProjects
     $dotnetPath = Get-DotNetPath
 
     # Get projects to build.
-    Get-ChildItem -Recurse -Path $env:TP_SRC_DIR -Include *.csproj | ForEach-Object {
+    Get-ChildItem -Recurse -Path $env:TP_ROOT_DIR -Include *.csproj | ForEach-Object {
         foreach ($ProjectNamePattern in $ProjectNamePatterns) {
             if($_.FullName -match  $ProjectNamePattern) {
                 $ProjectsToBuild += ,"$_"
@@ -560,6 +559,11 @@ function Build-SpecificProjects
         $output = & $dotnetPath build $ProjectToBuild
         PrintAndExit-OnError $output
 
+        if (-Not ($ProjectToBuild.FullName -contains "$($env:TP_ROOT_DIR)$([IO.Path]::DirectorySeparatorChar)src")) {
+            # Don't copy artifacts for non src folders.
+            continue;
+        }
+
         # Copy artifacts
         $ProjectDir = [System.IO.Path]::GetDirectoryName($ProjectToBuild)
         foreach($FrameworkAndOutDir in $FrameworksAndOutDirs) {

scripts/test.ps1

@@ -262,12 +262,12 @@ function Invoke-Test
 
                     if($fx -eq $TPT_TargetFrameworkFullCLR) {
 
-                        Write-Verbose "$vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath /logger:`"trx;LogFileName=$trxLogFileName`""
-                        & $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" /logger:"trx;LogFileName=$trxLogFileName"
+                        Write-Verbose "$vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath /logger:`"trx;LogFileName=$trxLogFileName`" $ConsoleLogger"
+                        & $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" /logger:"trx;LogFileName=$trxLogFileName" $ConsoleLogger
                     } else {
 
-                        Write-Verbose "$dotNetPath $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath /logger:`"trx;LogFileName=$trxLogFileName`""
-                        & $dotNetPath $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" /logger:"trx;LogFileName=$trxLogFileName"
+                        Write-Verbose "$dotNetPath $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath /logger:`"trx;LogFileName=$trxLogFileName`" $ConsoleLogger"
+                        & $dotNetPath $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" /logger:"trx;LogFileName=$trxLogFileName" $ConsoleLogger
                     }
 
                     Reset-TestEnvironment
@@ -334,6 +334,8 @@ Get-ChildItem env: | Where-Object -FilterScript { $_.Name.StartsWith("TP_") } |
 Write-Log "Test run configuration: "
 Get-Variable | Where-Object -FilterScript { $_.Name.StartsWith("TPT_") } | Format-Table
 
+$ConsoleLogger = if ($VerbosePreference -eq "Continue") {'/logger:"console;verbosity=normal"'} else {'/logger:"console;verbosity=minimal"'}
+
 Invoke-Test
 
 Write-Log "Test complete. {$(Get-ElapsedTime($timer))}"

src/Microsoft.TestPlatform.Build/Tasks/VSTestForwardingApp.cs

@@ -33,23 +33,15 @@ public int Execute()
                                       FileName = hostExe,
                                       Arguments = string.Join(" ", this.allArgs),
                                       UseShellExecute = false,
-                                      CreateNoWindow = true,
-                                      RedirectStandardError = true,
-                                      RedirectStandardOutput = true
                                   };
 
             Tracing.Trace("VSTest: Starting vstest.console...");
             Tracing.Trace("VSTest: Arguments: " + processInfo.FileName + " " + processInfo.Arguments);
 
             using (var activeProcess = new Process { StartInfo = processInfo })
             {
-                activeProcess.OutputDataReceived += (sender, args) => Console.WriteLine(args.Data);
-                activeProcess.ErrorDataReceived += (sender, args) => Console.WriteLine(args.Data);
-
                 activeProcess.Start();
                 this.activeProcessId = activeProcess.Id;
-                activeProcess.BeginOutputReadLine();
-                activeProcess.BeginErrorReadLine();
 
                 activeProcess.WaitForExit();
                 Tracing.Trace("VSTest: Exit code: " + activeProcess.ExitCode);

src/Microsoft.TestPlatform.CoreUtilities/Output/OutputUtilities.cs → src/Microsoft.TestPlatform.CoreUtilities/Output/OutputExtensions.cs

@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Utilities
     /// <summary>
     /// Utility Methods for sending output to IOutput.
     /// </summary>
-    public static class OutputUtilities
+    public static class OutputExtensions
     {
         private const string DefaultFormat = "{0}";
 
@@ -24,10 +24,10 @@ public static class OutputUtilities
         /// <param name="args">Arguments to format into the format string.</param>
         public static void Error(this IOutput output, string format, params object[] args)
         {
-            using (new ConsoleColorHelper(ConsoleColor.Red))
+            SetColorForAction(ConsoleColor.Red, () =>
             {
                 Output(output, OutputLevel.Error, DefaultFormat, format, args);
-            }
+            });
         }
 
         /// <summary>
@@ -38,10 +38,10 @@ public static void Error(this IOutput output, string format, params object[] arg
         /// <param name="args">Arguments to format into the format string.</param>
         public static void Warning(this IOutput output, string format, params object[] args)
         {
-            using (new ConsoleColorHelper(ConsoleColor.Yellow))
+            SetColorForAction(ConsoleColor.Yellow, () =>
             {
                 Output(output, OutputLevel.Warning, DefaultFormat, format, args);
-            }
+            });
         }
 
         /// <summary>
@@ -52,7 +52,22 @@ public static void Warning(this IOutput output, string format, params object[] a
         /// <param name="args">Arguments to format into the format string.</param>
         public static void Information(this IOutput output, string format, params object[] args)
         {
-            Output(output, OutputLevel.Information, DefaultFormat, format, args);
+           Information(output, Console.ForegroundColor, format, args);
+        }
+
+        /// <summary>
+        /// Output a informational message.
+        /// </summary>
+        /// <param name="output">Output instance the method is being invoked with.</param>
+        /// <param name="format">Format string for the informational message.</param>
+        /// <param name="foregroundColor">Color in which text prints.</param>
+        /// <param name="args">Arguments to format into the format string.</param>
+        public static void Information(this IOutput output, ConsoleColor foregroundColor, string format, params object[] args)
+        {
+            SetColorForAction(foregroundColor, () =>
+            {
+                Output(output, OutputLevel.Information, DefaultFormat, format, args);
+            });
         }
 
         /// <summary>
@@ -99,5 +114,24 @@ private static string Format(string messageTypeFormat, string format, params obj
 
             return string.Format(CultureInfo.CurrentCulture, messageTypeFormat, message);
         }
+
+        private static void SetColorForAction(ConsoleColor foregroundColor, Action action)
+        {
+            if (action == null)
+            {
+                return;
+            }
+
+            var previousForegroundColor = Console.ForegroundColor;
+            try
+            {
+                Console.ForegroundColor = foregroundColor;
+                action.Invoke();
+            }
+            finally
+            {
+                Console.ForegroundColor = previousForegroundColor;
+            }
+        }
     }
 }

src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs

@@ -17,6 +17,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger
     using Microsoft.TestPlatform.Extensions.TrxLogger.XML;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    using Microsoft.VisualStudio.TestPlatform.Utilities;
 
     using ObjectModel.Logging;
 
@@ -404,7 +405,7 @@ internal virtual void PopulateTrxFile(string trxFileName, XmlElement rootElement
                 {
                     var overwriteWarningMsg = string.Format(CultureInfo.CurrentCulture,
                         TrxLoggerResources.TrxLoggerResultsFileOverwriteWarning, trxFileName);
-                    Console.WriteLine(overwriteWarningMsg);
+                    ConsoleOutput.Instance.Warning(overwriteWarningMsg);
                     EqtTrace.Warning(overwriteWarningMsg);
                 }
 
@@ -413,12 +414,12 @@ internal virtual void PopulateTrxFile(string trxFileName, XmlElement rootElement
                     rootElement.OwnerDocument.Save(fs);
                 }
                 String resultsFileMessage = String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.TrxLoggerResultsFile, trxFileName);
-                Console.WriteLine(resultsFileMessage);
+                ConsoleOutput.Instance.Information(resultsFileMessage);
                 EqtTrace.Info(resultsFileMessage);
             }
             catch (System.UnauthorizedAccessException fileWriteException)
             {
-                Console.WriteLine(fileWriteException.Message);
+                ConsoleOutput.Instance.Error(fileWriteException.Message);
             }
         }