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

Add WorkingDirectory to output when a command fails for easier debugging.

Browse source
This commit is contained in:
Eric Erhardt 2016-05-26 15:00:54 -05:00
parent 369ec935c7
commit 409ccb2c9c
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs
View file

@ -147,7 +147,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework
} }
return this; return this;
} }
public Command Environment(string key, string value) public Command Environment(string key, string value)
{ {
_process.StartInfo.Environment[key] = value; _process.StartInfo.Environment[key] = value;
@ -293,21 +293,25 @@ namespace Microsoft.DotNet.Cli.Build.Framework
return this; return this;
} }
private string FormatProcessInfo(ProcessStartInfo info) private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirectory)
{ {
string prefix = includeWorkingDirectory ?
$"{info.WorkingDirectory}> {info.FileName}" :
info.FileName;
if (string.IsNullOrWhiteSpace(info.Arguments)) if (string.IsNullOrWhiteSpace(info.Arguments))
{ {
return info.FileName; return prefix;
} }
return info.FileName + " " + info.Arguments; return prefix + " " + info.Arguments;
} }
private void ReportExecBegin() private void ReportExecBegin()
{ {
if (!_quietBuildReporter) if (!_quietBuildReporter)
{ {
BuildReporter.BeginSection("EXEC", FormatProcessInfo(_process.StartInfo)); BuildReporter.BeginSection("EXEC", FormatProcessInfo(_process.StartInfo, includeWorkingDirectory: false));
} }
} }
@ -315,15 +319,14 @@ namespace Microsoft.DotNet.Cli.Build.Framework
{ {
if (!_quietBuildReporter) if (!_quietBuildReporter)
{ {
var message = $"{FormatProcessInfo(_process.StartInfo)} exited with {exitCode}"; bool success = exitCode == 0;
if (exitCode == 0)
{ var message = $"{FormatProcessInfo(_process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}";
BuildReporter.EndSection("EXEC", message.Green(), success: true);
} BuildReporter.EndSection(
else "EXEC",
{ success ? message.Green() : message.Red().Bold(),
BuildReporter.EndSection("EXEC", message.Red().Bold(), success: false); success);
}
} }
} }