diff --git a/.gitmodules b/.gitmodules
index e68f7e698393..df7f39cd320e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "external/fsharp"]
-    path = external/fsharp
-    url = ../../fsharp/fsharp.git
-    branch = master
 [submodule "external/guiunit"]
     path = external/guiunit
     url = ../../mono/guiunit.git
diff --git a/Make.config b/Make.config
index d506fd079911..3557857877e7 100644
--- a/Make.config
+++ b/Make.config
@@ -230,8 +230,6 @@ DEVICETV_OBJC_CFLAGS       = $(DEVICETV_CFLAGS) $(DEVICE_OBJC_CFLAGS)
 # paths to the modules we depend on, as variables, so people can put
 # things in other places if they absolutely must.
 MONO_PATH=$(TOP)/external/mono
-WATCH_MONO_PATH=$(TOP)/external/mono
-FSHARP_PATH=$(TOP)/external/fsharp
 TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit
 NUNITLITE_PATH=$(TOP)/external/mono/external/nunit-lite
 OPENTK_PATH=$(TOP)/external/opentk
diff --git a/Makefile b/Makefile
index b3dd84855443..6b4565b51e03 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ $(MAC_DESTDIR)$(MAC_FRAMEWORK_DIR)/Commands:
 $(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/buildinfo: Make.config.inc .git/index | $(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)
 	$(Q_GEN) echo "Version: $(MAC_PACKAGE_VERSION)" > $@
 	$(Q) echo "Hash: $(shell git log --oneline -1 --pretty=%h)" >> $@
-	$(Q) echo "Branch: $(shell git symbolic-ref --short HEAD)" >> $@
+	$(Q) echo "Branch: $(CURRENT_BRANCH)" >> $@
 	$(Q) echo "Build date: $(shell date '+%Y-%m-%d %H:%M:%S%z')" >> $@
 
 $(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/updateinfo: Make.config.inc
diff --git a/Xamarin.Mac.sln b/Xamarin.Mac.sln
index 9ee932978c73..127328a640ea 100644
--- a/Xamarin.Mac.sln
+++ b/Xamarin.Mac.sln
@@ -25,6 +25,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "src\generator.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator-tests", "tests\generator\generator-tests.csproj", "{10790816-D00E-40A0-8653-2A8AB4DD33A9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link sdk-mac", "tests\linker\mac\link sdk\link sdk-mac.csproj", "{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "link all-mac", "tests\linker\mac\link all\link all-mac.csproj", "{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dont link-mac-unified", "tests\linker\mac\dont link\dont link-mac-unified.csproj", "{78831857-A261-8EE0-A5F6-33D2628DE5D0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -351,6 +357,90 @@ Global
 		{10790816-D00E-40A0-8653-2A8AB4DD33A9}.winphone_Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10790816-D00E-40A0-8653-2A8AB4DD33A9}.winphone_Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{10790816-D00E-40A0-8653-2A8AB4DD33A9}.winphone_Release|Any CPU.Build.0 = Debug|Any CPU
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Debug|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Release|Any CPU.ActiveCfg = Release|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Release|Any CPU.Build.0 = Release|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Debug|x86.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Debug|x86.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Release|x86.ActiveCfg = Release|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.Release|x86.Build.0 = Release|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_2_0_Debug|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_2_0_Debug|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_2_0_Release|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_2_0_Release|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_3_5_Debug|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_3_5_Debug|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_3_5_Release|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_3_5_Release|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_4_0_Debug|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_4_0_Debug|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_4_0_Release|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.net_4_0_Release|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.silverlight_Debug|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.silverlight_Debug|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.silverlight_Release|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.silverlight_Release|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.winphone_Debug|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.winphone_Debug|Any CPU.Build.0 = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.winphone_Release|Any CPU.ActiveCfg = Debug|x86
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579}.winphone_Release|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Debug|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Release|Any CPU.ActiveCfg = Release|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Release|Any CPU.Build.0 = Release|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Debug|x86.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Debug|x86.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Release|x86.ActiveCfg = Release|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.Release|x86.Build.0 = Release|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_2_0_Debug|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_2_0_Debug|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_2_0_Release|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_2_0_Release|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_3_5_Debug|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_3_5_Debug|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_3_5_Release|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_3_5_Release|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_4_0_Debug|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_4_0_Debug|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_4_0_Release|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.net_4_0_Release|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.silverlight_Debug|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.silverlight_Debug|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.silverlight_Release|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.silverlight_Release|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.winphone_Debug|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.winphone_Debug|Any CPU.Build.0 = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.winphone_Release|Any CPU.ActiveCfg = Debug|x86
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB}.winphone_Release|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Debug|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Release|Any CPU.ActiveCfg = Release|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Release|Any CPU.Build.0 = Release|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Debug|x86.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Debug|x86.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Release|x86.ActiveCfg = Release|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.Release|x86.Build.0 = Release|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_2_0_Debug|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_2_0_Debug|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_2_0_Release|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_2_0_Release|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_3_5_Debug|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_3_5_Debug|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_3_5_Release|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_3_5_Release|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_4_0_Debug|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_4_0_Debug|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_4_0_Release|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.net_4_0_Release|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.silverlight_Debug|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.silverlight_Debug|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.silverlight_Release|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.silverlight_Release|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.winphone_Debug|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.winphone_Debug|Any CPU.Build.0 = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.winphone_Release|Any CPU.ActiveCfg = Debug|x86
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0}.winphone_Release|Any CPU.Build.0 = Debug|x86
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = tools\mmp\mmp.csproj
@@ -385,5 +475,8 @@ Global
 		{D12F0F7B-8DE3-43EC-BA49-41052D065A9B} = {542D4426-F287-4126-9889-E17628DAECEA}
 		{EA3E6B50-AE2B-4A63-BBFC-9888B93331CA} = {542D4426-F287-4126-9889-E17628DAECEA}
 		{10790816-D00E-40A0-8653-2A8AB4DD33A9} = {542D4426-F287-4126-9889-E17628DAECEA}
+		{F5FF0F5E-0C30-4719-A2B1-5DAE33D1E579} = {542D4426-F287-4126-9889-E17628DAECEA}
+		{4C943B12-C5AF-4CD4-B583-B4011D13CAAB} = {542D4426-F287-4126-9889-E17628DAECEA}
+		{78831857-A261-8EE0-A5F6-33D2628DE5D0} = {542D4426-F287-4126-9889-E17628DAECEA}
 	EndGlobalSection
 EndGlobal
diff --git a/builds/Makefile b/builds/Makefile
index 7e6d01fefd0a..85cdb1edbfac 100644
--- a/builds/Makefile
+++ b/builds/Makefile
@@ -91,9 +91,11 @@ CCACHE_CXXFLAGS=-Qunused-arguments
 #
 SDK_CONFIG=$(MONO_PATH)/sdks/Make.config
 SDK_ARGS=XCODE_DIR=$(XCODE_DEVELOPER_ROOT) IOS_VERSION=$(IOS_SDK_VERSION) IOS_VERSION_MIN=$(MIN_IOS_SDK_VERSION) TVOS_VERSION=$(TVOS_SDK_VERSION) TVOS_VERSION_MIN=$(MIN_TVOS_SDK_VERSION) WATCHOS_VERSION=$(WATCH_SDK_VERSION) WATCHOS_VERSION_MIN=$(MIN_WATCHOS_SDK_VERSION) IGNORE_PROVISION_LLVM=1
+SDK32_ARGS=XCODE_DIR=$(XCODE94_DEVELOPER_ROOT) IOS_VERSION=$(IOS_SDK_VERSION) IOS_VERSION_MIN=$(MIN_IOS_SDK_VERSION) TVOS_VERSION=$(TVOS_SDK_VERSION) TVOS_VERSION_MIN=$(MIN_TVOS_SDK_VERSION) WATCHOS_VERSION=$(WATCH_SDK_VERSION) WATCHOS_VERSION_MIN=$(MIN_WATCHOS_SDK_VERSION) IGNORE_PROVISION_LLVM=1
 
 ifdef DISABLE_DOWNLOAD_LLVM
 SDK_ARGS += DISABLE_DOWNLOAD_LLVM=1
+SDK32_ARGS += DISABLE_DOWNLOAD_LLVM=1
 endif
 
 SDK_BUILDDIR = $(MONO_PATH)/sdks/builds
@@ -388,11 +390,6 @@ endif
 $(MONO_PATH)/configure: $(MONO_PATH)/configure.ac $(BUILDS_MAKEFILE_DEP)
 	$(Q) ./wrap-autogen.sh $(MONO_PATH) mono $(XAMARIN_AUTOGEN_FLAGS)
 
-ifneq ($(WATCH_MONO_PATH),$(MONO_PATH))
-$(WATCH_MONO_PATH)/configure: $(WATCH_MONO_PATH)/configure.ac $(BUILDS_MAKEFILE_DEP)
-	$(Q) ./wrap-autogen.sh $(WATCH_MONO_PATH) mono
-endif
-
 configure-mono:
 	rm -f $(MONO_PATH)/configure
 	$(MAKE) $(MONO_PATH)/configure
@@ -420,6 +417,7 @@ TOOLS64_LDFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) $(COMMO
 
 TOOLS64_CONFIGURE_FLAGS=	--build=x86_64-apple-darwin10 \
 			--with-monotouch_tv=yes \
+			--with-monotouch_watch=yes \
 			--prefix=$(BUILD_DESTDIR)/tools64 \
 			--enable-maintainer-mode \
 			--cache-file=../tools64.config.cache \
@@ -434,12 +432,6 @@ TOOLS64_CONFIGURE_FLAGS=	--build=x86_64-apple-darwin10 \
 			--disable-boehm \
 			$(XAMARIN_IOS_CONFIGURE_FLAGS) \
 
-ifeq ($(WATCH_MONO_PATH),$(MONO_PATH))
-TOOLS64_CONFIGURE_FLAGS += --with-monotouch_watch=yes
-else
-TOOLS64_CONFIGURE_FLAGS += --with-monotouch_watch=no
-endif
-
 TOOLS64_ACVARS = $(COMMON_ACVARS)
 
 TOOLS64_CONFIGURE_ENVIRONMENT = \
@@ -493,79 +485,6 @@ install-local:: install-tools-tvos
 install-tools:: install-tools-tvos
 endif
 
-#
-# Xamarin.WatchOS BCL assemblies
-#
-# We need to build the WatchOS BCL using the same mono checkout as we're using for the
-# corresponding Mono runtimes, which means we can't use the normal tools64 build
-#
-# Also we can't reuse the existing watchsimulator/targetwatch builds, since their
-# monos don't run (correctly) on desktop OSX.
-#
-# So we build an entire Mono just to build the WatchOS BCL.
-#
-
-WATCHBCL_CFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION)
-WATCHBCL_CXXFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION)
-WATCHBCL_LDFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) $(COMMON_LDFLAGS)
-WATCHBCL_ACVARS = $(COMMON_ACVARS)
-
-
-WATCHBCL_CONFIGURE_FLAGS=	--build=x86_64-apple-darwin10 \
-			--prefix=$(BUILD_DESTDIR)/watchbcl \
-			--enable-maintainer-mode \
-			--cache-file=../watchbcl.config.cache \
-			--with-glib=embedded \
-			--enable-minimal=com	\
-			--with-profile4_x=no \
-			--with-monotouch=no \
-			--with-monotouch_watch=yes \
-			--with-monotouch_tv=no \
-			--with-xammac=no \
-			--with-mcs-docs=no \
-			--disable-nls \
-			--disable-iconv	\
-			--disable-boehm \
-			$(XAMARIN_IOS_CONFIGURE_FLAGS)
-
-WATCHBCL_CONFIGURE_ENVIRONMENT = \
-	$(WATCHBCL_ACVARS) \
-	CFLAGS="$(WATCHBCL_CFLAGS)" \
-	CXXFLAGS="$(WATCHBCL_CXXFLAGS)" \
-	LDFLAGS="$(WATCHBCL_LDFLAGS)" \
-	CC="$(MAC_CC)" \
-	CXX="$(MAC_CXX)" \
-
-ifdef INCLUDE_WATCH
-setup:: setup-watchbcl
-build:: build-watchbcl
-clean-local:: clean-watchbcl
-endif
-
-watchbcl: build-watchbcl install-tools-watch
-
-setup-watchbcl: .stamp-configure-watchbcl
-
-ifneq ($(WATCH_MONO_PATH),$(MONO_PATH))
-.stamp-configure-watchbcl: $(WATCH_MONO_PATH)/configure
-	$(Q) $(WATCHBCL_CONFIGURE_ENVIRONMENT) ./wrap-configure.sh watchbcl ../$(WATCH_MONO_PATH)/configure $(WATCHBCL_CONFIGURE_FLAGS)
-endif
-
-build-tools-bcl: build-watchbcl
-build-tools: build-watchbcl
-
-ifeq ($(WATCH_MONO_PATH),$(MONO_PATH))
-.stamp-build-watchbcl: .stamp-build-tools64 $(MONO_DEPENDENCIES)
-else
-.stamp-build-watchbcl: .stamp-configure-watchbcl .stamp-build-tools64 $(MONO_DEPENDENCIES)
-	$(MAKE) -C watchbcl all EXTERNAL_MCS=$(SYSTEM_CSC) EXTERNAL_RUNTIME=$(SYSTEM_MONO)
-	$(MAKE) -C watchbcl install EXTERNAL_MCS=$(SYSTEM_CSC) EXTERNAL_RUNTIME=$(SYSTEM_MONO)
-endif
-	$(Q) touch $@
-
-clean-watchbcl:
-	rm -rf watchbcl .stamp-*-watchbcl watchbcl.config.cache
-
 #
 # Xamarin.iOS/WatchOS/TVOS BCL assemblies
 #
@@ -587,7 +506,6 @@ IOS_REPL_ASSEMBLIES = mscorlib System System.Core System.Xml Mono.CSharp
 
 IOS_FACADE_ASSEMBLIES = $(monotouch_PARALLEL_SUBDIRS) $(monotouch_SUBDIRS)
 
-# TVOS/WATCHOS BCL is built from a different mono branch and the assembly list might differ across time
 TVOS_ASSEMBLIES = $(IOS_ASSEMBLIES)
 WATCHOS_ASSEMBLIES = $(filter-out Mono.Security Mono.Data.Tds,$(IOS_ASSEMBLIES))
 TVOS_FACADE_ASSEMBLIES = $(IOS_FACADE_ASSEMBLIES)
@@ -608,8 +526,8 @@ watch-facade-check: $(WATCH_BCL_TARGETS)
 disabled-watch-facade-check: $(WATCH_BCL_TARGETS)
 	$(Q) rm -f .$@*
 	$(Q) echo $(WATCHOS_FACADE_ASSEMBLIES) | tr ' ' '\n' | sort > .$@1
