Merge pull request #2970 from spouliot/xcode92-beta2

Bump Xcode and versions for 9.2 beta 2

Make.config

@@ -31,7 +31,7 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 # on wrench, because wrench technically builds hashes, not branches)
 #
 # 
-PACKAGE_HEAD_BRANCH=d15-5
+PACKAGE_HEAD_BRANCH=xcode9.2
 ifeq ($(BUILD_REVISION),)
 CURRENT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
 else
@@ -39,22 +39,22 @@ CURRENT_BRANCH:=$(PACKAGE_HEAD_BRANCH)
 endif
 
 # for service releases and previews
-PACKAGE_VERSION_REV=0
+PACKAGE_VERSION_REV=1
 
 IOS_PRODUCT=Xamarin.iOS
 IOS_PACKAGE_NAME=Xamarin.iOS
 IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
 # NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables
-IOS_PACKAGE_VERSION=11.4.$(PACKAGE_VERSION_REV).$(IOS_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=11.5.$(PACKAGE_VERSION_REV).$(IOS_COMMIT_DISTANCE)
 IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
 IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
 IOS_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV)
 IOS_PACKAGE_VERSION_BUILD=$(IOS_COMMIT_DISTANCE)
 IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(IOS_PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))
 
-XCODE_VERSION=9.1
-XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9.1.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode91.app/Contents/Developer
+XCODE_VERSION=9.2
+XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9.2_Beta2.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode92-beta2.app/Contents/Developer
 
 # Minimum Mono version
 MIN_MONO_VERSION=5.4.0.201
@@ -80,10 +80,10 @@ MIN_OSX_BUILD_VERSION=10.12
 MIN_OSX_VERSION_FOR_IOS=10.11
 MIN_OSX_VERSION_FOR_MAC=10.11
 
-IOS_SDK_VERSION=11.1
+IOS_SDK_VERSION=11.2
 OSX_SDK_VERSION=10.13
-WATCH_SDK_VERSION=4.1
-TVOS_SDK_VERSION=11.1
+WATCH_SDK_VERSION=4.2
+TVOS_SDK_VERSION=11.2
 
 MIN_IOS_SDK_VERSION=6.0
 MIN_OSX_SDK_VERSION=10.7
@@ -258,7 +258,7 @@ MAC_PRODUCT=Xamarin.Mac
 MAC_PACKAGE_NAME=xamarin.mac
 MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
 
-MAC_PACKAGE_VERSION=4.0.$(PACKAGE_VERSION_REV).$(MAC_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=4.1.$(PACKAGE_VERSION_REV).$(MAC_COMMIT_DISTANCE)
 MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION)))
 MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION)))
 MAC_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV)

Versions-ios.plist.in

@@ -25,6 +25,7 @@
 			<string>10.3</string>
 			<string>11.0</string>
 			<string>11.1</string>
+			<string>11.2</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -36,6 +37,7 @@
 			<string>10.2</string>
 			<string>11.0</string>
 			<string>11.1</string>
+			<string>11.2</string>
 		</array>
 		<key>watchOS</key>
 		<array>
@@ -48,6 +50,7 @@
 			<string>3.2</string>
 			<string>4.0</string>
 			<string>4.1</string>
+			<string>4.2</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

src/contacts.cs

