[xcode11.6] Initial bump to support Xcode 11.6 Beta 1

2020-06-11 13:07:27 -04:00 · 2020-06-11 13:07:27 -04:00 · 10059f1add
--- a/Make.config
+++ b/Make.config
@ -111,9 +111,9 @@ WATCHOS_NUGET_VERSION_NO_METADATA=$(WATCHOS_NUGET_VERSION)-$(NUGET_PRERELEASE_ID
 WATCHOS_NUGET_VERSION_FULL=$(WATCHOS_NUGET_VERSION_NO_METADATA)+$(NUGET_BUILD_METADATA)

 # Xcode version should have both a major and a minor version (even if the minor version is 0)
-XCODE_VERSION=11.5
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11.5.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_11.5.0.app/Contents/Developer
+XCODE_VERSION=11.6
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11.6_beta.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_11.6.0-beta1.app/Contents/Developer
 XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist)

 # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk
--- a/Make.versions
+++ b/Make.versions
@ -66,7 +66,7 @@ MAC_PACKAGE_VERSION=6.21.1.$(MAC_COMMIT_DISTANCE)
 # WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
 # When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)

-IOS_NUGET_VERSION=13.5.100
+IOS_NUGET_VERSION=13.6.100
 TVOS_NUGET_VERSION=13.4.100
 WATCHOS_NUGET_VERSION=6.2.100
 MACOS_NUGET_VERSION=10.15.100
--- a/Versions-ios.plist.in
+++ b/Versions-ios.plist.in
@ -39,6 +39,7 @@
 			<string>13.3</string>
 			<string>13.4</string>
 			<string>13.5</string>
+			<string>13.6</string>
 		</array>
 		<key>tvOS</key>
 		<array>
--- a/src/healthkit.cs
+++ b/src/healthkit.cs
@ -72,6 +72,32 @@ namespace HealthKit {
 		Active,
 	}

+	[iOS (13,6), NoWatch]
+	[Native]
+	public enum HKCategoryValueSeverity : long {
+		Unspecified = 0,
+		NotPresent,
+		Mild,
+		Moderate,
+		Severe,
+	}
+
+	[iOS (13,6), NoWatch]
+	[Native]
+	public enum HKCategoryValueAppetiteChanges : long {
+		Unspecified = 0,
+		NoChange,
+		Decreased,
+		Increased,
+	}
+
+	[iOS (13,6), NoWatch]
+	[Native]
+	public enum HKCategoryValuePresence : long {
+		Present = 0,
+		NotPresent,
+	}
+
 	delegate void HKAnchoredObjectResultHandler2 (HKAnchoredObjectQuery query, HKSample[] results, nuint newAnchor, NSError error);

 	[Obsolete ("Use HKAnchoredObjectResultHandler2 instead")]
@ -1857,7 +1883,141 @@ namespace HealthKit {

 		[Watch (6, 0), iOS (13, 0)]
 		[Field ("HKCategoryTypeIdentifierToothbrushingEvent")]
-	 	ToothbrushingEvent,
+		ToothbrushingEvent,
+
+#if IOS
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierAbdominalCramps")]
+		AbdominalCramps,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierAcne")]
+		Acne,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierAppetiteChanges")]
+		AppetiteChanges,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierGeneralizedBodyAche")]
+		GeneralizedBodyAche,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierBloating")]
+		Bloating,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierBreastPain")]
+		BreastPain,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierChestTightnessOrPain")]
+		ChestTightnessOrPain,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierChills")]
+		Chills,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierConstipation")]
+		Constipation,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierCoughing")]
+		Coughing,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierDiarrhea")]
+		Diarrhea,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierDizziness")]
+		Dizziness,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierFainting")]
+		Fainting,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierFatigue")]
+		Fatigue,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierFever")]
+		Fever,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierHeadache")]
+		Headache,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierHeartburn")]
+		Heartburn,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierHotFlashes")]
+		HotFlashes,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierLowerBackPain")]
+		LowerBackPain,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierLossOfSmell")]
+		LossOfSmell,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierLossOfTaste")]
+		LossOfTaste,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierMoodChanges")]
+		MoodChanges,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierNausea")]
+		Nausea,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierPelvicPain")]
+		PelvicPain,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierRapidPoundingOrFlutteringHeartbeat")]
+		RapidPoundingOrFlutteringHeartbeat,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierRunnyNose")]
+		RunnyNose,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierShortnessOfBreath")]
+		ShortnessOfBreath,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierSinusCongestion")]
+		SinusCongestion,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierSkippedHeartbeat")]
+		SkippedHeartbeat,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierSleepChanges")]
+		SleepChanges,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierSoreThroat")]
+		SoreThroat,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierVomiting")]
+		Vomiting,
+
+		[iOS (13,6), NoWatch]
+		[Field ("HKCategoryTypeIdentifierWheezing")]
+		Wheezing,
+#endif
 	}

 	[Watch (2,0)]