-	$(Q) ls -1 $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/Facades | grep dll$$ | sed 's/[.]dll//' | sort > .$@2
-	$(Q) if ! diff -u .$@1 .$@2; then echo "\n*** There are Facade assemblies in "$(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/Facades" not defined in "$(FACADE_SUBDIRS_MK)" ***\n"; exit 1; fi
+	$(Q) ls -1 $(MONO_PATH)/mcs/class/lib/monotouch_watch/Facades | grep dll$$ | sed 's/[.]dll//' | sort > .$@2
+	$(Q) if ! diff -u .$@1 .$@2; then echo "\n*** There are Facade assemblies in "$(MONO_PATH)/mcs/class/lib/monotouch_watch/Facades" not defined in "$(FACADE_SUBDIRS_MK)" ***\n"; exit 1; fi
 	$(Q) rm -f .$@*
 
 tvos-facade-check: $(TVOS_BCL_TARGETS) 
@@ -806,13 +724,10 @@ $(2):: build-$(2)
 build:: build-$(2)
 clean-local:: clean-$(2)
 
-# config/eglib-config.h is needed by the builds in runtime/
 .stamp-build-$(2): $(MONO_PATH)/configure $(MONO_DEPENDENCIES) $(BUILD_DESTDIR)/$(2)
 	$(MAKE) -C $(SDK_BUILDDIR) package-ios-$(3) $(SDK_ARGS)
 	$(Q) cp -r $(SDK_DESTDIR)/ios-$(4)/lib $(BUILD_DESTDIR)/$(2)
 	$(Q) cp -r $(SDK_DESTDIR)/ios-$(4)/include $(BUILD_DESTDIR)/$(2)
-	cp $(SDK_BUILDDIR)/ios-$(4)/config.h $(BUILD_DESTDIR)/$(2)/include/mono-2.0
-	cp $(SDK_BUILDDIR)/ios-$(4)/mono/eglib/eglib-config.h $(BUILD_DESTDIR)/$(2)/include/mono-2.0
 	$(Q) touch $$@
 
 build-$(2): .stamp-build-$(2)
@@ -919,8 +834,6 @@ endif
 	$(Q) mkdir -p $(BUILD_DESTDIR)/watchsimulator
 	$(Q) cp -r $(SDK_DESTDIR)/ios-simwatch-release/lib $(BUILD_DESTDIR)/watchsimulator
 	$(Q) cp -r $(SDK_DESTDIR)/ios-simwatch-release/include $(BUILD_DESTDIR)/watchsimulator
-	cp $(SDK_BUILDDIR)/ios-simwatch-release/config.h $(BUILD_DESTDIR)/watchsimulator/include/mono-2.0
-	cp $(SDK_BUILDDIR)/ios-simwatch-release/mono/eglib/eglib-config.h $(BUILD_DESTDIR)/watchsimulator/include/mono-2.0
 	$(Q) touch $@
 
 build-watchsimulator: .stamp-build-watchsimulator
@@ -1000,8 +913,6 @@ endif
 	$(Q) mkdir -p $(BUILD_DESTDIR)/tvsimulator
 	$(Q) cp -r $(SDK_DESTDIR)/ios-simtv-release/lib $(BUILD_DESTDIR)/tvsimulator
 	$(Q) cp -r $(SDK_DESTDIR)/ios-simtv-release/include $(BUILD_DESTDIR)/tvsimulator
-	cp $(SDK_BUILDDIR)/ios-simtv-release/config.h $(BUILD_DESTDIR)/tvsimulator/include/mono-2.0
-	cp $(SDK_BUILDDIR)/ios-simtv-release/mono/eglib/eglib-config.h $(BUILD_DESTDIR)/tvsimulator/include/mono-2.0
 	$(Q) touch $@
 
 build-tvsimulator: .stamp-build-tvsimulator
@@ -1092,8 +1003,6 @@ clean-local:: clean-$(2)
 	$(MAKE) -C $(SDK_BUILDDIR) package-ios-$(3) $(SDK_ARGS)
 	$(Q) mkdir -p $(BUILD_DESTDIR)/$(2)
 	$(Q) cp -r $(SDK_DESTDIR)/ios-$(3)-release/* $(BUILD_DESTDIR)/$(2)
-	$(Q) cp -r $(SDK_BUILDDIR)/ios-$(3)-release/config.h $(BUILD_DESTDIR)/$(2)/include/mono-2.0
-	$(Q) cp -r $(SDK_BUILDDIR)/ios-$(3)-release/mono/eglib/eglib-config.h $(BUILD_DESTDIR)/$(2)/include/mono-2.0
 	$(Q) touch $$@
 
 build-$(2): .stamp-build-$(2)
@@ -1268,8 +1177,6 @@ watchos:: targetwatch
 	$(MAKE) -C $(SDK_BUILDDIR) package-ios-targetwatch $(SDK_ARGS)
 	$(Q) mkdir -p $(BUILD_DESTDIR)/targetwatch
 	$(Q) cp -r $(SDK_DESTDIR)/ios-targetwatch-release/* $(BUILD_DESTDIR)/targetwatch
-	$(Q) cp -r $(SDK_BUILDDIR)/ios-targetwatch-release/config.h $(BUILD_DESTDIR)/targetwatch/include/mono-2.0
-	$(Q) cp -r $(SDK_BUILDDIR)/ios-targetwatch-release/mono/eglib/eglib-config.h $(BUILD_DESTDIR)/targetwatch/include/mono-2.0
 	$(Q) touch $@
 
 build-targetwatch: .stamp-build-targetwatch
@@ -1381,8 +1288,6 @@ tvos:: targettv
 	$(MAKE) -C $(SDK_BUILDDIR) package-ios-targettv $(SDK_ARGS)
 	$(Q) mkdir -p $(BUILD_DESTDIR)/targettv
 	$(Q) cp -r $(SDK_DESTDIR)/ios-targettv-release/* $(BUILD_DESTDIR)/targettv
-	$(Q) cp -r $(SDK_BUILDDIR)/ios-targettv-release/config.h $(BUILD_DESTDIR)/targettv/include/mono-2.0
-	$(Q) cp -r $(SDK_BUILDDIR)/ios-targettv-release/mono/eglib/eglib-config.h $(BUILD_DESTDIR)/targettv/include/mono-2.0
 	$(Q) touch $@
 
 build-targettv: .stamp-build-targettv
@@ -1498,11 +1403,15 @@ ifdef INCLUDE_DEVICE
 clean-local:: clean-llvm
 endif
 
-build-llvm32: .stamp-build-llvm
-build-llvm64: .stamp-build-llvm
+build-llvm32: .stamp-build-llvm .stamp-build-llvm32
+build-llvm64: .stamp-build-llvm .stamp-build-llvm32
 
 .stamp-build-llvm: $(SDK_CONFIG)
-	$(MAKE) -C $(SDK_BUILDDIR) provision-llvm36-llvm32 provision-llvm-llvm64 $(SDK_ARGS)
+	$(MAKE) -C $(SDK_BUILDDIR) provision-llvm-llvm64 $(SDK_ARGS)
+	$(Q) touch $@
+
+.stamp-build-llvm32: $(SDK_CONFIG)
+	$(MAKE) -C $(SDK_BUILDDIR) provision-llvm36-llvm32 $(SDK32_ARGS)
 	$(Q) touch $@
 
 clean-llvm: $(SDK_CONFIG)
@@ -1531,8 +1440,8 @@ $(PREFIX)/LLVM/bin:
 $(PREFIX)/LLVM36/bin:
 	$(Q) mkdir -p $@
 
-install-llvm32:.stamp-build-llvm $(LLVM_TARGETS)
-install-llvm64: .stamp-build-llvm $(LLVM_TARGETS)
+install-llvm32:.stamp-build-llvm .stamp-build-llvm32 $(LLVM_TARGETS)
+install-llvm64: .stamp-build-llvm .stamp-build-llvm32 $(LLVM_TARGETS)
 
 llvm: build-llvm64 install-llvm
 llvm64: install-llvm64
@@ -1540,11 +1449,6 @@ llvm64: install-llvm64
 $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(MONO_PATH)/configure $(wildcard $(MONO_PATH)/tools/offsets-tool/*.cs)
 	$(Q) $(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
 
-ifneq ($(WATCH_MONO_PATH),$(MONO_PATH))
-$(WATCH_MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(wildcard $(WATCH_MONO_PATH)/tools/offsets-tool/*.cs)
-	$(Q) $(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
-endif
-
 targetwatch/mono/arch/arm/arm_dpimacros.h: .stamp-configure-targetwatch
 	$(Q) $(MAKE) -C $(dir $@) $(notdir $@)
 
@@ -1574,7 +1478,7 @@ build:: build-$(1)
 install-local:: install-$(1)
 clean-local:: clean-$(1)
 
-.stamp-build-$(1): .stamp-build-llvm $(MONO_PATH)/configure $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe $(MONO_DEPENDENCIES) $(SDK_CONFIG)
+.stamp-build-$(1): .stamp-build-llvm .stamp-build-llvm32 $(MONO_PATH)/configure $(MONO_PATH)/tools/offsets-tool/MonoAotOffsetsDumper.exe $(MONO_DEPENDENCIES) $(SDK_CONFIG)
 	$(MAKE) -C $(SDK_BUILDDIR) package-ios-$(1) $(SDK_ARGS) $(if $(5), XCODE_DIR=$(5))
 	$(Q) touch $$@
 
diff --git a/docs/website/mtouch-errors.md b/docs/website/mtouch-errors.md
index 7be3a24de17b..58e6da56748e 100644
--- a/docs/website/mtouch-errors.md
+++ b/docs/website/mtouch-errors.md
@@ -915,7 +915,9 @@ Alternatively, enable the managed [linker](https://docs.microsoft.com/en-us/xama
 
 As a last-straw solution, use an older version of Xamarin.iOS that does not require these new SDKs to be present during the build process.
 
-### <a name="MT0136"/>MT0136: Cannot find the assembly {assembly} referenced from {assembly}.
+<a name="MT0136"/>
+
+### MT0136: Cannot find the assembly {assembly} referenced from {assembly}.
 
 This warning occurs when an assembly passed to mtouch contains a reference to
 another assembly that can't be found.
@@ -923,7 +925,9 @@ another assembly that can't be found.
 mtouch may in certain cases still find references at a later point, which
 means that if the build otherwise succeeds, this warning can be ignored.
 
-### <a name="MT0137"/>MT0137: Cannot find the assembly {assembly}, referenced by an attribute in {assembly}.
+<a name="MT0137"/>
+
+### MT0137: Cannot find the assembly {assembly}, referenced by an attribute in {assembly}.
 
 This warning occurs when an attribute contains a reference to another assembly
 that can't be found.
@@ -933,6 +937,14 @@ means that if the build otherwise succeeds, this warning can be ignored.
 
 <!-- 0138-0139: used by mmp -->
 
+<a name="MT0140"/>
+
+### MT0140: File '{framework_filename}' is not a valid framework.
+
+This error occurs when `mtouch` reads a binary in a `.framework` directory that is not a valid executable.
+
+It might be a broken file or a broken symlink (after decompressing an archive) to a valid file. The native framework should be removed and replaced with a valid one. 
+
 # MT1xxx: Project related error messages
 
 ### MT10xx: Installer / mtouch
@@ -3116,6 +3128,25 @@ Where * can be:
 
 *MSBuild task: PropertyListEditorTaskBase*
 
+<a name="MT7068" />
+
+### MT7068: Error loading '*': *
+
+*MSBuild task: IntentDefinitionCodegenTaskBase*
+*MSBuild task: IntentDefinitionCompilerTaskBase*
+
+<a name="MT7069" />
+
+### MT7069: Unknown response parameter: *
+
+*MSBuild task: IntentDefinitionCodegenTaskBase*
+
+<a name="MT7070" />
+
+### MT7070: All Intents must have a Title
+
+*MSBuild task: IntentDefinitionCompilerTaskBase*
+
 ## MT8xxx: Runtime error messages
 
 <!--
diff --git a/external/fsharp b/external/fsharp
deleted file mode 160000
index 717170087711..000000000000
--- a/external/fsharp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7171700877115e2243b4edbc4e2eb88d019e02b0
diff --git a/external/macios-binaries b/external/macios-binaries
index a4a1ceec883c..850e2e303584 160000
--- a/external/macios-binaries
+++ b/external/macios-binaries
@@ -1 +1 @@
-Subproject commit a4a1ceec883cc47f5eb4d4604fe5fe52d1f662d0
+Subproject commit 850e2e3035843e93e758ca79aff3fc977b2c18ac
diff --git a/fsharp/.gitignore b/fsharp/.gitignore
index 7259e350e439..ee3d10ec8d6b 100644
--- a/fsharp/.gitignore
+++ b/fsharp/.gitignore
@@ -1,2 +1,4 @@
 build.stamp
+Makefile.inc
+fsharp
 
diff --git a/fsharp/Makefile b/fsharp/Makefile
index 28a2fc0e1efb..11d2a2244745 100644
--- a/fsharp/Makefile
+++ b/fsharp/Makefile
@@ -1,7 +1,32 @@
 TOP=..
 include $(TOP)/Make.config
 
-FSHARP_FILES:=$(shell git --git-dir=$(FSHARP_PATH)/.git --work-tree=$(FSHARP_PATH) ls-tree --full-tree -r HEAD --name-only | sed 's_^\(.*\)_$(FSHARP_PATH)/\1_' | sed 's/ /\\ /g')
+# By default we'll get the F# binaries from the macios-binaries repository.
+# It's still possible to build from source, by passing "FSHARP_BUILD_FROM_SOURCE=1" when building,
+# which will automatically clone the fsharp repository, and build what's needed.
+# The FSHARP_SOURCE_HASH variable below defines which fsharp hash to build.
+
+FSHARP_SOURCE_HASH=7171700877115e2243b4edbc4e2eb88d019e02b0
+FSHARP_SOURCE_BRANCH=master
+
+FSHARP_BINARIES_PATH=$(abspath $(MACIOS_BINARIES_PATH)/fsharp)
+FSHARP_SOURCE_PATH=$(abspath $(CURDIR)/fsharp)
+
+ifeq ($(FSHARP_BUILD_FROM_SOURCE),)
+FSHARP_PATH=$(FSHARP_BINARIES_PATH)
+FSHARP_BUILD_PATH=$(FSHARP_BINARIES_PATH)
+else
+FSHARP_PATH=$(FSHARP_SOURCE_PATH)
+FSHARP_BUILD_PATH=build
+
+# Create a list of all the source files in the fsharp repo to use as dependencies.
+# But skip any files with spaces, because make + spaces is not a good combination.
+Makefile.inc: $(FSHARP_SOURCE_PATH)
+	$(Q) printf "FSHARP_FILES := \\\\\\n" >> $@.tmp
+	$(Q) git --git-dir=$(FSHARP_SOURCE_PATH)/.git --work-tree=$(FSHARP_SOURCE_PATH) ls-tree --full-tree -r HEAD --name-only | grep -v ' ' | sed -e 's_^\(.*\)_	$(FSHARP_SOURCE_PATH)/\1 \\_' >> $@.tmp
+	$(Q) mv $@.tmp $@
+-include Makefile.inc
+endif
 
 FSHARP_TARGET_FILES =   \
 	FSharp.Core.dll     \
@@ -10,6 +35,11 @@ FSHARP_TARGET_FILES =   \
 	FSharp.Core.sigdata \
 	FSharp.Core.xml     \
 
+$(FSHARP_SOURCE_PATH):
+	$(Q) echo "Cloning the fsharp repository..."
+	$(Q) git clone -q https://github.com/fsharp/fsharp fsharp
+	$(Q) cd fsharp && git checkout $(FSHARP_SOURCE_BRANCH) && git reset --hard $(FSHARP_SOURCE_HASH)
+
 BIN_DIR=$(FSHARP_PATH)/lib/release
 IOS_BIN_DIR = $(FSHARP_PATH)/lib/release/monotouch
 WATCH_BIN_DIR = $(FSHARP_PATH)/lib/release/xamarinwatchos
@@ -33,7 +63,7 @@ IOS_FSHARP_DIRECTORIES =                                   \
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/LICENSE-fsharp: $(FSHARP_PATH)/LICENSE | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
 	$(Q) install -m 0644 $< $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%.dll: build/monotouch/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%.dll: $(FSHARP_BUILD_PATH)/monotouch/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
 	$(Q) install -m 0644 $< $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%: $(IOS_BIN_DIR)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
@@ -42,7 +72,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%: $(IOS_BIN_DIR)/% | $(IOS_DESTD
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/LICENSE-fsharp: $(FSHARP_PATH)/LICENSE | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
 	$(Q) install -m 0644 $< $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.dll: build/monotouch/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.dll: $(FSHARP_BUILD_PATH)/monotouch/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
 	$(Q) install -m 0644 $< $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%: $(IOS_BIN_DIR)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
@@ -62,7 +92,7 @@ WATCH_FSHARP_DIRECTORIES =                                     \
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/LICENSE-fsharp: $(FSHARP_PATH)/LICENSE | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
 	$(Q) install -m 0644 $< $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.dll: build/xamarinwatchos/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.dll: $(FSHARP_BUILD_PATH)/xamarinwatchos/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
 	$(Q) install -m 0644 $< $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%: $(WATCH_BIN_DIR)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
@@ -82,7 +112,7 @@ TVOS_FSHARP_DIRECTORIES =                                   \
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/LICENSE-fsharp: $(FSHARP_PATH)/LICENSE | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
 	$(Q) install -m 0644 $< $@
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.dll: build/xamarintvos/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.dll: $(FSHARP_BUILD_PATH)/xamarintvos/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
 	$(Q) install -m 0644 $< $@
 
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%: $(TVOS_BIN_DIR)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
@@ -107,7 +137,7 @@ MAC_FSHARP_DIRECTORIES =                                            \
 $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/LICENSE-fsharp: $(FSHARP_PATH)/LICENSE | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
 	$(Q) install -m 0644 $< $@
 
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/%.dll: build/xamarinmacfull/%.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
+$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/%.dll: $(FSHARP_BUILD_PATH)/xamarinmacfull/%.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
 	$(Q) install -m 0644 $< $@
 
 $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/%: $(MAC_45_BIN_DIR)/% | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
@@ -118,7 +148,7 @@ $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/%: $(MAC_45_BIN_DIR)/% |
 $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/LICENSE-fsharp: $(FSHARP_PATH)/LICENSE | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac
 	$(Q) install -m 0644 $< $@
 
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/%.dll: build/xamarinmacmobile/%.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac
+$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/%.dll: $(FSHARP_BUILD_PATH)/xamarinmacmobile/%.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac
 	$(Q) install -m 0644 $< $@
 
 $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/%: $(MAC_MOBILE_BIN_DIR)/% | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac
@@ -163,11 +193,15 @@ build.stamp: $(FSHARP_FILES) $(FSHARP_PATH)/Makefile
 	$(MAKE) -C $(FSHARP_PATH)/src/fsharp $(FSHARP_BUILD_TARGETS)
 	$(Q) touch $@
 
+ifneq ($(FSHARP_BUILD_FROM_SOURCE),)
 $(FSHARP_TARGETS): build.stamp
+endif
 
 all-local:: $(FSHARP_TARGETS)
 install-local:: $(FSHARP_TARGETS)
 
+$(FSHARP_PATH)/autogen.sh: $(FSHARP_SOURCE_PATH)
+
 $(FSHARP_PATH)/Makefile: $(FSHARP_PATH)/autogen.sh $(FSHARP_FILES) /Library/Frameworks/Mono.framework/Versions/Current/updateinfo
 	@echo "Executing autogen for fsharp..."
 	$(Q) cd $(FSHARP_PATH) && ./autogen.sh --prefix=/Library/Frameworks/Mono.framework/Versions/Current
diff --git a/mk/rules.mk b/mk/rules.mk
index 847286c149c5..efb37a6c7f29 100644
--- a/mk/rules.mk
+++ b/mk/rules.mk
@@ -3,18 +3,18 @@ builds_root=$(TOP)/builds
 
 # helpful rules to compile things for the various architectures
 
-COMMON_I:= -I. -I$(mono_root) -I$(mono_root)/mono/eglib -I$(mono_root)/mono/metadata 
-SIM32_I := $(COMMON_I) -I$(BUILD_DESTDIR)/simulator86/include/mono-2.0
-SIM64_I := $(COMMON_I) -I$(BUILD_DESTDIR)/simulator64/include/mono-2.0
-DEV7_I  := $(COMMON_I) -I$(BUILD_DESTDIR)/target7/include/mono-2.0
-DEV7s_I := $(COMMON_I) -I$(BUILD_DESTDIR)/target7s/include/mono-2.0
-DEV64_I := $(COMMON_I) -I$(BUILD_DESTDIR)/target64/include/mono-2.0
-
-SIMW_I  := $(COMMON_I) -I$(BUILD_DESTDIR)/watchsimulator/include/mono-2.0
-DEVW_I  := $(COMMON_I) -I$(BUILD_DESTDIR)/targetwatch/include/mono-2.0
-
-SIM_TV_I:= $(COMMON_I) -I$(BUILD_DESTDIR)/tvsimulator/include/mono-2.0
-DEV_TV_I:= $(COMMON_I) -I$(BUILD_DESTDIR)/targettv/include/mono-2.0
+COMMON_I:= -I.
+SIM32_I := $(COMMON_I)
+SIM64_I := $(COMMON_I)
+DEV7_I  := $(COMMON_I)
+DEV7s_I := $(COMMON_I)
+DEV64_I := $(COMMON_I)
+
+SIMW_I  := $(COMMON_I)
+DEVW_I  := $(COMMON_I)
+
+SIM_TV_I:= $(COMMON_I)
+DEV_TV_I:= $(COMMON_I)
 
 define NativeCompilationTemplate
 
diff --git a/mk/versions.mk b/mk/versions.mk
index 368e3cd6c9fd..7427e4b063c3 100644
--- a/mk/versions.mk
+++ b/mk/versions.mk
@@ -67,7 +67,6 @@ endef
 
 $(shell rm -f .check-versions-failure)
 $(eval $(call CheckSubmoduleTemplate,mono,MONO))
-$(eval $(call CheckSubmoduleTemplate,fsharp,FSHARP))
 $(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
 $(eval $(call CheckSubmoduleTemplate,opentk,OPENTK))
 $(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
@@ -81,9 +80,6 @@ include $(TOP)/mk/xamarin.mk
 reset-mono::
 	$(Q) rm -f $(TOP)/.stamp-build* $(MONO_PATH)/configure
 
-reset-fsharp::
-	$(Q) cd $(FSHARP_PATH) && git clean -xffdq
-
 check-versions::
 	@if test -e .check-versions-failure; then  \
 		rm .check-versions-failure; \
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
index 8bb78b93e29f..753d86ffa252 100644
--- a/mk/xamarin.mk
+++ b/mk/xamarin.mk
@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 46a12247947cdf546e0e07f4e7062ef2f5fcf515
+NEEDED_MACCORE_VERSION := b35c3a8d7682c8482c7c749d7c1670b3d4bbed5c
 NEEDED_MACCORE_BRANCH := master
 
 MACCORE_DIRECTORY := maccore
diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ScnToolTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ScnToolTaskBase.cs
index b99e198c017a..a3f4206e9013 100644
--- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ScnToolTaskBase.cs
+++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ScnToolTaskBase.cs
@@ -58,16 +58,21 @@ void SetEnvironmentVariable (string variableName, string value)
 			var envVariables = EnvironmentVariables;
 			var index = -1;
 
-			for (int i = 0; i < envVariables.Length; i++) {
-				if (envVariables [i].StartsWith (variableName + "=", StringComparison.Ordinal)) {
-					index = i;
-					break;
+			if (envVariables == null) {
+				envVariables = new string [1];
+				index = 0;
+			} else {
+				for (int i = 0; i < envVariables.Length; i++) {
+					if (envVariables [i].StartsWith (variableName + "=", StringComparison.Ordinal)) {
+						index = i;
+						break;
+					}
 				}
-			}
 
-			if (index < 0) {
-				Array.Resize<string> (ref envVariables, envVariables.Length + 1);
-				index = envVariables.Length - 1;
+				if (index < 0) {
+					Array.Resize<string> (ref envVariables, envVariables.Length + 1);
+					index = envVariables.Length - 1;
+				}
 			}
 
 			envVariables [index] = string.Format ("{0}={1}", variableName, value);
diff --git a/runtime/Makefile b/runtime/Makefile
index 61a4498132a9..f6ce43219eac 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -50,9 +50,6 @@ bindings-generator.exe: bindings-generator.cs
 bindings-generated.m: bindings-generator.exe
 	$(Q_GEN) $(SYSTEM_MONO) --debug $< $@
 
-zlib-helper.c: $(MONO_PATH)/support/zlib-helper.c
-	$(Q) ln -fs $< $@
-
 # our makefiles don't support building the same source file multiple times with different defines,
 # so just symlink extension-main.m to another file and compile that instead.
 app-main.m watchextension-main.m tvextension-main.m: extension-main.m
@@ -83,7 +80,7 @@ MONOTOUCH_FRAMEWORKS =  \
 	Xamarin             \
 	Xamarin-debug       \
 
-MONOTOUCH_SOURCE_STEMS = $(patsubst %.s,%,$(patsubst %.m,%,$(SHARED_SOURCES) $(MONOTOUCH_SOURCES))) zlib-helper
+MONOTOUCH_SOURCE_STEMS = $(patsubst %.s,%,$(patsubst %.m,%,$(SHARED_SOURCES) $(MONOTOUCH_SOURCES)))
 MONOTOUCH_I386_SOURCE_STEMS = $(patsubst %.s,%,$(patsubst %.m,%,$(SHARED_I386_SOURCES)))
 MONOTOUCH_X86_64_SOURCE_STEMS = $(patsubst %.s,%,$(patsubst %.m,%,$(SHARED_X86_64_SOURCES)))
 
@@ -312,6 +309,20 @@ $(eval $(call LibTemplate,ios,IOS))
 $(eval $(call LibTemplate,watchos,WATCHOS))
 $(eval $(call LibTemplate,tvos,TVOS))
 
+SDK_BUILDDIR=$(MONO_PATH)/sdks/builds
+
+ZLIB_HELPER_IOS_armv7      = $(SDK_BUILDDIR)/ios-target32-release/support/zlib-helper.o
+ZLIB_HELPER_IOS_armv7s     = $(SDK_BUILDDIR)/ios-target32s-release/support/zlib-helper.o
+ZLIB_HELPER_IOS_arm64      = $(SDK_BUILDDIR)/ios-target64-release/support/zlib-helper.o
+ZLIB_HELPER_IOS_x86        = $(SDK_BUILDDIR)/ios-sim32-release/support/zlib-helper.o
+ZLIB_HELPER_IOS_x86_64     = $(SDK_BUILDDIR)/ios-sim64-release/support/zlib-helper.o
+
+ZLIB_HELPER_WATCHOS_armv7k = $(SDK_BUILDDIR)/ios-targetwatch-release/support/zlib-helper.o
+ZLIB_HELPER_WATCHOS_x86    = $(SDK_BUILDDIR)/ios-simwatch-release/support/zlib-helper.o
+
+ZLIB_HELPER_TVOS_arm64     = $(SDK_BUILDDIR)/ios-targettv-release/support/zlib-helper.o
+ZLIB_HELPER_TVOS_x86_64    = $(SDK_BUILDDIR)/ios-simtv-release/support/zlib-helper.o
+
 #
 # LibXamarinTemplate (and LibXamarinArchTemplate) builds libxamarin.a
 #
@@ -328,12 +339,12 @@ define LibXamarinTemplate
 $(1)$(3)_COMMON_DYLIB_FLAGS = -lmonosgen-2.0 -Wl,-install_name,libxamarin$(4).dylib -framework Foundation -framework CFNetwork -framework UIKit -lz
 $(1)$(3)_COMMON_FRAMEWORK_FLAGS = -framework Mono -Wl,-install_name,@rpath/Xamarin$(4).framework/Xamarin$(4) -framework Foundation -framework CFNetwork -framework UIKit -lz
 
-x86_$(1)$(3)_OBJECTS    = $$(patsubst %,.libs/$(1)/%$(4).x86.o,$$($(2)_SOURCE_STEMS))    $$(patsubst %,.libs/$(1)/%$(4).x86.o,$$($(2)_I386_SOURCE_STEMS))
-x86_64_$(1)$(3)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(4).x86_64.o,$$($(2)_SOURCE_STEMS)) $$(patsubst %,.libs/$(1)/%$(4).x86_64.o,$$($(2)_X86_64_SOURCE_STEMS))
-armv7_$(1)$(3)_OBJECTS  = $$(patsubst %,.libs/$(1)/%$(4).armv7.o,$$($(2)_SOURCE_STEMS))
-armv7s_$(1)$(3)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(4).armv7s.o,$$($(2)_SOURCE_STEMS))
-armv7k_$(1)$(3)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(4).armv7k.o,$$($(2)_SOURCE_STEMS))
-arm64_$(1)$(3)_OBJECTS  = $$(patsubst %,.libs/$(1)/%$(4).arm64.o,$$($(2)_SOURCE_STEMS))
+x86_$(1)$(3)_OBJECTS    = $(ZLIB_HELPER_$(2)_x86)    $$(patsubst %,.libs/$(1)/%$(4).x86.o,$$($(2)_SOURCE_STEMS))    $$(patsubst %,.libs/$(1)/%$(4).x86.o,$$($(2)_I386_SOURCE_STEMS))
+x86_64_$(1)$(3)_OBJECTS = $(ZLIB_HELPER_$(2)_x86_64) $$(patsubst %,.libs/$(1)/%$(4).x86_64.o,$$($(2)_SOURCE_STEMS)) $$(patsubst %,.libs/$(1)/%$(4).x86_64.o,$$($(2)_X86_64_SOURCE_STEMS))
+armv7_$(1)$(3)_OBJECTS  = $(ZLIB_HELPER_$(2)_armv7)  $$(patsubst %,.libs/$(1)/%$(4).armv7.o,$$($(2)_SOURCE_STEMS))
+armv7s_$(1)$(3)_OBJECTS = $(ZLIB_HELPER_$(2)_armv7s) $$(patsubst %,.libs/$(1)/%$(4).armv7s.o,$$($(2)_SOURCE_STEMS))
+armv7k_$(1)$(3)_OBJECTS = $(ZLIB_HELPER_$(2)_armv7k) $$(patsubst %,.libs/$(1)/%$(4).armv7k.o,$$($(2)_SOURCE_STEMS))
+arm64_$(1)$(3)_OBJECTS  = $(ZLIB_HELPER_$(2)_arm64)  $$(patsubst %,.libs/$(1)/%$(4).arm64.o,$$($(2)_SOURCE_STEMS))
 
 $$(foreach arch,$$($(2)_ARCHITECTURES),$$(eval $$(call LibXamarinArchTemplate,$(1),$(2),$(3),$(4),$$(arch))))
 
diff --git a/runtime/monotouch-debug.m b/runtime/monotouch-debug.m
index 74a022ead91b..3fd96ab09e8e 100644
--- a/runtime/monotouch-debug.m
+++ b/runtime/monotouch-debug.m
@@ -67,6 +67,7 @@
 static bool debugging_configured = false;
 static bool profiler_configured = false;
 static bool config_timedout = false;
+static bool connection_failed = false;
 static DebuggingMode debugging_mode = DebuggingModeWifi;
 static const char *connection_mode = "default"; // this is set from the cmd line, can be either 'usb', 'wifi', 'http' or 'none'
 
@@ -393,6 +394,7 @@ -(void) URLSession: (NSURLSession *) session task: (NSURLSessionTask *) task did
 			gettimeofday(&wait_tv, NULL);
 
 			int timeout;
+			int iterations = 1;
 #if TARGET_OS_WATCH && !TARGET_OS_SIMULATOR
 			// When debugging on a watch device, we ensure that a native debugger is attached as well
 			// (since otherwise the launch sequence takes so long that watchOS kills us).
@@ -400,7 +402,8 @@ -(void) URLSession: (NSURLSession *) session task: (NSURLSessionTask *) task did
 			// to not wait at all when a native debugger is not attached, which would otherwise
 			// slow down every debug launch. And *that* allows us to wait for as long as we wish
 			// when debugging.
-			timeout = 3600;
+			timeout = 10;
+			iterations = 360;
 #else
 			timeout = 2;
 #endif
@@ -408,14 +411,29 @@ -(void) URLSession: (NSURLSession *) session task: (NSURLSessionTask *) task did
 			wait_ts.tv_nsec = wait_tv.tv_usec * 1000;
 			
 			pthread_mutex_lock (&mutex);
-			while (!debugging_configured && !config_timedout) {
-				if (pthread_cond_timedwait (&cond, &mutex, &wait_ts) == ETIMEDOUT)
-					config_timedout = true;
+			while (!debugging_configured && !config_timedout && !connection_failed) {
+				if (pthread_cond_timedwait (&cond, &mutex, &wait_ts) == ETIMEDOUT) {
+					iterations--;
+					if (iterations <= 0) {
+						config_timedout = true;
+					} else {
+						LOG (PRODUCT ": Waiting for connection to the IDE...")
+						// Try again
+						gettimeofday(&wait_tv, NULL);
+						wait_ts.tv_sec = wait_tv.tv_sec + timeout;
+						wait_ts.tv_nsec = wait_tv.tv_usec * 1000;
+					}
+				}
 			}
 			pthread_mutex_unlock (&mutex);
 			
-			if (!config_timedout)
+			if (connection_failed) {
+				LOG (PRODUCT ": Debugger not loaded (failed to connect to the IDE).\n");
+			} else if (config_timedout) {
+				LOG (PRODUCT ": Debugger not loaded (timed out while trying to connect to the IDE).\n");
+			} else {
 				monotouch_load_debugger ();
+			}
 		} else {
 			LOG (PRODUCT ": Not connecting to the IDE, debug has been disabled\n");
 		}
@@ -772,6 +790,7 @@ int sdb_recv (void *buf, int len)
 static NSString *connected_ip = NULL;
 static pthread_cond_t connected_event = PTHREAD_COND_INITIALIZER;
 static pthread_mutex_t connected_mutex = PTHREAD_MUTEX_INITIALIZER;
+static int pending_connections = 0;
 
 void
 xamarin_connect_http (NSMutableArray *ips)
@@ -803,6 +822,7 @@ int sdb_recv (void *buf, int len)
 		}
 		pthread_mutex_unlock (&connected_mutex);
 
+		pending_connections = [ips count];
 		for (int i = 0; i < [ips count]; i++) {
 			XamarinHttpConnection *connection = [[[XamarinHttpConnection alloc] init] autorelease];
 			connection.ip = [ips objectAtIndex: i];
@@ -811,15 +831,16 @@ int sdb_recv (void *buf, int len)
 			[connection connect: [ips objectAtIndex: i] port: monodevelop_port completionHandler: ^void (bool success)
 			{
 				LOG_HTTP ("Connected: %@: %i", connection, success);
+				pthread_mutex_lock (&connected_mutex);
 				if (success) {
-					pthread_mutex_lock (&connected_mutex);
 					if (connected_connection == NULL) {
 						connected_ip = [connection ip];
 						connected_connection = connection;
-						pthread_cond_signal (&connected_event);
 					}
-					pthread_mutex_unlock (&connected_mutex);
 				}
+				pending_connections--;
+				pthread_cond_signal (&connected_event);
+				pthread_mutex_unlock (&connected_mutex);
 			}];
 		}
 
@@ -827,9 +848,16 @@ int sdb_recv (void *buf, int len)
 
 		LOG_HTTP ("Will wait for connections");
 		pthread_mutex_lock (&connected_mutex);
-		while (connected_connection == NULL)
+		while (connected_connection == NULL && pending_connections > 0)
 			pthread_cond_wait (&connected_event, &connected_mutex);
 		pthread_mutex_unlock (&connected_mutex);
+		if (connected_connection == NULL) {
+			pthread_mutex_lock (&mutex);
+			connection_failed = true;
+			pthread_cond_signal (&cond);
+			pthread_mutex_unlock (&mutex);
+			break;
+		}
 		LOG_HTTP ("Connection received fd: %i", connected_connection.fileDescriptor);
 	} while (monotouch_process_connection (connected_connection.fileDescriptor));
 
diff --git a/runtime/runtime.m b/runtime/runtime.m
index 2ab99e13c2fa..8e829b39a987 100644
--- a/runtime/runtime.m
+++ b/runtime/runtime.m
@@ -131,7 +131,7 @@
 };
 
 enum InitializationFlags : int {
-	/* unused									= 0x01,*/
+	InitializationFlagsIsPartialStaticRegistrar = 0x01,
 	/* unused									= 0x02,*/
 	InitializationFlagsDynamicRegistrar			= 0x04,
 	/* unused									= 0x08,*/
@@ -1001,11 +1001,28 @@ -(void) xamarinSetGCHandle: (int) gc_handle;
  * Registration map
  */ 
 
+static int
+compare_mtclassmap (const void *a, const void *b)
+{
+	MTClassMap *mapa = (MTClassMap *) a;
+	MTClassMap *mapb = (MTClassMap *) b;
+	if (mapa->handle == mapb->handle)
+		return 0;
+	if ((intptr_t) mapa->handle < (intptr_t) mapb->handle)
+		return -1;
+	return 1;
+}
+
 void
-xamarin_add_registration_map (struct MTRegistrationMap *map)
+xamarin_add_registration_map (struct MTRegistrationMap *map, bool partial)
 {
 	// COOP: no managed memory access: any mode
 	options.RegistrationData = map;
+	if (partial)
+		options.flags = (InitializationFlags) (options.flags | InitializationFlagsIsPartialStaticRegistrar);
+
+	// Sort the type map according to Class
+	qsort (map->map, map->map_count, sizeof (MTClassMap), compare_mtclassmap);
 }
 
 /*
@@ -1879,11 +1896,42 @@ -(void) xamarinSetGCHandle: (int) gc_handle;
 	set_raw_gchandle (self, gchandle);
 }
 
+static int
+find_user_type_index (MTClassMap *map, int lo, int hi, Class cls)
+{
+	if (hi >= lo) {
+		int mid = lo + (hi - lo) / 2;
+
+		if (map [mid].handle == cls)
+			return mid;
+
+		if ((intptr_t) map [mid].handle > (intptr_t) cls)
+			return find_user_type_index (map, lo, mid - 1, cls);
+
+		return find_user_type_index (map, mid + 1, hi, cls);
+	}
+
+	return -1;
+}
+
 static inline bool
 is_user_type (id self)
 {
+	Class cls = object_getClass (self);
+
+	if (options.RegistrationData != NULL && options.RegistrationData->map_count > 0) {
+		MTClassMap *map = options.RegistrationData->map;
+		int idx = find_user_type_index (map, 0, options.RegistrationData->map_count - 1, cls);
+		if (idx >= 0)
+			return (map [idx].flags & MTTypeFlagsUserType) == MTTypeFlagsUserType;
+		// If using the partial static registrar, we need to continue
+		// If full static registrar, we can return false
+		if ((options.flags & InitializationFlagsIsPartialStaticRegistrar) != InitializationFlagsIsPartialStaticRegistrar)
+			return false;
+	}
+
 	// COOP: no managed memory access: any mode
-	return class_getInstanceMethod (object_getClass (self), @selector (xamarinSetGCHandle:)) != NULL;
+	return class_getInstanceMethod (cls, @selector (xamarinSetGCHandle:)) != NULL;
 }
 
 #if defined(DEBUG_REF_COUNTING)
diff --git a/runtime/xamarin/runtime.h b/runtime/xamarin/runtime.h
index 765f05d8d64a..bfb443fd4d5b 100644
--- a/runtime/xamarin/runtime.h
+++ b/runtime/xamarin/runtime.h
@@ -68,14 +68,21 @@ typedef struct __attribute__((packed)) {
 } MTTokenReference;
 static const uint32_t INVALID_TOKEN_REF = 0xFFFFFFFF;
 
+enum MTTypeFlags {
+	MTTypeFlagsNone = 0,
+	MTTypeFlagsCustomType = 1, // not a platform type
+	MTTypeFlagsUserType = 2, // not a wrapped type
+};
+
 typedef struct __attribute__((packed)) {
 	void *handle;
 	uint32_t /* MTTokenReference */ type_reference;
+	uint32_t /* MTTypeFlags */ flags;
 } MTClassMap;
 
 typedef struct __attribute__((packed)) {
 	uint32_t /* MTTokenReference */ skipped_reference;
-	uint32_t /* index into MTRegistrationMap->map */ index;
+	uint32_t /* MTTokenReference */ actual_reference;
 } MTManagedClassMap;
 
 typedef struct __attribute__((packed)) {
@@ -109,7 +116,6 @@ struct MTRegistrationMap {
 	const MTProtocolMap protocols;
 	int assembly_count;
 	int map_count;
-	int custom_type_count;
 	int full_token_reference_count;
 	int skipped_map_count;
 	int protocol_wrapper_count;
@@ -198,7 +204,7 @@ void			xamarin_unhandled_exception_handler (MonoObject *exc, gpointer user_data)
 void			xamarin_ftnptr_exception_handler (guint32 gchandle);
 void			xamarin_create_classes ();
 const char *	xamarin_skip_encoding_flags (const char *encoding);
-void			xamarin_add_registration_map (struct MTRegistrationMap *map);
+void			xamarin_add_registration_map (struct MTRegistrationMap *map, bool partial);
 uint32_t		xamarin_find_protocol_wrapper_type (uint32_t token_ref);
 void			xamarin_release_block_on_main_thread (void *obj);
 
diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs
index db15b7ed77c3..e4460421e2a8 100644
--- a/src/AppKit/Enums.cs
+++ b/src/AppKit/Enums.cs
@@ -2542,7 +2542,7 @@ public enum NSVisualEffectMaterial : long {
 		[Mac (10,14)]
 		WindowBackground = 12,
 		[Mac (10,14)]
-		HUDWindow = 13,
+		HudWindow = 13,
 		[Mac (10,14)]
 		FullScreenUI = 15,
 		[Mac (10,14)]
diff --git a/src/CoreFoundation/Dispatch.cs b/src/CoreFoundation/Dispatch.cs
index 4538525de10d..4882d9132cf2 100644
--- a/src/CoreFoundation/Dispatch.cs
+++ b/src/CoreFoundation/Dispatch.cs
@@ -47,6 +47,17 @@ public enum DispatchQueuePriority : int {
 		Low = -2,
 		Background = Int16.MinValue
 	}
+
+	// dispatch_qos_class_t is defined in usr/include/dispatch/queue.h, but redirects to qos_class_t
+	// the qos_class_t enum is defined in usr/include/sys/qos.h (typed as 'unsigned int')
+	public enum DispatchQualityOfService : uint {
+		UserInteractive = 0x21,
+		UserInitiated   = 0x19,
+		Default         = 0x15,
+		Utility         = 0x11,
+		Background      = 0x09,
+		Unspecified     = 0x00,
+	}
 	
 	public abstract class DispatchObject : NativeObject
 	{
@@ -140,6 +151,22 @@ public void SetTargetQueue (DispatchQueue queue)
 
 		[DllImport (Constants.libcLibrary)]
 		internal extern static void dispatch_suspend (IntPtr o);
+
+		[Mac (10,12)]
+		[iOS (10,0)]
+		[TV (10,0)]
+		[Watch (3,0)]
+		public void Activate ()
+		{
+			dispatch_activate (GetCheckedHandle ());
+		}
+
+		[DllImport (Constants.libcLibrary)]
+		[Mac (10,12)]
+		[iOS (10,0)]
+		[TV (10,0)]
+		[Watch (3,0)]
+		extern static void dispatch_activate (/* dispatch_object_t */ IntPtr @object);
 #endif // !COREBUILD
 	}
 
@@ -177,6 +204,15 @@ public DispatchQueue (string label, bool concurrent)
 				throw new Exception ("Error creating dispatch queue");
 		}
 		
+		[Mac (10,12)]
+		[iOS (10,0)]
+		[TV (10,0)]
+		[Watch (3,0)]
+		public DispatchQueue (string label, Attributes attributes, DispatchQueue target = null)
+			: base (dispatch_queue_create_with_target (label, attributes?.Create () ?? IntPtr.Zero, target.GetHandle ()), true)
+		{
+		}
+
 		//
 		// Properties and methods
 		//
@@ -320,6 +356,14 @@ static void static_dispatcher_iterations_to_managed (IntPtr context, IntPtr coun
 
 		}
 						     
+		internal static readonly dispatch_callback_t free_gchandle = static_free_gchandle;
+
+		[MonoPInvokeCallback (typeof (dispatch_callback_t))]
+		static void static_free_gchandle (IntPtr context)
+		{
+			GCHandle.FromIntPtr (context).Free ();
+		}
+
 		public void DispatchAsync (Action action)
 		{
 			if (action == null)
@@ -343,7 +387,15 @@ public void DispatchBarrierAsync (Action action)
 			
 			dispatch_barrier_async_f (Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
 		}
-		
+
+		public void DispatchBarrierSync (Action action)
+		{
+			if (action == null)
+				throw new ArgumentNullException (nameof (action));
+
+			dispatch_barrier_sync_f (Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
+		}
+
 		public void DispatchAfter (DispatchTime when, Action action)
 		{
 			if (action == null)
@@ -359,12 +411,50 @@ public void Submit (Action<int> action, long times)
 			dispatch_apply_f ((IntPtr) times, Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch_iterations);
 		}
 		
+		public void SetSpecific (IntPtr key, object context)
+		{
+			dispatch_queue_set_specific (GetCheckedHandle (), key, (IntPtr) GCHandle.Alloc (context), free_gchandle);
+		}
+
+		public object GetSpecific (IntPtr key)
+		{
+			GCHandle gchandle = (GCHandle) dispatch_queue_get_specific (GetCheckedHandle (), key);
+			return gchandle.Target;
+		}
+
+		[Mac (10,10)]
+		[iOS (8,0)]
+		public DispatchQualityOfService GetQualityOfService (out int relative_priority)
+		{
+			unsafe {
+				fixed (int* rel_pri = &relative_priority)
+					return dispatch_queue_get_qos_class (Handle, rel_pri);
+			}
+		}
+
+		[Mac (10,10)]
+		[iOS (8,0)]
+		public DispatchQualityOfService QualityOfService {
+			get {
+				unsafe {
+					return dispatch_queue_get_qos_class (Handle, null);
+				}
+			}
+		}
+
 		//
 		// Native methods
 		//
 		[DllImport (Constants.libcLibrary)]
 		extern static IntPtr dispatch_queue_create (string label, IntPtr attr);
 
+		[Mac (10,12)]
+		[iOS (10,0)]
+		[TV (10,0)]
+		[Watch (3,0)]
+		[DllImport (Constants.libcLibrary)]
+		extern static IntPtr dispatch_queue_create_with_target (string label, IntPtr attr, IntPtr target);
+
 		[DllImport (Constants.libcLibrary)]
 		extern static void dispatch_async_f (IntPtr queue, IntPtr context, dispatch_callback_t dispatch);
 
@@ -374,6 +464,9 @@ public void Submit (Action<int> action, long times)
 		[DllImport (Constants.libcLibrary)]
 		extern static void dispatch_barrier_async_f (IntPtr queue, IntPtr context, dispatch_callback_t dispatch);
 
+		[DllImport(Constants.libcLibrary)]
+		extern static void dispatch_barrier_sync_f (IntPtr queue, IntPtr context, dispatch_callback_t dispatch);
+
 		[DllImport (Constants.libcLibrary)]
 		extern static void dispatch_after_f (/* dispath_time_t */ ulong time, IntPtr queue, IntPtr context, dispatch_callback_t dispatch);
 
@@ -388,6 +481,17 @@ public void Submit (Action<int> action, long times)
 		// this returns a "const char*" so we cannot make a string out of it since it will be freed (and crash)
 		extern static IntPtr dispatch_queue_get_label (IntPtr queue);
 
+		[DllImport(Constants.libcLibrary)]
+		extern static void dispatch_queue_set_specific (IntPtr queue, /* const void* */ IntPtr key, /* void *_Nullable */ IntPtr context, dispatch_callback_t /* _Nullable */ destructor);
+
+		[DllImport(Constants.libcLibrary)]
+		extern static IntPtr dispatch_queue_get_specific (IntPtr queue, /* const void* */ IntPtr key);
+
+		[Mac (10,10)]
+		[iOS (8,0)]
+		[DllImport (Constants.libcLibrary)]
+		unsafe extern static /* dispatch_qos_class_t */ DispatchQualityOfService dispatch_queue_get_qos_class (/* dispatch_queue_t */ IntPtr queue, /* int *_Nullable */ int* relative_priority);
+
 		public override bool Equals (object other)
 		{
 			DispatchQueue o = other as DispatchQueue;
@@ -428,6 +532,81 @@ public static void MainIteration ()
 			dispatch_main ();
 		}
 #endif
+
+		public class Attributes
+		{
+			public bool Concurrent { get; set; }
+
+			[Mac (10,12)]
+			[iOS (10,0)]
+			[TV (10,0)]
+			[Watch (3,0)]
+			public bool IsInitiallyInactive { get; set; }
+
+			[Mac (10,12)]
+			[iOS (10,0)]
+			[TV (10,0)]
+			[Watch (3,0)]
+			public AutoreleaseFrequency? AutoreleaseFrequency { get; set; }
+
+			[Mac (10,10)]
+			[iOS (8,0)]
+			public int RelativePriority { get; set; }
+
+			[Mac (10,10)]
+			[iOS (8,0)]
+			public DispatchQualityOfService? QualityOfService { get; set; }
+
+			internal IntPtr Create ()
+			{
+				IntPtr rv = IntPtr.Zero;
+
+				if (Concurrent)
+					rv = DispatchQueue.ConcurrentQueue;
+
+				if (IsInitiallyInactive)
+					rv = dispatch_queue_attr_make_initially_inactive (rv);
+
+				if (AutoreleaseFrequency.HasValue)
+					rv = dispatch_queue_attr_make_with_autorelease_frequency (rv, (nuint) (ulong) AutoreleaseFrequency.Value);
+
+				if (QualityOfService.HasValue)
+					rv = dispatch_queue_attr_make_with_qos_class (rv, QualityOfService.Value, RelativePriority);
+
+				return rv;
+			}
+
+			[Mac (10,12)]
+			[iOS (10,0)]
+			[TV (10,0)]
+			[Watch (3,0)]
+			[DllImport (Constants.libcLibrary)]
+			static extern /* dispatch_queue_attr_t */ IntPtr dispatch_queue_attr_make_initially_inactive (/* dispatch_queue_attr_t _Nullable */ IntPtr attr);
+
+			[Mac (10,12)]
+			[iOS (10,0)]
+			[TV (10,0)]
+			[Watch (3,0)]
+			[DllImport (Constants.libcLibrary)]
+			static extern /* dispatch_queue_attr_t */ IntPtr dispatch_queue_attr_make_with_autorelease_frequency (/* dispatch_queue_attr_t _Nullable */ IntPtr attr, /* dispatch_autorelease_frequency_t */ nuint frequency);
+
+			[Mac (10,10)]
+			[iOS (8,0)]
+			[DllImport (Constants.libcLibrary)]
+			static extern /* dispatch_queue_attr_t */ IntPtr dispatch_queue_attr_make_with_qos_class (/* dispatch_queue_attr_t _Nullable */ IntPtr attr, /* dispatch_qos_class_t */ DispatchQualityOfService qos_class, int relative_priority);
+		}
+
+		[Mac (10,12)]
+		[iOS (10,0)]
+		[TV (10,0)]
+		[Watch (3,0)]
+		[Native]
+		public enum AutoreleaseFrequency : ulong /* unsigned long */
+		{
+			Inherit = 0,
+			WorkItem = 1,
+			Never = 2,
+		}
 #endif // !COREBUILD
 	}
 
diff --git a/src/CoreGraphics/CGAffineTransform.cs b/src/CoreGraphics/CGAffineTransform.cs
index 10055c66f895..b57f3c9a3774 100644
--- a/src/CoreGraphics/CGAffineTransform.cs
+++ b/src/CoreGraphics/CGAffineTransform.cs
@@ -106,10 +106,30 @@ public void Multiply (CGAffineTransform b)
 			x0 = a.x0 * b.xx + a.y0 * b.xy + b.x0;
 			y0 = a.x0 * b.yx + a.y0 * b.yy + b.y0;
 		}
+
+		public enum MatrixOrder {
+			Prepend = 0,
+			Append = 1,
+		}
+
+		public void Scale (nfloat sx, nfloat sy, MatrixOrder order)
+		{
+			switch (order) {
+			case MatrixOrder.Prepend: // The new operation is applied before the old operation.
+				this = Multiply (MakeScale (sx, sy), this); // t' = [ sx 0 0 sy 0 0 ] * t – Swift equivalent
+				break;
+			case MatrixOrder.Append: // The new operation is applied after the old operation.
+				this = Multiply (this, MakeScale (sx, sy)); // t' = t * [ sx 0 0 sy 0 0 ]
+				break;
+			default:
+				throw new ArgumentOutOfRangeException (nameof (order));
+			}
+		}
 		
+		[Advice ("By default, the new operation is applied after the old operation: t' = t * [ sx 0 0 sy 0 0 ].\nTo have the same behavior as the native Swift API, pass 'MatrixOrder.Prepend' to 'Scale (nfloat, nfloat, MatrixOrder)'.")]
 		public void Scale (nfloat sx, nfloat sy)
 		{
-			Multiply (MakeScale (sx, sy));
+			Scale (sx, sy, MatrixOrder.Append);
 		}
 
 		public static CGAffineTransform Scale (CGAffineTransform transform, nfloat sx, nfloat sy)
@@ -123,9 +143,24 @@ public static CGAffineTransform Scale (CGAffineTransform transform, nfloat sx, n
 				transform.y0);
 		}
 
+		public void Translate (nfloat tx, nfloat ty, MatrixOrder order)
+		{
+			switch (order) {
+			case MatrixOrder.Prepend: // The new operation is applied before the old operation.
+				this = Multiply (MakeTranslation (tx, ty), this); // t' = [ 1 0 0 1 tx ty ] * t – Swift equivalent
+				break;
+			case MatrixOrder.Append: // The new operation is applied after the old operation.
+				this = Multiply (this, MakeTranslation (tx, ty)); // t' = t * [ 1 0 0 1 tx ty ]
+				break;
+			default:
+				throw new ArgumentOutOfRangeException (nameof (order));
+			}
+		}
+
+		[Advice ("By default, the new operation is applied after the old operation: t' = t * [ 1 0 0 1 tx ty ].\nTo have the same behavior as the native Swift API, pass 'MatrixOrder.Prepend' to 'Translate (nfloat, nfloat, MatrixOrder)'.")]
 		public void Translate (nfloat tx, nfloat ty)
 		{
-			Multiply (MakeTranslation (tx, ty));
+			Translate (tx, ty, MatrixOrder.Append);
 		}
 
 		public static CGAffineTransform Translate (CGAffineTransform transform, nfloat tx, nfloat ty)
@@ -139,9 +174,24 @@ public static CGAffineTransform Translate (CGAffineTransform transform, nfloat t
 				tx * transform.yx + ty * transform.yy + transform.y0);
 		}
 
