[Microsoft.Build] Rename method parameters to match .NET contract

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs
index 271029897218c81eb9d1a562cac5a734fa1c0c77..794d33e0fc7a8b2424455d3bc9e0ca8c2904eacd 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs
@@ -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;
                }
 

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
index 4189bf8b2f108f19b8086e5a8fa52423e329419a..e4263aa9de1c6ba6bc994e8facf7998cf05d02b1 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
@@ -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)
                {
                }
 

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
index 01a66207142e41dec4ebf2fd0b1fa8710341147b..21df964a75ad4c13a065c2ea747d182d50889a0e 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
@@ -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)
                {
                }