--- a/tests/common/TestRuntime.cs
+++ b/tests/common/TestRuntime.cs
@ -269,6 +269,30 @@ partial class TestRuntime
 				return CheckMacSystemVersion (10, 15, 4);
 #else
 				throw new NotImplementedException ();
+#endif
+			case 5:
+#if __WATCHOS__
+				return CheckWatchOSSystemVersion (6, 2);
+#elif __TVOS__
+				return ChecktvOSSystemVersion (13, 4);
+#elif __IOS__
+				return CheckiOSSystemVersion(13, 5);
+#elif MONOMAC
+				return CheckMacSystemVersion (10, 15, 5);
+#else
+				throw new NotImplementedException ();
+#endif
+			case 6:
+#if __WATCHOS__
+				return CheckWatchOSSystemVersion (6, 2);
+#elif __TVOS__
+				return ChecktvOSSystemVersion (13, 4);
+#elif __IOS__
+				return CheckiOSSystemVersion(13, 6);
+#elif MONOMAC
+				return CheckMacSystemVersion (10, 15, 6);
+#else
+				throw new NotImplementedException ();
 #endif
 			default:
 				throw new NotImplementedException ();
--- a/tests/monotouch-test/Foundation/UrlSessionTaskTransactionMetricsTest.cs
+++ b/tests/monotouch-test/Foundation/UrlSessionTaskTransactionMetricsTest.cs
@ -58,7 +58,12 @@ namespace MonoTouchFixtures.Foundation {
 					Assert.Null (sttm.ResponseEndDate, "ResponseEndDate");
 					Assert.Null (sttm.ResponseStartDate, "ResponseStartDate");
 				}
-				Assert.False (sttm.ReusedConnection, "ReusedConnection");
+#if __IOS__
+				if (TestRuntime.CheckXcodeVersion (11, 6)) // Returns true in iOS 13.6
+					Assert.True (sttm.ReusedConnection, "ReusedConnection");
+				else
+#endif
+					Assert.False (sttm.ReusedConnection, "ReusedConnection");
 				Assert.Null (sttm.SecureConnectionEndDate, "SecureConnectionEndDate");
 				Assert.Null (sttm.SecureConnectionStartDate, "SecureConnectionStartDate");
 			}
