[xharness] Incorporate MacTarget into MacUnifiedTarget.

Since there's no MacClassicTarget anymore, we don't need the intermediate
class.

tests/xharness/Harness.cs

@@ -434,7 +434,7 @@ namespace xharness
 			var unified_targets = new List<MacUnifiedTarget> ();
 			var hardcoded_unified_targets = new List<MacUnifiedTarget> ();
 
-			Action<MacTarget, string, bool> configureTarget = (MacTarget target, string file, bool isNUnitProject) => {
+			Action<MacUnifiedTarget, string, bool> configureTarget = (MacUnifiedTarget target, string file, bool isNUnitProject) => {
 				target.TemplateProjectPath = file;
 				target.Harness = this;
 				target.IsNUnitProject = isNUnitProject;

tests/xharness/MacTarget.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace xharness
-{
-	public class MacTarget : Target
-	{
-		public MonoNativeInfo MonoNativeInfo { get; set; }
-
-		protected override bool FixProjectReference (string name)
-		{
-			switch (name) {
-			case "GuiUnit_NET_4_5":
-				return false;
-			default:
-				return base.FixProjectReference (name);
-			}
-		}
-		public string SimplifiedName {
-			get {
-				return Name.EndsWith ("-mac", StringComparison.Ordinal) ? Name.Substring (0, Name.Length - 4) : Name;
-			}
-		}
-	}
-}
-

tests/xharness/MacUnifiedTarget.cs

@@ -7,7 +7,7 @@ using Xamarin;
 
 namespace xharness
 {
-	public class MacUnifiedTarget : MacTarget
+	public class MacUnifiedTarget : Target
 	{
 		public bool Mobile { get; private set; }
 		public bool System { get; set; }
@@ -116,6 +116,24 @@ namespace xharness
 				return "mac";
 			}
 		}
+		
+		public MonoNativeInfo MonoNativeInfo { get; set; }
+
+		protected override bool FixProjectReference (string name)
+		{
+			switch (name) {
+			case "GuiUnit_NET_4_5":
+				return false;
+			default:
+				return base.FixProjectReference (name);
+			}
+		}
+
+		public string SimplifiedName {
+			get {
+				return Name.EndsWith ("-mac", StringComparison.Ordinal) ? Name.Substring (0, Name.Length - 4) : Name;
+			}
+		}
 
 		public override string DefaultAssemblyReference { get { return "Xamarin.Mac"; } }
 

tests/xharness/xharness.csproj

@@ -93,7 +93,6 @@
     <Compile Include="MakefileGenerator.cs" />
     <Compile Include="SolutionGenerator.cs" />
     <Compile Include="MacUnifiedTarget.cs" />
-    <Compile Include="MacTarget.cs" />
     <Compile Include="SimpleHttpListener.cs" />
     <Compile Include="SimpleListener.cs" />
     <Compile Include="Jenkins.cs" />