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

4 files changed, 52 insertions, 52 deletions

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
index 9800c6883f5..d75ac2543e4 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
@@ -168,19 +168,19 @@ namespace Microsoft.Build.BuildEngine {
 					yield return kvp.Value;
 		}
 
-		public void RemoveProperty (BuildProperty propertyToRemove)
+		public void RemoveProperty (BuildProperty property)
 		{
-			if (propertyToRemove == null)
-				throw new ArgumentNullException ("propertyToRemove");
+			if (property == null)
+				throw new ArgumentNullException ("property");
 
 			if (FromXml) {
-				if (!propertyToRemove.FromXml)
+				if (!property.FromXml)
 					throw new InvalidOperationException ("The specified property does not belong to the current property group.");
 
-				propertyToRemove.XmlElement.ParentNode.RemoveChild (propertyToRemove.XmlElement);
-				properties.Remove (propertyToRemove);
+				property.XmlElement.ParentNode.RemoveChild (property.XmlElement);
+				properties.Remove (property);
 			} else
-				propertiesByName.Remove (propertyToRemove.Name);
+				propertiesByName.Remove (property.Name);
 		}
 
 		public void RemoveProperty (string propertyName)
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
index ff6acda08f3..2e3e06f47a8 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
@@ -296,14 +296,14 @@ namespace Microsoft.Build.BuildEngine
 			return build_records.GetOrAdd (key, _ => new BuildRecord (this));
 		}
 
-		public void BuildStartedHandler (object sender, BuildStartedEventArgs args)
+		public void BuildStartedHandler (object sender, BuildStartedEventArgs e)
 		{
-			GetBuildRecord (sender).BuildStartedHandler (sender, args);
+			GetBuildRecord (sender).BuildStartedHandler (sender, e);
 		}
 		
-		public void BuildFinishedHandler (object sender, BuildFinishedEventArgs args)
+		public void BuildFinishedHandler (object sender, BuildFinishedEventArgs e)
 		{
-			GetBuildRecord (sender).BuildFinishedHandler (args);
+			GetBuildRecord (sender).BuildFinishedHandler (e);
 			((IDictionary) build_records).Remove (sender);
 		}
 		
@@ -315,47 +315,47 @@ namespace Microsoft.Build.BuildEngine
 		{
 			GetBuildRecord (sender).PopEvent (args);
 		}
-		public void ProjectStartedHandler (object sender, ProjectStartedEventArgs args)
+		public void ProjectStartedHandler (object sender, ProjectStartedEventArgs e)
 		{
-			GetBuildRecord (sender).ProjectStartedHandler (args);
+			GetBuildRecord (sender).ProjectStartedHandler (e);
 		}
-		public void ProjectFinishedHandler (object sender, ProjectFinishedEventArgs args)
+		public void ProjectFinishedHandler (object sender, ProjectFinishedEventArgs e)
 		{
-			GetBuildRecord (sender).ProjectFinishedHandler (args);
+			GetBuildRecord (sender).ProjectFinishedHandler (e);
 		}		
-		public void TargetStartedHandler (object sender, TargetStartedEventArgs args)
+		public void TargetStartedHandler (object sender, TargetStartedEventArgs e)
 		{
-			GetBuildRecord (sender).TargetStartedHandler (args);
+			GetBuildRecord (sender).TargetStartedHandler (e);
 		}
-		public void TargetFinishedHandler (object sender, TargetFinishedEventArgs args)
+		public void TargetFinishedHandler (object sender, TargetFinishedEventArgs e)
 		{
-			GetBuildRecord (sender).TargetFinishedHandler (args);
+			GetBuildRecord (sender).TargetFinishedHandler (e);
 		}
-		public void TaskStartedHandler (object sender, TaskStartedEventArgs args)
+		public void TaskStartedHandler (object sender, TaskStartedEventArgs e)
 		{
-			GetBuildRecord (sender).TaskStartedHandler (args);
+			GetBuildRecord (sender).TaskStartedHandler (e);
 		}
-		public void TaskFinishedHandler (object sender, TaskFinishedEventArgs args)
+		public void TaskFinishedHandler (object sender, TaskFinishedEventArgs e)
 		{
-			GetBuildRecord (sender).TaskFinishedHandler (args);
+			GetBuildRecord (sender).TaskFinishedHandler (e);
 		}
-		public void MessageHandler (object sender, BuildMessageEventArgs args)
+		public void MessageHandler (object sender, BuildMessageEventArgs e)
 		{
-			GetBuildRecord (sender).MessageHandler (args);
+			GetBuildRecord (sender).MessageHandler (e);
 		}
-		public void WarningHandler (object sender, BuildWarningEventArgs args)
+		public void WarningHandler (object sender, BuildWarningEventArgs e)
 		{
-			GetBuildRecord (sender).WarningHandler (args);
+			GetBuildRecord (sender).WarningHandler (e);
 		}
