diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs index a016349b17..71cb4329d6 100644 --- a/tests/xharness/Harness.cs +++ b/tests/xharness/Harness.cs @@ -434,7 +434,7 @@ namespace xharness var unified_targets = new List (); var hardcoded_unified_targets = new List (); - Action configureTarget = (MacTarget target, string file, bool isNUnitProject) => { + Action configureTarget = (MacUnifiedTarget target, string file, bool isNUnitProject) => { target.TemplateProjectPath = file; target.Harness = this; target.IsNUnitProject = isNUnitProject; diff --git a/tests/xharness/MacTarget.cs b/tests/xharness/MacTarget.cs deleted file mode 100644 index 9dbc227cc2..0000000000 --- a/tests/xharness/MacTarget.cs +++ /dev/null @@ -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; - } - } - } -} - diff --git a/tests/xharness/MacUnifiedTarget.cs b/tests/xharness/MacUnifiedTarget.cs index 01397e3b69..ff11b1fb36 100644 --- a/tests/xharness/MacUnifiedTarget.cs +++ b/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"; } } diff --git a/tests/xharness/xharness.csproj b/tests/xharness/xharness.csproj index 7d502a83c8..0b2d4162be 100644 --- a/tests/xharness/xharness.csproj +++ b/tests/xharness/xharness.csproj @@ -93,7 +93,6 @@ -