[xharness] Remove iOS 32-bit simulator support, current Xcodes don't support it. (#12880)

Our existing tests that claimed to run iOS 32-bit tests were really executing
in 64-bit mode.

tests/xharness/Harness.cs

@@ -287,7 +287,6 @@ namespace Xharness {
 					SkipwatchOSVariation = true,
 					SkipTodayExtensionVariation = true,
 					SkipDeviceVariations = false,
-					SkipiOS32Variation = true,
 					TestPlatform = TestPlatform.iOS_Unified,
 					Ignore = dotnetIgnored,
 					Configurations = projectInfo.Configurations,
@@ -301,7 +300,6 @@ namespace Xharness {
 					SkipwatchOSVariation = true,
 					SkipTodayExtensionVariation = true,
 					SkipDeviceVariations = false,
-					SkipiOS32Variation = true,
 					GenerateVariations = false,
 					TestPlatform = TestPlatform.tvOS,
 					Ignore = dotnetIgnored,

tests/xharness/Jenkins/RunSimulatorTasksFactory.cs

@@ -125,24 +125,10 @@ namespace Xharness.Jenkins {
 				ignored = new [] { false };
 				break;
 			case TestPlatform.iOS_Unified:
-				var iOSProject = (iOSTestProject) buildTask.TestProject;
+				platforms = new TestPlatform [] { TestPlatform.iOS_Unified64 };
-				if (iOSProject.SkipiOS32Variation && iOSProject.SkipiOS64Variation) {
+				ignored = new [] { false };
-					return runtasks;
-				} else if (iOSProject.SkipiOS32Variation) {
-					targets = new TestTarget [] { TestTarget.Simulator_iOS64 };
-					platforms = new TestPlatform [] { TestPlatform.iOS_Unified64 };
-					ignored = new [] { false };
-				} else if (iOSProject.SkipiOS64Variation) {
-					targets = new TestTarget [] { TestTarget.Simulator_iOS32 };
-					platforms = new TestPlatform [] { TestPlatform.iOS_Unified32 };
-					ignored = new [] { !jenkins.IncludeiOS32 };
-				} else {
-					platforms = new TestPlatform [] { TestPlatform.iOS_Unified32, TestPlatform.iOS_Unified64 };
-					ignored = new [] { !jenkins.IncludeiOS32, false };
-				}
 				break;
 			case TestPlatform.iOS_TodayExtension64:
-				targets = new TestTarget [] { TestTarget.Simulator_iOS64 };
 				platforms = new TestPlatform [] { TestPlatform.iOS_TodayExtension64 };
 				ignored = new [] { false };
 				break;

tests/xharness/TestTargetExtensions.cs

@@ -15,9 +15,9 @@ namespace Xharness {
 			case TestPlatform.watchOS_64_32:
 				return new TestTarget [] { TestTarget.Simulator_watchOS };
 			case TestPlatform.iOS_Unified:
-				return new TestTarget [] { TestTarget.Simulator_iOS32, TestTarget.Simulator_iOS64 };
+				return new TestTarget [] { TestTarget.Simulator_iOS64 };
 			case TestPlatform.iOS_Unified32:
-				return new TestTarget [] { TestTarget.Simulator_iOS32 };
+				throw new NotSupportedException ($"32-bit simulators aren't supported anymore.");
 			case TestPlatform.iOS_Unified64:
 			case TestPlatform.iOS_TodayExtension64:
 				return new TestTarget [] { TestTarget.Simulator_iOS64 };

tests/xharness/Xharness.Tests/Tests/TestTargetExtensionsTests.cs

@@ -12,8 +12,7 @@ namespace Xharness.Tests.Tests {
 		[TestCase (TestPlatform.watchOS, new [] { TestTarget.Simulator_watchOS })]
 		[TestCase (TestPlatform.watchOS_32, new [] { TestTarget.Simulator_watchOS })]
 		[TestCase (TestPlatform.watchOS_64_32, new [] { TestTarget.Simulator_watchOS })]
-		[TestCase (TestPlatform.iOS_Unified, new [] { TestTarget.Simulator_iOS32, TestTarget.Simulator_iOS64 })]
+		[TestCase (TestPlatform.iOS_Unified, new [] { TestTarget.Simulator_iOS64 })]
-		[TestCase (TestPlatform.iOS_Unified32, new [] { TestTarget.Simulator_iOS32 })]
 		[TestCase (TestPlatform.iOS_Unified64, new [] { TestTarget.Simulator_iOS64 })]
 		[TestCase (TestPlatform.iOS_TodayExtension64, new [] { TestTarget.Simulator_iOS64 })]
 		public void GetAppRunnerTargetsTest (TestPlatform platform, TestTarget[] expectedTargets)

tests/xharness/iOSTestProject.cs

@@ -4,8 +4,6 @@ using Microsoft.DotNet.XHarness.iOS.Shared.Hardware;
 namespace Xharness {
 	public class iOSTestProject : TestProject {
 		public bool SkipiOSVariation;
-		public bool SkipiOS32Variation;
-		public bool SkipiOS64Variation;
 		public bool SkipwatchOSVariation; // skip both
 		public bool SkipwatchOSARM64_32Variation;
 		public bool SkipwatchOS32Variation;
@@ -36,8 +34,6 @@ namespace Xharness {
 		{
 			var rv = (iOSTestProject) base.Clone ();
 			rv.SkipiOSVariation = SkipiOSVariation;
-			rv.SkipiOS32Variation = SkipiOS32Variation;
-			rv.SkipiOS64Variation = SkipiOS64Variation;
 			rv.SkipwatchOSVariation = SkipwatchOSVariation;
 			rv.SkipwatchOSARM64_32Variation = SkipwatchOSARM64_32Variation;
 			rv.SkipwatchOS32Variation = SkipwatchOS32Variation;