X

xamarin · Oct 30, 2018 · b4185d8 · b4185d8
1 parent 3416bdb
commit b4185d8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 56 deletions.
diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs
@@ -505,13 +505,9 @@ void ConfigureIOS ()
 				var file = proj.Path;
 				if (proj.MonoNativeInfo != null)
 					file = proj.MonoNativeInfo.TemplatePath;
-
 				if (!File.Exists (file))
 					throw new FileNotFoundException (file);
 
-				if (proj.MonoNativeInfo != null)
-					file = proj.MonoNativeInfo.TemplatePath;
-
 				if (!proj.SkipwatchOSVariation) {
 					var watchos = new WatchOSTarget () {
 						TemplateProjectPath = file,
@@ -541,11 +537,6 @@ void ConfigureIOS ()
 					unified.Execute ();
 					unified_targets.Add (unified);
 
-					if (proj.MonoNativeInfo != null) {
-						//FIXME
-						continue;
-					}
-
 					var today = new TodayExtensionTarget {
 						TemplateProjectPath = file,
 						Harness = this,

diff --git a/tests/xharness/MonoNativeInfo.cs b/tests/xharness/MonoNativeInfo.cs
@@ -52,6 +52,8 @@ public MonoNativeInfo (Harness harness, MonoNativeFlavor flavor)
 
 		public void Convert ()
 		{
+			return;
+
 			var inputProject = new XmlDocument ();
 
 			var xml = File.ReadAllText (TemplatePath);

diff --git a/tests/xharness/TVOSTarget.cs b/tests/xharness/TVOSTarget.cs
@@ -9,7 +9,7 @@ public class TVOSTarget : iOSTarget
 	{
 		public override string Suffix {
 			get {
-				return MonoNativeInfo != null ? MonoNativeInfo.FlavorSuffix + "-tvos" : "-tvos";
+				return "-tvos";
 			}
 		}
 

diff --git a/tests/xharness/Target.cs b/tests/xharness/Target.cs
@@ -128,14 +128,6 @@ protected void CreateExecutableProject ()
 				info_plist.SetMinimumOSVersion (GetMinimumOSVersion (info_plist.GetMinimumOSVersion ()));
 				info_plist.SetUIDeviceFamily (UIDeviceFamily);
 				Harness.Save (info_plist, target_info_plist);
-
-				var linker_defs = Path.Combine (TargetDirectory, "extra-linker-defs.xml");
-				var target_linker_defs = Path.Combine (TargetDirectory, "extra-linker-defs" + Suffix + ".xml");
-				if (File.Exists (linker_defs) && !File.Exists (target_linker_defs)) {
-					XmlDocument linker_defs_doc = new XmlDocument ();
-					linker_defs_doc.LoadWithoutNetworkAccess (target_linker_defs);
-					Harness.Save (linker_defs_doc, target_linker_defs);
-				}
 			}
 		}
 

diff --git a/tests/xharness/TodayExtensionTarget.cs b/tests/xharness/TodayExtensionTarget.cs
@@ -18,7 +18,7 @@ public class TodayExtensionTarget : UnifiedTarget
 
 		public override string Suffix {
 			get {
-				return MonoNativeInfo != null ? MonoNativeInfo.FlavorSuffix + "-today" : "-today";
+				return "-today";
 			}
 		}
 
@@ -30,8 +30,6 @@ public override string ExtraLinkerDefsSuffix {
 
 		public override string ProjectFileSuffix {
 			get {
-				if (MonoNativeInfo != null)
-					return MonoNativeInfo.FlavorSuffix + "-today";
 				return "-today";
 			}
 		}
@@ -96,8 +94,6 @@ void CreateTodayExtensionProject ()
 
 			Harness.Save (csproj, TodayExtensionProjectPath);
 
-			CreateExtraLinkerDefs (Suffix);
-
 			TodayExtensionGuid = csproj.GetProjectGuid ();
 
 			XmlDocument info_plist = new XmlDocument ();
@@ -118,17 +114,6 @@ void CreateTodayExtensionProject ()
 			Harness.Save (info_plist, target_info_plist);
 		}
 
-		void CreateExtraLinkerDefs (string suffix)
-		{
-			var linker_defs = Path.Combine (TargetDirectory, "extra-linker-defs.xml");
-			var target_linker_defs = Path.Combine (TargetDirectory, "extra-linker-defs" + suffix + ".xml");
-			if (File.Exists (linker_defs) && !File.Exists (target_linker_defs)) {
-				XmlDocument linker_defs_doc = new XmlDocument ();
-				linker_defs_doc.LoadWithoutNetworkAccess (linker_defs);
-				Harness.Save (linker_defs_doc, target_linker_defs);
-			}
-		}
-
 		protected override void ExecuteInternal ()
 		{
 			ExtensionName = Name + " Today Extension";

diff --git a/tests/xharness/UnifiedTarget.cs b/tests/xharness/UnifiedTarget.cs
@@ -8,7 +8,7 @@ public class UnifiedTarget : iOSTarget
 	{
 		public override string Suffix {
 			get {
-				return MonoNativeInfo != null ? MonoNativeInfo.FlavorSuffix : "-ios";
+				return "-ios";
 			}
 		}
 
@@ -124,7 +124,7 @@ protected override bool SupportsBitcode {
 
 		protected override void ExecuteInternal ()
 		{
-			if (MonoNativeInfo == null)
+			if (true || MonoNativeInfo == null)
 				return;
 
 			MonoNativeInfo.AddProjectDefines (inputProject);

diff --git a/tests/xharness/WatchOSTarget.cs b/tests/xharness/WatchOSTarget.cs
@@ -109,8 +109,6 @@ void CreateWatchOSExtensionProject ()
 
 			Harness.Save (csproj, WatchOSExtensionProjectPath);
 
-			CreateExtraLinkerDefs (Suffix);
-
 			WatchOSExtensionGuid = csproj.GetProjectGuid ();
 
 			XmlDocument info_plist = new XmlDocument ();
@@ -120,10 +118,7 @@ void CreateWatchOSExtensionProject ()
 			if (BundleIdentifier.Length >= 58)
 				BundleIdentifier = BundleIdentifier.Substring (0, 57); // If the main app's bundle id is 58 characters (or sometimes more), then the watch extension crashes at launch. radar #29847128.
 			info_plist.SetCFBundleIdentifier (BundleIdentifier + ".watchkitapp.watchkitextension");
-			if (MonoNativeInfo != null)
-				info_plist.SetMinimumOSVersion (MonoNativeInfo.GetMinimumWatchOSVersion ());
-			else
-				info_plist.SetMinimumOSVersion ("2.0");
+			info_plist.SetMinimumOSVersion ("2.0");
 			info_plist.SetUIDeviceFamily (4);
 			info_plist.AddPListStringValue ("RemoteInterfacePrincipleClass", "InterfaceController");
 			info_plist.AddPListKeyValuePair ("NSExtension", "dict", string.Format (
@@ -174,19 +169,6 @@ void CreateWatchOSLibraryProject ()
 			Harness.Save (csproj, WatchOSProjectPath);
 
 			WatchOSGuid = csproj.GetProjectGuid ();
-
-			CreateExtraLinkerDefs (Suffix);
-		}
-
-		void CreateExtraLinkerDefs (string suffix)
-		{
-			var linker_defs = Path.Combine (TargetDirectory, "extra-linker-defs.xml");
-			var target_linker_defs = Path.Combine (TargetDirectory, "extra-linker-defs" + suffix + ".xml");
-			if (File.Exists (linker_defs) && !File.Exists (target_linker_defs)) {
-				XmlDocument linker_defs_doc = new XmlDocument ();
-				linker_defs_doc.LoadWithoutNetworkAccess (linker_defs);
-				Harness.Save (linker_defs_doc, target_linker_defs);
-			}
 		}
 
 		protected override void ExecuteInternal ()
@@ -238,7 +220,7 @@ protected override string GetMinimumOSVersion (string templateMinimumOSVersion)
 
 		public override string Suffix {
 			get {
-				return MonoNativeInfo != null ? MonoNativeInfo.FlavorSuffix + "-watchos" : "-watchos";
+				return "-watchos";
 			}
 		}