a bit of rework

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/RemoveResourceDesignerStep.cs

@@ -40,7 +40,6 @@ protected override void Process ()
 
 		protected override void EndProcess ()
 		{
-			Context.LogMessage ($"  End Process Called.");
 			if (mainDesigner != null) {
 				Context.LogMessage ($"  Setting Action on {mainAssembly.Name} to Save.");
 				Annotations.SetAction (mainAssembly, AssemblyAction.Save);
@@ -63,7 +62,7 @@ bool FindResourceDesigner (AssemblyDefinition assembly, bool mainApplication, ou
 						{
 							if (p.Name == "IsApplication" && (bool)p.Argument.Value == (mainApplication ? mainApplication : (bool)p.Argument.Value))
 							{
-								designerFullName = attribute.ConstructorArguments[0].Value.ToString();
+								designerFullName = attribute.ConstructorArguments[0].Value.ToString ();
 								break;
 							}
 						}
@@ -89,7 +88,7 @@ bool FindResourceDesigner (AssemblyDefinition assembly, bool mainApplication, ou
 			return false;
 		}
 
-		Dictionary<string, int> BuildResourceDesignerFieldLookup(TypeDefinition type)
+		Dictionary<string, int> BuildResourceDesignerFieldLookup (TypeDefinition type)
 		{
 			var output = new Dictionary<string, int> ();
 			foreach (TypeDefinition definition in type.NestedTypes)
@@ -104,7 +103,7 @@ Dictionary<string, int> BuildResourceDesignerFieldLookup(TypeDefinition type)
 			return output;
 		}
 
-		void RemoveDesigner(TypeDefinition designer)
+		void ClearDesignerClass (TypeDefinition designer)
 		{
 			Context.LogMessage ($"    TryRemoving {designer.FullName}");
 			designer.NestedTypes.Clear ();
@@ -120,7 +119,7 @@ void RemoveDesigner(TypeDefinition designer)
 		void FixBody (MethodBody body, TypeDefinition localDesigner)
 		{
 			Dictionary<Instruction, int> instructions = new Dictionary<Instruction, int>();
-			var processor = body.GetILProcessor();
+			var processor = body.GetILProcessor ();
 			string designerFullName = $"{localDesigner.FullName}/";
 			foreach (var i in body.Instructions)
 			{
@@ -131,7 +130,7 @@ void FixBody (MethodBody body, TypeDefinition localDesigner)
 					if (match.Success && match.Groups.Count == 5) {
 						string key = match.Groups[4].Value.Replace (designerFullName, string.Empty);
 						if (designerConstants.ContainsKey (key) && !instructions.ContainsKey (i))
-							instructions.Add(i, designerConstants[key]);
+							instructions.Add(i, designerConstants [key]);
 					}
 				}
 			}
@@ -146,28 +145,28 @@ void FixBody (MethodBody body, TypeDefinition localDesigner)
 			}
 		}
 
-		void ProcessTypeR (TypeDefinition type, TypeDefinition localDesigner)
+		void FixType (TypeDefinition type, TypeDefinition localDesigner)
 		{
 			foreach (MethodDefinition method in type.Methods)
 			{
 				if (!method.HasBody)
 					continue;
-				FixBody(method.Body, localDesigner);
+				FixBody (method.Body, localDesigner);
 			}
 			foreach (PropertyDefinition property in type.Properties)
 			{
 				if (property.GetMethod != null && property.GetMethod.HasBody)
 				{
-					FixBody(property.GetMethod.Body, localDesigner);
+					FixBody (property.GetMethod.Body, localDesigner);
 				}
 				if (property.SetMethod != null && property.SetMethod.HasBody)
 				{
-					FixBody(property.SetMethod.Body, localDesigner);
+					FixBody (property.SetMethod.Body, localDesigner);
 				}
 			}
 			foreach (TypeDefinition nestedType in type.NestedTypes)
 			{
-				ProcessTypeR(nestedType, localDesigner);
+				FixType (nestedType, localDesigner);
 			}
 		}
 
@@ -200,10 +199,10 @@ protected override void ProcessAssembly (AssemblyDefinition assembly)
 				foreach (var type in mod.Types) {
 					if (type == localDesigner)
 						continue;
-					ProcessTypeR (type, localDesigner);
+					FixType (type, localDesigner);
 				}
 			}
-			RemoveDesigner (localDesigner);
+			ClearDesignerClass (localDesigner);
 			if (designerAttribute != null) {
 				assembly.CustomAttributes.Remove (designerAttribute);
 			}