Imported Upstream version 3.10.0

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

View File

@ -83,6 +83,11 @@ namespace Microsoft.Build.Framework
get {
return message;
}
#if NET_4_0
protected set {
message = value;
}
#endif
}
public string SenderName {

View File

@ -26,12 +26,12 @@ namespace Microsoft.Build.Framework
{
}
public BuildEventContext (int nodeId, int projectInstanceId, int targetId, int projectContextId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, targetId, projectContextId, taskId)
public BuildEventContext (int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId)
: this (rnd.Next (), nodeId, projectInstanceId, projectContextId, targetId, taskId)
{
}
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int targetId, int projectContextId, int taskId)
public BuildEventContext (int submissionId, int nodeId, int projectInstanceId, int projectContextId, int targetId, int taskId)
{
SubmissionId = submissionId;
NodeId = nodeId;
@ -56,9 +56,9 @@ namespace Microsoft.Build.Framework
public int TaskId { get; private set; }
// MSDN document says "true if the references are equal, false otherwise." but that doesn't make sense.
public override bool Equals (object other)
public override bool Equals (object obj)
{
var o = other as BuildEventContext;
var o = obj as BuildEventContext;
return (object) o != null &&
o.NodeId == NodeId &&
o.ProjectContextId == ProjectContextId &&

View File

@ -32,7 +32,7 @@ using System;
namespace Microsoft.Build.Framework
{
[Serializable]
public abstract class LazyFormattedBuildEventArgs : BuildEventArgs {
public class LazyFormattedBuildEventArgs : BuildEventArgs {
string message, format;
object[] args;

View File

@ -3,8 +3,8 @@ namespace Microsoft.Build.Framework
{
public enum RegisteredTaskObjectLifetime
{
AppDomain,
Build
Build,
AppDomain
}
}
#endif