Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -45,9 +45,9 @@ namespace Microsoft.Build.Construction
get { return Line == 0 ? File : String.Format ("{0} ({1}{2})", File, Line, Column != 0 ? "," + Column : String.Empty); }
}
public override bool Equals (object other)
public override bool Equals (object obj)
{
var o = other as ElementLocation;
var o = obj as ElementLocation;
return (object) o != null && o.File == File && o.Line == Line && o.Column == Column;
}

View File

@@ -79,27 +79,27 @@ namespace Microsoft.Build.Evaluation
+ "{data.Items.Count} #Targets={data.Targets.Count}")]
public class Project
{
public Project (XmlReader xml)
: this (ProjectRootElement.Create (xml))
public Project (XmlReader xmlReader)
: this (ProjectRootElement.Create (xmlReader))
{
}
public Project (XmlReader xml, IDictionary<string, string> globalProperties,
public Project (XmlReader xmlReader, IDictionary<string, string> globalProperties,
string toolsVersion)
: this (ProjectRootElement.Create (xml), globalProperties, toolsVersion)
: this (ProjectRootElement.Create (xmlReader), globalProperties, toolsVersion)
{
}
public Project (XmlReader xml, IDictionary<string, string> globalProperties,
public Project (XmlReader xmlReader, IDictionary<string, string> globalProperties,
string toolsVersion, ProjectCollection projectCollection)
: this (ProjectRootElement.Create (xml), globalProperties, toolsVersion, projectCollection)
: this (ProjectRootElement.Create (xmlReader), globalProperties, toolsVersion, projectCollection)
{
}
public Project (XmlReader xml, IDictionary<string, string> globalProperties,
public Project (XmlReader xmlReader, IDictionary<string, string> globalProperties,
string toolsVersion, ProjectCollection projectCollection,
ProjectLoadSettings loadSettings)
: this (ProjectRootElement.Create (xml), globalProperties, toolsVersion, projectCollection, loadSettings)
: this (ProjectRootElement.Create (xmlReader), globalProperties, toolsVersion, projectCollection, loadSettings)
{
}

View File

@@ -49,15 +49,15 @@ namespace Microsoft.Build.Evaluation
{
public class ProjectCollection : IDisposable
{
public delegate void ProjectAddedEventHandler (object target, ProjectAddedToProjectCollectionEventArgs args);
public delegate void ProjectAddedEventHandler (object sender, ProjectAddedToProjectCollectionEventArgs e);
public class ProjectAddedToProjectCollectionEventArgs : EventArgs
{
public ProjectAddedToProjectCollectionEventArgs (ProjectRootElement project)
public ProjectAddedToProjectCollectionEventArgs (ProjectRootElement element)
{
if (project == null)
if (element == null)
throw new ArgumentNullException ("project");
ProjectRootElement = project;
ProjectRootElement = element;
}
public ProjectRootElement ProjectRootElement { get; private set; }
@@ -98,8 +98,8 @@ namespace Microsoft.Build.Evaluation
{
}
public ProjectCollection (ToolsetDefinitionLocations toolsetDefinitionLocations)
: this (null, null, toolsetDefinitionLocations)
public ProjectCollection (ToolsetDefinitionLocations toolsetLocations)
: this (null, null, toolsetLocations)
{
}