mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/Logger.cs
View File

@@ -112,9 +112,9 @@ namespace Microsoft.Build.Utilities
}
[MonoTODO]
public bool IsVerbosityAtLeast (LoggerVerbosity verbosity)
public bool IsVerbosityAtLeast (LoggerVerbosity checkVerbosity)
{
return (this.verbosity >= verbosity) ? true : false;
return this.verbosity >= checkVerbosity;
}
}
}

42
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TaskLoggingHelper.cs
View File

@@ -127,31 +127,31 @@ namespace Microsoft.Build.Utilities
hasLoggedErrors = true;
}
public void LogErrorFromException (Exception e)
public void LogErrorFromException (Exception exception)
{
LogErrorFromException (e, true);
LogErrorFromException (exception, true);
}
public void LogErrorFromException (Exception e,
public void LogErrorFromException (Exception exception,
bool showStackTrace)
{
LogErrorFromException (e, showStackTrace, true, String.Empty);
LogErrorFromException (exception, showStackTrace, true, String.Empty);
}
[MonoTODO ("Arguments @showDetail and @file are not honored")]
public void LogErrorFromException (Exception e,
public void LogErrorFromException (Exception exception,
bool showStackTrace, bool showDetail, string file)
{
if (e == null)
throw new ArgumentNullException ("e");
if (exception == null)
throw new ArgumentNullException ("exception");
StringBuilder sb = new StringBuilder ();
sb.Append (e.Message);
sb.Append (exception.Message);
if (showStackTrace == true)
sb.Append (e.StackTrace);
sb.Append (exception.StackTrace);
BuildErrorEventArgs beea = new BuildErrorEventArgs (
null, null, buildEngine.ProjectFileOfTaskNode, 0, 0, 0, 0, sb.ToString (),
e.HelpLink, e.Source);
exception.HelpLink, exception.Source);
buildEngine.LogErrorEvent (beea);
hasLoggedErrors = true;
}
@@ -239,16 +239,16 @@ namespace Microsoft.Build.Utilities
messageResourceName), messageArgs);
}
public bool LogMessagesFromFile (string filename)
public bool LogMessagesFromFile (string fileName)
{
return LogMessagesFromFile (filename, MessageImportance.Normal);
return LogMessagesFromFile (fileName, MessageImportance.Normal);
}
public bool LogMessagesFromFile (string filename,
public bool LogMessagesFromFile (string fileName,
MessageImportance messageImportance)
{
try {
StreamReader sr = new StreamReader (filename);
StreamReader sr = new StreamReader (fileName);
LogMessage (messageImportance, sr.ReadToEnd (),
null);
sr.Close ();
@@ -276,14 +276,14 @@ namespace Microsoft.Build.Utilities
}
public bool LogMessageFromText (string lineOfText,
MessageImportance importance)
MessageImportance messageImportance)
{
if (lineOfText == null)
throw new ArgumentNullException ("lineOfText");
BuildMessageEventArgs bmea = new BuildMessageEventArgs (
lineOfText, helpKeywordPrefix,
null, importance);
null, messageImportance);
buildEngine.LogMessageEvent (bmea);
return true;
@@ -313,18 +313,18 @@ namespace Microsoft.Build.Utilities
buildEngine.LogWarningEvent (bwea);
}
public void LogWarningFromException (Exception e)
public void LogWarningFromException (Exception exception)
{
LogWarningFromException (e, false);
LogWarningFromException (exception, false);
}
public void LogWarningFromException (Exception e,
public void LogWarningFromException (Exception exception,
bool showStackTrace)
{
StringBuilder sb = new StringBuilder ();
sb.Append (e.Message);
sb.Append (exception.Message);
if (showStackTrace)
sb.Append (e.StackTrace);
sb.Append (exception.StackTrace);
LogWarning (null, null, null, null, 0, 0, 0, 0,
sb.ToString (), null);
}

8
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
View File

@@ -233,10 +233,10 @@ namespace Microsoft.Build.Utilities
}
}
protected virtual void LogEventsFromTextOutput (string singleLine, MessageImportance importance)
protected virtual void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
if (singleLine.Length == 0) {
Log.LogMessage (singleLine, importance);
Log.LogMessage (singleLine, messageImportance);
return;
}
@@ -254,7 +254,7 @@ namespace Microsoft.Build.Utilities
var result = MSBuildErrorParser.TryParseLine (singleLine);
if (result == null) {
Log.LogMessage (importance, singleLine);
Log.LogMessage (messageImportance, singleLine);
return;
}
@@ -304,7 +304,7 @@ namespace Microsoft.Build.Utilities
return String.Format ("@{0}", responseFilePath);
}
protected virtual ProcessStartInfo GetProcessStartInfo (string pathToTool, string commandLineCommands, string responseFileSwitch)
protected ProcessStartInfo GetProcessStartInfo (string pathToTool, string commandLineCommands, string responseFileSwitch)
{
var pinfo = new ProcessStartInfo (pathToTool, String.Format ("{0} {1}", commandLineCommands, responseFileSwitch));