diff --git a/Make.config b/Make.config
index b333f239b2..76789177d4 100644
--- a/Make.config
+++ b/Make.config
@@ -60,8 +60,8 @@ IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_M
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
 XCODE_VERSION=12.0
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12_beta_5.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.0.0-beta5.app/Contents/Developer
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12_beta_6.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.0.0-beta6.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
diff --git a/tests/xtro-sharpie/Makefile b/tests/xtro-sharpie/Makefile
index cc201bc0bd..259f815c6c 100644
--- a/tests/xtro-sharpie/Makefile
+++ b/tests/xtro-sharpie/Makefile
@@ -48,7 +48,7 @@ XMAC_ARCH = x86_64
 XMAC_PCH = macosx$(OSX_SDK_VERSION)-$(XMAC_ARCH).pch
 
 $(XMAC_PCH): .stamp-check-sharpie
-	sharpie sdk-db --xcode $(XCODE) -s macosx$(OSX_SDK_VERSION) -a $(XMAC_ARCH) -exclude ClockKit
+	sharpie sdk-db --xcode $(XCODE) -s macosx$(OSX_SDK_VERSION) -a $(XMAC_ARCH) -exclude ClockKit -exclude JavaNativeFoundation
 
 
 
diff --git a/tests/xtro-sharpie/iOS-CarPlay.todo b/tests/xtro-sharpie/iOS-CarPlay.todo
index 8e47f60aa4..834423fd27 100644
--- a/tests/xtro-sharpie/iOS-CarPlay.todo
+++ b/tests/xtro-sharpie/iOS-CarPlay.todo
@@ -44,10 +44,6 @@
 !missing-selector! CPBarButton::initWithImage:handler: not bound
 !missing-selector! CPBarButton::initWithTitle:handler: not bound
 !missing-selector! CPBarButton::setButtonStyle: not bound
-!missing-selector! CPBaseListItem::listItemHandler not bound
-!missing-selector! CPBaseListItem::setListItemHandler: not bound
-!missing-selector! CPBaseListItem::setUserInfo: not bound
-!missing-selector! CPBaseListItem::userInfo not bound
 !missing-selector! CPButton::image not bound
 !missing-selector! CPButton::initWithImage:handler: not bound
 !missing-selector! CPButton::isEnabled not bound
@@ -242,7 +238,6 @@
 !missing-selector! CPTextButton::setTitle: not bound
 !missing-selector! CPTextButton::textStyle not bound
 !missing-selector! CPTextButton::title not bound
-!missing-type! CPBaseListItem not bound
 !missing-type! CPButton not bound
 !missing-type! CPContact not bound
 !missing-type! CPContactCallButton not bound
@@ -271,4 +266,5 @@
 !missing-type! CPTabBarTemplate not bound
 !missing-type! CPTextButton not bound
 !unknown-field! CPMaximumListItemImageSize bound
-!wrong-base-type! CPListItem expected CPBaseListItem actual NSObject
+!missing-selector! CPPointOfInterest::setUserInfo: not bound
+!missing-selector! CPPointOfInterest::userInfo not bound
diff --git a/tests/xtro-sharpie/iOS-GameKit.todo b/tests/xtro-sharpie/iOS-GameKit.todo
new file mode 100644
index 0000000000..8e5077bceb
--- /dev/null
+++ b/tests/xtro-sharpie/iOS-GameKit.todo
@@ -0,0 +1,2 @@
+!deprecated-attribute-missing! GKMatchRequest::restrictToAutomatch missing a [Deprecated] attribute
+!deprecated-attribute-missing! GKMatchRequest::setRestrictToAutomatch: missing a [Deprecated] attribute
diff --git a/tests/xtro-sharpie/tvOS-GameKit.todo b/tests/xtro-sharpie/tvOS-GameKit.todo
new file mode 100644
index 0000000000..8e5077bceb
--- /dev/null
+++ b/tests/xtro-sharpie/tvOS-GameKit.todo
@@ -0,0 +1,2 @@
+!deprecated-attribute-missing! GKMatchRequest::restrictToAutomatch missing a [Deprecated] attribute
+!deprecated-attribute-missing! GKMatchRequest::setRestrictToAutomatch: missing a [Deprecated] attribute
diff --git a/tests/xtro-sharpie/tvOS-Intents.ignore b/tests/xtro-sharpie/tvOS-Intents.ignore
index fcd2aab8ff..ba4764aa8e 100644
--- a/tests/xtro-sharpie/tvOS-Intents.ignore
+++ b/tests/xtro-sharpie/tvOS-Intents.ignore
@@ -1,32 +1,7 @@
 ## Marked as available but do not make sense at all to be on Apple TV
 !missing-field! INSetMessageAttributeIntentIdentifier not bound