+		public void Rotate (nfloat angle, MatrixOrder order)
+		{
+			switch (order) {
+			case MatrixOrder.Prepend: // The new operation is applied before the old operation.
+				this = Multiply (MakeRotation (angle), this); // t' = [ cos(angle) sin(angle) -sin(angle) cos(angle) 0 0 ] * t – Swift equivalent
+				break;
+			case MatrixOrder.Append: // The new operation is applied after the old operation.
+				this = Multiply (this, MakeRotation (angle)); // t' = t * [ cos(angle) sin(angle) -sin(angle) cos(angle) 0 0 ]
+				break;
+			default:
+				throw new ArgumentOutOfRangeException (nameof (order));
+			}
+		}
+
+		[Advice ("By default, the new operation is applied after the old operation: t' = t * [ cos(angle) sin(angle) -sin(angle) cos(angle) 0 0 ].\nTo have the same behavior as the native Swift API, pass 'MatrixOrder.Prepend' to 'Rotate (nfloat, MatrixOrder)'.")]
 		public void Rotate (nfloat angle)
 		{
-			Multiply (MakeRotation (angle));
+			Rotate (angle, MatrixOrder.Append);
 		}
 			
 		public static CGAffineTransform Rotate (CGAffineTransform transform, nfloat angle)
diff --git a/src/Foundation/NSUrlSessionHandler.cs b/src/Foundation/NSUrlSessionHandler.cs
index 415d6324d5e5..3dd531173f59 100644
--- a/src/Foundation/NSUrlSessionHandler.cs
+++ b/src/Foundation/NSUrlSessionHandler.cs
@@ -68,6 +68,7 @@ public NSUrlSessionHandler () : this (NSUrlSessionConfiguration.DefaultSessionCo
 		{
 		}
 
+		[CLSCompliant (false)]
 		public NSUrlSessionHandler (NSUrlSessionConfiguration configuration)
 		{
 			if (configuration == null)
@@ -86,7 +87,7 @@ public NSUrlSessionHandler (NSUrlSessionConfiguration configuration)
 			else if ((sp & SecurityProtocolType.Tls12) != 0)
 				configuration.TLSMinimumSupportedProtocol = SslProtocol.Tls_1_2;
 
-			session = NSUrlSession.FromConfiguration (configuration, new NSUrlSessionHandlerDelegate (this), null);
+			session = NSUrlSession.FromConfiguration (configuration, (INSUrlSessionDelegate) new NSUrlSessionHandlerDelegate (this), null);
 			inflightRequests = new Dictionary<NSUrlSessionTask, InflightData> ();
 		}
 
diff --git a/src/Makefile b/src/Makefile
index b1cc23f40b2f..336e8c58a202 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -667,7 +667,7 @@ WATCH_BMONO = MONO_PATH=$(WATCH_LIBDIR)/repl $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/b
 WATCH_GENERATOR=$(BUILD_DIR)/common/bgen.exe
 WATCH_GENERATE=$(SYSTEM_MONO) --debug $(WATCH_GENERATOR)
 WATCH_GENERATED_DEFINES= -d:WATCH -d:XAMCORE_3_0 -d:XAMCORE_2_0 -d:__UNIFIED__
-WATCH_BCL_DIR = $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch
+WATCH_BCL_DIR = $(MONO_PATH)/mcs/class/lib/monotouch_watch
 
 WATCHOS_EXTRA_CORE_SOURCES = \
     $(WATCH_BUILD_DIR)/Constants.cs    \
@@ -732,7 +732,7 @@ $(BUILD_DIR)/watchos.rsp: Makefile Makefile.generator frameworks.sources
 		-tmpdir=$(WATCH_BUILD_DIR)/watch                         \
 		-baselib=$(WATCH_BUILD_DIR)/watch/core.dll               \
 		-attributelib=$(WATCH_BUILD_DIR)/Xamarin.WatchOS.BindingAttributes.dll \
-		-r=$(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/System.dll \
+		-r=$(MONO_PATH)/mcs/class/lib/monotouch_watch/System.dll \
 		-ns=MonoTouch.ObjCRuntime                                \
 		-native-exception-marshalling                            \
 		$(WATCH_GENERATED_DEFINES)				\
@@ -766,42 +766,42 @@ $(WATCH_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(WATCH_BUILD_DIR)/referenc
 
 # System.Drawing.Primitives.dll is special
 
-$(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/reference_Facades/System.Drawing.Primitives.dll: $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
-	$(call Q_PROF_CSC,watch) $(MAKE) $(if $(V),,-s) -C $(WATCH_MONO_PATH)/mcs/class/Facades/System.Drawing.Primitives PROFILE=monotouch_watch LIBRARY_SUBDIR=reference_Facades EXTERNAL_FACADE_DRAWING_REFERENCE="$(abspath $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll)"
+$(MONO_PATH)/mcs/class/lib/monotouch_watch/reference_Facades/System.Drawing.Primitives.dll: $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
+	$(call Q_PROF_CSC,watch) $(MAKE) $(if $(V),,-s) -C $(MONO_PATH)/mcs/class/Facades/System.Drawing.Primitives PROFILE=monotouch_watch LIBRARY_SUBDIR=reference_Facades EXTERNAL_FACADE_DRAWING_REFERENCE="$(abspath $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll)"
 	@touch $@
 
-$(WATCH_BUILD_DIR)/%/Facades/System.Drawing.Primitives.dll: $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/%_Facades/System.Drawing.Primitives.dll | $(WATCH_BUILD_DIR)/reference/Facades
+$(WATCH_BUILD_DIR)/%/Facades/System.Drawing.Primitives.dll: $(MONO_PATH)/mcs/class/lib/monotouch_watch/%_Facades/System.Drawing.Primitives.dll | $(WATCH_BUILD_DIR)/reference/Facades
 	$(Q) cp $< $@
 
 # netstandard.dll is special
 
-$(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/reference_Facades/netstandard.dll: $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
-	$(call Q_PROF_CSC,watch) $(MAKE) $(if $(V),,-s) -C $(WATCH_MONO_PATH)/mcs/class/Facades/netstandard PROFILE=monotouch_watch LIBRARY_SUBDIR=reference_Facades EXTERNAL_FACADE_DRAWING_REFERENCE="$(abspath $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll)"
+$(MONO_PATH)/mcs/class/lib/monotouch_watch/reference_Facades/netstandard.dll: $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
+	$(call Q_PROF_CSC,watch) $(MAKE) $(if $(V),,-s) -C $(MONO_PATH)/mcs/class/Facades/netstandard PROFILE=monotouch_watch LIBRARY_SUBDIR=reference_Facades EXTERNAL_FACADE_DRAWING_REFERENCE="$(abspath $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll)"
 	@touch $@
 
-$(WATCH_BUILD_DIR)/%/Facades/netstandard.dll: $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/%_Facades/netstandard.dll | $(WATCH_BUILD_DIR)/reference/Facades
+$(WATCH_BUILD_DIR)/%/Facades/netstandard.dll: $(MONO_PATH)/mcs/class/lib/monotouch_watch/%_Facades/netstandard.dll | $(WATCH_BUILD_DIR)/reference/Facades
 	$(Q) cp $< $@
 
 # System.Net.Http.dll is special. See comment in src/Makefile
 
 WATCH_EXTRA_SYSTEM_NET_HTTP_FILES = \
-	$(abspath $(WATCH_MONO_PATH)/mcs/class/System.Net.Http/HttpClientEx.cs) \
+	$(abspath $(MONO_PATH)/mcs/class/System.Net.Http/HttpClientEx.cs) \
 	$(abspath $(TOP)/src/Foundation/NSUrlSessionHandler.cs) \
 	$(abspath $(TOP)/src/ObjCRuntime/RuntimeOptions.cs) \
 
 # build (into custom LIBRARY_SUBDIR)
-$(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http%dll $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http%pdb: $(WATCH_EXTRA_SYSTEM_NET_HTTP_FILES) $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/System.Net.Http.dll $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
-	$(call Q_PROF_CSC,watch) $(MAKE) $(if $(V),,-s) -C $(WATCH_MONO_PATH)/mcs/class/System.Net.Http PROFILE=monotouch_watch LIBRARY_SUBDIR=reference MONOTOUCH_MCS_FLAGS=$(IOS_CSC_FLAGS) EXTRA_LIB_MCS_FLAGS="-r:$(abspath $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll) $(WATCH_EXTRA_SYSTEM_NET_HTTP_FILES) -D:XAMCORE_2_0 -D:XAMCORE_3_0 -D:XAMARIN_MODERN -D:SYSTEM_NET_HTTP -D:UNIFIED -D:__UNIFIED__"
+$(MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http%dll $(MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http%pdb: $(WATCH_EXTRA_SYSTEM_NET_HTTP_FILES) $(MONO_PATH)/mcs/class/lib/monotouch_watch/System.Net.Http.dll $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
+	$(call Q_PROF_CSC,watch) $(MAKE) $(if $(V),,-s) -C $(MONO_PATH)/mcs/class/System.Net.Http PROFILE=monotouch_watch LIBRARY_SUBDIR=reference MONOTOUCH_MCS_FLAGS=$(IOS_CSC_FLAGS) EXTRA_LIB_MCS_FLAGS="-r:$(abspath $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll) $(WATCH_EXTRA_SYSTEM_NET_HTTP_FILES) -D:XAMCORE_2_0 -D:XAMCORE_3_0 -D:XAMARIN_MODERN -D:SYSTEM_NET_HTTP -D:UNIFIED -D:__UNIFIED__"
 	@# If the make we executed didn't result in building the dll/pdb (because make determined it wasn't necessary to rebuild),
 	@# then this make can end up confused and in an infinite loop. So touch the output files, to make sure they look rebuilt to make.
 	$(Q) touch $(basename $@).dll $(basename $@).pdb
 
 # sign dll
-$(WATCH_BUILD_DIR)/reference/System.Net.Http.dll: $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http.dll | $(WATCH_BUILD_DIR)/reference
+$(WATCH_BUILD_DIR)/reference/System.Net.Http.dll: $(MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http.dll | $(WATCH_BUILD_DIR)/reference
 	$(Q) cp $< $@
 	$(call Q_PROF_SN,watch) MONO_CFG_DIR=$(TOP) $(SYSTEM_SN) -q -R $@ $(PRODUCT_KEY_PATH)
 
-$(WATCH_BUILD_DIR)/reference/System.Net.Http.pdb: $(WATCH_MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http.pdb | $(WATCH_BUILD_DIR)/reference
+$(WATCH_BUILD_DIR)/reference/System.Net.Http.pdb: $(MONO_PATH)/mcs/class/lib/monotouch_watch/reference/System.Net.Http.pdb | $(WATCH_BUILD_DIR)/reference
 	$(Q) cp $< $@
 
 $(PROJECT_DIR)/xamwatch.csproj: xamwatch.tmpl.csproj Makefile $(wildcard $(TOP)/*.sources)
diff --git a/src/MediaPlayer/MPNowPlayingInfoCenter.cs b/src/MediaPlayer/MPNowPlayingInfoCenter.cs
index bec879b5c162..d9064899b151 100644
--- a/src/MediaPlayer/MPNowPlayingInfoCenter.cs
+++ b/src/MediaPlayer/MPNowPlayingInfoCenter.cs
@@ -210,13 +210,10 @@ internal MPNowPlayingInfo (NSDictionary source)
 
 		bool TryGetValue (NSDictionary source, NSObject key, out NSObject result)
 		{
-			var b = false;
 			result = null;
-			if (key != null) {
-				source.TryGetValue (key, out result);
-				b = true;
-			}
-			return b;
+			if (key != null)
+				return source.TryGetValue (key, out result);
+			return false;
 		}
 	}
 	
diff --git a/src/ObjCRuntime/Class.cs b/src/ObjCRuntime/Class.cs
index 761e100b1e1a..62dec18e7e0d 100644
--- a/src/ObjCRuntime/Class.cs
+++ b/src/ObjCRuntime/Class.cs
@@ -25,6 +25,7 @@ public partial class Class : INativeObject
 
 		// We use the last significant bit of the IntPtr to store if this is a custom class or not.
 		static Dictionary<Type, IntPtr> type_to_class; // accessed from multiple threads, locking required.
+		static Type[] class_to_type;
 
 		internal IntPtr handle;
 
@@ -33,12 +34,15 @@ internal unsafe static void Initialize (Runtime.InitializationOptions* options)
 		{
 			type_to_class = new Dictionary<Type, IntPtr> (Runtime.TypeEqualityComparer);
 
-			if (!Runtime.DynamicRegistrationSupported)
-				return; // Only the dynamic registrar needs the list of registered assemblies.
-
 			var map = options->RegistrationMap;
 			if (map == null)
 				return;
+
+			class_to_type = new Type [map->map_count];
+
+			if (!Runtime.DynamicRegistrationSupported)
+				return; // Only the dynamic registrar needs the list of registered assemblies.
+
 			
 			for (int i = 0; i < map->assembly_count; i++) {
 				var ptr = Marshal.ReadIntPtr (map->assembly, i * IntPtr.Size);
@@ -237,7 +241,7 @@ unsafe static IntPtr FindClass (Type type, out bool is_custom_type)
 					continue;
 
 				var rv = map->map [i].handle;
-				is_custom_type = i >= (map->map_count - map->custom_type_count);
+				is_custom_type = (map->map [i].flags & Runtime.MTTypeFlags.CustomType) == Runtime.MTTypeFlags.CustomType;
 #if LOG_TYPELOAD
 				Console.WriteLine ($"FindClass ({type.FullName}, {is_custom_type}): 0x{rv.ToString ("x")} = {class_getName (rv)}.");
 #endif
@@ -251,10 +255,13 @@ unsafe static IntPtr FindClass (Type type, out bool is_custom_type)
 				if (!CompareTokenReference (asm_name, mod_token, type_token, token_reference))
 					continue;
 
-				// This is a skipped type, we now got the index into the normal table.
-				var idx = map->skipped_map [i].index;
-				is_custom_type = idx >= (map->map_count - map->custom_type_count);
-				return map->map [idx].handle;
+				// This is a skipped type, we now got the actual type reference of the type we're looking for,
+				// so go look for it in the type map.
+				var actual_reference = map->skipped_map [i].actual_reference;  
+				for (int k = 0; k < map->map_count; k++) {
+					if (map->map [k].type_reference == actual_reference)
+						return map->map [k].handle;
+				}
 			}
 
 			return IntPtr.Zero;
@@ -293,10 +300,26 @@ unsafe static bool CompareTokenReference (string asm_name, int mod_token, int ty
 			return Runtime.StringEquals (assembly_name, asm_name);
 		}
 
+		static unsafe int FindMapIndex (Runtime.MTClassMap *array, int lo, int hi, IntPtr @class)
+		{
+			if (hi >= lo) {
+				int mid = lo + (hi - lo) / 2;
+
+				if (array [mid].handle == @class)
+					return mid;
+
+				if (array [mid].handle.ToInt64 () > @class.ToInt64 ())
+					return FindMapIndex (array, lo, mid - 1, @class);
+
+				return FindMapIndex (array, mid + 1, hi, @class);
+			}
+
+			return -1;
+		}
+
 		internal unsafe static Type FindType (IntPtr @class, out bool is_custom_type)
 		{
 			var map = Runtime.options->RegistrationMap;
-			Runtime.MTClassMap? entry = null;
 
 			is_custom_type = false;
 
@@ -308,36 +331,34 @@ internal unsafe static Type FindType (IntPtr @class, out bool is_custom_type)
 			}
 
 			// Find the ObjC class pointer in our map
-			// Potential improvement: order the type handles after loading them, which means we could do a binary search here.
-			// A binary search will likely be faster than a dictionary for any real-world scenario (and if slower, not much slower),
-			// but it would need a lot less memory (very little when sorting, could probably use stack memory, and then nothing at all afterwards).
-			for (int i = 0; i < map->map_count; i++) {
-				if (map->map [i].handle != @class)
-					continue;
-
-				entry = map->map [i];
-				is_custom_type = i >= (map->map_count - map->custom_type_count);
-				break;
-			}
-
-			if (!entry.HasValue) {
+			var mapIndex = FindMapIndex (map->map, 0, map->map_count - 1, @class);
+			if (mapIndex == -1) {
 #if LOG_TYPELOAD
 				Console.WriteLine ($"FindType (0x{@class:X} = {Marshal.PtrToStringAuto (class_getName (@class))}) => found no type.");
 #endif
 				return null;
 			}
 
+			is_custom_type = (map->map [mapIndex].flags & Runtime.MTTypeFlags.CustomType) == Runtime.MTTypeFlags.CustomType;
+
+			Type type = class_to_type [mapIndex];
+			if (type != null)
+				return type;
+
 			// Resolve the map entry we found to a managed type
-			var member = ResolveTokenReference (entry.Value.type_reference, 0x02000000);
-			var type = member as Type;
+			var type_reference = map->map [mapIndex].type_reference;
+			var member = ResolveTokenReference (type_reference, 0x02000000);
+			type = member as Type;
 
 			if (type == null && member != null)
-				throw ErrorHelper.CreateError (8022, $"Expected the token reference 0x{entry.Value.type_reference:X} to be a type, but it's a {member.GetType ().Name}. Please file a bug report at https://github.com/xamarin/xamarin-macios/issues/new.");
+				throw ErrorHelper.CreateError (8022, $"Expected the token reference 0x{type_reference:X} to be a type, but it's a {member.GetType ().Name}. Please file a bug report at https://github.com/xamarin/xamarin-macios/issues/new.");
 
 #if LOG_TYPELOAD
-			Console.WriteLine ($"FindType (0x{@class:X} = {Marshal.PtrToStringAuto (class_getName (@class))}) => {type.FullName}; is custom: {is_custom_type} (token reference: 0x{entry.Value.type_reference:X}).");
+			Console.WriteLine ($"FindType (0x{@class:X} = {Marshal.PtrToStringAuto (class_getName (@class))}) => {type.FullName}; is custom: {is_custom_type} (token reference: 0x{type_reference:X}).");
 #endif
 
+			class_to_type [mapIndex] = type;
+
 			return type;
 		}
 
diff --git a/src/ObjCRuntime/Runtime.cs b/src/ObjCRuntime/Runtime.cs
index a9186009a193..9001aee2dbb1 100644
--- a/src/ObjCRuntime/Runtime.cs
+++ b/src/ObjCRuntime/Runtime.cs
@@ -39,6 +39,8 @@ public partial class Runtime {
 #endif
 
 		static Dictionary<IntPtrTypeValueTuple,Delegate> block_to_delegate_cache;
+		static Dictionary<Type, ConstructorInfo> intptr_ctor_cache;
+		static Dictionary<Type, ConstructorInfo> intptr_bool_ctor_cache;
 
 		static List <object> delegates;
 		static List <Assembly> assemblies;
@@ -63,24 +65,32 @@ internal unsafe struct MTRegistrationMap {
 			public MTProtocolMap protocol_map;
 			public int assembly_count;
 			public int map_count;
-			public int custom_type_count;
 			public int full_token_reference_count;
 			public int skipped_map_count;
 			public int protocol_wrapper_count;
 			public int protocol_count;
 		}
 
+		[Flags]
+		internal enum MTTypeFlags : uint
+		{
+			None = 0,
+			CustomType = 1,
+			UserType = 2,
+		}
+
 		[StructLayout (LayoutKind.Sequential, Pack = 1)]
 		internal struct MTClassMap {
 			public IntPtr handle;
 			public uint type_reference;
+			public MTTypeFlags flags;
 		}
 
 		[StructLayout (LayoutKind.Sequential, Pack = 1)]
 		internal struct MTManagedClassMap
 		{
 			public uint skipped_reference; // implied token type: TypeDef
-			public uint index; // index into MTRegistrationMap.map
+			public uint actual_reference; // implied token type: TypeDef
 		}
 
 		[StructLayout (LayoutKind.Sequential, Pack = 1)]
@@ -122,7 +132,7 @@ internal struct Trampolines {
 
 		[Flags]
 		internal enum InitializationFlags : int {
-			/* unused               = 0x01 */
+			IsPartialStaticRegistrar= 0x01,
 			/* unused				= 0x02,*/
 			DynamicRegistrar		= 0x04,
 			/* unused				= 0x08,*/
@@ -239,6 +249,8 @@ unsafe static void Initialize (InitializationOptions* options)
 			Runtime.options = options;
 			delegates = new List<object> ();
 			object_map = new Dictionary <IntPtr, WeakReference> (IntPtrEqualityComparer);
+			intptr_ctor_cache = new Dictionary<Type, ConstructorInfo> (TypeEqualityComparer);
+			intptr_bool_ctor_cache = new Dictionary<Type, ConstructorInfo> (TypeEqualityComparer);
 			lock_obj = new object ();
 
 			NSObjectClass = NSObject.Initialize ();
@@ -1153,22 +1165,36 @@ static T ConstructINativeObject<T> (IntPtr ptr, bool owns, Type type, MissingCto
 
 		static ConstructorInfo GetIntPtrConstructor (Type type)
 		{
+			lock (intptr_ctor_cache) {
+				if (intptr_ctor_cache.TryGetValue (type, out var rv))
+					return rv;
+			}
 			var ctors = type.GetConstructors (BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic);
 			for (int i = 0; i < ctors.Length; ++i) {
 				var param = ctors[i].GetParameters ();
-				if (param.Length == 1 && param [0].ParameterType == typeof (IntPtr))
+				if (param.Length == 1 && param [0].ParameterType == typeof (IntPtr)) {
+					lock (intptr_ctor_cache)
+						intptr_ctor_cache [type] = ctors [i];
 					return ctors [i];
+				}
 			}
 			return null;
 		}
 
 		static ConstructorInfo GetIntPtr_BoolConstructor (Type type)
 		{
+			lock (intptr_bool_ctor_cache) {
+				if (intptr_bool_ctor_cache.TryGetValue (type, out var rv))
+					return rv;
+			}
 			var ctors = type.GetConstructors (BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic);
 			for (int i = 0; i < ctors.Length; ++i) {
 				var param = ctors[i].GetParameters ();
-				if (param.Length == 2 && param [0].ParameterType == typeof (IntPtr) && param [1].ParameterType == typeof (bool))
+				if (param.Length == 2 && param [0].ParameterType == typeof (IntPtr) && param [1].ParameterType == typeof (bool)) {
+					lock (intptr_bool_ctor_cache)
+						intptr_bool_ctor_cache [type] = ctors [i];
 					return ctors [i];
+				}
 			}
 			return null;
 		}
diff --git a/src/UIKit/UIGestureRecognizer.cs b/src/UIKit/UIGestureRecognizer.cs
index 9b9ebb984b7b..2943e99a730d 100644
--- a/src/UIKit/UIGestureRecognizer.cs
+++ b/src/UIKit/UIGestureRecognizer.cs
@@ -12,13 +12,17 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Foundation; 
 using ObjCRuntime;
 using CoreGraphics;
 
 namespace UIKit {
 	public partial class UIGestureRecognizer {
-		object recognizers;
+		//
+		// Tracks the targets (NSObject, which we always enforce to be Token) to the Selector the point to, used when disposing
+		//
+		Dictionary<Token,IntPtr> recognizers = new Dictionary<Token,IntPtr> ();
 		const string tsel = "target";
 		internal const string parametrized_selector = "target:";
 #if !XAMCORE_2_0
@@ -30,18 +34,26 @@ public partial class UIGestureRecognizer {
 		{
 		}
 
+		// Called by the Dispose() method
+		void OnDispose ()
+		{
+			foreach (var kv in recognizers)
+				RemoveTarget (kv.Key, kv.Value);
+			recognizers = null;
+		}
+		
 		//
 		// Signature swapped, this is only used so we can store the "token" in recognizers
 		//
 		public UIGestureRecognizer (Selector sel, Token token) : this (token, sel)
 		{
-			recognizers = token;
+			recognizers [token] = sel.Handle;
 			MarkDirty ();
 		}
 
 		internal UIGestureRecognizer (IntPtr sel, Token token) : this (token, sel)
 		{
-			recognizers = token;
+			recognizers [token] = sel;
 			MarkDirty ();
 		}
 		
@@ -111,17 +123,7 @@ void RegisterTarget (Token target, IntPtr sel)
 		{
 			AddTarget (target, sel);
 			MarkDirty ();
-			if (recognizers == null)
-				recognizers = target;
-			else {
-				Hashtable table = recognizers as Hashtable;
-				if (table == null){
-					table = new Hashtable ();
-					table [recognizers] = recognizers;
-					recognizers = table;
-				}
-				table [target] = target;
-			}
+			recognizers [target] = sel;
 		}
 
 		public void RemoveTarget (Token token)
@@ -130,12 +132,16 @@ public void RemoveTarget (Token token)
 				throw new ArgumentNullException ("token");
 			if (recognizers == null)
 				return;
-			if (recognizers == token)
-				recognizers = null;
-			Hashtable asHash = recognizers as Hashtable;
-			if (asHash != null)
-				asHash.Remove (token);
-			RemoveTarget (token, token is ParametrizedDispatch ? Selector.GetHandle (parametrized_selector) : Selector.GetHandle (tsel));
+			if (recognizers.Remove (token, out var sel))
+				RemoveTarget (token, sel);
+		}
+
+		//
+		// Used to enumerate all the registered handlers for this UIGestureRecognizer
+		//
+		public IEnumerable<Token> GetTargets ()
+		{
+			return (IEnumerable<Token>) recognizers?.Keys ?? Array.Empty<Token> ();
 		}
 	}
 
diff --git a/src/UIKit/UISearchController.cs b/src/UIKit/UISearchController.cs
index 0a6b7b28a4ac..ea8a37bcf610 100644
--- a/src/UIKit/UISearchController.cs
+++ b/src/UIKit/UISearchController.cs
@@ -5,6 +5,7 @@
 #if !WATCH
 
 using System;
+using Foundation;
 
 namespace UIKit {
 
@@ -17,6 +18,8 @@ public __Xamarin_UISearchResultsUpdating (Action<UISearchController> cback)
 				this.cback = cback;
 				IsDirectBinding = false;
 			}
+
+			[Preserve (Conditional = true)] // called back from native, no direct managed reference (except on the type itself)
 			public override void UpdateSearchResultsForSearchController (UISearchController searchController)
 			{
 				cback (searchController);
diff --git a/src/appkit.cs b/src/appkit.cs
index 448fa0a74f55..730528233a2c 100644
--- a/src/appkit.cs
+++ b/src/appkit.cs
@@ -3731,6 +3731,7 @@ partial interface NSColor : NSCoding, NSCopying, NSSecureCoding, NSPasteboardRea
 		NSColor SelectedControl { get; }
 
 		[Static]
+		[Deprecated (PlatformName.MacOSX, message: "Use 'SelectedContentBackgroundColor' instead.")]
 		[Export ("secondarySelectedControlColor")]
 		NSColor SecondarySelectedControl { get; }
 
@@ -3821,6 +3822,7 @@ partial interface NSColor : NSCoding, NSCopying, NSSecureCoding, NSPasteboardRea
 		NSColor HeaderText { get; }
 
 		[Static]
+		[Deprecated (PlatformName.MacOSX, message : "Use 'SelectedContentBackgroundColor' instead.")]
 		[Export ("alternateSelectedControlColor")]
 		NSColor AlternateSelectedControl { get; }
 
@@ -3829,6 +3831,7 @@ partial interface NSColor : NSCoding, NSCopying, NSSecureCoding, NSPasteboardRea
 		NSColor AlternateSelectedControlText { get; }
 
 		[Static]
+		[Advice ("Use 'AlternatingContentBackgroundColors' instead.")]
 		[Export ("controlAlternatingRowBackgroundColors")]
 		NSColor [] ControlAlternatingRowBackgroundColors ();
 
@@ -4120,7 +4123,7 @@ partial interface NSColor : NSCoding, NSCopying, NSSecureCoding, NSPasteboardRea
 
 		[Mac (10,14, onlyOn64: true)]
 		[Export ("colorWithSystemEffect:")]
-		NSColor WithSystemEffect (NSColorSystemEffect systemEffect);
+		NSColor FromSystemEffect (NSColorSystemEffect systemEffect);
 
 		[Mac (10, 13)]
 		[Static]
@@ -5757,6 +5760,7 @@ partial interface NSDocumentController : NSWindowRestoration, NSCoding {
 		[Export ("runModalOpenPanel:forTypes:")]
 		nint RunModalOpenPanel (NSOpenPanel openPanel, string [] types);
 
+		[Deprecated (PlatformName.MacOSX, 10, 7, message: "Use 'OpenDocument (NSUrl, bool, OpenDocumentCompletionHandler)' instead.")]
 		[Export ("openDocumentWithContentsOfURL:display:error:")]
 		NSObject OpenDocument (NSUrl url, bool displayDocument, out NSError outError);
 
@@ -5767,6 +5771,7 @@ partial interface NSDocumentController : NSWindowRestoration, NSCoding {
 		[Export ("makeDocumentWithContentsOfURL:ofType:error:")]
 		NSObject MakeDocument (NSUrl url, string typeName, out NSError outError);
 
+		[Deprecated (PlatformName.MacOSX, 10, 7, message: "Use 'NSDocumentController.ReopenDocumentForUrl (NSUrl, NSUrl, bool, OpenDocumentCompletionHandler)' instead.")]
 		[Export ("reopenDocumentForURL:withContentsOfURL:error:")]
 		bool ReopenDocument (NSUrl url, NSUrl contentsUrl, out NSError outError);
 
@@ -6790,6 +6795,7 @@ interface NSFontManager : NSMenuItemValidation {
 		[Export ("sendAction")]
 		bool SendAction { get; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("delegate", ArgumentSemantic.Assign)][NullAllowed]
 		NSObject WeakDelegate { get; set; } 
 
@@ -6802,24 +6808,31 @@ interface NSFontManager : NSMenuItemValidation {
 		[Export ("convertAttributes:")]
 		NSDictionary ConvertAttributes (NSDictionary attributes);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSFontDescriptor.MatchingFontDescriptors' instead.")]
 		[Export ("availableFontNamesMatchingFontDescriptor:")]
 		string [] AvailableFontNamesMatchingFontDescriptor (NSFontDescriptor descriptor);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSFontCollection.AllFontCollectionNames' instead.")]
 		[Export ("collectionNames")]
 		string [] CollectionNames { get; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSFontCollection.GetMatchingDescriptors ()' instead.")]
 		[Export ("fontDescriptorsInCollection:")]
 		NSArray FontDescriptorsInCollection (string collectionNames);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSFontCollection.ShowFontCollection (NSFontCollection, string, NSFontCollectionVisibility, out NSError)' instead.")]
 		[Export ("addCollection:options:")]
 		bool AddCollection (string collectionName, NSFontCollectionOptions collectionOptions);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'HideFontCollection (string, NSFontCollectionVisibility, out NSError)' instead.")]
 		[Export ("removeCollection:")]
 		bool RemoveCollection (string collectionName);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSMutableFontCollection.AddQueryForDescriptors' instead.")]
 		[Export ("addFontDescriptors:toCollection:")]
 		void AddFontDescriptors (NSFontDescriptor [] descriptors, string collectionName);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSMutableFontCollection.RemoveQueryForDescriptors' instead.")]
 		[Export ("removeFontDescriptor:fromCollection:")]
 		void RemoveFontDescriptor (NSFontDescriptor descriptor, string collection);
 
@@ -7925,16 +7938,13 @@ partial interface NSMenu : NSCoding, NSCopying, NSAccessibility, NSAccessibility
 		[PostSnippet ("__mt_items_var = ItemArray();")]
 		void RemoveAllItems ();
 
-#if XAMCORE_4_0
 		[Export ("itemArray", ArgumentSemantic.Copy)]
-		NSMenuItem[] ItemArray { get; [Mac (10, 14, onlyOn64: true)] set; }
-#else
-		[Export ("itemArray")]
-		NSMenuItem [] ItemArray ();
+		NSMenuItem[] Items { get; [Mac (10, 14, onlyOn64: true)] set; }
 
-		[Mac (10, 14, onlyOn64: true)]
-		[Export ("setItemArray:")]
-		void SetItemArray (NSMenuItem [] items);
+#if !XAMCORE_4_0
+		[Obsolete ("Use 'Items' instead.")]
+		[Wrap ("Items", IsVirtual = true)]
+		NSMenuItem [] ItemArray ();
 #endif
 
 		[Export ("numberOfItems")]
@@ -7998,13 +8008,16 @@ partial interface NSMenu : NSCoding, NSCopying, NSAccessibility, NSAccessibility
 		[Export ("size")]
 		CGSize Size { get; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Static]
 		[Export ("menuZone")]
 		NSZone MenuZone { get; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("helpRequested:")]
 		void HelpRequested (NSEvent eventPtr);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("isTornOff")]
 		bool IsTornOff { get; }
 
@@ -8042,6 +8055,7 @@ partial interface NSMenu : NSCoding, NSCopying, NSAccessibility, NSAccessibility
 		[Export ("showsStateColumn")]
 		bool ShowsStateColumn { get; set; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("menuChangedMessagesEnabled")]
 		bool MenuChangedMessagesEnabled { get; set; }
 
@@ -11919,30 +11933,39 @@ interface NSPrinter : NSCoding, NSCopying {
 		[Export ("pageSizeForPaper:")]
 		CGSize PageSizeForPaper (string paperName); 
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("statusForTable:")]
 		NSPrinterTableStatus StatusForTable (string tableName);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("isKey:inTable:")]
 		bool IsKeyInTable (string key, string table);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("booleanForKey:inTable:")]
 		bool BooleanForKey (string key, string table);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("floatForKey:inTable:")]
 		float /* float, not CGFloat */ FloatForKey (string key, string table);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("intForKey:inTable:")]
 		int /* int, not NSInteger */ IntForKey (string key, string table);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("rectForKey:inTable:")]
 		CGRect RectForKey (string key, string table);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("sizeForKey:inTable:")]
 		CGSize SizeForKey (string key, string table);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("stringForKey:inTable:")]
 		string StringForKey (string key, string table);
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("stringListForKey:inTable:")]
 		string [] StringListForKey (string key, string table);
 
@@ -14314,7 +14337,7 @@ partial interface NSSound : NSSecureCoding, NSCopying, NSPasteboardReading, NSPa
 		[Export ("playbackDeviceIdentifier")]
 		string PlaybackDeviceID { get; set; }
 
-		// FIXME: Poor docs, no type defined for the array elements
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("channelMapping")]
 		NSObject ChannelMapping { get; set; }
 	}
@@ -15942,6 +15965,7 @@ partial interface NSView : NSDraggingDestination, NSAnimatablePropertyContainer,
 		[Export ("drawPageBorderWithSize:")]
 		void DrawPageBorder (CGSize borderSize);
 		
+		[Deprecated (PlatformName.MacOSX, 10, 14, message: "Never called.")]
 		[Export ("drawSheetBorderWithSize:")]
 		void DrawSheetBorder (CGSize borderSize);
 		
@@ -17147,6 +17171,7 @@ interface NSTableViewDataSource {
 		[Export ("tableView:acceptDrop:row:dropOperation:")]
 		bool AcceptDrop (NSTableView tableView, [Protocolize (4)] NSDraggingInfo info, nint row, NSTableViewDropOperation dropOperation);
 	
+		[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'NSFilePromiseReceiver' instead.")]
 		[Export ("tableView:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:")]
 		string [] FilesDropped (NSTableView tableView, NSUrl dropDestination, NSIndexSet indexSet );
 
@@ -18492,6 +18517,7 @@ partial interface NSTextContainer : NSCoding {
 		[Export ("isSimpleRectangularTextContainer")]
 		bool IsSimpleRectangularTextContainer { get; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("containsPoint:")]
 		bool ContainsPoint (CGPoint point);
 
@@ -18641,6 +18667,7 @@ interface NSTextTab : NSSecureCoding, NSCopying {
 	interface NSTextInput
 	{
 		[Abstract]
+		[Deprecated (PlatformName.MacOSX, 10, 6)]
 		[Export ("insertText:")]
 		void InsertText (NSObject insertString);
 
@@ -18756,6 +18783,7 @@ partial interface NSTextView : NSTextInputClient, NSTextLayoutOrientationProvide
 		[Export ("lowerBaseline:")]
 		void LowerBaseline (NSObject sender);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use unicode characters via the character palette.")]
 		[Export ("toggleTraditionalCharacterShape:")]
 		void ToggleTraditionalCharacterShape (NSObject sender);
 
@@ -20340,6 +20368,7 @@ partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfaceItemI
 		[Export ("gState")]
 		nint GState ();
 	
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("setOneShot:")]
 		void SetOneShot (bool flag);
 	
@@ -20415,9 +20444,11 @@ partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfaceItemI
 		[Export ("sharingType")]
 		NSWindowSharingType SharingType  { get; set; }
 	
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("preferredBackingLocation")]
 		NSWindowBackingLocation PreferredBackingLocation  { get; set; }
 	
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("backingLocation")]
 		NSWindowBackingLocation BackingLocation { get; }
 	
@@ -21242,6 +21273,7 @@ interface NSWorkspace : NSWorkspaceAccessibilityExtensions {
 		[Export ("openFile:withApplication:andDeactivate:"), ThreadSafe]
 		bool OpenFile (string fullPath, [NullAllowed] string appName, bool deactivate);
 		
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSWorkspace.OpenUrl' instead.")]
 		[Export ("openFile:fromImage:at:inView:"), ThreadSafe]
 		bool OpenFile (string fullPath, NSImage anImage, CGPoint point, NSView aView);
 		
@@ -21305,6 +21337,7 @@ interface NSWorkspace : NSWorkspaceAccessibilityExtensions {
 		[Export ("getFileSystemInfoForPath:isRemovable:isWritable:isUnmountable:description:type:"), ThreadSafe]
 		bool GetFileSystemInfo (string fullPath, out bool removableFlag, out bool writableFlag, out bool unmountableFlag, out string description, out string fileSystemType);
 		
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("performFileOperation:source:destination:files:tag:"), ThreadSafe]
 		bool PerformFileOperation (NSString workspaceOperation, string source, string destination, string[] files, out nint tag);
 		
@@ -21320,9 +21353,11 @@ interface NSWorkspace : NSWorkspaceAccessibilityExtensions {
 		[Export ("hideOtherApplications")]
 		void HideOtherApplications ();
 		
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("mountedLocalVolumePaths")]
 		string[] MountedLocalVolumePaths { get; }
 		
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Export ("mountedRemovableMedia")]
 		string[] MountedRemovableMedia {  get; }
 		
@@ -21342,9 +21377,11 @@ interface NSWorkspace : NSWorkspaceAccessibilityExtensions {
 		[Export ("openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers:"), ThreadSafe]
 		bool _OpenUrls (NSUrl[] urls, string bundleIdentifier, NSWorkspaceLaunchOptions options, NSAppleEventDescriptor descriptor, [NullAllowed] string[] identifiers);
 		
+		[Deprecated (PlatformName.MacOSX, 10, 7, message: "Use 'NSWorkspace.RunningApplications' instead.")]
 		[Export ("launchedApplications")]
 		NSDictionary [] LaunchedApplications { get; }
 		
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSWorkspace.FrontmostApplication' instead.")]
 		[Export ("activeApplication")]
 		NSDictionary ActiveApplication { get; }
 		
@@ -22263,6 +22300,7 @@ partial interface NSTypesetter {
 		NSRange GlyphRangeForCharacterRange (NSRange charRange, out NSRange actualCharRange);
 
 		// TODO: could use a higher level API
+		[Deprecated (PlatformName.MacOSX, 10, 13)]
 		[Export ("getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:bidiLevels:")]
 		nuint GetGlyphsInRange (NSRange glyphsRange, IntPtr glyphBuffer, IntPtr charIndexBuffer, IntPtr inscribeBuffer, IntPtr elasticBuffer, IntPtr bidiLevelBuffer);
 
diff --git a/src/avfoundation.cs b/src/avfoundation.cs
index 465ac064d3f8..90b3d379ba86 100644
--- a/src/avfoundation.cs
+++ b/src/avfoundation.cs
@@ -1827,6 +1827,7 @@ interface AVAudioSession {
 		AVAudioSession SharedInstance ();
 	
 		[NoWatch]
+		[Availability (Deprecated = Platform.iOS_6_0, Message = "Use 'AVAudioSession.Notification.Observe*' methods instead.")]
 		[Export ("delegate", ArgumentSemantic.Assign)][NullAllowed]
 		[NoTV]
 		NSObject WeakDelegate { get; set;  }
@@ -2339,6 +2340,7 @@ interface AVAudioSessionRouteChangeEventArgs {
 		AVAudioSessionRouteDescription PreviousRoute { get; }
 	}
 	
+	[Deprecated (PlatformName.iOS, 6, 0)]
 	[BaseType (typeof (NSObject))]
 	[Model]
 	[Protocol]
@@ -3989,7 +3991,8 @@ interface AVAssetWriter {
 		void CancelWriting ();
 
 		[Export ("finishWriting")]
-		[Availability (Deprecated = Platform.iOS_6_0, Message = "Use the asynchronous 'FinishWriting (NSAction completionHandler)' instead.")]
+		[Deprecated (PlatformName.iOS, 6, 0, message: "Use the asynchronous 'FinishWriting (NSAction completionHandler)' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 9, message: "Use the asynchronous 'FinishWriting (NSAction completionHandler)' instead.")]
 		bool FinishWriting ();
 
 		[Mac (10,9)]
@@ -9412,11 +9415,13 @@ interface AVCapturePhotoOutput
 		[Export ("livePhotoAutoTrimmingEnabled")]
 		bool IsLivePhotoAutoTrimmingEnabled { [Bind ("isLivePhotoAutoTrimmingEnabled")] get; set; }
 
+		[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'AVCapturePhoto.FileDataRepresentation' instead.")]
 		[Static]
 		[Export ("JPEGPhotoDataRepresentationForJPEGSampleBuffer:previewPhotoSampleBuffer:")]
 		[return: NullAllowed]
 		NSData GetJpegPhotoDataRepresentation (CMSampleBuffer JPEGSampleBuffer, [NullAllowed] CMSampleBuffer previewPhotoSampleBuffer);
 
+		[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'AVCapturePhoto.FileDataRepresentation' instead.")]
 		[Static]
 		[Export ("DNGPhotoDataRepresentationForRawSampleBuffer:previewPhotoSampleBuffer:")]
 		[return: NullAllowed]
@@ -10298,6 +10303,8 @@ interface AVPlayer {
 		[Export ("actionAtItemEnd")]
 		AVPlayerActionAtItemEnd ActionAtItemEnd { get; set;  }
 
+		[Deprecated (PlatformName.MacOSX, 10, 13)]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		[Export ("closedCaptionDisplayEnabled")]
 		bool ClosedCaptionDisplayEnabled { [Bind ("isClosedCaptionDisplayEnabled")] get; set;  }
 
@@ -10713,12 +10720,18 @@ interface AVPlayerItem : NSCopying {
 		[Export ("stepByCount:")]
 		void StepByCount (nint stepCount);
 
+		[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'Seek (NSDate, AVCompletion)' instead.")]
+		[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'Seek (NSDate, AVCompletion)' instead.")]
 		[Export ("seekToDate:")]
 		bool Seek (NSDate date);
 
+		[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'Seek (CMTime, AVCompletion)' instead.")]
+		[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'Seek (CMTime, AVCompletion)' instead.")]
 		[Export ("seekToTime:")]
 		void Seek (CMTime time);
 		
+		[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'Seek (CMTime, CMTime, CMTime, AVCompletion)' instead.")]
+		[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'Seek (CMTime, CMTime, CMTime, AVCompletion)' instead.")]
 		[Export ("seekToTime:toleranceBefore:toleranceAfter:")]
 		void Seek (CMTime time, CMTime toleranceBefore, CMTime toleranceAfter);
 
@@ -10775,6 +10788,8 @@ interface AVPlayerItem : NSCopying {
 
 		[return: NullAllowed]
 		[Mac (10, 8)]
+		[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'CurrentMediaSelection' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'CurrentMediaSelection' instead.")]
 		[Export ("selectedMediaOptionInMediaSelectionGroup:")]
 		AVMediaSelectionOption SelectedMediaOption (AVMediaSelectionGroup inMediaSelectionGroup);
 
@@ -12892,6 +12907,7 @@ interface AVCapturePhoto
 		NSData FileDataRepresentation { get; }
 
 		[iOS (11,0)]
+		[Deprecated (PlatformName.iOS, 12, 0, message: "Use 'GetFileDataRepresentation' instead.")]
 		[Export ("fileDataRepresentationWithReplacementMetadata:replacementEmbeddedThumbnailPhotoFormat:replacementEmbeddedThumbnailPixelBuffer:replacementDepthData:")]
 		[return: NullAllowed]
 		NSData GetFileDataRepresentation ([NullAllowed] NSDictionary<NSString, NSObject> replacementMetadata, [NullAllowed] NSDictionary<NSString, NSObject> replacementEmbeddedThumbnailPhotoFormat, [NullAllowed] CVPixelBuffer replacementEmbeddedThumbnailPixelBuffer, [NullAllowed] AVDepthData replacementDepthData);
diff --git a/src/corebluetooth.cs b/src/corebluetooth.cs
index dd8932600f86..deb69b26eb42 100644
--- a/src/corebluetooth.cs
+++ b/src/corebluetooth.cs
@@ -501,7 +501,8 @@ interface CBPeripheral : NSCopying {
 	[Model]
 	[Protocol]
 	interface CBPeripheralDelegate {
-		[Availability (Deprecated=Platform.iOS_8_0, Message="Use 'RssiRead' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 13, message : "Use 'RssiRead' instead.")]
+		[Deprecated (PlatformName.iOS, 8, 0, message : "Use 'RssiRead' instead.")]
 		[Export ("peripheralDidUpdateRSSI:error:"), EventArgs ("NSError", true)]
 		void RssiUpdated (CBPeripheral peripheral, NSError error);
 
@@ -636,6 +637,8 @@ interface CBUUID : NSCopying {
 		CBUUID FromData (NSData theData);
 
 		[Availability (Deprecated = Platform.iOS_9_0)]
+		[Deprecated (PlatformName.MacOSX, 10, 13)]
+		[Deprecated (PlatformName.iOS, 9, 0)]
 		[NoWatch]
 		[Static]
 		[Export ("UUIDWithCFUUID:")]
diff --git a/src/coredata.cs b/src/coredata.cs
index b2abb00f8e07..37bcb4a71419 100644
--- a/src/coredata.cs
+++ b/src/coredata.cs
@@ -313,10 +313,10 @@ interface NSEntityDescription : NSCoding, NSCopying {
 
 		[NullAllowed] // by default this property is null
 		[Export ("compoundIndexes", ArgumentSemantic.Retain)]
-		[Deprecated (PlatformName.iOS, 11, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
 		[Mac (10, 7)]
+		[Deprecated (PlatformName.iOS, 11, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
 		[Deprecated (PlatformName.MacOSX, 10, 13, message : "Use 'NSEntityDescription.Indexes' instead.")]
-		[Deprecated (PlatformName.TvOS, 9, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
+		[Deprecated (PlatformName.TvOS, 11, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
 		[Deprecated (PlatformName.WatchOS, 4, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
 		NSPropertyDescription [] CompoundIndexes { get; set; }
 
@@ -909,6 +909,7 @@ interface NSQueryGenerationToken : NSSecureCoding, NSCopying
 	}
 	
 	[BaseType (typeof (NSObject))]
+	[DisableDefaultCtor]
 	interface NSManagedObjectContext : NSCoding
 #if !WATCH && !TVOS
 	, NSLocking
@@ -917,7 +918,11 @@ interface NSManagedObjectContext : NSCoding
 	, NSEditor, NSEditorRegistration
 #endif
 	{
-
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'NSManagedObjectContext (NSManagedObjectContextConcurrencyType)' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSManagedObjectContext (NSManagedObjectContextConcurrencyType)' instead.")]
+		[Export ("init")]
+		IntPtr Constructor ();
+		
 		[NullAllowed] // by default this property is null
 		[Export ("persistentStoreCoordinator", ArgumentSemantic.Retain)]
 		NSPersistentStoreCoordinator PersistentStoreCoordinator { get; set; }
@@ -1812,7 +1817,8 @@ partial interface NSPersistentStoreCoordinator
 		[return: NullAllowed]
 		NSDictionary<NSString, NSObject> GetMetadata (string storeType, NSUrl url, [NullAllowed] NSDictionary options, out NSError error);
 
-		[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the method that takes an out NSError parameter.")]
+		[Deprecated (PlatformName.iOS, 9, 0, message : "Use the method that takes an 'out NSError' parameter.")]
+		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use the method that takes an 'out NSError' parameter.")]
 		[Static, Export ("setMetadata:forPersistentStoreOfType:URL:error:")]
 		bool SetMetadata (NSDictionary metadata, NSString storeType, NSUrl url, out NSError error);
 		
@@ -1878,16 +1884,19 @@ partial interface NSPersistentStoreCoordinator
 		NSManagedObjectID ManagedObjectIDForURIRepresentation (NSUrl url);
 
 #if !WATCH && !TVOS
-		[Availability (Deprecated = Platform.iOS_8_0, Message="Use 'PerformAndWait' instead.")]
+		[Deprecated (PlatformName.iOS, 8, 0, message: "Use 'PerformAndWait' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 10, message: "Use 'PerformAndWait' instead.")]
 		[Export ("lock")]
 		new void Lock ();
 
-		[Availability (Deprecated = Platform.iOS_8_0, Message="Use 'PerformAndWait' instead.")]
+		[Deprecated (PlatformName.iOS, 8, 0, message: "Use 'PerformAndWait' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 10, message: "Use 'PerformAndWait' instead.")]
 		[Export ("unlock")]
 		new void Unlock ();
 
 		[NoTV]
-		[Availability (Deprecated = Platform.iOS_8_0, Message="Use 'Perform' instead.")]
+		[Deprecated (PlatformName.iOS, 8, 0, message: "Use 'Perform' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 10, message: "Use 'Perform' instead.")]
 		[Export ("tryLock")]
 		bool TryLock { get; }
 #endif // !WATCH && !TVOS
@@ -2020,7 +2029,8 @@ partial interface NSPersistentStoreCoordinator
 		[NoWatch][NoTV]
 		[iOS (7,0), Mac (10, 9)]
 		[Static]
-		[Availability (Deprecated = Platform.iOS_10_0, Message = "Please see the release notes and Core Data documentation.")]
+		[Deprecated (PlatformName.iOS, 10, 0, message: "Please see the release notes and Core Data documentation.")]
+		[Deprecated (PlatformName.MacOSX, 10, 12, message: "Please see the release notes and Core Data documentation.")]
 		[Export ("removeUbiquitousContentAndPersistentStoreAtURL:options:error:")]
 		bool RemoveUbiquitousContentAndPersistentStore (NSUrl storeUrl, NSDictionary options, out NSError error);
 
@@ -2189,7 +2199,7 @@ interface NSPropertyDescription : NSCoding, NSCopying {
 		[Export ("indexed")]
 		[Deprecated (PlatformName.iOS, 11, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
 		[Deprecated (PlatformName.MacOSX, 10, 13, message : "Use 'NSEntityDescription.Indexes' instead.")]
-		[Deprecated (PlatformName.TvOS, 9, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
+		[Deprecated (PlatformName.TvOS, 11, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
 		[Deprecated (PlatformName.WatchOS, 4, 0, message : "Use 'NSEntityDescription.Indexes' instead.")]
 		bool Indexed { [Bind ("isIndexed")] get; set; }
 
diff --git a/src/coreimage.cs b/src/coreimage.cs
index a3a1ad4f0ca3..9d28e8d62370 100644
--- a/src/coreimage.cs
+++ b/src/coreimage.cs
@@ -248,10 +248,12 @@ interface CIContext {
 		CIContext Create ();
 
 #if !MONOMAC
+		[Deprecated (PlatformName.iOS, 12, 0)]
 		[Static]
 		[Export ("contextWithEAGLContext:")]
 		CIContext FromContext (EAGLContext eaglContext);
 
+		[Deprecated (PlatformName.iOS, 12, 0)]
 		[Static]
 		[Export ("contextWithEAGLContext:options:")]
 		CIContext FromContext (EAGLContext eaglContext, [NullAllowed] NSDictionary dictionary);
@@ -359,6 +361,7 @@ interface CIContext {
 		int OfflineGPUCount { get; }
 
 		[Mac(10,11)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("contextForOfflineGPUAtIndex:")]
 		[Static]
 		CIContext FromOfflineGpu (int gpuIndex);
@@ -1347,10 +1350,12 @@ interface CIImage : NSSecureCoding, NSCopying {
 		CIImage FromCGImage (CGImage image, [NullAllowed] CIImageInitializationOptionsWithMetadata options);
 
 #if MONOMAC
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Static]
 		[Export ("imageWithCGLayer:")]
 		CIImage FromLayer (CGLayer layer);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Static]
 		[Export ("imageWithCGLayer:options:")]
 		CIImage FromLayer (CGLayer layer, NSDictionary options);
@@ -1366,6 +1371,8 @@ interface CIImage : NSSecureCoding, NSCopying {
 		CIImage FromData (NSData bitmapData, nint bytesPerRow, CGSize size, int /* CIFormat = int */ pixelFormat, [NullAllowed] CGColorSpace colorSpace);
 
 		[iOS (6,0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Static]
 		[Export ("imageWithTexture:size:flipped:colorSpace:")]
 		CIImage ImageWithTexture (uint /* unsigned int */ glTextureName, CGSize size, bool flipped, [NullAllowed] CGColorSpace colorspace);
@@ -1481,9 +1488,11 @@ interface CIImage : NSSecureCoding, NSCopying {
 		IntPtr Constructor (CGImage image, [NullAllowed] CIImageInitializationOptionsWithMetadata options);
 
 #if MONOMAC
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'CIImage (CGImage)' instead.")]
 		[Export ("initWithCGLayer:")]
 		IntPtr Constructor (CGLayer layer);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'CIImage (CGImage)' instead.")]
 		[EditorBrowsable (EditorBrowsableState.Advanced)]
 		[Export ("initWithCGLayer:options:")]
 		IntPtr Constructor (CGLayer layer, [NullAllowed] NSDictionary d);
@@ -1505,6 +1514,8 @@ interface CIImage : NSSecureCoding, NSCopying {
 		IntPtr Constructor (NSData d, nint bytesPerRow, CGSize size, int /* CIFormat = int */ pixelFormat, [NullAllowed] CGColorSpace colorSpace);
 
 		[iOS (6,0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithTexture:size:flipped:colorSpace:")]
 		IntPtr Constructor (int /* unsigned int */ glTextureName, CGSize size, bool flipped, [NullAllowed] CGColorSpace colorSpace);
 
@@ -2079,9 +2090,13 @@ interface CIKernel {
 		[Static, Export ("kernelsWithString:")]
 		CIKernel [] FromPrograms (string coreImageShaderProgram);
 #endif
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Static, Export ("kernelsWithString:")]
 		CIKernel [] FromProgramMultiple (string coreImageShaderProgram);
 
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Static, Export ("kernelWithString:")]
 		CIKernel FromProgramSingle (string coreImageShaderProgram);
 
@@ -2122,6 +2137,8 @@ interface CIColorKernel {
 
 		// Note: the API is supported in iOS 8, but with iOS 9, they guarantee
 		// a more derived result
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[New, Static, Export ("kernelWithString:")]
 		CIColorKernel FromProgramSingle (string coreImageShaderProgram);
 	}
@@ -2135,6 +2152,8 @@ interface CIWarpKernel {
 
 		// Note: the API is supported in iOS 8, but with iOS 9, they guarantee
 		// a more derived result
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[New, Static, Export ("kernelWithString:")]
 		CIWarpKernel FromProgramSingle (string coreImageShaderProgram);
 	}
@@ -2205,6 +2224,7 @@ interface CIPlugIn {
 		[Export ("loadNonExecutablePlugIns")]
 		void LoadNonExecutablePlugIns ();
 
+		[Deprecated (PlatformName.MacOSX, 10, 7)]
 		[Static]
 		[Export ("loadPlugIn:allowNonExecutable:")]
 		void LoadPlugIn (NSUrl pluginUrl, bool allowNonExecutable);
@@ -5200,6 +5220,8 @@ interface CIDataMatrixCodeDescriptor {
 	[DisableDefaultCtor] // Handle is nil for `init`
 	interface CIBlendKernel {
 
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Static]
 		[Export ("kernelWithString:")]
 		[return: NullAllowed]
diff --git a/src/coretelephony.cs b/src/coretelephony.cs
index 66e17de3dde9..75b28eea527c 100644
--- a/src/coretelephony.cs
+++ b/src/coretelephony.cs
@@ -151,6 +151,7 @@ interface CTCarrier {
 	[iOS (7,0)]
 	partial interface CTSubscriber {
 		[iOS (7,0), Export ("carrierToken")]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		NSData CarrierToken { get; }
 	}
 
diff --git a/src/corewlan.cs b/src/corewlan.cs
index 2d68042396f3..eaa1cfb19236 100644
--- a/src/corewlan.cs
+++ b/src/corewlan.cs
@@ -376,6 +376,7 @@ interface CWInterface {
 		[Internal]
 		NSSet _InterfaceNames { get; }
 		 
+		[Deprecated (PlatformName.MacOSX, 10, 10, message: "Use 'CWWiFiClient.FromName' instead.")]
 		[Export ("initWithInterfaceName:")]
 		IntPtr Constructor ([NullAllowed]string name);
 		 
diff --git a/src/eventkit.cs b/src/eventkit.cs
index 6c28e8cabd6a..0a0d4725f915 100644
--- a/src/eventkit.cs
+++ b/src/eventkit.cs
@@ -223,6 +223,7 @@ interface EKAlarm : NSCopying {
 		[Export ("soundName")]
 		string SoundName { get; set; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("url", ArgumentSemantic.Copy)]
 		NSUrl Url { get; set; }
 #endif
@@ -633,6 +634,7 @@ interface EKEventStore {
 		bool SaveReminder (EKReminder reminder, bool commit, out NSError error);
 
 #if MONOMAC
+		[Deprecated (PlatformName.MacOSX, 10, 9)]
 		[Export ("initWithAccessToEntityTypes:")]
 		IntPtr Constructor (EKEntityMask accessToEntityTypes);
 
diff --git a/src/foundation.cs b/src/foundation.cs
index 3532d79ab58a..a73735104ff8 100644
--- a/src/foundation.cs
+++ b/src/foundation.cs
@@ -415,9 +415,11 @@ partial interface NSAttributedString : NSCoding, NSMutableCopying, NSSecureCodin
 		[Wrap ("this (data, options == null ? null : options.Dictionary, out resultDocumentAttributes, out error)")]
 		IntPtr Constructor (NSData data, NSAttributedStringDocumentAttributes options, out NSDictionary resultDocumentAttributes, out NSError error);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSAttributedString (NSUrl, NSDictionary, out NSDictionary, ref NSError)' instead.")]
 		[Export ("initWithPath:documentAttributes:")]
 		IntPtr Constructor (string path, out NSDictionary resultDocumentAttributes);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSAttributedString (NSUrl, NSDictionary, out NSDictionary, ref NSError)' instead.")]
 		[Export ("initWithURL:documentAttributes:")]
 		IntPtr Constructor (NSUrl url, out NSDictionary resultDocumentAttributes);
 
@@ -460,6 +462,7 @@ partial interface NSAttributedString : NSCoding, NSMutableCopying, NSSecureCodin
 		[Export ("nextWordFromIndex:forward:")]
 		nuint GetNextWord (nuint fromIndex, bool isForward);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSDataDetector' instead.")]
 		[Export ("URLAtIndex:effectiveRange:")]
 		NSUrl GetUrl (nuint index, out NSRange effectiveRange);
 
@@ -5439,6 +5442,10 @@ partial interface NSUrl : NSSecureCoding, NSCopying
 	, QLPreviewItem
 #endif
 	{
+		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'NSUrlComponents' instead.")]
+		[Deprecated (PlatformName.WatchOS, 2, 0, message : "Use 'NSUrlComponents' instead.")]
+		[Deprecated (PlatformName.TvOS, 9, 0, message : "Use 'NSUrlComponents' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'NSUrlComponents' instead.")]
 		[Export ("initWithScheme:host:path:")]
 		IntPtr Constructor (string scheme, string host, string path);
 
@@ -6477,6 +6484,9 @@ interface NSUrlConnection :
 		[Export ("setDelegateQueue:")]
 		void SetDelegateQueue (NSOperationQueue queue);
 
+		[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'NSUrlSession.CreateDataTask' instead.")]
+		[Deprecated (PlatformName.TvOS, 9, 0, message : "Use 'NSUrlSession.CreateDataTask' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'NSUrlSession.CreateDataTask' instead.")]
 		[NoWatch]
 		[Static]
 		[Export ("sendAsynchronousRequest:queue:completionHandler:")]
@@ -8567,12 +8577,15 @@ interface NSObject2 : NSObjectProtocol {
 		void SetDefaultPlaceholder (NSObject placeholder, NSObject marker, NSString binding);
 #endif
 
+		[Deprecated (PlatformName.MacOSX, message: "Now on 'NSEditor' protocol.")]
 		[Export ("objectDidEndEditing:")]
 		void ObjectDidEndEditing (NSObject editor);
 
+		[Deprecated (PlatformName.MacOSX, message: "Now on 'NSEditor' protocol.")]
 		[Export ("commitEditing")]
 		bool CommitEditing ();
 
+		[Deprecated (PlatformName.MacOSX, message: "Now on 'NSEditor' protocol.")]
 		[Export ("commitEditingWithDelegate:didCommitSelector:contextInfo:")]
 		//void CommitEditingWithDelegateDidCommitSelectorContextInfo (NSObject objDelegate, Selector didCommitSelector, IntPtr contextInfo);
 		void CommitEditing (NSObject objDelegate, Selector didCommitSelector, IntPtr contextInfo);
@@ -8789,6 +8802,10 @@ interface NSOperation {
 		void WaitUntilFinished ();
 
 		[Export ("threadPriority")]
+		[Deprecated (PlatformName.iOS, 8, 0)]
+		[Deprecated (PlatformName.WatchOS, 2, 0)]
+		[Deprecated (PlatformName.TvOS, 9, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 10)]
 		double ThreadPriority { get; set; }
 
 		//Detected properties
@@ -9458,6 +9475,7 @@ partial interface NSBundle {
 
 		// https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSBundle_AppKitAdditions/Reference/Reference.html
 		[Static]
+		[Deprecated (PlatformName.MacOSX, 10, 8)]
 		[Export ("loadNibNamed:owner:")]
 		bool LoadNib (string nibName, NSObject owner);
 
@@ -12351,7 +12369,11 @@ interface NSFileManager_NSUserInformation {
 	partial interface NSFilePresenter {
 		[Abstract]
 		[Export ("presentedItemURL", ArgumentSemantic.Retain)]
+#if XAMCORE_4_0
+		NSUrl PresentedItemUrl { get; }
+#else
 		NSUrl PresentedItemURL { get; }
+#endif
 
 #if XAMCORE_2_0
 		[Abstract]
@@ -12761,9 +12783,11 @@ interface NSUrlDownload {
 		[Static, Export ("canResumeDownloadDecodedWithEncodingMIMEType:")]
 		bool CanResumeDownloadDecodedWithEncodingMimeType (string mimeType);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSURLSession' instead.")]
 		[Export ("initWithRequest:delegate:")]
 		IntPtr Constructor (NSUrlRequest request, NSObject delegate1);
 
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSURLSession' instead.")]
 		[Export ("initWithResumeData:delegate:path:")]
 		IntPtr Constructor (NSData resumeData, NSObject delegate1, string path);
 
@@ -13884,6 +13908,10 @@ interface NSDistantObjectRequest {
 		void Reply ([NullAllowed] NSException exception);
 	}
 
+	[Deprecated (PlatformName.TvOS, 11, 0)]
+	[Deprecated (PlatformName.WatchOS, 4, 0)]
+	[Deprecated (PlatformName.iOS, 11, 0)]
+	[Deprecated (PlatformName.MacOSX, 10, 13)]
 	[BaseType (typeof (NSObject))]
 	[DisableDefaultCtor]
 	interface NSPortNameServer {
diff --git a/src/gamekit.cs b/src/gamekit.cs
index a14a37de6eaf..188f2e7e5646 100644
--- a/src/gamekit.cs
+++ b/src/gamekit.cs
@@ -792,6 +792,8 @@ interface GKLocalPlayer
 		void GenerateIdentityVerificationSignature ([NullAllowed] GKIdentityVerificationSignatureHandler completionHandler);
 
 		[iOS (8,0), Mac (10,10)]
+		[Deprecated (PlatformName.iOS, 10, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 11)]
 		[Async]
 		[Export ("loadFriendPlayersWithCompletionHandler:")]
 		void LoadFriendPlayers ([NullAllowed] Action<GKPlayer [], NSError> completionHandler);
@@ -936,7 +938,7 @@ interface GKMatchDelegate {
 
 		[NoTV]
 		[Deprecated (PlatformName.iOS, 8, 0, message : "Use 'StateChangedForPlayer (GKMatch,GKPlayer,GKPlayerConnectionState)' instead.")]
-		[Deprecated (PlatformName.MacOSX, 10, 10, message : "Use 'StateChangedForPlayer (GKMatch,GKPlayer,GKPlayerConnectionState)' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 8, message : "Use 'StateChangedForPlayer (GKMatch,GKPlayer,GKPlayerConnectionState)' instead.")]
 		[Export ("match:player:didChangeState:"), EventArgs ("GKState")]
 		void StateChanged (GKMatch match, string playerId, GKPlayerConnectionState state);
 
@@ -1060,6 +1062,8 @@ interface GKMatchRequest {
 		[NoTV]
 		[NoWatch]
 		[NullAllowed] // by default this property is null
+		[Deprecated (PlatformName.iOS, 8, 0, message: "Use 'Recipients' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 10, message: "Use 'Recipients' instead.")]
 		[Export ("playersToInvite", ArgumentSemantic.Retain)]
 		string [] PlayersToInvite { get; set;  }
 
@@ -1129,6 +1133,8 @@ interface GKMatchmaker {
 		GKMatchmaker SharedMatchmaker { get; }
 
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 7, 0, message : "Use 'GKLocalPlayer.RegisterListener' with an object that implements 'IGKInviteEventListenerProtocol'.")]
+		[Deprecated (PlatformName.MacOSX, 10, 10, message: "Use 'GKLocalPlayer.RegisterListener' with an object that implements 'IGKInviteEventListenerProtocol'.")]
 		[NullAllowed, Export ("inviteHandler", ArgumentSemantic.Copy)]
 		GKInviteHandler InviteHandler { get; set; }
 
diff --git a/src/healthkit.cs b/src/healthkit.cs
index c93edc9f7dfd..4f1eb8385b2d 100644
--- a/src/healthkit.cs
+++ b/src/healthkit.cs
@@ -469,6 +469,8 @@ interface HKHealthStore {
 		void HandleAuthorizationForExtension (Action<bool, NSError> completion);
 
 		[iOS (9,0)]
+		[Deprecated (PlatformName.WatchOS, 4, 0)]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		[Export ("splitTotalEnergy:startDate:endDate:resultsHandler:")]
 		void SplitTotalEnergy (HKQuantity totalEnergy, NSDate startDate, NSDate endDate, Action<HKQuantity, HKQuantity, NSError> resultsHandler);
 
@@ -479,19 +481,23 @@ interface HKHealthStore {
 
 		[NoiOS]
 		[Watch (2,0)]
+		[Deprecated (PlatformName.WatchOS, 5, 0, message: "Use 'HKWorkoutSession.Start' instead.")]
 		[Export ("startWorkoutSession:")]
 		void StartWorkoutSession (HKWorkoutSession workoutSession);
 
 		[NoiOS]
 		[Watch (2,0)]
+		[Deprecated (PlatformName.WatchOS, 5, 0, message: "Use 'HKWorkoutSession.End' instead.")]
 		[Export ("endWorkoutSession:")]
 		void EndWorkoutSession (HKWorkoutSession workoutSession);
 
 		[Watch (3,0), NoiOS]
+		[Deprecated (PlatformName.WatchOS, 5, 0, message: "Use 'HKWorkoutSession.Pause' instead.")]
 		[Export ("pauseWorkoutSession:")]
 		void PauseWorkoutSession (HKWorkoutSession workoutSession);
 
 		[Watch (3,0), NoiOS]
+		[Deprecated (PlatformName.WatchOS, 5, 0, message: "Use 'HKWorkoutSession.Resume' instead.")]
 		[Export ("resumeWorkoutSession:")]
 		void ResumeWorkoutSession (HKWorkoutSession workoutSession);
 
diff --git a/src/mapkit.cs b/src/mapkit.cs
index 814b34d224af..7178d71989b4 100644
--- a/src/mapkit.cs
+++ b/src/mapkit.cs
@@ -822,7 +822,8 @@ interface MKPinAnnotationView {
 
 		[NoTV]
 		[Export ("pinColor")]
-		[Availability (Deprecated = Platform.iOS_9_0, Message = "Use 'PinTintColor' instead.")]
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'PinTintColor' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'PinTintColor' instead.")]
 		MKPinAnnotationColor PinColor { get; set; }
 	
 		[Export ("animatesDrop")]
diff --git a/src/mediaplayer.cs b/src/mediaplayer.cs
index e2947c12b3aa..23f9eadbb874 100644
--- a/src/mediaplayer.cs
+++ b/src/mediaplayer.cs
@@ -1578,6 +1578,7 @@ interface MPPlayableContentDelegate {
 		void InitializePlaybackQueue (MPPlayableContentManager contentManager, Action<NSError> completionHandler);
 
 		[iOS (9,3)]
+		[Deprecated (PlatformName.iOS, 12, 0, message: "Use the Intents framework API instead.")]
 		[Export ("playableContentManager:initializePlaybackQueueWithContentItems:completionHandler:")]
 		void InitializePlaybackQueue (MPPlayableContentManager contentManager, [NullAllowed] MPContentItem[] contentItems, Action<NSError> completionHandler);
 	}
diff --git a/src/metalperformanceshaders.cs b/src/metalperformanceshaders.cs
index be6bdbc2e191..ec9bca50ce06 100644
--- a/src/metalperformanceshaders.cs
+++ b/src/metalperformanceshaders.cs
@@ -788,6 +788,9 @@ interface MPSCnnNeuronLinear {
 		[Export ("b")]
 		float B { get; }
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:a:b:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, float a, float b);
@@ -803,6 +806,9 @@ interface MPSCnnNeuronReLU {
 		[Export ("a")]
 		float A { get; }
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:a:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, float a);
@@ -815,6 +821,9 @@ interface MPSCnnNeuronReLU {
 	[DisableDefaultCtor]
 	interface MPSCnnNeuronSigmoid {
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device);
@@ -831,6 +840,9 @@ interface MPSCnnNeuronTanH {
 		[Export ("b")]
 		float B { get; }
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:a:b:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, float a, float b);
@@ -843,6 +855,9 @@ interface MPSCnnNeuronTanH {
 	[DisableDefaultCtor]
 	interface MPSCnnNeuronAbsolute {
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device);
@@ -875,9 +890,13 @@ interface MPSCnnConvolutionDescriptor : NSCopying, NSSecureCoding {
 		nuint Groups { get; set; }
 
 		[NullAllowed, Export ("neuron", ArgumentSemantic.Retain)]
+		[Deprecated (PlatformName.TvOS, 11, 0)]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		MPSCnnNeuron Neuron { get; set; }
 
 		[Static]
+		[Deprecated (PlatformName.TvOS, 11, 0)]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		[Export ("cnnConvolutionDescriptorWithKernelWidth:kernelHeight:inputFeatureChannels:outputFeatureChannels:neuronFilter:")]
 		MPSCnnConvolutionDescriptor GetConvolutionDescriptor (nuint kernelWidth, nuint kernelHeight, nuint inputFeatureChannels, nuint outputFeatureChannels, [NullAllowed] MPSCnnNeuron neuronFilter);
 
@@ -896,22 +915,37 @@ interface MPSCnnConvolutionDescriptor : NSCopying, NSSecureCoding {
 		void SetBatchNormalizationParameters (IntPtr /* float* */ mean, IntPtr /* float* */ variance, [NullAllowed] IntPtr /* float* */ gamma, [NullAllowed] IntPtr /* float* */ beta, float epsilon);
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 11, 3)]
+		[Deprecated (PlatformName.iOS, 11, 3)]
+		[Deprecated (PlatformName.MacOSX, 10, 13, 4)]
 		[Export ("setNeuronType:parameterA:parameterB:")]
 		void SetNeuronType (MPSCnnNeuronType neuronType, float parameterA, float parameterB);
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 11, 3)]
+		[Deprecated (PlatformName.iOS, 11, 3)]
+		[Deprecated (PlatformName.MacOSX, 10, 13, 4)]
 		[Export ("neuronType")]
 		MPSCnnNeuronType NeuronType { get; }
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 11, 3)]
+		[Deprecated (PlatformName.iOS, 11, 3)]
+		[Deprecated (PlatformName.MacOSX, 10, 13, 4)]
 		[Export ("neuronParameterA")]
 		float NeuronParameterA { get; }
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 11, 3)]
+		[Deprecated (PlatformName.iOS, 11, 3)]
+		[Deprecated (PlatformName.MacOSX, 10, 13, 4)]
 		[Export ("neuronParameterB")]
 		float NeuronParameterB { get; }
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 11, 3)]
+		[Deprecated (PlatformName.iOS, 11, 3)]
+		[Deprecated (PlatformName.MacOSX, 10, 13, 4)]
 		[Export ("setNeuronToPReLUWithParametersA:")]
 		void SetNeuronToPReLU (NSData A);
 
@@ -961,6 +995,8 @@ interface MPSCnnConvolution {
 		[Export ("groups")]
 		nuint Groups { get; }
 
+		[Deprecated (PlatformName.TvOS, 11, 0)]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		[NullAllowed, Export ("neuron")]
 		MPSCnnNeuron Neuron { get; }
 
@@ -997,18 +1033,30 @@ interface MPSCnnConvolution {
 		nuint ChannelMultiplier { get; }
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("neuronType")]
 		MPSCnnNeuronType NeuronType { get; }
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("neuronParameterA")]
 		float NeuronParameterA { get; }
 
 		[TV (11, 0), iOS (11, 0)]
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("neuronParameterB")]
 		float NeuronParameterB { get; }
 
 		[TV (11,2), iOS (11,2), Mac (10,13,2, onlyOn64: true)]
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("neuronParameterC")]
 		float NeuronParameterC { get; }
 
@@ -1432,10 +1480,14 @@ interface MPSMatrixDescriptor {
 		nuint RowBytes { get; set; }
 
 		[Static]
+		[Deprecated (PlatformName.TvOS, 11, 0)]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		[Export ("matrixDescriptorWithDimensions:columns:rowBytes:dataType:")]
 		MPSMatrixDescriptor Create (nuint rows, nuint columns, nuint rowBytes, MPSDataType dataType);
 
 		[Static]
+		[Deprecated (PlatformName.TvOS, 11, 0)]
+		[Deprecated (PlatformName.iOS, 11, 0)]
 		[Export ("rowBytesFromColumns:dataType:")]
 		nuint GetRowBytesFromColumns (nuint columns, MPSDataType dataType);
 
@@ -2146,6 +2198,9 @@ interface MPSCnnNeuronHardSigmoid {
 		[Export ("b")]
 		float B { get; }
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:a:b:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, float a, float b);
@@ -2161,6 +2216,9 @@ interface MPSCnnNeuronSoftPlus {
 		[Export ("b")]
 		float B { get; }
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:a:b:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, float a, float b);
@@ -2170,6 +2228,9 @@ interface MPSCnnNeuronSoftPlus {
 	[BaseType (typeof(MPSCnnNeuron), Name = "MPSCNNNeuronSoftSign")]
 	[DisableDefaultCtor]
 	interface MPSCnnNeuronSoftSign {
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device);
@@ -2182,6 +2243,9 @@ interface MPSCnnNeuronElu {
 		[Export ("a")]
 		float A { get; }
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:a:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, float a);
@@ -2197,6 +2261,9 @@ interface MPSCnnNeuronReLun {
 		[Export ("b")]
 		float B { get; }
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithDevice:a:b:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, float a, float b);
@@ -2802,6 +2869,9 @@ interface MPSCnnNeuronLinearNode {
 		[Export ("nodeWithSource:a:b:")]
 		MPSCnnNeuronLinearNode Create (MPSNNImageNode sourceNode, float a, float b);
 
+		[Deprecated (PlatformName.TvOS, 12, 0)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("initWithSource:a:b:")]
 		IntPtr Constructor (MPSNNImageNode sourceNode, float a, float b);
 
@@ -3186,6 +3256,9 @@ interface MPSCnnUpsamplingBilinearNode {
 	[BaseType (typeof(MPSKernel))]
 	[DisableDefaultCtor] // There is a DesignatedInitializer, file a bug if needed.
 	interface MPSNNGraph : NSCopying, NSSecureCoding {
+		[Deprecated (PlatformName.TvOS, 11, 3)]
+		[Deprecated (PlatformName.iOS, 11, 3)]
+		[Deprecated (PlatformName.MacOSX, 10, 13, 4)]
 		[Export ("initWithDevice:resultImage:")]
 		[DesignatedInitializer]
 		IntPtr Constructor (IMTLDevice device, MPSNNImageNode resultImage);
@@ -3684,4 +3757,4 @@ interface MPSMatrixFindTopK {
 		MPSMatrixFindTopK Copy ([NullAllowed] NSZone zone, [NullAllowed] IMTLDevice device);
 	}
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/networkextension.cs b/src/networkextension.cs
index ca911d6e642a..cbaa050da172 100644
--- a/src/networkextension.cs
+++ b/src/networkextension.cs
@@ -727,6 +727,8 @@ interface NEProvider
 		NWPath DefaultPath { get; }
 
 		[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
+		[Deprecated (PlatformName.iOS, 12, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 14)]
 		[Export ("displayMessage:completionHandler:")]
 		[Async]
 		void DisplayMessage (string message, Action<bool> completionHandler);
diff --git a/src/passkit.cs b/src/passkit.cs
index c5129b9795d2..f0aa95fc384f 100644
--- a/src/passkit.cs
+++ b/src/passkit.cs
@@ -90,7 +90,7 @@ interface PKPassLibrary {
 
 		[iOS (8,0)]
 		[Static,Export ("isPaymentPassActivationAvailable")]
-		[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the library's instance 'IsLibraryPaymentPassActivationAvailable' property instead.")]
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use the library's instance 'IsLibraryPaymentPassActivationAvailable' property instead.")]
 		bool IsPaymentPassActivationAvailable { get; }
 
 		[iOS (9,0)]
@@ -105,6 +105,7 @@ interface PKPassLibrary {
 
 		[NoWatch]
 		[iOS (8,0)]
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'ActivatePaymentPass (PKPaymentPass, NSData, Action<bool, NSError> completion)' instead.")]
 		[Async]
 		[Export ("activatePaymentPass:withActivationCode:completion:")]
 		void ActivatePaymentPass (PKPaymentPass paymentPass, string activationCode, [NullAllowed] Action<bool, NSError> completion);
@@ -245,6 +246,7 @@ void DidAuthorizePayment (PKPaymentAuthorizationViewController controller, PKPay
 		[EventArgs ("PKPaymentRequestShippingMethodUpdate")]
 		void DidSelectShippingMethod2 (PKPaymentAuthorizationViewController controller, PKShippingMethod shippingMethod, Action<PKPaymentRequestShippingMethodUpdate> completion);
 
+		[Deprecated (PlatformName.iOS, 9, 0)]
 		[Export ("paymentAuthorizationViewController:didSelectShippingAddress:completion:")]
 		[EventArgs ("PKPaymentShippingAddressSelected")]
 		void DidSelectShippingAddress (PKPaymentAuthorizationViewController controller, ABRecord address, PKPaymentShippingAddressSelected completion);
diff --git a/src/pdfkit.cs b/src/pdfkit.cs
index 5a1c0e075a44..956c9f1201e7 100644
--- a/src/pdfkit.cs
+++ b/src/pdfkit.cs
@@ -550,7 +550,7 @@ interface PdfAnnotation : NSCoding, NSCopying {
 		IntPtr Constructor (CGRect bounds, PdfAnnotationKey annotationType, [NullAllowed] NSDictionary properties);
 
 		[Deprecated (PlatformName.iOS, 11, 0, message: "Use '.ctor (CGRect, PDFAnnotationKey, NSDictionary)' instead.")]
-		[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use '.ctor (CGRect, PDFAnnotationKey, NSDictionary)' instead.")]
+		[Deprecated (PlatformName.MacOSX, 10, 12, message: "Use '.ctor (CGRect, PDFAnnotationKey, NSDictionary)' instead.")]
 		[Export ("initWithBounds:")]
 		IntPtr Constructor (CGRect bounds);
 
@@ -1516,7 +1516,7 @@ interface PdfPage : NSCopying {
 		CGAffineTransform GetTransform (PdfDisplayBox box);
 
 		[NoiOS]
-		[Mac (10,12)]
+		[Deprecated (PlatformName.MacOSX, 10, 12)]
 		[Export ("drawWithBox:")]
 		void Draw (PdfDisplayBox box);
 
@@ -1533,6 +1533,7 @@ interface PdfPage : NSCopying {
 		NSImage GetThumbnail (CGSize size, PdfDisplayBox box);
 
 		[NoiOS]
+		[Deprecated (PlatformName.MacOSX, 10, 12)]
 		[Export ("transformContextForBox:")]
 		void TransformContext (PdfDisplayBox box);
 
@@ -1875,10 +1876,12 @@ interface PdfView :
 		[Export ("highlightedSelections")]
 		PdfSelection [] HighlightedSelections { get; set; }
 
+		[Deprecated (PlatformName.MacOSX, 10, 12)]
 		[Export ("takePasswordFrom:")]
 		void TakePasswordFrom (NSObject sender);
 
 		[NoiOS]
+		[Deprecated (PlatformName.MacOSX, 10, 12)]
 		[Export ("drawPage:")]
 		void DrawPage (PdfPage page);
 
@@ -1891,6 +1894,7 @@ interface PdfView :
 		void DrawPagePost (PdfPage page, CGContext context);
 
 		[NoiOS]
+		[Deprecated (PlatformName.MacOSX, 10, 12)]
 		[Export ("drawPagePost:")]
 		void DrawPagePost (PdfPage page);
 
diff --git a/src/replaykit.cs b/src/replaykit.cs
index de70db44d517..c053711f4302 100644
--- a/src/replaykit.cs
+++ b/src/replaykit.cs
@@ -127,8 +127,8 @@ interface IRPScreenRecorderDelegate { }
 	[BaseType (typeof (NSObject))]
 	interface RPScreenRecorderDelegate {
 
-		[Deprecated (PlatformName.TvOS, 11,0, message: "Use 'DidStopRecording(RPScreenRecorder,RPPreviewViewController,NSError)' instead.")]
-		[Deprecated (PlatformName.iOS, 11,0, message: "Use 'DidStopRecording(RPScreenRecorder,RPPreviewViewController,NSError)' instead.")]
+		[Deprecated (PlatformName.TvOS, 10,0, message: "Use 'DidStopRecording(RPScreenRecorder,RPPreviewViewController,NSError)' instead.")]
+		[Deprecated (PlatformName.iOS, 10,0, message: "Use 'DidStopRecording(RPScreenRecorder,RPPreviewViewController,NSError)' instead.")]
 		[Export ("screenRecorder:didStopRecordingWithError:previewViewController:")]
 		void DidStopRecording (RPScreenRecorder screenRecorder, NSError error, [NullAllowed] RPPreviewViewController previewViewController);
 
diff --git a/src/spritekit.cs b/src/spritekit.cs
index 7c135c6d2738..84b579a8fd11 100644
--- a/src/spritekit.cs
+++ b/src/spritekit.cs
@@ -870,6 +870,9 @@ partial interface SKEmitterNode {
 		[Export ("particleZPosition")]
 		nfloat ParticleZPosition { get; set; }
 
+		[Deprecated (PlatformName.iOS, 8, 0)]
+		[Deprecated (PlatformName.TvOS, 8, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 10)]
 		[Export ("particleZPositionRange")]
 		nfloat ParticleZPositionRange { get; set; }
 
@@ -1010,6 +1013,9 @@ partial interface SKEmitterNode {
 		uint FieldBitMask { get; set; } /* uint32_t */
 
 		[iOS (8,0), Mac(10,10)]
+		[Deprecated (PlatformName.iOS, 8, 0)]
+		[Deprecated (PlatformName.TvOS, 8, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 10)]
 		[Export ("particleZPositionSpeed")]
 		nfloat ParticleZPositionSpeed { get; set; }
 
@@ -1461,6 +1467,9 @@ partial interface SKView {
 		[Export ("asynchronous")]
 		bool Asynchronous { [Bind ("isAsynchronous")] get; set; }
 
+		[Deprecated (PlatformName.iOS, 10, 0)]
+		[Deprecated (PlatformName.TvOS, 10, 0)]
+		[Deprecated (PlatformName.MacOSX, 10, 12)]
 		[Export ("frameInterval")]
 		nint FrameInterval { get; set; }
 
diff --git a/src/uikit.cs b/src/uikit.cs
index 36c6b970eff9..4e5118b1f7c5 100644
--- a/src/uikit.cs
+++ b/src/uikit.cs
@@ -1712,6 +1712,7 @@ interface UIAccessibilityContentSizeCategoryImageAdjusting {
 
 	[NoTV]
 	[BaseType (typeof (UIView), KeepRefUntil="Dismissed", Delegates=new string [] { "WeakDelegate" }, Events=new Type [] {typeof(UIActionSheetDelegate)})]
+	[Deprecated (PlatformName.iOS, 8, 3, message: "Use 'UIAlertController' with 'UIAlertControllerStyle.ActionSheet' instead.")]
 	interface UIActionSheet {
 		[Export ("initWithFrame:")]
 		IntPtr Constructor (CGRect frame);
@@ -1780,6 +1781,7 @@ interface IUIActionSheetDelegate {}
 	[BaseType (typeof (NSObject))]
 	[Model]
 	[Protocol]
+	[Deprecated (PlatformName.iOS, 8, 3)]
 	interface UIActionSheetDelegate {
 
 		[Export ("actionSheet:clickedButtonAtIndex:"), EventArgs ("UIButton")]
@@ -2109,6 +2111,7 @@ interface UIAlertView : NSCoding {
 	[BaseType (typeof (NSObject))]
 	[Model]
 	[Protocol]
+	[Deprecated (PlatformName.iOS, 9, 0)]
 	interface UIAlertViewDelegate {
 		[Export ("alertView:clickedButtonAtIndex:"), EventArgs ("UIButton")]
 		void Clicked (UIAlertView alertview, nint buttonIndex);
@@ -2524,18 +2527,22 @@ interface UIApplication {
 
 		[NoTV]
 		[Export ("statusBarStyle")]
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'UIViewController.PreferredStatusBarStyle' instead.")]
 		UIStatusBarStyle StatusBarStyle { get; set; }
 		
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'UIViewController.PreferredStatusBarStyle' instead.")]
 		[Export ("setStatusBarStyle:animated:")]
 		void SetStatusBarStyle (UIStatusBarStyle statusBarStyle, bool animated);
 
 		[NoTV]
 		[Export ("statusBarHidden")]
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'UIViewController.PrefersStatusBarHidden' instead.")]
 		bool StatusBarHidden { [Bind ("isStatusBarHidden")] get; set; }
 
 		[NoTV]
 		[Export ("setStatusBarHidden:withAnimation:")]
+		[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'UIViewController.PrefersStatusBarHidden' instead.")]
 		void SetStatusBarHidden (bool state, UIStatusBarAnimation animation);
 
 		[NoTV]
@@ -2545,10 +2552,12 @@ interface UIApplication {
 
 		[NoTV]
 		[Export ("statusBarOrientation")]
+		[Deprecated (PlatformName.iOS, 9, 0)]
 		UIInterfaceOrientation StatusBarOrientation { get; set; }
 		
 		[NoTV]
 		[Export ("setStatusBarOrientation:animated:")]
+		[Deprecated (PlatformName.iOS, 9, 0)]
 		void SetStatusBarOrientation (UIInterfaceOrientation orientation, bool animated);
 
 		[NoTV]
@@ -5537,6 +5546,7 @@ partial interface UIFontDescriptor : NSSecureCoding, NSCopying {
 
 #if !WATCH
 	[BaseType (typeof(NSObject), Delegates=new string [] {"WeakDelegate"}, Events=new Type[] {typeof (UIGestureRecognizerDelegate)})]
+	[Dispose ("OnDispose ();")]
 	interface UIGestureRecognizer {
 		[DesignatedInitializer]
 		[Export ("initWithTarget:action:")]
@@ -9708,6 +9718,10 @@ interface UIScrollView : UIFocusItemScrollableContainer {
 		[Export ("initWithFrame:")]
 		IntPtr Constructor (CGRect frame);
 
+		// moved to UIFocusItemScrollableContainer in iOS 12 - but that makes the availability information incorrect (so `new` is used to avoid compiler warnings)
+		[Export ("contentOffset")]
+		new CGPoint ContentOffset { get; set; }
+
 		[Export ("contentSize")]
 		new CGSize ContentSize { get; set; }
 
@@ -13602,10 +13616,12 @@ interface UIViewController : NSCoding, UIAppearanceContainer, UIContentContainer
 		bool CanPerformUnwind (Selector segueAction, UIViewController fromViewController, NSObject sender);
 
 		[iOS (6,0)]
+		[Deprecated (PlatformName.iOS, 9, 0)]
 		[Export ("viewControllerForUnwindSegueAction:fromViewController:withSender:")]
 		UIViewController GetViewControllerForUnwind (Selector segueAction, UIViewController fromViewController, NSObject sender);
 
 		[iOS (6,0)]
+		[Deprecated (PlatformName.iOS, 9, 0)]
 		[Export ("segueForUnwindingToViewController:fromViewController:identifier:")]
 		UIStoryboardSegue GetSegueForUnwinding (UIViewController toViewController, UIViewController fromViewController, string identifier);
 
@@ -14888,6 +14904,7 @@ interface UIPopoverBackgroundView : UIPopoverBackgroundViewMethods {
 		
 	[BaseType (typeof (NSObject), Delegates=new string [] { "WeakDelegate" }, Events=new Type [] {typeof(UIPopoverControllerDelegate)})]
 	[DisableDefaultCtor] // bug #1786
+	[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'UIViewController' with style of 'UIModalPresentationStyle.Popover' or UIPopoverPresentationController' instead.")]
 	interface UIPopoverController : UIAppearanceContainer {
 		[Export ("initWithContentViewController:")][PostGet ("ContentViewController")]
 		IntPtr Constructor (UIViewController viewController);
@@ -14946,6 +14963,7 @@ interface UIPopoverController : UIAppearanceContainer {
 	[BaseType (typeof (NSObject))]
 	[Model]
 	[Protocol]
+	[Deprecated (PlatformName.iOS, 9, 0)]
 	interface UIPopoverControllerDelegate {
 		[Export ("popoverControllerDidDismissPopover:"), EventArgs ("UIPopoverController")]
 		void DidDismiss (UIPopoverController popoverController);
diff --git a/src/webkit.cs b/src/webkit.cs
index fb8b59ce90cc..264c353495ad 100644
--- a/src/webkit.cs
+++ b/src/webkit.cs
@@ -4115,6 +4115,7 @@ interface DomHtmlTableRowElement {
 
 	[BaseType (typeof (DomHtmlElement), Name="DOMHTMLTableSectionElement")]
 	[DisableDefaultCtor] // ObjCException: +[<TYPE> init]: should never be used
+	[Deprecated (PlatformName.MacOSX, 10, 14)]
 	interface DomHtmlTableSectionElement {
 
 		[Export ("align")]
diff --git a/tests/Makefile b/tests/Makefile
index 9994d79b156b..73fbd88c45da 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -89,7 +89,6 @@ test.config: Makefile $(TOP)/Make.config
 	@echo "MONOTOUCH_PREFIX=$(abspath $(MONOTOUCH_PREFIX))" >> $@
 	@echo "IOS_DESTDIR=$(abspath $(IOS_DESTDIR))" >> $@
 	@echo "MAC_DESTDIR=$(abspath $(MAC_DESTDIR))" >> $@
-	@echo "WATCH_MONO_PATH=$(abspath $(WATCH_MONO_PATH))" >> $@
 	@echo "JENKINS_RESULTS_DIRECTORY=$(abspath $(JENKINS_RESULTS_DIRECTORY))" >> $@
 	@echo "INCLUDE_DEVICE=$(INCLUDE_DEVICE)" >> $@
 
@@ -98,7 +97,6 @@ test-system.config:
 	@echo "MONOTOUCH_PREFIX=$(IOS_FRAMEWORK_DIR)/Versions/Current" >> $@
 	@echo "IOS_DESTDIR=/" >> $@
 	@echo "MAC_DESTDIR=/" >> $@
-	@echo "WATCH_MONO_PATH=$(abspath $(WATCH_MONO_PATH))" >> $@
 	@echo "JENKINS_RESULTS_DIRECTORY=$(abspath $(JENKINS_RESULTS_DIRECTORY))" >> $@
 	@echo "INCLUDE_DEVICE=$(INCLUDE_DEVICE)" >> $@
 
diff --git a/tests/linker/CommonDontLinkTest.cs b/tests/linker/CommonDontLinkTest.cs
new file mode 100644
index 000000000000..1fa9f2dc3181
--- /dev/null
+++ b/tests/linker/CommonDontLinkTest.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections;
+using System.Reflection;
+
+using NUnit.Framework;
+
+#if XAMCORE_2_0
+using Foundation;
+#elif MONOMAC
+using MonoMac.Foundation;
+#endif
+
+namespace DontLink {
+
+	[TestFixture]
+	public class CommonDontLinkTest {
+
+		[Test]
+		public void TypeDescriptorCanary ()
+		{
+			// this will fail is ReflectTypeDescriptionProvider.cs is modified
+			var rtdp = Type.GetType ("System.ComponentModel.ReflectTypeDescriptionProvider, System");
+			Assert.NotNull (rtdp, "type");
+			var p = rtdp.GetProperty ("IntrinsicTypeConverters", BindingFlags.Static | BindingFlags.NonPublic);
+			Assert.NotNull (p, "property");
+			var ht = (Hashtable) p.GetGetMethod (true).Invoke (null, null);
+			Assert.NotNull (ht, "Hashtable");
+			Assert.That (ht.Count, Is.EqualTo (26), "Count");
+			foreach (var item in ht.Values) {
+				var name = item.ToString ();
+				switch (name) {
+				case "System.ComponentModel.DateTimeOffsetConverter":
+				case "System.ComponentModel.DecimalConverter":
+				case "System.ComponentModel.StringConverter":
+				case "System.ComponentModel.SByteConverter":
+				case "System.ComponentModel.CollectionConverter":
+				case "System.ComponentModel.ReferenceConverter":
+				case "System.ComponentModel.TypeConverter":
+				case "System.ComponentModel.DateTimeConverter":
+				case "System.ComponentModel.UInt64Converter":
+				case "System.ComponentModel.ArrayConverter":
+				case "System.ComponentModel.NullableConverter":
+				case "System.ComponentModel.Int16Converter":
+				case "System.ComponentModel.CultureInfoConverter":
+				case "System.ComponentModel.SingleConverter":
+				case "System.ComponentModel.UInt16Converter":
+				case "System.ComponentModel.GuidConverter":
+				case "System.ComponentModel.DoubleConverter":
+				case "System.ComponentModel.Int32Converter":
+				case "System.ComponentModel.TimeSpanConverter":
+				case "System.ComponentModel.CharConverter":
+				case "System.ComponentModel.Int64Converter":
+				case "System.ComponentModel.BooleanConverter":
+				case "System.ComponentModel.UInt32Converter":
+				case "System.ComponentModel.ByteConverter":
+				case "System.ComponentModel.EnumConverter":
+					break;
+				default:
+					Assert.Fail ($"Unknown type descriptor {name}");
+					break;
+				}
+			}
+		}
+	}
+}
diff --git a/tests/linker/CommonLinkAllTest.cs b/tests/linker/CommonLinkAllTest.cs
new file mode 100644
index 000000000000..0a63f8b16ce6
--- /dev/null
+++ b/tests/linker/CommonLinkAllTest.cs
@@ -0,0 +1,53 @@
+using System;
+using System.ComponentModel;
+
+using NUnit.Framework;
+
+using Foundation;
+
+namespace LinkAll {
+
+	public class CustomConverter : TypeConverter {
+		// note: the default ctor will be preserved by the linker because it's used in a [TypeConverter] attribute
+	} 
+
+	[TypeConverter (typeof (BooleanConverter))]
+	public class BuiltInConverter {
+	}
+
+	[TypeConverter (typeof (CustomConverter))]
+	class TypeDescriptorTest {
+	}
+
+	[TestFixture]
+	// we want the test to be availble if we use the linker
+	[Preserve (AllMembers = true)]
+	public class CommonLinkAllTest {
+
+		[Test]
+		public void TypeConverter_BuiltIn ()
+		{
+			Assert.NotNull (TypeDescriptor.GetConverter (new BuiltInConverter ()), "BuiltInConverter");
+
+			string name = (typeof (BuiltInConverter).GetCustomAttributes (false) [0] as TypeConverterAttribute).ConverterTypeName;
+			Assert.That (name, Is.EqualTo ("System.ComponentModel.BooleanConverter, System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"), "ConverterTypeName");
+		}
+
+		[Test]
+		public void TypeConverter_Custom ()
+		{
+			Assert.NotNull (TypeDescriptor.GetConverter (new TypeDescriptorTest ()), "TypeDescriptorTest");
+
+			string name = (typeof (TypeDescriptorTest).GetCustomAttributes (false) [0] as TypeConverterAttribute).ConverterTypeName;
+			Assert.That (name, Is.EqualTo ("LinkAll.CustomConverter, link all, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"), "ConverterTypeName");
+		}
+
+		[Test]
+		public void ConstantsVersion_4859 ()
+		{
+			// Check that the Makefile generated a valid version number, e.g. "12.3." was not
+			// reference: https://github.com/xamarin/xamarin-macios/issues/4859
+			Assert.True (Version.TryParse (ObjCRuntime.Constants.Version, out var _), "Version");
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/linker/CommonLinkSdkTest.cs b/tests/linker/CommonLinkSdkTest.cs
new file mode 100644
index 000000000000..d5b2e060f7e5
--- /dev/null
+++ b/tests/linker/CommonLinkSdkTest.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+
+using NUnit.Framework;
+
+using Foundation;
+
+namespace LinkSdk {
+
+	[TestFixture]
+	// we want the test to be availble if we use the linker
+	[Preserve (AllMembers = true)]
+	public class CommonLinkSdkTest {
+
+		[Test]
+		public void TypeDescriptor_A7793 ()
+		{
+			var c = TypeDescriptor.GetConverter (typeof (DateTimeOffset));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("DateTimeOffsetConverter"), "DateTimeOffsetConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (decimal));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("DecimalConverter"), "DecimalConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (string));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("StringConverter"), "StringConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (sbyte));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("SByteConverter"), "SByteConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (Collection<string>));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("CollectionConverter"), "CollectionConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (INSCoding));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("ReferenceConverter"), "ReferenceConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (Type));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("TypeConverter"), "TypeConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (ulong));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("UInt64Converter"), "UInt64Converter");
+
+			c = TypeDescriptor.GetConverter (typeof (int[]));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("ArrayConverter"), "ArrayConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (int?));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("NullableConverter"), "NullableConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (short));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("Int16Converter"), "Int16Converter");
+
+			c = TypeDescriptor.GetConverter (typeof (CultureInfo));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("CultureInfoConverter"), "CultureInfoConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (float));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("SingleConverter"), "SingleConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (ushort));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("UInt16Converter"), "UInt16Converter");
+		
+			c = TypeDescriptor.GetConverter (typeof (Guid));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("GuidConverter"), "GuidConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (double));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("DoubleConverter"), "DoubleConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (int));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("Int32Converter"), "Int32Converter");
+
+			c = TypeDescriptor.GetConverter (typeof (TimeSpan));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("TimeSpanConverter"), "TimeSpanConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (char));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("CharConverter"), "CharConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (long));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("Int64Converter"), "Int64Converter");
+
+			c = TypeDescriptor.GetConverter (typeof (bool));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("BooleanConverter"), "BooleanConverter");
+
+			c = TypeDescriptor.GetConverter (typeof (long));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("Int64Converter"), "Int64Converter");
+
+			c = TypeDescriptor.GetConverter (typeof (uint));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("UInt32Converter"), "UInt32Converter");
+
+			c = TypeDescriptor.GetConverter (typeof (FileShare));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("EnumConverter"), "EnumConverter");
+
+			// special case - it's not in the default list we reflect in dont link tests
+
+			c = TypeDescriptor.GetConverter (typeof (IComponent));
+			Assert.That (c.GetType ().Name, Is.EqualTo ("ComponentConverter"), "ComponentConverter");
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/linker/ios/dont link/DontLinkRegressionTests.cs b/tests/linker/ios/dont link/DontLinkRegressionTests.cs
index ec5d4ff43d49..0370dc423eec 100644
--- a/tests/linker/ios/dont link/DontLinkRegressionTests.cs	
+++ b/tests/linker/ios/dont link/DontLinkRegressionTests.cs	
@@ -108,53 +108,6 @@ public void DefaultEncoding ()
 			Assert.True (de.IsReadOnly, "IsReadOnly");
 		}
 
-		[Test]
-		public void TypeDescriptorCanary ()
-		{
-			// this will fail is ReflectTypeDescriptionProvider.cs is modified
-			var rtdp = Type.GetType ("System.ComponentModel.ReflectTypeDescriptionProvider, System");
-			Assert.NotNull (rtdp, "type");
-			var p = rtdp.GetProperty ("IntrinsicTypeConverters", BindingFlags.Static | BindingFlags.NonPublic);
-			Assert.NotNull (p, "property");
-			var ht = (Hashtable) p.GetGetMethod (true).Invoke (null, null);
-			Assert.NotNull (ht, "Hashtable");
-			Assert.That (ht.Count, Is.EqualTo (26), "Count");
-			foreach (var item in ht.Values) {
-				var name = item.ToString ();
-				switch (name) {
-				case "System.ComponentModel.DateTimeOffsetConverter":
-				case "System.ComponentModel.DecimalConverter":
-				case "System.ComponentModel.StringConverter":
-				case "System.ComponentModel.SByteConverter":
-				case "System.ComponentModel.CollectionConverter":
-				case "System.ComponentModel.ReferenceConverter":
-				case "System.ComponentModel.TypeConverter":
-				case "System.ComponentModel.DateTimeConverter":
-				case "System.ComponentModel.UInt64Converter":
-				case "System.ComponentModel.ArrayConverter":
-				case "System.ComponentModel.NullableConverter":
-				case "System.ComponentModel.Int16Converter":
-				case "System.ComponentModel.CultureInfoConverter":
-				case "System.ComponentModel.SingleConverter":
-				case "System.ComponentModel.UInt16Converter":
-				case "System.ComponentModel.GuidConverter":
-				case "System.ComponentModel.DoubleConverter":
-				case "System.ComponentModel.Int32Converter":
-				case "System.ComponentModel.TimeSpanConverter":
-				case "System.ComponentModel.CharConverter":
-				case "System.ComponentModel.Int64Converter":
-				case "System.ComponentModel.BooleanConverter":
-				case "System.ComponentModel.UInt32Converter":
-				case "System.ComponentModel.ByteConverter":
-				case "System.ComponentModel.EnumConverter":
-					break;
-				default:
-					Assert.Fail ($"Unknown type descriptor {name}");
-					break;
-				}
-			}
-		}
-
 #if __TVOS__ || __WATCHOS__
 		void AssertThrowsWrappedNotSupportedException (Action action, string message)
 		{
diff --git a/tests/linker/ios/dont link/dont link.csproj b/tests/linker/ios/dont link/dont link.csproj
index 8c268cef7831..0542807a2558 100644
--- a/tests/linker/ios/dont link/dont link.csproj	
+++ b/tests/linker/ios/dont link/dont link.csproj	
@@ -150,6 +150,9 @@
     <Compile Include="DontLinkRegressionTests.cs" />
     <Compile Include="TableViewSourceTest.cs" />
     <Compile Include="CalendarTest.cs" />
+    <Compile Include="..\..\CommonDontLinkTest.cs">
+      <Link>CommonDontLinkTest.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="LaunchScreen.storyboard" Condition="'$(TargetFrameworkIdentifier)' != 'Xamarin.WatchOS'" />
diff --git a/tests/linker/ios/link all/link all.csproj b/tests/linker/ios/link all/link all.csproj
index adc2425530a8..c37c67fe4683 100644
--- a/tests/linker/ios/link all/link all.csproj	
+++ b/tests/linker/ios/link all/link all.csproj	
@@ -195,6 +195,9 @@
     <Compile Include="..\..\..\common\TestRuntime.cs">
       <Link>TestRuntime.cs</Link>
     </Compile>
+    <Compile Include="..\..\CommonLinkAllTest.cs">
+      <Link>CommonLinkAllTest.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="LaunchScreen.storyboard" Condition="'$(TargetFrameworkIdentifier)' != 'Xamarin.WatchOS'" />
diff --git a/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs b/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
index ce53fb849460..036aa3c9c052 100644
--- a/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs	
+++ b/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs	
@@ -489,88 +489,7 @@ public void Modal_3489 ()
 			}
 		}
 #endif // !__TVOS__ && !__WATCHOS__
-		
-		[Test]
-		public void TypeDescriptor_A7793 ()
-		{
-			var c = TypeDescriptor.GetConverter (typeof (DateTimeOffset));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("DateTimeOffsetConverter"), "DateTimeOffsetConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (decimal));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("DecimalConverter"), "DecimalConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (string));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("StringConverter"), "StringConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (sbyte));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("SByteConverter"), "SByteConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (Collection<string>));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("CollectionConverter"), "CollectionConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (INSCoding));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("ReferenceConverter"), "ReferenceConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (Type));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("TypeConverter"), "TypeConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (ulong));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("UInt64Converter"), "UInt64Converter");
-
-			c = TypeDescriptor.GetConverter (typeof (int[]));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("ArrayConverter"), "ArrayConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (int?));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("NullableConverter"), "NullableConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (short));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("Int16Converter"), "Int16Converter");
-
-			c = TypeDescriptor.GetConverter (typeof (CultureInfo));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("CultureInfoConverter"), "CultureInfoConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (float));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("SingleConverter"), "SingleConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (ushort));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("UInt16Converter"), "UInt16Converter");
-		
-			c = TypeDescriptor.GetConverter (typeof (Guid));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("GuidConverter"), "GuidConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (double));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("DoubleConverter"), "DoubleConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (int));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("Int32Converter"), "Int32Converter");
-
-			c = TypeDescriptor.GetConverter (typeof (TimeSpan));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("TimeSpanConverter"), "TimeSpanConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (char));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("CharConverter"), "CharConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (long));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("Int64Converter"), "Int64Converter");
-
-			c = TypeDescriptor.GetConverter (typeof (bool));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("BooleanConverter"), "BooleanConverter");
-
-			c = TypeDescriptor.GetConverter (typeof (long));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("Int64Converter"), "Int64Converter");
-
-			c = TypeDescriptor.GetConverter (typeof (uint));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("UInt32Converter"), "UInt32Converter");
-
-			c = TypeDescriptor.GetConverter (typeof (FileShare));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("EnumConverter"), "EnumConverter");
-
-			// special case - it's not in the default list we reflect in dont link tests
-
-			c = TypeDescriptor.GetConverter (typeof (IComponent));
-			Assert.That (c.GetType ().Name, Is.EqualTo ("ComponentConverter"), "ComponentConverter");
-		}
-		
+				
 		[Test]
 		public void Parse_3677 ()
 		{
@@ -1119,6 +1038,20 @@ public void TlsProvider_Apple ()
 			Assert.NotNull (provider, "provider");
 			Assert.That (provider.ID, Is.EqualTo (new Guid ("981af8af-a3a3-419a-9f01-a518e3a17c1c")), "correct provider");
 		}
+
+		[Test]
+		public void Github5024 ()
+		{
+			TestRuntime.AssertXcodeVersion (6,0);
+			var sc = new UISearchController ((UIViewController) null);
+			sc.SetSearchResultsUpdater ((vc) => { });
+
+			var a = typeof (UISearchController).AssemblyQualifiedName;
+			var n = a.Replace ("UIKit.UISearchController", "UIKit.UISearchController+__Xamarin_UISearchResultsUpdating");
+			var t = Type.GetType (n);
+			Assert.NotNull (t, "private inner type");
+			Assert.IsNotNull (t.GetMethod ("UpdateSearchResultsForSearchController"), "preserved");
+		}
 #endif // !__WATCHOS__
 
 		[Test]
diff --git a/tests/linker/ios/link sdk/link sdk.csproj b/tests/linker/ios/link sdk/link sdk.csproj
index 4d5643e7004a..47af0b1d7304 100644
--- a/tests/linker/ios/link sdk/link sdk.csproj	
+++ b/tests/linker/ios/link sdk/link sdk.csproj	
@@ -189,6 +189,9 @@
     <Compile Include="..\link all\ILReader.cs">
       <Link>ILReader.cs</Link>
     </Compile>
+    <Compile Include="..\..\CommonLinkSdkTest.cs">
+      <Link>CommonLinkSdkTest.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="LaunchScreen.storyboard" Condition="'$(TargetFrameworkIdentifier)' != 'Xamarin.WatchOS'" />
diff --git a/tests/linker/mac/dont link/dont link-mac.csproj b/tests/linker/mac/dont link/dont link-mac.csproj
index 20a2a9b09be6..1590422dfdf2 100644
--- a/tests/linker/mac/dont link/dont link-mac.csproj	
+++ b/tests/linker/mac/dont link/dont link-mac.csproj	
@@ -65,6 +65,9 @@
     <Compile Include="..\..\..\common\mac\MacTestMain.cs">
       <Link>MacTestMain.cs</Link>
     </Compile>
+    <Compile Include="..\..\CommonDontLinkTest.cs">
+      <Link>CommonDontLinkTest.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_NET_4_5.csproj">
diff --git a/tests/linker/mac/link all/link all-mac.csproj b/tests/linker/mac/link all/link all-mac.csproj
index 182cd8fbc002..bc9ec562f107 100644
--- a/tests/linker/mac/link all/link all-mac.csproj	
+++ b/tests/linker/mac/link all/link all-mac.csproj	
@@ -78,6 +78,9 @@
     <Compile Include="..\..\..\common\TestRuntime.cs">
       <Link>TestRuntime.cs</Link>
     </Compile>
+    <Compile Include="..\..\CommonLinkAllTest.cs">
+      <Link>CommonLinkAllTest.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_xammac_mobile.csproj">
diff --git a/tests/linker/mac/link sdk/link sdk-mac.csproj b/tests/linker/mac/link sdk/link sdk-mac.csproj
index fe14153b13f1..25b5f1b3a525 100644
--- a/tests/linker/mac/link sdk/link sdk-mac.csproj	
+++ b/tests/linker/mac/link sdk/link sdk-mac.csproj	
@@ -76,6 +76,9 @@
     <Compile Include="..\..\..\common\TestRuntime.cs">
       <Link>TestRuntime.cs</Link>
     </Compile>
+    <Compile Include="..\..\CommonLinkSdkTest.cs">
+      <Link>CommonLinkSdkTest.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_xammac_mobile.csproj">
diff --git a/tests/mmptest/regression/Makefile b/tests/mmptest/regression/Makefile
index b4be3a04bda4..bd7bd3370f79 100644
--- a/tests/mmptest/regression/Makefile
+++ b/tests/mmptest/regression/Makefile
@@ -24,8 +24,6 @@ TESTS_4_0 = \
 	link-frameworks-1 \
 	link-aes-1 \
 	link-blocks-1 \
-	link-typedescriptor-1 \
-	link-typedescriptor-2 \
 	embedded-mono \
 	system-mono \
 	embedded-mono-profile \
diff --git a/tests/mmptest/regression/link-typedescriptor-1/Info.plist b/tests/mmptest/regression/link-typedescriptor-1/Info.plist
deleted file mode 100644
index cb9124a4af95..000000000000
--- a/tests/mmptest/regression/link-typedescriptor-1/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDisplayName</key>
-	<string>link-typedescriptor-1</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.your-company.linktypedescriptor1</string>
-	<key>CFBundleName</key>
-	<string>link-typedescriptor-1</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>LSUIElement</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/tests/mmptest/regression/link-typedescriptor-1/LinkTypeDescriptor1.cs b/tests/mmptest/regression/link-typedescriptor-1/LinkTypeDescriptor1.cs
deleted file mode 100644
index e1ed352fbade..000000000000
--- a/tests/mmptest/regression/link-typedescriptor-1/LinkTypeDescriptor1.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2013 Xamarin Inc. All rights reserved.
-
-using System;
-using System.ComponentModel;
-using MonoMac.AppKit;
-
-// Test
-// * Application use System.ComponentModel.TypeDescriptor
-// * Application includes every *default* converter (see TypeDescriptor.cs)
-// * Application does not include CustomConverter as it's not used by the application
-//
-// Requirement
-// * Link All must be enabled
-
-namespace Xamarin.Mac.Linker.Test {
-
-	public class CustomConverter : TypeConverter {
-	} 
-
-	class TypeDescriptorTest {
-		static string typeToCheck = "Xamarin.Mac.Linker.Test.CustomConverter";
-
-		static void Check (string typeName)
-		{
-			var t = Type.GetType (typeName + ", System", false);
-			Test.Log.WriteLine ("{0}\t{1}", t != null ? "[PASS]" : "[FAIL]", typeName);
-		}
-
-		static void Main (string[] args)
-		{
-			NSApplication.Init ();
-
-			Test.EnsureLinker (true);
-
-			TypeDescriptor td = null;
-			Test.Log.WriteLine ("{0}\tTypeDescriptor", td == null ? "[PASS]" : "[FAIL]");
-
-			Check ("System.ComponentModel.BooleanConverter");
-			Check ("System.ComponentModel.ByteConverter");
-			Check ("System.ComponentModel.SByteConverter");
-			Check ("System.ComponentModel.StringConverter");
-			Check ("System.ComponentModel.CharConverter");
-			Check ("System.ComponentModel.Int16Converter");
-			Check ("System.ComponentModel.Int32Converter");
-			Check ("System.ComponentModel.Int64Converter");
-			Check ("System.ComponentModel.UInt16Converter");
-			Check ("System.ComponentModel.UInt32Converter");
-			Check ("System.ComponentModel.UInt64Converter");
-			Check ("System.ComponentModel.SingleConverter");
-			Check ("System.ComponentModel.DoubleConverter");
-			Check ("System.ComponentModel.DecimalConverter");
-			Check ("System.ComponentModel.TypeConverter");
-			Check ("System.ComponentModel.ArrayConverter");
-			Check ("System.ComponentModel.CultureInfoConverter");
-			Check ("System.ComponentModel.DateTimeConverter");
-			Check ("System.ComponentModel.GuidConverter");
-			Check ("System.ComponentModel.TimeSpanConverter");
-			Check ("System.ComponentModel.CollectionConverter");
-			Check ("System.ComponentModel.EnumConverter");
-
-			var t = Type.GetType (typeToCheck, false);
-			Test.Log.WriteLine ("{0}\tXamarin.Mac.Linker.Test.CustomConverter", t == null ? "[PASS]" : "[FAIL]");
-
-			Test.Terminate ();
-		}
-	}
-}
\ No newline at end of file
diff --git a/tests/mmptest/regression/link-typedescriptor-1/link-typedescriptor-1.csproj b/tests/mmptest/regression/link-typedescriptor-1/link-typedescriptor-1.csproj
deleted file mode 100644
index 0f3ae8dcbef2..000000000000
--- a/tests/mmptest/regression/link-typedescriptor-1/link-typedescriptor-1.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0AA2D44B-E4C6-4FC3-B49E-30ED3D744823}</ProjectGuid>
-    <ProjectTypeGuids>{42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>linktypedescriptor1</RootNamespace>
-    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
-    <AssemblyName>link-typedescriptor-1</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <EnablePackageSigning>false</EnablePackageSigning>
-    <CodeSigningKey>Mac Developer</CodeSigningKey>
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <CreatePackage>false</CreatePackage>
-    <PackageSigningKey>Developer ID Installer</PackageSigningKey>
-    <I18n>
-    </I18n>
-    <LinkMode>Full</LinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <LinkMode>Full</LinkMode>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <EnablePackageSigning>false</EnablePackageSigning>
-    <CodeSigningKey>Developer ID Application</CodeSigningKey>
-    <EnableCodeSigning>true</EnableCodeSigning>
-    <CreatePackage>true</CreatePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\AppStore</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <LinkMode>Full</LinkMode>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
-    <CreatePackage>true</CreatePackage>
-    <CodeSigningKey>3rd Party Mac Developer Application</CodeSigningKey>
-    <EnableCodeSigning>true</EnableCodeSigning>
-    <EnablePackageSigning>true</EnablePackageSigning>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="XamMac" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\common\Test.cs">
-      <Link>Test.cs</Link>
-    </Compile>
-    <Compile Include="LinkTypeDescriptor1.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <InterfaceDefinition Include="..\common\MainMenu.xib">
-      <Link>MainMenu.xib</Link>
-    </InterfaceDefinition>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/mmptest/regression/link-typedescriptor-2/Info.plist b/tests/mmptest/regression/link-typedescriptor-2/Info.plist
deleted file mode 100644
index 32d5eda74422..000000000000
--- a/tests/mmptest/regression/link-typedescriptor-2/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDisplayName</key>
-	<string>link-typedescriptor-2</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.your-company.linktypedescriptor2</string>
-	<key>CFBundleName</key>
-	<string>link-typedescriptor-2</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>LSUIElement</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/tests/mmptest/regression/link-typedescriptor-2/LinkTypeDescriptor2.cs b/tests/mmptest/regression/link-typedescriptor-2/LinkTypeDescriptor2.cs
deleted file mode 100644
index 5aaf89013f3d..000000000000
--- a/tests/mmptest/regression/link-typedescriptor-2/LinkTypeDescriptor2.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2013 Xamarin Inc. All rights reserved.
-
-using System;
-using System.ComponentModel;
-using MonoMac.AppKit;
-
-// Test
-// * Application use [TypeConverter] on a custom (non default) TypeConverter
-// * Application includes CustomConverter as it is used by the application
-//
-// Requirement
-// * Link All must be enabled
-
-namespace Xamarin.Mac.Linker.Test {
-
-	public class CustomConverter : TypeConverter {
-		// note: the default ctor will be preserved by the linker because it's used in a [TypeConverter] attribute
-	} 
-
-	[TypeConverter (typeof (BooleanConverter))]
-	public class BuiltInConverter {
-	}
-
-	[TypeConverter (typeof (CustomConverter))]
-	class TypeDescriptorTest {
-
-		static void Main (string[] args)
-		{
-			NSApplication.Init ();
-
-			Test.EnsureLinker (true);
-
-			TypeConverter converter = null;
-			string msg = "BooleanConverter";
-
-			try {
-				converter = TypeDescriptor.GetConverter (new BuiltInConverter ());
-				msg = (typeof (BuiltInConverter).GetCustomAttributes (false) [0] as TypeConverterAttribute).ConverterTypeName;
-			}
-			catch (Exception e) {
-				msg = e.ToString ();
-			}
-			finally {
-				Test.Log.WriteLine ("[{0}]\tTypeDescriptor.GetConverter BooleanConverter", converter != null ? "PASS" : "FAIL");
-				bool success = msg == "System.ComponentModel.BooleanConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
-				Test.Log.WriteLine ("[{0}]\t{1}", success ? "PASS" : "FAIL", msg);
-			}
-
-			msg = "CustomConverter";
-			try {
-				converter = TypeDescriptor.GetConverter (new TypeDescriptorTest ());
-				msg = (typeof (TypeDescriptorTest).GetCustomAttributes (false) [0] as TypeConverterAttribute).ConverterTypeName;
-			}
-			catch (Exception e) {
-				msg = e.ToString ();
-			}
-			finally {
-				Test.Log.WriteLine ("[{0}]\tTypeDescriptor.GetConverter CustomConverter", converter != null ? "PASS" : "FAIL");
-				bool success = msg == "Xamarin.Mac.Linker.Test.CustomConverter, link-typedescriptor-2, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null";
-				Test.Log.WriteLine ("[{0}]\t{1}", success ? "PASS" : "FAIL", msg);
-			}
-
-			Test.Terminate ();
-		}
-	}
-}
\ No newline at end of file
diff --git a/tests/mmptest/regression/link-typedescriptor-2/link-typedescriptor-2.csproj b/tests/mmptest/regression/link-typedescriptor-2/link-typedescriptor-2.csproj
deleted file mode 100644
index 44eeb8494f84..000000000000
--- a/tests/mmptest/regression/link-typedescriptor-2/link-typedescriptor-2.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3FF064DE-5B37-404B-9FD1-234361AD3DB8}</ProjectGuid>
-    <ProjectTypeGuids>{42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>linktypedescriptor2</RootNamespace>
-    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
-    <AssemblyName>link-typedescriptor-2</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <EnablePackageSigning>false</EnablePackageSigning>
-    <CodeSigningKey>Mac Developer</CodeSigningKey>
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <CreatePackage>false</CreatePackage>
-    <PackageSigningKey>Developer ID Installer</PackageSigningKey>
-    <I18n>
-    </I18n>
-    <LinkMode>Full</LinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <LinkMode>Full</LinkMode>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <EnablePackageSigning>false</EnablePackageSigning>
-    <CodeSigningKey>Developer ID Application</CodeSigningKey>
-    <EnableCodeSigning>true</EnableCodeSigning>
-    <CreatePackage>true</CreatePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\AppStore</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <LinkMode>Full</LinkMode>
-    <UseSGen>false</UseSGen>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
-    <CreatePackage>true</CreatePackage>
-    <CodeSigningKey>3rd Party Mac Developer Application</CodeSigningKey>
-    <EnableCodeSigning>true</EnableCodeSigning>
-    <EnablePackageSigning>true</EnablePackageSigning>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="XamMac" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\common\Test.cs">
-      <Link>Test.cs</Link>
-    </Compile>
-    <Compile Include="LinkTypeDescriptor2.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <InterfaceDefinition Include="..\common\MainMenu.xib">
-      <Link>MainMenu.xib</Link>
-    </InterfaceDefinition>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/monotouch-test/CoreFoundation/DispatchQueueTest.cs b/tests/monotouch-test/CoreFoundation/DispatchQueueTest.cs
new file mode 100644
index 000000000000..a7b7e87d9469
--- /dev/null
+++ b/tests/monotouch-test/CoreFoundation/DispatchQueueTest.cs
@@ -0,0 +1,124 @@
+//
+// Unit tests for DispatchQueue
+//
+// Authors:
+//	Rolf Bjarne Kvinge <rolf@xamarin.com>
+//
+// Copyright 2018 Microsoft Corp. All rights reserved.
+//
+
+using System;
+using System.IO;
+#if XAMCORE_2_0
+using CoreFoundation;
+using Foundation;
+using ObjCRuntime;
+#if MONOMAC
+using AppKit;
+#else
+using UIKit;
+#endif
+#else
+using MonoTouch.CoreFoundation;
+using MonoTouch.Foundation;
+using MonoTouch.ObjCRuntime;
+using MonoTouch.UIKit;
+#endif
+using NUnit.Framework;
+using System.Drawing;
+using System.Threading;
+
+#if XAMCORE_2_0
+using RectangleF = CoreGraphics.CGRect;
+using SizeF = CoreGraphics.CGSize;
+using PointF = CoreGraphics.CGPoint;
+#else
+using nfloat=global::System.Single;
+using nint=global::System.Int32;
+using nuint=global::System.UInt32;
+#endif
+
+namespace MonoTouchFixtures.CoreFoundation
+{
+
+	[TestFixture]
+	[Preserve(AllMembers = true)]
+	public class DispatchQueueTests
+	{
+		[Test]
+		public void CtorWithAttributes ()
+		{
+			TestRuntime.AssertXcodeVersion (8, 0);
+
+			using (var queue = new DispatchQueue ("1", new DispatchQueue.Attributes
+			{
+				AutoreleaseFrequency = DispatchQueue.AutoreleaseFrequency.Inherit,
+			}))
+			{
+				Assert.AreNotEqual (IntPtr.Zero, queue.Handle, "Handle 1");
+			}
+
+			using (var queue = new DispatchQueue ("2", new DispatchQueue.Attributes
+			{
+				IsInitiallyInactive = true,
+			}))
+			{
+				queue.Activate (); // must activate the queue before it can be released according to Apple's documentation
+				Assert.AreNotEqual (IntPtr.Zero, queue.Handle, "Handle 2");
+			}
+
+			using (var queue = new DispatchQueue ("3", new DispatchQueue.Attributes
+			{
+				QualityOfService = DispatchQualityOfService.Utility,
+			}))
+			{
+				Assert.AreNotEqual (IntPtr.Zero, queue.Handle, "Handle 3");
+				Assert.AreEqual (DispatchQualityOfService.Utility, queue.QualityOfService, "QualityOfService 3");
+			}
+
+			using (var target_queue = new DispatchQueue ("4 - target")) {
+				using (var queue = new DispatchQueue ("4", new DispatchQueue.Attributes
+				{
+					QualityOfService = DispatchQualityOfService.Background,
+					AutoreleaseFrequency = DispatchQueue.AutoreleaseFrequency.WorkItem,
+					RelativePriority = -1,
+				}, target_queue))
+				{
+					Assert.AreNotEqual (IntPtr.Zero, queue.Handle, "Handle 4");
+					Assert.AreEqual (DispatchQualityOfService.Background, queue.GetQualityOfService (out var relative_priority), "QualityOfService 4");
+					Assert.AreEqual (-1, relative_priority, "RelativePriority 4");
+				}
+			}
+		}
+
+		[Test]
+		public void Specific ()
+		{
+			using (var queue = new DispatchQueue ("Specific"))
+			{
+				var key = (IntPtr) 0x31415926;
+				queue.SetSpecific (key, "hello world");
+				Assert.AreEqual ("hello world", queue.GetSpecific (key), "Key");
+			}
+		}
+
+		[Test]
+		public void DispatchBarrierSync ()
+		{
+			using (var queue = new DispatchQueue ("DispatchBarrierSync")) {
+				var called = false;
+				queue.DispatchBarrierSync(() =>
+				{
+					called = true;
+				});
+				Assert.IsTrue (called, "Called");
+			}
+		}
+
+		[Test]
+		public void MainQueue ()
+		{
+			Assert.AreEqual (DispatchQueue.CurrentQueue, DispatchQueue.MainQueue, "MainQueue");
+		}
+	}
+}
diff --git a/tests/monotouch-test/CoreGraphics/AffineTransformTest.cs b/tests/monotouch-test/CoreGraphics/AffineTransformTest.cs
index 37029eb7181a..c21769c7b2be 100644
--- a/tests/monotouch-test/CoreGraphics/AffineTransformTest.cs
+++ b/tests/monotouch-test/CoreGraphics/AffineTransformTest.cs
@@ -140,15 +140,27 @@ public void StaticMultiply ()
 		[Test]
 		public void Scale ()
 		{
-			var transform = CGAffineTransform.MakeTranslation (0, 200);
-			transform.Scale (1, -1);
-		
-			Assert.AreEqual ((nfloat) 1, transform.xx);
-			Assert.AreEqual ((nfloat) 0, transform.yx);
-			Assert.AreEqual ((nfloat) 0, transform.xy);
-			Assert.AreEqual ((nfloat) (-1), transform.yy);
-			Assert.AreEqual ((nfloat) 0, transform.x0);
-			Assert.AreEqual ((nfloat) (-200), transform.y0);
+			var transform1 = CGAffineTransform.MakeTranslation (1, 2);
+			// t' = t * [ sx 0 0 sy 0 0 ]
+			transform1.Scale (3, 4); // MatrixOrder.Append by default
+
+			Assert.AreEqual ((nfloat) 3, transform1.xx);
+			Assert.AreEqual ((nfloat) 0, transform1.yx);
+			Assert.AreEqual ((nfloat) 0, transform1.xy);
+			Assert.AreEqual ((nfloat) 4, transform1.yy);
+			Assert.AreEqual ((nfloat) 3, transform1.x0);
+			Assert.AreEqual ((nfloat) 8, transform1.y0);
+
+			var transform2 = CGAffineTransform.MakeTranslation (1, 2);
+			// t' = [ sx 0 0 sy 0 0 ] * t – Swift equivalent
+			transform2.Scale (3, 4, CGAffineTransform.MatrixOrder.Prepend);
+
+			Assert.AreEqual ((nfloat)3, transform2.xx);
+			Assert.AreEqual ((nfloat)0, transform2.yx);
+			Assert.AreEqual ((nfloat)0, transform2.xy);
+			Assert.AreEqual ((nfloat)4, transform2.yy);
+			Assert.AreEqual ((nfloat)1, transform2.x0);
+			Assert.AreEqual ((nfloat)2, transform2.y0);
 		}
 
 		[Test]
@@ -172,7 +184,7 @@ public void StaticScale ()
 		public void Translate ()
 		{
 			var transform = CGAffineTransform.MakeIdentity ();
-			transform.Translate (1, -1);
+			transform.Translate (1, -1); // MatrixOrder.Append by default
 
 			Assert.AreEqual ((nfloat) 1, transform.xx, "xx");
 			Assert.AreEqual ((nfloat) 0, transform.yx, "yx");
@@ -184,12 +196,22 @@ public void Translate ()
 			transform = new CGAffineTransform (1, 2, 3, 4, 5, 6);
 			transform.Translate (2, -3);
 
-			Assert.AreEqual ((nfloat) 1, transform.xx, "xx");
-			Assert.AreEqual ((nfloat) 2, transform.yx, "yx");
-			Assert.AreEqual ((nfloat) 3, transform.xy, "xy");
-			Assert.AreEqual ((nfloat) 4, transform.yy, "yy");
-			Assert.AreEqual ((nfloat) 7, transform.x0, "x0");
-			Assert.AreEqual ((nfloat) 3, transform.y0, "y0");
+			Assert.AreEqual ((nfloat)1, transform.xx, "xx");
+			Assert.AreEqual ((nfloat)2, transform.yx, "yx");
+			Assert.AreEqual ((nfloat)3, transform.xy, "xy");
+			Assert.AreEqual ((nfloat)4, transform.yy, "yy");
+			Assert.AreEqual ((nfloat)7, transform.x0, "x0");
+			Assert.AreEqual ((nfloat)3, transform.y0, "y0");
+
+			transform = new CGAffineTransform (1, 2, 3, 4, 5, 6);
+			transform.Translate (2, -3, CGAffineTransform.MatrixOrder.Prepend);
+
+			Assert.AreEqual ((nfloat)1, transform.xx, "xx");
+			Assert.AreEqual ((nfloat)2, transform.yx, "yx");
+			Assert.AreEqual ((nfloat)3, transform.xy, "xy");
+			Assert.AreEqual ((nfloat)4, transform.yy, "yy");
+			Assert.AreEqual ((nfloat)(-2), transform.x0, "x0");
+			Assert.AreEqual ((nfloat)(-2), transform.y0, "y0");
 		}
 
 		[Test]
@@ -227,7 +249,7 @@ public void StaticTranslate ()
 		public void Rotate ()
 		{
 			var transform = new CGAffineTransform (1, 2, 3, 4, 5, 6);
-			transform.Rotate ((nfloat) Math.PI);
+			transform.Rotate ((nfloat) Math.PI); // MatrixOrder.Append by default
 
 			Assert.That ((double) (-1), Is.EqualTo ((double) transform.xx).Within (0.000001), "xx");
 			Assert.That ((double) (-2), Is.EqualTo ((double) transform.yx).Within (0.000001), "yx");
@@ -235,6 +257,16 @@ public void Rotate ()
 			Assert.That ((double) (-4), Is.EqualTo ((double) transform.yy).Within (0.000001), "yy");
 			Assert.That ((double) (-5), Is.EqualTo ((double) transform.x0).Within (0.000001), "x0");
 			Assert.That ((double) (-6), Is.EqualTo ((double) transform.y0).Within (0.000001), "y0");
+
+			transform = new CGAffineTransform (1, 2, 3, 4, 5, 6);
+			transform.Rotate ((nfloat)Math.PI, CGAffineTransform.MatrixOrder.Prepend);
+
+			Assert.That ((double)(-1), Is.EqualTo ((double)transform.xx).Within (0.000001), "xx");
+			Assert.That ((double)(-2), Is.EqualTo ((double)transform.yx).Within (0.000001), "yx");
+			Assert.That ((double)(-3), Is.EqualTo ((double)transform.xy).Within (0.000001), "xy");
+			Assert.That ((double)(-4), Is.EqualTo ((double)transform.yy).Within (0.000001), "yy");
+			Assert.That ((double)5, Is.EqualTo ((double)transform.x0).Within (0.000001), "x0");
+			Assert.That ((double)6, Is.EqualTo ((double)transform.y0).Within (0.000001), "y0");
 		}
 
 		[Test]
diff --git a/tests/monotouch-test/UIKit/GestureRecognizerTest.cs b/tests/monotouch-test/UIKit/GestureRecognizerTest.cs
index 0e2f9a1237d9..9832001cc8aa 100644
--- a/tests/monotouch-test/UIKit/GestureRecognizerTest.cs
+++ b/tests/monotouch-test/UIKit/GestureRecognizerTest.cs
@@ -10,6 +10,7 @@
 #if !__WATCHOS__ && !MONOMAC
 
 using System;
+using System.Collections.Generic;
 #if XAMCORE_2_0
 using Foundation;
 using UIKit;
@@ -37,6 +38,66 @@ public void Null ()
 				gr.RemoveTarget (null, null);
 			}
 		}
+
+		[Test]
+		public void NoStrongCycles ()
+		{
+			bool finalizedAnyCtor = false;
+			bool finalizedAnyAddTarget1 = false;
+			bool finalizedAnyAddTarget2 = false;
+
+			// Add the gesture recognizers to a list so that they're not collected until after the test
+			// This is to avoid false positives (the callback should be collectible already after disposing the gesture recognizer).
+			var list = new List<UIGestureRecognizer> ();
+
+			var pool = new NSAutoreleasePool ();
+			for (var k = 0; k < 10; k++) {
+				{
+					var notifier = new FinalizerNotifier (() => finalizedAnyCtor = true);
+					using (var gr = new UIGestureRecognizer (() => {
+						GC.KeepAlive (notifier); // Make sure the 'notifier' instance is only collected if the delegate to UIGestureRecognizer is collectable.
+					})) {
+						list.Add (gr);
+					}
+				}
+				{
+					var notifier = new FinalizerNotifier (() => finalizedAnyAddTarget1 = true);
+					using (var gr = new UIGestureRecognizer ()) {
+						gr.AddTarget (() => { GC.KeepAlive (notifier); });
+						list.Add (gr);
+					}
+				}
+				{
+					var notifier = new FinalizerNotifier (() => finalizedAnyAddTarget2 = true);
+					using (var gr = new UIGestureRecognizer ()) {
+						gr.AddTarget ((obj) => { GC.KeepAlive (notifier); });
+						list.Add (gr);
+					}
+				}
+			}
+			pool.Dispose ();
+
+			TestRuntime.RunAsync (DateTime.Now.AddSeconds (1), () => { GC.Collect (); }, () => finalizedAnyCtor && finalizedAnyAddTarget1 && finalizedAnyAddTarget2);
+			Assert.IsTrue (finalizedAnyCtor, "Any finalized");
+			Assert.IsTrue (finalizedAnyAddTarget1, "AddTarget1 finalized");
+			Assert.IsTrue (finalizedAnyAddTarget2, "AddTarget2 finalized");
+
+			GC.KeepAlive (list);
+		}
+
+		class FinalizerNotifier
+		{
+			public Action Action;
+			public FinalizerNotifier (Action action)
+			{
+				Action = action;
+			}
+			~FinalizerNotifier ()
+			{
+				if (Action != null)
+					Action ();
+			}
+		}
 	}
 }
 
diff --git a/tests/monotouch-test/mono/MonoWeakReferenceTest.cs b/tests/monotouch-test/mono/MonoWeakReferenceTest.cs
index 2c0084969f01..749abb074114 100644
--- a/tests/monotouch-test/mono/MonoWeakReferenceTest.cs
+++ b/tests/monotouch-test/mono/MonoWeakReferenceTest.cs
@@ -27,51 +27,85 @@ namespace MonoTouchFixtures {
 	[TestFixture]
 	[Preserve (AllMembers = true)]
 	public partial class WeakReferenceTest {
+		public static class FinalizerHelpers {
+			private static IntPtr aptr;
+
+			private static unsafe void NoPinActionHelper (int depth, Action act)
+			{
+				// Avoid tail calls
+				int* values = stackalloc int [20];
+				aptr = new IntPtr (values);
+
+				if (depth <= 0) {
+					//
+					// When the action is called, this new thread might have not allocated
+					// anything yet in the nursery. This means that the address of the first
+					// object that would be allocated would be at the start of the tlab and
+					// implicitly the end of the previous tlab (address which can be in use
+					// when allocating on another thread, at checking if an object fits in
+					// this other tlab). We allocate a new dummy object to avoid this type
+					// of false pinning for most common cases.
+					//
+					new object ();
+					act ();
+				} else {
+					NoPinActionHelper (depth - 1, act);
+				}
+			}
+
+			public static void PerformNoPinAction (Action act)
+			{
+				Thread thr = new Thread (() => NoPinActionHelper (128, act));
+				thr.Start ();
+				thr.Join ();
+			}
+		}
 
 		[Test]
 		public void WeakTest ()
 		{
 			//Finalizable.debug = true;
 			var t = new Test ();
-			var thread = new Thread (delegate () {
-				t.Obj = new Finalizable ();
-				t.Obj2 = new Finalizable ();
-				t.Obj3 = new Finalizable ();
-				t.Obj4 = Test.retain = new Finalizable ();
-				Test.retain.a = 0x1029458;
-			});
-			thread.Start ();
-			thread.Join ();
-			GC.Collect (0);
-			GC.Collect ();
-			GC.WaitForPendingFinalizers ();
-			GC.WaitForPendingFinalizers ();
-			Assert.That (t.Obj, Is.Null, "'t.Obj' should be null");
-			Assert.That (t.Obj2, Is.Null, "'t.Obj2' should be null");
-			Assert.That (t.Obj3, Is.Not.Null, "'t.Obj3' should not be null");
-
-			//overflow the nursery, make sure we fill it
-			for (int i = 0; i < 1000 * 1000 * 10; ++i)
-				new OneField ();
-
-			Exception ex = null;
-			thread = new Thread (() => {
-				try {
-					// This must be done on a separate thread so that the 'Test.retain' value doesn't
-					// show up on the main thread's stack as a temporary value in registers the
-					// GC can see.
-					Assert.That (Test.retain.a, Is.EqualTo (0x1029458), "retain.a");
-				} catch (Exception e) {
-					ex = e;
-				}
+
+			FinalizerHelpers.PerformNoPinAction (delegate () {
+				FinalizerHelpers.PerformNoPinAction (delegate () {
+					t.Obj = new Finalizable ();
+					t.Obj2 = new Finalizable ();
+					t.Obj3 = new Finalizable ();
+					t.Obj4 = Test.retain = new Finalizable ();
+					Test.retain.a = 0x1029458;
+				});
+				GC.Collect (0);
+				GC.Collect ();
+				GC.WaitForPendingFinalizers ();
+				GC.WaitForPendingFinalizers ();
+				Assert.That (t.Obj, Is.Null, "'t.Obj' should be null");
+				Assert.That (t.Obj2, Is.Null, "'t.Obj2' should be null");
+				Assert.That (t.Obj3, Is.Not.Null, "'t.Obj3' should not be null");
+
+				//overflow the nursery, make sure we fill it
+				for (int i = 0; i < 1000 * 1000 * 10; ++i)
+					new OneField ();
+
+				Exception ex = null;
+				FinalizerHelpers.PerformNoPinAction (delegate () {
+					try {
+						// This must be done on a separate thread so that the 'Test.retain' value doesn't
+						// show up on the main thread's stack as a temporary value in registers the
+						// GC can see.
+						Assert.That (Test.retain.a, Is.EqualTo (0x1029458), "retain.a");
+					} catch (Exception e) {
+						ex = e;
+					}
+				});
+
+				Test.retain = null;
 			});
-			thread.Start ();
-			thread.Join ();
 
-			Test.retain = null;
 			GC.Collect ();
 			GC.WaitForPendingFinalizers ();
 			GC.WaitForPendingFinalizers ();
+
 			Assert.That (t.Obj4, Is.Null, "'t.Obj4' should be null");
 		}
 	}
diff --git a/tests/monotouch-test/mono/Symbols.cs b/tests/monotouch-test/mono/Symbols.cs
index df76e1edc2fc..87c73a63e1c1 100644
--- a/tests/monotouch-test/mono/Symbols.cs
+++ b/tests/monotouch-test/mono/Symbols.cs
@@ -26,7 +26,13 @@ public void FunctionNames ()
 				Assert.Ignore ("This is a device-only test.");
 			
 			Collect ();
-			Assert.That (symbols [1], Contains.Substring ("MonoTouchFixtures_Symbols_Collect"), "#1");
+			bool aot = symbols [1].Contains ("MonoTouchFixtures_Symbols_Collect");
+			/* ves_pinvoke_method (slow path) and do_icall (fast path) are
+			 * MONO_NEVER_INLINE, so they should show up in the backtrace
+			 * reliably */
+			bool interp = symbols [1].Contains ("ves_pinvoke_method") || symbols [1].Contains ("do_icall");
+
+			Assert.IsTrue (aot || interp, "#1");
 		}
 
 		void Collect ()
diff --git a/tests/xharness/BCLTestInfo.cs b/tests/xharness/BCLTestInfo.cs
index e709c17253b3..c6e377e33941 100644
--- a/tests/xharness/BCLTestInfo.cs
+++ b/tests/xharness/BCLTestInfo.cs
@@ -11,7 +11,6 @@ public class BCLTestInfo
 	{
 		public Harness Harness;
 		public string MonoPath { get { return Harness.MONO_PATH; } }
-		public string WatchMonoPath { get { return Harness.WATCH_MONO_PATH; } }
 		public string TestName;
 
 		static readonly Dictionary<string, string[]> ignored_tests =  new Dictionary<string, string[]> { 
@@ -123,7 +122,7 @@ public virtual void Convert ()
 			var testName = TestName == "mscorlib" ? "corlib" : TestName;
 			var main_test_sources = Path.Combine (MonoPath, "mcs", "class", testName, testName + "_test.dll.sources");
 			var main_test_files = File.ReadAllLines (main_test_sources);
-			var watch_test_sources = Path.Combine (WatchMonoPath, "mcs", "class", testName, testName + "_test.dll.sources");
+			var watch_test_sources = Path.Combine (MonoPath, "mcs", "class", testName, testName + "_test.dll.sources");
 			var watch_test_files = File.ReadAllLines (watch_test_sources).Where ((arg) => !string.IsNullOrEmpty (arg));
 			var template_path = Path.Combine (Harness.RootDirectory, "bcl-test", TestName, TestName + ".csproj.template");
 			var csproj_input = File.ReadAllText (template_path);
diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs
index c3e932b9b444..874bc6f38ec1 100644
--- a/tests/xharness/Harness.cs
+++ b/tests/xharness/Harness.cs
@@ -73,7 +73,6 @@ public string RootDirectory {
 		public string TodayContainerTemplate { get; set; }
 		public string TodayExtensionTemplate { get; set; }
 		public string MONO_PATH { get; set; } // Use same name as in Makefiles, so that a grep finds it.
-		public string WATCH_MONO_PATH { get; set; } // Use same name as in Makefiles, so that a grep finds it.
 		public string TVOS_MONO_PATH { get; set; } // Use same name as in Makefiles, so that a grep finds it.
 		public bool INCLUDE_IOS { get; set; }
 		public bool INCLUDE_TVOS { get; set; }
@@ -209,7 +208,6 @@ void LoadConfig ()
 			ParseConfigFiles ();
 			var src_root = Path.GetDirectoryName (Path.GetFullPath (RootDirectory));
 			MONO_PATH = Path.GetFullPath (Path.Combine (src_root, "external", "mono"));
-			WATCH_MONO_PATH = make_config ["WATCH_MONO_PATH"];
 			TVOS_MONO_PATH = MONO_PATH;
 			INCLUDE_IOS = make_config.ContainsKey ("INCLUDE_IOS") && !string.IsNullOrEmpty (make_config ["INCLUDE_IOS"]);
 			INCLUDE_TVOS = make_config.ContainsKey ("INCLUDE_TVOS") && !string.IsNullOrEmpty (make_config ["INCLUDE_TVOS"]);
diff --git a/tests/xtro-sharpie/AttributeHelpers.cs b/tests/xtro-sharpie/AttributeHelpers.cs
new file mode 100644
index 000000000000..e9851512cdc1
--- /dev/null
+++ b/tests/xtro-sharpie/AttributeHelpers.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Clang;
+using Clang.Ast;
+using Mono.Cecil;
+
+namespace Extrospection
+{
+	public static class AttributeHelpers
+	{
+		static bool Skip (ICustomAttributeProvider item)
+		{
+			// Before accessing CustomAttributes we must query HasCustomAttributes
+			// else Cecil will happily allocate an empty collection and impact performance
+			return !item.HasCustomAttributes;
+		}
+
+		// These both return out Version and bool as you can have an an attribute with no version (null) which is different no matching attribute at all
+		public static bool FindDeprecated (ICustomAttributeProvider item, out Version version)
+		{
+			version = null;
+
+			if (Skip (item))
+				return false;
+
+			foreach (var attribute in item.CustomAttributes.Where (x => HasDeprecated (x, Helpers.Platform)))
+				return GetPlatformVersion (attribute, out version);
+
+			return false;
+		}
+
+		public static bool FindObsolete (ICustomAttributeProvider item, out Version version)
+		{
+			version = null;
+
+			if (Skip (item))
+				return false;
+
+			foreach (var attribute in item.CustomAttributes.Where (x => HasObsoleted (x, Helpers.Platform)))
+				return GetPlatformVersion (attribute, out version);
+
+			return false;
+		}
+
+		public static bool HasDeprecated (CustomAttribute attribute, Platforms platform) => HasMatchingPlatformAttribute ("DeprecatedAttribute", attribute, platform);
+		public static bool HasObsoleted (CustomAttribute attribute, Platforms platform) => HasMatchingPlatformAttribute ("ObsoletedAttribute", attribute, platform);
+
+		static bool HasMatchingPlatformAttribute (string expectedAttributeName, CustomAttribute attribute, Platforms platform)
+		{
+			if (attribute.Constructor.DeclaringType.Name == expectedAttributeName) {
+				byte attrPlatform = (byte)attribute.ConstructorArguments[0].Value;
+				if (attrPlatform == Helpers.GetPlatformManagedValue (platform))
+					return true;
+			}
+			return false;
+		}
+
+		static bool GetPlatformVersion (CustomAttribute attribute, out Version version)
+		{
+			// Three different Attribute flavors
+			// (PlatformName platform, PlatformArchitecture architecture = PlatformArchitecture.None, string message = null)
+			// (PlatformName platform, int majorVersion, int minorVersion, PlatformArchitecture architecture = PlatformArchitecture.None, string message = null)
+			// (PlatformName platform, int majorVersion, int minorVersion, int subminorVersion, PlatformArchitecture architecture = PlatformArchitecture.None, string message = null)
+			switch (attribute.ConstructorArguments.Count) {
+			case 3:
+				version = null;
+				return true;
+			case 5:
+				version = new Version ((int)attribute.ConstructorArguments[1].Value, (int)attribute.ConstructorArguments[2].Value);
+				return true;
+			case 6:
+				version = new Version ((int)attribute.ConstructorArguments[1].Value, (int)attribute.ConstructorArguments[2].Value, (int)attribute.ConstructorArguments[3].Value);
+				return true;
+			default:
+				throw new InvalidOperationException ("GetPlatformVersion with unexpected number of arguments {attribute.ConstructorArguments.Count}");
+			}
+		}
+
+		public static bool FindObjcDeprecated (IEnumerable<Attr> attrs, out VersionTuple version)
+		{
+			AvailabilityAttr attr = attrs.OfType<AvailabilityAttr> ().FirstOrDefault (x => !x.Deprecated.IsEmpty && x.Platform.Name == Helpers.ClangPlatformName);
+			if (attr != null) {
+				version = attr.Deprecated;
+				return true;
+			} else {
+				version = VersionTuple.Empty;
+				return false;
+			}
+		}
+
+		public static bool HasAnyDeprecationForCurrentPlatform (ICustomAttributeProvider item)
+		{
+			if (Skip (item))
+				return false;
+
+			// This allows us to accept [Deprecated (iOS)] for watch and tv, which many of our bindings currently have
+			// If we want to force seperate tv\watch attributes remove GetRelatedPlatforms and just check Helpers.Platform
+			Platforms[] platforms = GetRelatedPlatforms ();
+			foreach (var attribute in item.CustomAttributes) {
+				if (platforms.Any (x => AttributeHelpers.HasDeprecated (attribute, x)) || platforms.Any (x => AttributeHelpers.HasObsoleted (attribute, x)))
+					return true;
+			}
+			return false;
+		}
+
+		static Platforms[] GetRelatedPlatforms ()
+		{
+			// TV and Watch also implictly accept iOS
+			switch (Helpers.Platform) {
+			case Platforms.macOS:
+				return new Platforms[] { Platforms.macOS };
+			case Platforms.iOS:
+				return new Platforms[] { Platforms.iOS };
+			case Platforms.tvOS:
+				return new Platforms[] { Platforms.iOS, Platforms.tvOS };
+			case Platforms.watchOS:
+				return new Platforms[] { Platforms.iOS, Platforms.watchOS };
+			default:
+				throw new InvalidOperationException ($"Unknown {Helpers.Platform} in GetPlatforms");
+			}
+		}
+
+		public static bool HasAnyAdvice (ICustomAttributeProvider item)
+		{
+			if (Skip (item))
+				return false;
+
+			if (HasAdviced (item.CustomAttributes))
+				return true;
+
+			// Properties are a special case for [Advice], as it is generated on the property itself and not the individual get_ \ set_ methods
+			// Cecil does not have a link between the MethodDefinition we have and the hosting PropertyDefinition, so we have to dig to find the match
+			if (item is MethodDefinition method) {
+				PropertyDefinition property = method.DeclaringType.Properties.FirstOrDefault (p => p.GetMethod == method || p.SetMethod == method);
+				if (property != null && HasAdviced (property.CustomAttributes))
+					return true;
+			}
+			return false;
+		}
+
+		static bool HasAdviced (IEnumerable<CustomAttribute> attributes)
+		{
+			return attributes.Any (x => x.Constructor.DeclaringType.Name == "AdviceAttribute");
+		}
+	}
+}
diff --git a/tests/xtro-sharpie/DeprecatedCheck.cs b/tests/xtro-sharpie/DeprecatedCheck.cs
new file mode 100644
index 000000000000..ecc84eba4069
--- /dev/null
+++ b/tests/xtro-sharpie/DeprecatedCheck.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Clang;
+using Clang.Ast;
+using Mono.Cecil;
+
+namespace Extrospection
+{
+	public class DeprecatedCheck : BaseVisitor
+	{
+		Dictionary<string, VersionTuple> ObjCDeprecatedItems = new Dictionary<string, VersionTuple> ();
+		Dictionary<string, VersionTuple> ObjCDeprecatedSelectors = new Dictionary<string, VersionTuple> ();
+
+		List<TypeDefinition> ManagedTypes = new List<TypeDefinition> ();
+
+		public override void End ()
+		{
+			foreach (var objcEntry in ObjCDeprecatedItems)
+				ProcessObjcEntry (objcEntry.Key, objcEntry.Value);
+
+			foreach (var objcEntry in ObjCDeprecatedSelectors)
+				ProcessObjcSelector (objcEntry.Key, objcEntry.Value);
+		}
+
+		void ProcessObjcEntry (string objcClassName, VersionTuple objcVersion)
+		{
+			TypeDefinition managedType = ManagedTypes.FirstOrDefault (x => Helpers.GetName (x) == objcClassName && x.IsPublic);
+			if (managedType != null) {					
+				var framework = Helpers.GetFramework (managedType);
+				if (framework != null)
+					ProcessItem (managedType, Helpers.GetName (managedType), objcVersion, framework);
+			}
+		}
+
+		void ProcessObjcSelector (string fullname, VersionTuple objcVersion)
+		{
+			string[] nameParts = fullname.Split (new string[] { "::" }, StringSplitOptions.None);
+
+			string objcClassName = nameParts[0];
+			string selector = nameParts[1];
+
+			TypeDefinition managedType = ManagedTypes.FirstOrDefault (x => Helpers.GetName (x) == objcClassName);
+			if (managedType != null) {
+				var framework = Helpers.GetFramework (managedType);
+				if (framework == null)
+					return;
+
+				// If the entire type is deprecated, call it good enough
+				if (AttributeHelpers.HasAnyDeprecationForCurrentPlatform (managedType))
+					return;
+
+				var matchingMethod = managedType.Methods.FirstOrDefault (x => x.GetSelector () == selector && x.IsPublic);
+				if (matchingMethod != null)
+					ProcessItem (matchingMethod, fullname, objcVersion, framework);
+			}
+		}
+
+		public void ProcessItem (ICustomAttributeProvider item, string itemName, VersionTuple objcVersion, string framework)
+		{
+			// Our bindings do not need have [Deprecated] for ancicent versions we don't support anymore
+			if (VersionHelpers.VersionTooOldToCare (objcVersion))
+				return;
+
+			// In some cases we've used [Advice] when entire types are deprecated
+			// TODO - This is a hack, we shouldn't be doing ^
+			if (AttributeHelpers.HasAnyAdvice (item))
+				return;
+
+			if (!AttributeHelpers.HasAnyDeprecationForCurrentPlatform (item)) {
+				Log.On (framework).Add ($"!deprecated-attribute-missing! {itemName} missing a [Deprecated] attribute");
+				return;
+			}
+
+			// Don't version check us when Apple does __attribute__((availability(macos, introduced=10.0, deprecated=100000)));
+			// #define __API_TO_BE_DEPRECATED 100000
+			if (objcVersion.Major == 100000) 
+				return;
+
+			// Some APIs have both a [Deprecated] and [Obsoleted]. Bias towards [Obsoleted].
+			Version managedVersion;
+			bool foundObsoleted = AttributeHelpers.FindObsolete (item, out managedVersion);
+			if (foundObsoleted) {
+				if (managedVersion != null && !ManagedBeforeOrEqualToObjcVersion (objcVersion, managedVersion))
+					Log.On (framework).Add ($"!deprecated-attribute-wrong! {itemName} has {managedVersion} not {objcVersion} on [Obsoleted] attribute");
+				return;
+			}
+
+			bool foundDeprecated = AttributeHelpers.FindDeprecated (item, out managedVersion);
+			if (foundDeprecated && managedVersion != null && !ManagedBeforeOrEqualToObjcVersion (objcVersion, managedVersion))
+				Log.On (framework).Add ($"!deprecated-attribute-wrong! {itemName} has {managedVersion} not {objcVersion} on [Deprecated] attribute");
+		}
+
+		public static bool ManagedBeforeOrEqualToObjcVersion (VersionTuple objcVersionTuple, Version managedVersion)
+		{
+			// Often header files will soft deprecate APIs versions before a formal deprecation (10.7 soft vs 10.10 formal). Accept older deprecation values
+			return managedVersion <= VersionHelpers.Convert (objcVersionTuple);
+		}
+
+		public override void VisitManagedType (TypeDefinition type)
+		{
+			ManagedTypes.Add (type);
+		}
+
+		public override void VisitObjCCategoryDecl (ObjCCategoryDecl decl, VisitKind visitKind) => VisitItem (decl, visitKind);
+		public override void VisitObjCInterfaceDecl (ObjCInterfaceDecl decl, VisitKind visitKind) => VisitItem (decl, visitKind);
+
+		void VisitItem (NamedDecl decl, VisitKind visitKind)
+		{
+			if (visitKind == VisitKind.Enter && AttributeHelpers.FindObjcDeprecated (decl.Attrs, out VersionTuple version))
+				ObjCDeprecatedItems[decl.Name] = version;
+		}
+
+		public override void VisitObjCMethodDecl (ObjCMethodDecl decl, VisitKind visitKind)
+		{
+			if (visitKind == VisitKind.Enter && AttributeHelpers.FindObjcDeprecated(decl.Attrs, out VersionTuple version))
+				ObjCDeprecatedSelectors[decl.QualifiedName] = version;
+		}
+	}
+}
diff --git a/tests/xtro-sharpie/Helpers.cs b/tests/xtro-sharpie/Helpers.cs
index 87dfcf81b4e9..70e33a8062e8 100644
--- a/tests/xtro-sharpie/Helpers.cs
+++ b/tests/xtro-sharpie/Helpers.cs
@@ -8,7 +8,15 @@
 using Clang.Ast;
 
 namespace Extrospection {
-	
+
+	public enum Platforms
+	{
+		macOS,
+		iOS,
+		watchOS,
+		tvOS,
+	}
+
 	public static partial class Helpers {
 
 		// the original name can be lost and, if not registered (e.g. enums), might not be available
@@ -55,15 +63,43 @@ public static string ReplaceFirstInstance (this string source, string find, stri
 			return index < 0 ? source : source.Substring (0, index) + replace + source.Substring (index + find.Length);
 		}
 
-		public enum Platforms
+		public static Platforms Platform { get; set; }
+
+		public static int GetPlatformManagedValue (Platforms platform)
 		{
-			macOS,
-			iOS,
-			watchOS,
-			tvOS,
+			// None, MacOSX, iOS, WatchOS, TvOS
+			switch (platform) {
+			case Platforms.macOS:
+				return 1;
+			case Platforms.iOS:
+				return 2;
+			case Platforms.watchOS:
+				return 3;
+			case Platforms.tvOS:
+				return 4;
+			default:
+				throw new InvalidOperationException ($"Unexpected Platform {Platform} in GetPlatformManagedValue");
+			}
 		}
 
-		public static Platforms Platform { get; set; }
+		// Clang.Ast.AvailabilityAttr.Platform.Name
+		public static string ClangPlatformName
+		{
+			get {
+				switch (Helpers.Platform) {
+				case Platforms.macOS:
+					return "macos";
+				case Platforms.iOS:
+					return "ios";
+				case Platforms.watchOS:
+					return "watchos";
+				case Platforms.tvOS:
+					return "tvos";
+				default:
+					throw new InvalidOperationException ($"Unexpected Platform {Platform} in ClangPlatformName");
+				}
+			}
+		}
 
 		public static bool IsAvailable (this Decl decl)
 		{
diff --git a/tests/xtro-sharpie/Runner.cs b/tests/xtro-sharpie/Runner.cs
index da2b88ec7050..a394147b70ab 100644
--- a/tests/xtro-sharpie/Runner.cs
+++ b/tests/xtro-sharpie/Runner.cs
@@ -27,18 +27,19 @@ public void Execute (string pchFile, IEnumerable<string> assemblyNames)
 				new SelectorCheck (),
 				new SimdCheck (),
 				new RequiresSuperCheck (),
+				new DeprecatedCheck (),
 //				new ListNative (), // for debug
 			};
 			foreach (var assemblyName in assemblyNames) {
 				var name = Path.GetFileNameWithoutExtension (assemblyName);
 				if (name.EndsWith (".iOS", StringComparison.Ordinal))
-					Helpers.Platform = Helpers.Platforms.iOS;
+					Helpers.Platform = Platforms.iOS;
 				else if (name.EndsWith (".Mac", StringComparison.Ordinal))
-					Helpers.Platform = Helpers.Platforms.macOS;
+					Helpers.Platform = Platforms.macOS;
 				else if (name.EndsWith (".WatchOS", StringComparison.Ordinal))
-					Helpers.Platform = Helpers.Platforms.watchOS;
+					Helpers.Platform = Platforms.watchOS;
 				else if (name.EndsWith (".TVOS", StringComparison.Ordinal))
-					Helpers.Platform = Helpers.Platforms.tvOS;
+					Helpers.Platform = Platforms.tvOS;
 				managed_reader.Load (assemblyName);
 			}
 
diff --git a/tests/xtro-sharpie/VersionHelpers.cs b/tests/xtro-sharpie/VersionHelpers.cs
new file mode 100644
index 000000000000..6b671f95d800
--- /dev/null
+++ b/tests/xtro-sharpie/VersionHelpers.cs
@@ -0,0 +1,35 @@
+using System;
+using Clang;
+using static Extrospection.Helpers;
+
+namespace Extrospection
+{
+	public static class VersionHelpers
+	{
+		public static Version Convert (VersionTuple version)
+		{
+			uint major = version.Major;
+			uint minor = version.Minor.HasValue ? version.Minor.Value : 0;
+			if (version.Subminor.HasValue)
+				return new Version ((int)major, (int)minor, (int)version.Subminor.Value);
+			else
+				return new Version ((int)major, (int)minor);
+		}
+
+		public static bool VersionTooOldToCare (VersionTuple version)
+		{
+			switch (Helpers.Platform) {
+			case Platforms.iOS:
+				return version.Major < 6;
+			case Platforms.macOS:
+				return version.Minor < 7;
+			case Platforms.tvOS:
+				return version.Major < 9;
+			case Platforms.watchOS:
+				return version.Major < 2;
+			default:
+				throw new InvalidOperationException ($"Unknown platform {Platform} in VersionTooOldToCare");
+			}
+		}
+	}
+}
diff --git a/tests/xtro-sharpie/common-CloudKit.ignore b/tests/xtro-sharpie/common-CloudKit.ignore
index 7c55dfa423bf..e72c9c63119c 100644
--- a/tests/xtro-sharpie/common-CloudKit.ignore
+++ b/tests/xtro-sharpie/common-CloudKit.ignore
@@ -7,6 +7,7 @@
 
 ## auto-generated attribute (but deprecated API where Apple removed it)
 !extra-designated-initializer! CKSubscription::initWithCoder: is incorrectly decorated with an [DesignatedInitializer] attribute
+!deprecated-attribute-missing! CKSubscription::initWithCoder: missing a [Deprecated] attribute
 
 ## Formalizes a protocol for getting and setting keys on a CKRecord.
 ## Not intended to be used directly by client code
diff --git a/tests/xtro-sharpie/common-CoreFoundation.ignore b/tests/xtro-sharpie/common-CoreFoundation.ignore
index 834c51367967..14643d8404f1 100644
--- a/tests/xtro-sharpie/common-CoreFoundation.ignore
+++ b/tests/xtro-sharpie/common-CoreFoundation.ignore
@@ -931,10 +931,12 @@
 !missing-pinvoke! CFWriteStreamGetTypeID is not bound
 !unknown-field! _dispatch_data_destructor_free bound
 !unknown-pinvoke! close bound
+!unknown-pinvoke! dispatch_activate bound
 !unknown-pinvoke! dispatch_after_f bound
 !unknown-pinvoke! dispatch_apply_f bound
 !unknown-pinvoke! dispatch_async_f bound
 !unknown-pinvoke! dispatch_barrier_async_f bound
+!unknown-pinvoke! dispatch_barrier_sync_f bound
 !unknown-pinvoke! dispatch_data_create bound
 !unknown-pinvoke! dispatch_data_create_concat bound
 !unknown-pinvoke! dispatch_data_create_map bound
@@ -949,8 +951,15 @@
 !unknown-pinvoke! dispatch_group_leave bound
 !unknown-pinvoke! dispatch_group_notify_f bound
 !unknown-pinvoke! dispatch_group_wait bound
+!unknown-pinvoke! dispatch_queue_attr_make_initially_inactive bound
+!unknown-pinvoke! dispatch_queue_attr_make_with_autorelease_frequency bound
+!unknown-pinvoke! dispatch_queue_attr_make_with_qos_class bound
 !unknown-pinvoke! dispatch_queue_create bound
+!unknown-pinvoke! dispatch_queue_create_with_target bound
 !unknown-pinvoke! dispatch_queue_get_label bound
+!unknown-pinvoke! dispatch_queue_get_qos_class bound
+!unknown-pinvoke! dispatch_queue_get_specific bound
+!unknown-pinvoke! dispatch_queue_set_specific bound
 !unknown-pinvoke! dispatch_read bound
 !unknown-pinvoke! dispatch_release bound
 !unknown-pinvoke! dispatch_resume bound
diff --git a/tests/xtro-sharpie/common-PassKit.ignore b/tests/xtro-sharpie/common-PassKit.ignore
index e2a1855c14bf..2874d7805e28 100644
--- a/tests/xtro-sharpie/common-PassKit.ignore
+++ b/tests/xtro-sharpie/common-PassKit.ignore
@@ -1,2 +1,5 @@
+## Was bound as both static and instance and already deprecated
+!deprecated-attribute-missing! PKPassLibrary::isPaymentPassActivationAvailable missing a [Deprecated] attribute
+
 ## made optional in xcode9 beta 3 since it was replaced with newer API
 !incorrect-protocol-member! PKPaymentAuthorizationControllerDelegate::paymentAuthorizationController:didAuthorizePayment:completion: is OPTIONAL and should NOT be abstract
diff --git a/tests/xtro-sharpie/iOS-AVFoundation.ignore b/tests/xtro-sharpie/iOS-AVFoundation.ignore
index 6f30d64dfca7..6349f779eec7 100644
--- a/tests/xtro-sharpie/iOS-AVFoundation.ignore
+++ b/tests/xtro-sharpie/iOS-AVFoundation.ignore
@@ -10,3 +10,6 @@
 
 ## https://github.com/xamarin/xamarin-macios/issues/3213 should be fixed before conformance to 'AVQueuedSampleBufferRendering' is restored.
 !missing-protocol-conformance! AVSampleBufferDisplayLayer should conform to AVQueuedSampleBufferRendering (defined in 'AVSampleBufferDisplayLayerQueueManagement' category)
+
+# Deprecated in iOS 6.0 but we have same C# signature as a method that was deprecated in iOS 8.0
+!deprecated-attribute-wrong! AVAudioRecorderDelegate::audioRecorderEndInterruption:withFlags: has 8.0 not 6.0 on [Deprecated] attribute
diff --git a/tests/xtro-sharpie/xtro-sharpie.csproj b/tests/xtro-sharpie/xtro-sharpie.csproj
index ab5aea7d3e92..797b0811bda4 100644
--- a/tests/xtro-sharpie/xtro-sharpie.csproj
+++ b/tests/xtro-sharpie/xtro-sharpie.csproj
@@ -20,7 +20,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <Commandlineparameters>../../iphoneos9.2-arm64.pch /Library/Frameworks/Xamarin.iOS.framework/Versions/Current//lib/64bits/Xamarin.iOS.dll</Commandlineparameters>
+    <Commandlineparameters>../../iphoneos12.0-arm64.pch /Library/Frameworks/Xamarin.iOS.framework/Versions/Current//lib/64bits/Xamarin.iOS.dll</Commandlineparameters>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -88,6 +88,9 @@
     <Compile Include="Log.cs" />
     <Compile Include="RequiresSuperCheck.cs" />
     <Compile Include="Filter.cs" />
+    <Compile Include="DeprecatedCheck.cs" />
+    <Compile Include="AttributeHelpers.cs" />
+    <Compile Include="VersionHelpers.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -96,4 +99,4 @@
   <Target Name="AfterBuild">
     <Copy SourceFiles="\Library\Frameworks\ObjectiveSharpie.framework\Versions\Current\libclang-mono.dylib" DestinationFolder="$(TargetDir)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tools/common/StaticRegistrar.cs b/tools/common/StaticRegistrar.cs
index 883b677e0f32..52a26776fe12 100644
--- a/tools/common/StaticRegistrar.cs
+++ b/tools/common/StaticRegistrar.cs
@@ -2636,6 +2636,7 @@ class SkippedType
 			public TypeReference Skipped;
 			public ObjCType Actual;
 			public uint SkippedTokenReference;
+			public uint ActualTokenReference;
 		}
 		List<SkippedType> skipped_types = new List<SkippedType> ();
 		protected override void OnSkipType (TypeReference type, ObjCType registered_type)
@@ -2724,24 +2725,6 @@ void Specialize (AutoIndentStringBuilder sb)
 				allTypes.Add (@class);
 			}
 
-			// Move all the custom types to the end of the list, respecting 
-			// existing order (so that a derived type always comes after
-			// its base type; the Types.Values has that property, and we
-			// need to keep it that way).
-
-			var mappedEnd = allTypes.Count;
-			var counter = 0;
-			while (counter < mappedEnd) {
-				if (!IsPlatformType (allTypes [counter].Type)) {
-					var t = allTypes [counter];
-					allTypes.RemoveAt (counter);
-					allTypes.Add (t);
-					mappedEnd--;
-				} else {
-					counter++;
-				}
-			}
-
 			if (string.IsNullOrEmpty (single_assembly)) {
 				foreach (var assembly in GetAssemblies ())
 					registered_assemblies.Add (GetAssemblyName (assembly));
@@ -2749,23 +2732,27 @@ void Specialize (AutoIndentStringBuilder sb)
 				registered_assemblies.Add (single_assembly);
 			}
 
-			var customTypeCount = 0;
 			foreach (var @class in allTypes) {
 				var isPlatformType = IsPlatformType (@class.Type);
+				var flags = MTTypeFlags.None;
 
 				skip.Clear ();
 
 				uint token_ref = uint.MaxValue;
 				if (!@class.IsProtocol && !@class.IsCategory) {
 					if (!isPlatformType)
-						customTypeCount++;
-					
+						flags |= MTTypeFlags.CustomType;
+
+					if (!@class.IsWrapper && !@class.IsModel)
+						flags |= MTTypeFlags.UserType;
+
 					CheckNamespace (@class, exceptions);
 					token_ref = CreateTokenReference (@class.Type, TokenType.TypeDef);
-					map.AppendLine ("{{ NULL, 0x{1:X} /* #{3} '{0}' => '{2}' */ }},", 
+					map.AppendLine ("{{ NULL, 0x{1:X} /* #{3} '{0}' => '{2}' */, (MTTypeFlags) ({4}) /* {5} */ }},", 
 									@class.ExportedName,
 									CreateTokenReference (@class.Type, TokenType.TypeDef), 
-									GetAssemblyQualifiedName (@class.Type), map_entries);
+									GetAssemblyQualifiedName (@class.Type), map_entries,
+									(int) flags, flags);
 					map_dict [@class] = map_entries++;
 
 					bool use_dynamic;
@@ -3031,16 +3018,13 @@ void Specialize (AutoIndentStringBuilder sb)
 
 			if (skipped_types.Count > 0) {
 				map.AppendLine ("static const MTManagedClassMap __xamarin_skipped_map [] = {");
-				foreach (var skipped in skipped_types)
+				foreach (var skipped in skipped_types) {
 					skipped.SkippedTokenReference = CreateTokenReference (skipped.Skipped, TokenType.TypeDef);
-
-				foreach (var skipped in skipped_types.OrderBy ((v) => v.SkippedTokenReference)) {
-					if (map_dict.TryGetValue (skipped.Actual, out var index)) {
-						map.AppendLine ("{{ 0x{0:X}, {1} /* '{2}' => '{3}' */ }},", skipped.SkippedTokenReference, map_dict [skipped.Actual], skipped.Skipped.FullName, skipped.Actual.Type.FullName);
-					} else {
-						throw ErrorHelper.CreateError (99, $"Internal error: could not find the native type for {skipped.Skipped.FullName} (failed to find {skipped.Actual.Type.FullName}). Please file a bug report with a test case (https://github.com/xamarin/xamarin-macios/issues/new).");
-					}
+					skipped.ActualTokenReference = CreateTokenReference (skipped.Actual.Type, TokenType.TypeDef);
 				}
+
+				foreach (var skipped in skipped_types.OrderBy ((v) => v.SkippedTokenReference))
+					map.AppendLine ("{{ 0x{0:X}, 0x{1:X} /* '{2}' => '{3}' */ }},", skipped.SkippedTokenReference, skipped.ActualTokenReference, skipped.Skipped.FullName, skipped.Actual.Type.FullName);
 				map.AppendLine ("};");
 				map.AppendLine ();
 			}
@@ -3112,7 +3096,6 @@ void Specialize (AutoIndentStringBuilder sb)
 			}
 			map.AppendLine ("{0},", count);
 			map.AppendLine ("{0},", i);
-			map.AppendLine ("{0},", customTypeCount);
 			map.AppendLine ("{0},", full_token_reference_count);
 			map.AppendLine ("{0},", skipped_types.Count);
 			map.AppendLine ("{0},", protocol_wrapper_map.Count);
@@ -3120,7 +3103,7 @@ void Specialize (AutoIndentStringBuilder sb)
 			map.AppendLine ("};");
 
 
-			map_init.AppendLine ("xamarin_add_registration_map (&__xamarin_registration_map);");
+			map_init.AppendLine ("xamarin_add_registration_map (&__xamarin_registration_map, {0});", string.IsNullOrEmpty (single_assembly) ? "false" : "true");
 			map_init.AppendLine ("}");
 
 			sb.WriteLine (map.ToString ());
@@ -5007,4 +4990,12 @@ class AdoptsAttribute : Attribute
 	{
 		public string ProtocolType { get; set; }
 	}
+
+	[Flags]
+	internal enum MTTypeFlags : uint
+	{
+		None = 0,
+		CustomType = 1,
+		UserType = 2,
+	}
 }
diff --git a/tools/mtouch/Application.cs b/tools/mtouch/Application.cs
index 413fb0354423..bc1d8f4d1ba8 100644
--- a/tools/mtouch/Application.cs
+++ b/tools/mtouch/Application.cs
@@ -1667,7 +1667,13 @@ void BuildBundle ()
 						throw ErrorHelper.CreateError (99, $"Internal error: 'can't convert frameworks to frameworks: {files.First ()}'. Please file a bug report with a test case (https://github.com/xamarin/xamarin-macios/issues/new).");
 					var framework_src = files.First ();
 					var framework_filename = Path.Combine (framework_src, Path.GetFileNameWithoutExtension (framework_src));
-					if (!MachO.IsDynamicFramework (framework_filename)) {
+					var dynamic = false;
+					try {
+						dynamic = MachO.IsDynamicFramework (framework_filename);
+					} catch (Exception e) {
+						throw ErrorHelper.CreateError (140, e, $"File '{framework_filename}' is not a valid framework.");
+					}
+					if (!dynamic) {
 						Driver.Log (1, "The framework {0} is a framework of static libraries, and will not be copied to the app.", framework_src);
 					} else {
 						var macho_file = Path.Combine (targetPath, Path.GetFileNameWithoutExtension (framework_src));