提交 907e1135 编写于 作者: K Kevin Ransom (msft) 提交者: Don Syme

Fix In IDE Build logging. (#3609)

* Fix in ide build logging.

* Fix in ide build logging.
上级 966bd7f7
......@@ -581,6 +581,9 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
override fsc.GenerateFullPathToTool() =
if toolPath = "" then raise (new System.InvalidOperationException(FSBuild.SR.toolpathUnknown()))
System.IO.Path.Combine(toolPath, fsc.ToolExe)
override fsc.LogToolCommand (message:string) =
fsc.Log.LogMessageFromText(message, MessageImportance.Normal) |>ignore
member internal fsc.InternalGenerateFullPathToTool() = fsc.GenerateFullPathToTool() // expose for unit testing
member internal fsc.BaseExecuteTool(pathToTool, responseFileCommands, commandLineCommands) = // F# does not allow protected members to be captured by lambdas, this is the standard workaround
base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands)
......
......@@ -358,7 +358,7 @@ private void BuildStartedHandler(object sender, BuildStartedEventArgs buildEvent
try
{
this.haveCachedRegistry = false;
if (LogAtImportance(MessageImportance.Low))
if (LogAtImportance(MessageImportance.Normal))
{
LogEvent(sender, buildEvent);
}
......@@ -385,7 +385,7 @@ private void BuildFinishedHandler(object sender, BuildFinishedEventArgs buildEve
{
try
{
if (LogAtImportance(buildEvent.Succeeded ? MessageImportance.Low :
if (LogAtImportance(buildEvent.Succeeded ? MessageImportance.Normal :
MessageImportance.High))
{
if (this.outputWindowPane != null)
......@@ -408,7 +408,7 @@ private void ProjectStartedHandler(object sender, ProjectStartedEventArgs buildE
{
try
{
if (LogAtImportance(MessageImportance.Low))
if (LogAtImportance(MessageImportance.Normal))
{
LogEvent(sender, buildEvent);
}
......@@ -427,7 +427,7 @@ private void ProjectFinishedHandler(object sender, ProjectFinishedEventArgs buil
{
try
{
if (LogAtImportance(buildEvent.Succeeded ? MessageImportance.Low
if (LogAtImportance(buildEvent.Succeeded ? MessageImportance.Normal
: MessageImportance.High))
{
LogEvent(sender, buildEvent);
......@@ -473,7 +473,7 @@ private void TargetFinishedHandler(object sender, TargetFinishedEventArgs buildE
{
--this.currentIndent;
if ((isLogTaskDone) &&
LogAtImportance(buildEvent.Succeeded ? MessageImportance.Low
LogAtImportance(buildEvent.Succeeded ? MessageImportance.Normal
: MessageImportance.High))
{
LogEvent(sender, buildEvent);
......@@ -572,9 +572,10 @@ private bool LogAtImportance(MessageImportance importance)
logIt = (importance == MessageImportance.High);
break;
case LoggerVerbosity.Normal:
// Falling through...
logIt = (importance == MessageImportance.Normal) || (importance == MessageImportance.High);
break;
case LoggerVerbosity.Detailed:
logIt = (importance != MessageImportance.Low);
logIt = (importance == MessageImportance.Low) || (importance == MessageImportance.Normal) || (importance == MessageImportance.High);
break;
case LoggerVerbosity.Diagnostic:
logIt = true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册