diff --git a/Make.config b/Make.config
index 718d95e33b37..a37ec168d414 100644
--- a/Make.config
+++ b/Make.config
@@ -18,7 +18,7 @@ endif
include $(TOP)/Make.versions
-APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-2/a3b8cddd3259be36efb500124e584caaa1ccaa34/45/package/bundle.zip
+APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-3/d532e90de664caf46baea6226d742b9f68b3173a/44/package/bundle.zip
PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
@@ -46,9 +46,9 @@ 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 should have both a major and a minor version (even if the minor version is 0)
-XCODE_VERSION=11.0
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode11.app/Contents/Developer
+XCODE_VERSION=11.1
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11.1_GM_Seed.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode111-GM.app/Contents/Developer
XCODE94_VERSION=9.4
XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
@@ -87,12 +87,19 @@ MIN_OSX_BUILD_VERSION=10.14
MIN_OSX_VERSION_FOR_IOS=10.11
MIN_OSX_VERSION_FOR_MAC=10.11
-IOS_SDK_VERSION=13.0
+IOS_SDK_VERSION=13.1
# When bumping OSX_SDK_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)
OSX_SDK_VERSION=10.15
WATCH_SDK_VERSION=6.0
TVOS_SDK_VERSION=13.0
+# If the max OS version does not match the SDK version (for instance the iOS
+# 12.2 SDK supported both iOS 12.3 and iOS 12.4), then these variables can be
+# set to something other than the corresponding SDK versions.
+MAX_IOS_VERSION=$(IOS_SDK_VERSION)
+MAX_WATCH_VERSION=$(WATCH_SDK_VERSION)
+MAX_TVOS_VERSION=$(TVOS_SDK_VERSION)
+
# Minimum OS versions for running XI/XM apps.
MIN_IOS_SDK_VERSION=7.0
MIN_OSX_SDK_VERSION=10.9
diff --git a/Versions-ios.plist.in b/Versions-ios.plist.in
index b9e89b46db1d..ef52126330c4 100644
--- a/Versions-ios.plist.in
+++ b/Versions-ios.plist.in
@@ -34,6 +34,7 @@
12.3
12.4
13.0
+ 13.1
tvOS
diff --git a/builds/Makefile b/builds/Makefile
index c59a6cb09cd1..e4e0eb48095c 100644
--- a/builds/Makefile
+++ b/builds/Makefile
@@ -620,7 +620,7 @@ $(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/Version: $(TOP)/Make.config.inc
$(Q) echo $(MAC_PACKAGE_VERSION) > $@
$(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/Versions.plist: $(TOP)/Versions-mac.plist.in Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/versions-check.csharp .stamp-$(MONO_BUILD_MODE)
- $(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
+ $(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(MAX_IOS_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(MAX_TVOS_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(MAX_WATCH_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
$(Q_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' -e "s/@MONO_VERSION@/$(shell cat $(MONO_MAC_SDK_DESTDIR)/mac-mono-version.txt)/g" -e "s/@MIN_XM_MONO_VERSION@/$(MIN_XM_MONO_VERSION)/g" $< > $@
$(MAC_COMMON_DIRECTORIES):
@@ -708,7 +708,7 @@ $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/updateinfo: $(TOP)/Make.config.inc
$(Q) echo "4569c276-1397-4adb-9485-82a7696df22e $(IOS_PACKAGE_UPDATE_ID)" > $@
$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/Versions.plist: $(TOP)/Versions-ios.plist.in Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/versions-check.csharp .stamp-$(MONO_BUILD_MODE)
- $(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
+ $(Q) $(TOP)/versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(MAX_IOS_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(MAX_TVOS_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(MAX_WATCH_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)"
$(Q_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' -e "s/@MONO_VERSION@/$(shell cat $(MONO_IOS_SDK_DESTDIR)/ios-mono-version.txt)/g" $< > $@
$(IOS_COMMON_DIRECTORIES):
diff --git a/tests/monotouch-test/CoreBluetooth/CentralManagerTest.cs b/tests/monotouch-test/CoreBluetooth/CentralManagerTest.cs
index 03ef19a8fd1a..5ced2e88a1c1 100644
--- a/tests/monotouch-test/CoreBluetooth/CentralManagerTest.cs
+++ b/tests/monotouch-test/CoreBluetooth/CentralManagerTest.cs
@@ -110,6 +110,7 @@ public void Constructors ()
Assert.NotNull (mgr.Delegate, "Delegate");
}
+ [Ignore ("https://github.com/xamarin/xamarin-macios/issues/7108")]
[Test, Timeout (5000)]
public void ScanForPeripherals ()
{
@@ -123,6 +124,7 @@ public void ScanForPeripherals ()
}
#if !XAMCORE_3_0
+ [Ignore ("https://github.com/xamarin/xamarin-macios/issues/7108")]
[Test, Timeout (5000)]
public void RetrievePeripherals ()
{
diff --git a/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo b/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo
index 4d7551537aaf..e78c59e36746 100644
--- a/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo
+++ b/tests/xtro-sharpie/iOS-MetalPerformanceShaders.todo
@@ -595,3 +595,6 @@
!missing-type! MPSTemporaryNDArray not bound
!unknown-simd-type-mapping! The Simd type vector_uchar16 does not have a mapping to a managed type. Please add one in SimdCheck.cs
!wrong-base-type! MPSTriangleAccelerationStructure expected MPSPolygonAccelerationStructure actual MPSAccelerationStructure
+## appended from unclassified file
+!missing-selector! MPSMatrix::offset not bound
+!missing-selector! MPSVector::offset not bound