mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use System.Console on Unix

Browse source
This commit is contained in:
Bryan 2016-02-23 11:45:57 -08:00
parent 2aedd677c6
commit 619eaa0c55
2 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs
View file

@ -8,28 +8,23 @@ namespace Microsoft.DotNet.Cli.Utils
{ {
public class AnsiConsole public class AnsiConsole
{ {
private AnsiConsole(TextWriter writer, bool useConsoleColor) private AnsiConsole(TextWriter writer)
{ {
Writer = writer; Writer = writer;
_useConsoleColor = useConsoleColor;
if (_useConsoleColor)
{
OriginalForegroundColor = Console.ForegroundColor; OriginalForegroundColor = Console.ForegroundColor;
} }
}
private int _boldRecursion; private int _boldRecursion;
private bool _useConsoleColor;
public static AnsiConsole GetOutput(bool useConsoleColor) public static AnsiConsole GetOutput()
{ {
return new AnsiConsole(Console.Out, useConsoleColor); return new AnsiConsole(Console.Out);
} }
public static AnsiConsole GetError(bool useConsoleColor) public static AnsiConsole GetError()
{ {
return new AnsiConsole(Console.Error, useConsoleColor); return new AnsiConsole(Console.Error);
} }
public TextWriter Writer { get; } public TextWriter Writer { get; }
@ -61,12 +56,6 @@ namespace Microsoft.DotNet.Cli.Utils
public void Write(string message) public void Write(string message)
{ {
if (!_useConsoleColor)
{
Writer.Write(message);
return;
}
var escapeScan = 0; var escapeScan = 0;
for (;;) for (;;)
{ {

13
src/Microsoft.DotNet.Cli.Utils/Reporter.cs
View file

@ -19,14 +19,11 @@ namespace Microsoft.DotNet.Cli.Utils
_console = console; _console = console;
} }
public static Reporter Output { get; } = Create(AnsiConsole.GetOutput); public static Reporter Output { get; } = new Reporter(AnsiConsole.GetOutput());
public static Reporter Error { get; } = Create(AnsiConsole.GetError); public static Reporter Error { get; } = new Reporter(AnsiConsole.GetError());
public static Reporter Verbose { get; } = CommandContext.IsVerbose() ? Create(AnsiConsole.GetOutput) : NullReporter; public static Reporter Verbose { get; } = CommandContext.IsVerbose() ?
new Reporter(AnsiConsole.GetOutput()) :
public static Reporter Create(Func<bool, AnsiConsole> getter) NullReporter;
{
return new Reporter(getter(PlatformServices.Default.Runtime.OperatingSystemPlatform == Platform.Windows));
}
public void WriteLine(string message) public void WriteLine(string message)
{ {