-!missing-protocol! INGetRideStatusIntentResponseObserver not bound
 !missing-selector! INDateComponentsRange::EKRecurrenceRule not bound
 !missing-selector! INDateComponentsRange::initWithEKRecurrenceRule: not bound
 !missing-selector! INDateComponentsRange::initWithStartDateComponents:endDateComponents:recurrenceRule: not bound
 !missing-selector! INDateComponentsRange::recurrenceRule not bound
-!missing-enum! INCancelRideIntentResponseCode not bound
-!missing-enum! INSendRideFeedbackIntentResponseCode not bound
-!missing-protocol! INCancelRideIntentHandling not bound
-!missing-protocol! INSendRideFeedbackIntentHandling not bound
-!missing-selector! INCancelRideIntentResponse::cancellationFee not bound
-!missing-selector! INCancelRideIntentResponse::cancellationFeeThreshold not bound
-!missing-selector! INCancelRideIntentResponse::code not bound
-!missing-selector! INCancelRideIntentResponse::initWithCode:userActivity: not bound
-!missing-selector! INCancelRideIntentResponse::setCancellationFee: not bound
-!missing-selector! INCancelRideIntentResponse::setCancellationFeeThreshold: not bound
-!missing-selector! INSendRideFeedbackIntent::initWithRideIdentifier: not bound
-!missing-selector! INSendRideFeedbackIntent::rating not bound
-!missing-selector! INSendRideFeedbackIntent::rideIdentifier not bound
-!missing-selector! INSendRideFeedbackIntent::setRating: not bound
-!missing-selector! INSendRideFeedbackIntent::setTip: not bound
-!missing-selector! INSendRideFeedbackIntent::tip not bound
-!missing-selector! INSendRideFeedbackIntentResponse::code not bound
-!missing-selector! INSendRideFeedbackIntentResponse::initWithCode:userActivity: not bound
-!missing-type! INCancelRideIntentResponse not bound
-!missing-type! INSendRideFeedbackIntent not bound
-!missing-type! INSendRideFeedbackIntentResponse not bound
 !unknown-native-enum! INCallRecordType bound
-!missing-selector! INCancelRideIntent::initWithRideIdentifier: not bound
-!missing-selector! INCancelRideIntent::rideIdentifier not bound
-!missing-type! INCancelRideIntent not bound
diff --git a/tests/xtro-sharpie/watchOS-GameKit.todo b/tests/xtro-sharpie/watchOS-GameKit.todo
index 382a4c1de8..54ee6e74cb 100644
--- a/tests/xtro-sharpie/watchOS-GameKit.todo
+++ b/tests/xtro-sharpie/watchOS-GameKit.todo
@@ -1 +1,3 @@
 !missing-selector! GKPlayer::isInvitable not bound
+!missing-selector! GKMatchRequest::restrictToAutomatch not bound
+!missing-selector! GKMatchRequest::setRestrictToAutomatch: not bound
diff --git a/tools/common/Frameworks.cs b/tools/common/Frameworks.cs
index 5e428e324f..1d2d6c01ac 100644
--- a/tools/common/Frameworks.cs
+++ b/tools/common/Frameworks.cs
@@ -547,7 +547,7 @@ public class Frameworks : Dictionary <string, Framework>
 	// This checks if a framework is unavailable due to bugs in Xcode (such as Apple forgetting to ship a library or headers for a framework, which seems to happen at least once a year).
 	public static bool IsFrameworkBroken (Application app, string framework)
 	{
-		if (app.IsSimulatorBuild && Driver.XcodeProductVersion == "12A8189h" /* Xcode 12 beta 5 */) {
+		if (app.IsSimulatorBuild && Driver.XcodeProductVersion == "12A8189n" /* Xcode 12 beta 6 */) {
 			switch (framework) {
 			// Apple seems to have forgotten to ship the several libraries for the simulator in Xcode 12 betas (it's still available for device builds).
 			// https://github.com/xamarin/maccore/issues/2266