-		public void ErrorHandler (object sender, BuildErrorEventArgs args)
+		public void ErrorHandler (object sender, BuildErrorEventArgs e)
 		{
-			GetBuildRecord (sender).ErrorHandler (args);
+			GetBuildRecord (sender).ErrorHandler (e);
 		}
 		
 		[MonoTODO]
-		public void CustomEventHandler (object sender, CustomBuildEventArgs args)
+		public void CustomEventHandler (object sender, CustomBuildEventArgs e)
 		{
-			build_records [sender].CustomHandler (args);
+			build_records [sender].CustomHandler (e);
 		}
 
 		void SetColor (ConsoleColor color)
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
index b4ed8562382..b1e95b14c69 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@ -131,17 +131,17 @@ namespace Microsoft.Build.BuildEngine {
 		}
 
 		[MonoTODO ("Not tested")]
-		public void AddNewImport (string importLocation,
-					  string importCondition)
+		public void AddNewImport (string projectFile,
+					  string condition)
 		{
-			if (importLocation == null)
-				throw new ArgumentNullException ("importLocation");
+			if (projectFile == null)
+				throw new ArgumentNullException ("projectFile");
 
 			XmlElement importElement = xmlDocument.CreateElement ("Import", XmlNamespace);
 			xmlDocument.DocumentElement.AppendChild (importElement);
-			importElement.SetAttribute ("Project", importLocation);
-			if (!String.IsNullOrEmpty (importCondition))
-				importElement.SetAttribute ("Condition", importCondition);
+			importElement.SetAttribute ("Project", projectFile);
+			if (!String.IsNullOrEmpty (condition))
+				importElement.SetAttribute ("Condition", condition);
 
 			AddImport (importElement, null, false);
 			MarkProjectAsDirty ();
@@ -506,9 +506,9 @@ namespace Microsoft.Build.BuildEngine {
 			Load (projectFileName, ProjectLoadSettings.None);
 		}
 
-		public void Load (string projectFileName, ProjectLoadSettings settings)
+		public void Load (string projectFileName, ProjectLoadSettings projectLoadSettings)
 		{
-			project_load_settings = settings;
+			project_load_settings = projectLoadSettings;
 			if (String.IsNullOrEmpty (projectFileName))
 				throw new ArgumentNullException ("projectFileName");
 
@@ -644,7 +644,7 @@ namespace Microsoft.Build.BuildEngine {
 		
 		[MonoTODO]
 		// NOTE: does not modify imported projects
-		public void RemoveItemGroupsWithMatchingCondition (string matchingCondition)
+		public void RemoveItemGroupsWithMatchingCondition (string matchCondition)
 		{
 			throw new NotImplementedException ();
 		}
@@ -697,9 +697,9 @@ namespace Microsoft.Build.BuildEngine {
 			isDirty = false;
 		}
 
-		public void Save (TextWriter outTextWriter)
+		public void Save (TextWriter textWriter)
 		{
-			xmlDocument.Save (outTextWriter);
+			xmlDocument.Save (textWriter);
 			isDirty = false;
 		}
 
@@ -733,12 +733,12 @@ namespace Microsoft.Build.BuildEngine {
 			throw new NotImplementedException ();
 		}
 
-		public void SetProjectExtensions (string id, string xmlText)
+		public void SetProjectExtensions (string id, string content)
 		{
 			if (id == null)
 				throw new ArgumentNullException ("id");
-			if (xmlText == null)
-				throw new ArgumentNullException ("xmlText");
+			if (content == null)
+				throw new ArgumentNullException ("content");
 
 			XmlNode projectExtensions, node;
 
@@ -749,7 +749,7 @@ namespace Microsoft.Build.BuildEngine {
 				xmlDocument.DocumentElement.AppendChild (projectExtensions);
 
 				node = xmlDocument.CreateElement (id, XmlNamespace);
-				node.InnerXml = xmlText;
+				node.InnerXml = content;
 				projectExtensions.AppendChild (node);
 			} else {
 				node = xmlDocument.SelectSingleNode (String.Format ("/tns:Project/tns:ProjectExtensions/tns:{0}", id), XmlNamespaceManager);
@@ -759,7 +759,7 @@ namespace Microsoft.Build.BuildEngine {
 					projectExtensions.AppendChild (node);
 				}
 				
-				node.InnerXml = xmlText;
+				node.InnerXml = content;
 				
 			}
 
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
index dd1b9cc88c2..e4f384bceac 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
@@ -111,11 +111,11 @@ namespace Microsoft.Build.BuildEngine {
 		}
 
 		// FIXME: shouldn't we remove it from XML?
-		public void RemoveTask (BuildTask buildTask)
+		public void RemoveTask (BuildTask taskElement)
 		{
-			if (buildTask == null)
-				throw new ArgumentNullException ("buildTask");
-			buildTasks.Remove (buildTask);
+			if (taskElement == null)
+				throw new ArgumentNullException ("taskElement");
+			buildTasks.Remove (taskElement);
 		}
 
 		bool Build ()