@@ -311,7 +311,7 @@ namespace XamCore.Contacts {
 
 	[iOS (9,0), Mac (10,11, onlyOn64: true)]
 	[BaseType (typeof (NSFormatter))]
-	interface CNContactFormatter {
+	interface CNContactFormatter : NSSecureCoding {
 
 		[Static]
 		[Export ("descriptorForRequiredKeysForStyle:")]

tests/introspection/iOS/iOSApiProtocolTest.cs

@@ -218,6 +218,9 @@ namespace Introspection {
 				case "HKSeriesBuilder":
 				case "HKWorkoutRouteBuilder":
 					return true;
+				// Xcode 9.2 undocumented conformance (like due to new base type)
+				case "HMHomeAccessControl":
+					return true;
 #if __WATCHOS__
 				case "CLKComplicationTemplate":
 				case "CLKComplicationTemplateCircularSmallRingImage":
@@ -363,6 +366,9 @@ namespace Introspection {
 				case "HKSeriesBuilder":
 				case "HKWorkoutRouteBuilder":
 					return true;
+				// Xcode 9.2 undocumented conformance (like due to new base type)
+				case "HMHomeAccessControl":
+					return true;
 #if __WATCHOS__
 				case "CLKComplicationTemplate":
 				case "CLKComplicationTemplateCircularSmallRingImage":

tests/linker-ios/dont link/DontLinkRegressionTests.cs

@@ -78,21 +78,12 @@ namespace DontLink {
 			// this same test existed in linksdk.app and linkall.app to test the linker optimizing IL code
 			// around [Autorelease] decorated methods. However iOS7 changed it's behavior and returns null now
 			using (UIImage img = new UIImage ()) {
-#if __WATCHOS__
-				if (true) {
-#else
-				if (UIDevice.CurrentDevice.CheckSystemVersion (7, 0)) {
-#endif
+				// different versions of iOS returns null or something - so we're not validating the return
+				// value since it's not the goal of the test
 #if !__TVOS__
-					Assert.Null (img.StretchableImage (10, 10), "StretchableImage");
+				img.StretchableImage (10, 10);
 #endif
-					Assert.Null (img.CreateResizableImage (new UIEdgeInsets (1, 2, 3, 4)), "CreateResizableImage");
-				} else {
-#if !__TVOS__
-					Assert.NotNull (img.StretchableImage (10, 10), "StretchableImage");
-#endif
-					Assert.NotNull (img.CreateResizableImage (new UIEdgeInsets (1, 2, 3, 4)), "CreateResizableImage");
-				}
+				img.CreateResizableImage (new UIEdgeInsets (1, 2, 3, 4));
 			}
 		}
 

tests/monotouch-test/AddressBook/SourceTest.cs

@@ -43,11 +43,8 @@ namespace MonoTouchFixtures.AddressBook {
 			// ABRecord
 			// some bots returns -1 (invalid) and I get 0 after a reset (maybe permission related?)
 			Assert.That (source.Id, Is.LessThanOrEqualTo (0), "Id");
-			if (TestRuntime.CheckXcodeVersion (9, 0)) {
-				Assert.That (source.Type, Is.EqualTo (ABRecordType.Person), "Type");
-			} else {
-				Assert.That (source.Type, Is.EqualTo (ABRecordType.Source), "Type");
-			}
+			// iOS [9,11.2[ returned ABRecordType.Person, otherwise ABRecordType.Source
+			Assert.That (source.Type, Is.Not.EqualTo (ABRecordType.Group), "Type");
 		}
 	}
 }

tests/monotouch-test/Contacts/ContactStoreTest.cs

@@ -49,10 +49,9 @@ namespace MonoTouchFixtures.Contacts {
 			using (var store = new CNContactStore ()) {
 				var contacts = store.GetUnifiedContacts (predicate, fetchKeys, out error);
 				// we can't be sure what's on devices, so check there's no error is the only thing we do
-				Assert.Null (error, "error");
 				// but it's in the default simulator build (but not the watchOS simulator)
-#if !__WATCHOS__ && !MONOMAC
-				if (Runtime.Arch == Arch.SIMULATOR) {
+#if !MONOMAC
+				if ((error == null) && (Runtime.Arch == Arch.SIMULATOR)) {
 					Assert.That (contacts.Length, Is.EqualTo (1), "Length");
 					identifier = contacts [0].Identifier;
 				}
@@ -69,17 +68,13 @@ namespace MonoTouchFixtures.Contacts {
 				// it's in the default simulator build
 #if !MONOMAC
 				if (Runtime.Arch == Arch.SIMULATOR) {
-					Assert.Null (error, "error");
+					// it fails on some bots (watchOS 4.2 on jenkins) so we cannot assume it always work
+					if (error != null)
+						return;
 					Assert.NotNull (contact, "contact");
 					Assert.False (contact.AreKeysAvailable (CNContactOptions.OrganizationName | CNContactOptions.Note), "AreKeysAvailable-1");
 					Assert.True (contact.AreKeysAvailable (CNContactOptions.None), "AreKeysAvailable-2");
 					Assert.True (contact.AreKeysAvailable (fetchKeys), "AreKeysAvailable-3");
-				} else {
-#endif
-					// and it's a safe bet that id does not exists on any device
-					Assert.NotNull (error, "error"); // Updated Record Does Not Exist
-
-#if !MONOMAC
 				}
 #endif
 			}

tests/monotouch-test/ModelIO/MDLAnimatedValueTypesTests.cs

@@ -341,7 +341,7 @@ namespace MonoTouchFixtures.ModelIO {
 			var onesDoubleArr = TestMatrices.CreateOnesArray<double> ((int) doubleArr.ElementCount);
 			var timesDoubleArr = new [] { 5d };
 			doubleArr.Reset (onesDoubleArr, timesDoubleArr);
-			var doubleValues = doubleArr.GetFloatValues (5);
+			var doubleValues = doubleArr.GetDoubleValues (5);
 			for (int i = 0; i < onesDoubleArr.Length; i++)
 				Asserts.AreEqual (onesDoubleArr [i], doubleValues [i], $"onesDoubleArr iter: {i}");
 

tests/monotouch-test/UIKit/TextFieldTest.cs

@@ -88,16 +88,9 @@ namespace MonoTouchFixtures.UIKit {
 		{
 			// https://bugzilla.xamarin.com/show_bug.cgi?id=20572
 			using (UITextField tf = new UITextField ()) {
-				var rect = tf.GetCaretRectForPosition (null);
-				if (TestRuntime.CheckXcodeVersion (9, 0)) {
-#if __TVOS__
-					Assert.AreEqual (new CGRect (0, -24, 2, 19), rect, "IsEmpty");
-#else
-					Assert.AreEqual (new CGRect (0, -12, 2, 18.5), rect, "IsEmpty");
-#endif
-				} else {
-					Assert.AreEqual (CGRect.Empty, rect, "IsEmpty");
-				}
+				// most iOS versions returns `CGRect.Empty` but iOS [9-11.2[ did not
+				// so we're not checking the return value - just that the call works (original bug)
+				tf.GetCaretRectForPosition (null);
 			}
 		}