[xharness] Add the Touch.Client projects to our solutions instead of MonoTouch.NUnitLite.

tests/xharness/Harness.cs

@@ -545,9 +545,9 @@ namespace Xharness {
 				}
 			}
 
-			SolutionGenerator.CreateSolution (this, watchos_targets, "watchos");
-			SolutionGenerator.CreateSolution (this, tvos_targets, "tvos");
-			SolutionGenerator.CreateSolution (this, today_targets, "today");
+			SolutionGenerator.CreateSolution (this, watchos_targets, "watchos", DevicePlatform.watchOS);
+			SolutionGenerator.CreateSolution (this, tvos_targets, "tvos", DevicePlatform.tvOS);
+			SolutionGenerator.CreateSolution (this, today_targets, "today", DevicePlatform.iOS);
 			MakefileGenerator.CreateMakefile (this, unified_targets, tvos_targets, watchos_targets, today_targets);
 
 			return rv;

tests/xharness/SolutionGenerator.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Xml;
 using System.Text;
+using Microsoft.DotNet.XHarness.iOS.Shared.Hardware;
 using Microsoft.DotNet.XHarness.iOS.Shared.Utilities;
 using Xharness.Targets;
 
@@ -48,12 +49,12 @@ namespace Xharness
 			return project_path;
 		}
 
-		public static void CreateSolution (IHarness harness, IEnumerable<Target> targets, string infix)
+		public static void CreateSolution (IHarness harness, IEnumerable<Target> targets, string infix, DevicePlatform testPlatform)
 		{
-			CreateSolution (harness, targets, null, infix);
+			CreateSolution (harness, targets, null, infix, testPlatform);
 		}
 
-		public static void CreateSolution (IHarness harness, IEnumerable<Target> targets, Target exeTarget, string infix)
+		public static void CreateSolution (IHarness harness, IEnumerable<Target> targets, Target exeTarget, string infix, DevicePlatform testPlatform)
 		{
 			var folders = new StringBuilder ();
 
@@ -72,7 +73,7 @@ namespace Xharness
 
 					if (hasRelatedProjects && target.IsExe) {
 						if (exeTarget == null) {
-							CreateSolution (harness, targets, target, infix); // create a solution for just this test project as well
+							CreateSolution (harness, targets, target, infix, testPlatform); // create a solution for just this test project as well
 						} else if (exeTarget != target) {
 							continue;
 						}
@@ -101,11 +102,9 @@ namespace Xharness
 					}
 				}
 
-				// Add reference to MonoTouch.NUnitLite project
+				// Add reference to the Touch.Client project
 				string configuration;
-				var proj_path = Path.GetFullPath (Path.Combine (srcDirectory, "MonoTouch.NUnitLite." + infix + ".csproj"));
-				if (!File.Exists (proj_path))
-					proj_path = Path.GetFullPath (Path.Combine (srcDirectory, "MonoTouch.NUnitLite.csproj"));
+				var proj_path = Path.GetFullPath (Path.Combine (srcDirectory, "..", "external", "Touch.Unit", "Touch.Client", testPlatform.AsString (), "Touch.Client-" + testPlatform.AsString () + ".csproj"));
 				AddProjectToSolution (harness, sln_path, writer, proj_path, out configuration);
 
 				writer.WriteLine ("Global");