--- a/tests/monotouch-test/HealthKit/CategoryTypeIdentifierTest.cs
+++ b/tests/monotouch-test/HealthKit/CategoryTypeIdentifierTest.cs
@ -47,6 +47,44 @@ namespace MonoTouchFixtures.HealthKit {
 					if (!TestRuntime.CheckXcodeVersion (11, 0))
 						continue;
 					break;
+#if !__WATCHOS__
+				case HKCategoryTypeIdentifier.AbdominalCramps:
+				case HKCategoryTypeIdentifier.Acne:
+				case HKCategoryTypeIdentifier.AppetiteChanges:
+				case HKCategoryTypeIdentifier.GeneralizedBodyAche:
+				case HKCategoryTypeIdentifier.Bloating:
+				case HKCategoryTypeIdentifier.BreastPain:
+				case HKCategoryTypeIdentifier.ChestTightnessOrPain:
+				case HKCategoryTypeIdentifier.Chills:
+				case HKCategoryTypeIdentifier.Constipation:
+				case HKCategoryTypeIdentifier.Coughing:
+				case HKCategoryTypeIdentifier.Diarrhea:
+				case HKCategoryTypeIdentifier.Dizziness:
+				case HKCategoryTypeIdentifier.Fainting:
+				case HKCategoryTypeIdentifier.Fatigue:
+				case HKCategoryTypeIdentifier.Fever:
+				case HKCategoryTypeIdentifier.Headache:
+				case HKCategoryTypeIdentifier.Heartburn:
+				case HKCategoryTypeIdentifier.HotFlashes:
+				case HKCategoryTypeIdentifier.LowerBackPain:
+				case HKCategoryTypeIdentifier.LossOfSmell:
+				case HKCategoryTypeIdentifier.LossOfTaste:
+				case HKCategoryTypeIdentifier.MoodChanges:
+				case HKCategoryTypeIdentifier.Nausea:
+				case HKCategoryTypeIdentifier.PelvicPain:
+				case HKCategoryTypeIdentifier.RapidPoundingOrFlutteringHeartbeat:
+				case HKCategoryTypeIdentifier.RunnyNose:
+				case HKCategoryTypeIdentifier.ShortnessOfBreath:
+				case HKCategoryTypeIdentifier.SinusCongestion:
+				case HKCategoryTypeIdentifier.SkippedHeartbeat:
+				case HKCategoryTypeIdentifier.SleepChanges:
+				case HKCategoryTypeIdentifier.SoreThroat:
+				case HKCategoryTypeIdentifier.Vomiting:
+				case HKCategoryTypeIdentifier.Wheezing:
+					if (!TestRuntime.CheckXcodeVersion (11, 6))
+						continue;
+					break;
+#endif
 				default:
 					if (!TestRuntime.CheckXcodeVersion (7, 0))
 						continue;
--- a/tests/xtro-sharpie/iOS-ExposureNotification.ignore
+++ b/tests/xtro-sharpie/iOS-ExposureNotification.ignore
@ -28,13 +28,11 @@
 !missing-selector! ENExposureDetectionSummary::matchedKeyCount not bound
 !missing-selector! ENExposureDetectionSummary::maximumRiskScore not bound
 !missing-selector! ENExposureDetectionSummary::metadata not bound
-!missing-selector! ENExposureDetectionSummary::setAttenuationDurations: not bound
 !missing-selector! ENExposureInfo::attenuationDurations not bound
 !missing-selector! ENExposureInfo::attenuationValue not bound
 !missing-selector! ENExposureInfo::date not bound
 !missing-selector! ENExposureInfo::duration not bound
 !missing-selector! ENExposureInfo::metadata not bound
-!missing-selector! ENExposureInfo::setAttenuationDurations: not bound
 !missing-selector! ENExposureInfo::totalRiskScore not bound
 !missing-selector! ENExposureInfo::transmissionRiskLevel not bound
 !missing-selector! ENManager::activateWithCompletionHandler: not bound
@ -63,3 +61,9 @@
 !missing-type! ENExposureInfo not bound
 !missing-type! ENManager not bound
 !missing-type! ENTemporaryExposureKey not bound
+!missing-selector! ENExposureConfiguration::attenuationDurationThresholds not bound
+!missing-selector! ENExposureConfiguration::minimumRiskScoreFullRange not bound
+!missing-selector! ENExposureConfiguration::setMinimumRiskScoreFullRange: not bound
+!missing-selector! ENExposureDetectionSummary::maximumRiskScoreFullRange not bound
+!missing-selector! ENExposureDetectionSummary::riskScoreSumFullRange not bound
+!missing-selector! ENExposureInfo::totalRiskScoreFullRange not bound