diff --git a/src/.gitignore b/src/.gitignore
index 7bac7c02b964..0fe08a7f6e4a 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,15 +1,5 @@
 build
-MonoTouch.NUnitLite.csproj
-MonoTouch.NUnitLite.tvos.csproj
-MonoTouch.NUnitLite.unified.csproj
-MonoTouch.NUnitLite.watchos.csproj
-MonoTouch.NUnitLite.maccatalyst.csproj
-xamios.csproj
-xammac.csproj
-xamtvos.csproj
-xamwatch.csproj
-xammaccatalyst.csproj
-generator.csproj.inc
+bgen.csproj.inc
 *~
 *.rsp
 MinimumVersions.cs
diff --git a/src/AddressBook/ABPerson.cs b/src/AddressBook/ABPerson.cs
index 05d8eaf4f4dc..6d665b24ccbf 100644
--- a/src/AddressBook/ABPerson.cs
+++ b/src/AddressBook/ABPerson.cs
@@ -1021,11 +1021,7 @@ public void SetRelatedNames (ABMultiValue<string>? value)
 
 		public NSData? GetImage (ABPersonImageFormat format)
 		{
-#if ARCH_32
-			return Runtime.GetNSObject<NSData> (ABPersonCopyImageDataWithFormat (Handle, (nint)(int)format));
-#else
 			return Runtime.GetNSObject<NSData> (ABPersonCopyImageDataWithFormat (Handle, (nint) (long) format));
-#endif
 		}
 
 		[DllImport (Constants.AddressBookLibrary)]
diff --git a/src/AssemblyInfo.cs.in b/src/AssemblyInfo.cs.in
index 01573ff30652..76cae03392a2 100644
--- a/src/AssemblyInfo.cs.in
+++ b/src/AssemblyInfo.cs.in
@@ -10,26 +10,15 @@ using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-#if NET
 [assembly: AssemblyInformationalVersion ("@NUGET_VERSION_NO_METADATA@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")]
 [assembly: AssemblyTitle ("Microsoft.@DOTNET_PLATFORM@")]
 [assembly: AssemblyProduct ("Microsoft.@DOTNET_PLATFORM@")]
-#else
-[assembly: AssemblyInformationalVersion ("@PACKAGE_VERSION_MAJOR@.@PACKAGE_VERSION_MINOR@.@PACKAGE_VERSION_REV@.@PACKAGE_VERSION_BUILD@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")]
-[assembly: AssemblyTitle ("@PRODUCT_NAME@")]
-[assembly: AssemblyProduct ("@PRODUCT_NAME@")]
-#endif
 // FIXME: Probably need to add Copyright 2009-2011 Novell Inc.
 // [assembly: AssemblyCopyright ("Copyright 2011-2014 Xamarin Inc.")]
 [assembly: AssemblyCompany ("Microsoft Corp.")]
 
 [assembly: AssemblyMetadata ("IsTrimmable", "True")]
 
-#if !NET
-[assembly: InternalsVisibleTo ("System.Net.Http,PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-#endif
-
-#if NET
 // Use a two-part version, because there shouldn't be any API changes when the third or fourth digit changes (according to Semver 2.0 rules).
 // In other words: the following scenario is safe:
 // - Assembly A builds against Microsoft.*.dll v1.0.1
@@ -38,8 +27,7 @@ using System.Runtime.CompilerServices;
 // To avoid scenarios where everybody would have to update to the latest patch version of Microsoft.*.dll
 // in order to compile stuff, we erase the third and fourth number and only use 0 for both.
 [assembly: AssemblyVersion ("@NUGET_VERSION_MAJOR@.@NUGET_VERSION_MINOR@.0.0")]
-#endif
 
-#if NET && !XCODE_IS_STABLE && !COREBUILD
+#if !XCODE_IS_STABLE && !COREBUILD
 [assembly: Experimental("XCODE_@XCODE_VERSION@_PREVIEW", UrlFormat = "https://github.com/xamarin/xamarin-macios/blob/main/docs/preview-apis.md")]
 #endif
diff --git a/src/Constants.watch.cs.in b/src/Constants.watch.cs.in
deleted file mode 100644
index d23a3524bf56..000000000000
--- a/src/Constants.watch.cs.in
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace ObjCRuntime {
-	public static partial class Constants {
-		public const string Version = "@VERSION@";
-		internal const string Revision = "@REVISION@";
-		public const string SdkVersion = "@WATCH_SDK_VERSION@";
-
-		// WatchOS 2.0
-		public const string CFNetworkLibrary = "/System/Library/Frameworks/CFNetwork.framework/CFNetwork";
-		internal const string CoreServicesLibrary = "/System/Library/Frameworks/MobileCoreServices.framework/MobileCoreServices";
-		public const string libcompressionLibrary = "/usr/lib/libcompression.dylib";
-
-		// WatchOS 3.2
-		public const string AccelerateImageLibrary = "/System/Library/Frameworks/Accelerate.framework/Frameworks/vImage.framework/vImage";
-
-		// WatchOS 4.0
-#if !NET
-		public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
-#endif
-	}
-}
diff --git a/src/Foundation/NSIndexPath.cs b/src/Foundation/NSIndexPath.cs
index 9b7b2486e1b0..c3cd5dd2a59c 100644
--- a/src/Foundation/NSIndexPath.cs
+++ b/src/Foundation/NSIndexPath.cs
@@ -40,12 +40,7 @@ public unsafe static NSIndexPath Create (params int [] indexes)
 			if (indexes is null)
 				throw new ArgumentNullException ("indexes");
 
-#if ARCH_32
-			fixed (int* ptr = indexes)
-#else
 			fixed (nint* ptr = Array.ConvertAll<int, nint> (indexes, (v) => v))
-#endif
-
 				return _FromIndex ((IntPtr) ptr, indexes.Length);
 		}
 
@@ -54,12 +49,7 @@ public unsafe static NSIndexPath Create (params uint [] indexes)
 			if (indexes is null)
 				throw new ArgumentNullException ("indexes");
 
-#if ARCH_32
-			fixed (uint* ptr = indexes)
-#else
 			fixed (nuint* ptr = Array.ConvertAll<uint, nuint> (indexes, (v) => v))
-#endif
-
 				return _FromIndex ((IntPtr) ptr, indexes.Length);
 		}
 
diff --git a/src/Foundation/NSNumber2.cs b/src/Foundation/NSNumber2.cs
index 7def06d4e0f9..87e90f53a5fd 100644
--- a/src/Foundation/NSNumber2.cs
+++ b/src/Foundation/NSNumber2.cs
@@ -131,31 +131,19 @@ public static explicit operator bool (NSNumber source)
 		}
 
 		public NSNumber (nfloat value) :
-#if ARCH_64
-			this ((double)value)
-#else
-			this ((float) value)
-#endif
+			this ((double) value)
 		{
 		}
 
 		public nfloat NFloatValue {
 			get {
-#if ARCH_64
-				return (nfloat)DoubleValue;
-#else
-				return (nfloat) FloatValue;
-#endif
+				return (nfloat) DoubleValue;
 			}
 		}
 
 		public static NSNumber FromNFloat (nfloat value)
 		{
-#if ARCH_64
-			return (FromDouble ((double)value));
-#else
-			return (FromFloat ((float) value));
-#endif
+			return (FromDouble ((double) value));
 		}
 
 		public override string ToString ()
diff --git a/src/ImageIO/CGImageAnimation.cs b/src/ImageIO/CGImageAnimation.cs
index a8bd2e48f96a..c9158e71847c 100644
--- a/src/ImageIO/CGImageAnimation.cs
+++ b/src/ImageIO/CGImageAnimation.cs
@@ -67,9 +67,6 @@ public static class CGImageAnimation {
 		[BindingImpl (BindingImplOptions.Optimizable)]
 		public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOptions options, CGImageSourceAnimationHandler handler)
 		{
-#if IOS && ARCH_32
-            throw new PlatformNotSupportedException ("This API is not supported on this version of iOS");
-#else
 			if (url is null)
 				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (url));
 			if (handler is null)
@@ -85,7 +82,6 @@ public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOp
 #endif
 				return CGAnimateImageAtURLWithBlock (url.Handle, options.GetHandle (), &block);
 			}
-#endif
 		}
 
 #if NET
@@ -101,9 +97,6 @@ public static CGImageAnimationStatus AnimateImage (NSUrl url, CGImageAnimationOp
 		[BindingImpl (BindingImplOptions.Optimizable)]
 		public static CGImageAnimationStatus AnimateImage (NSData data, CGImageAnimationOptions options, CGImageSourceAnimationHandler handler)
 		{
-#if IOS && ARCH_32
-            throw new PlatformNotSupportedException ("This API is not supported on this version of iOS");
-#else
 			if (data is null)
 				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (data));
 			if (handler is null)
@@ -119,7 +112,6 @@ public static CGImageAnimationStatus AnimateImage (NSData data, CGImageAnimation
 #endif
 				return CGAnimateImageDataWithBlock (data.Handle, options.GetHandle (), &block);
 			}
-#endif
 		}
 
 		//
diff --git a/src/Makefile b/src/Makefile
index 19c2027a39d3..ea2a4162dcb4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,17 +9,6 @@ PROJECT_DIR=.
 include $(TOP)/src/frameworks.sources
 include $(TOP)/mk/rules.mk
 
-include $(TOP)/src/touch-unit.sources
-
-export MD_MTOUCH_SDK_ROOT=$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)
-export XamarinMacFrameworkRoot=$(MAC_DESTDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current
-
-MACOS_BUILD_DIR=$(BUILD_DIR)/mac
-IOS_BUILD_DIR=$(BUILD_DIR)/ios
-WATCH_BUILD_DIR=$(BUILD_DIR)/watch
-TVOS_BUILD_DIR=$(BUILD_DIR)/tvos
-MACCATALYST_BUILD_DIR=$(BUILD_DIR)/maccatalyst
-
 MACOS_DOTNET_BUILD_DIR=$(DOTNET_BUILD_DIR)/macos
 IOS_DOTNET_BUILD_DIR=$(DOTNET_BUILD_DIR)/ios
 TVOS_DOTNET_BUILD_DIR=$(DOTNET_BUILD_DIR)/tvos
@@ -29,23 +18,6 @@ GENERATOR_FLAGS=-process-enums -core -nologo -nostdlib -noconfig -native-excepti
 
 GENERATOR_TF_VERSION=$(subst net,,$(DOTNET_TFM))
 
-# This is a workaround to create assemblies with a higher version than the
-# stable versions we released for Xcode 13.3. The stable versions we released
-# for Xcode 13.3 has a <osmajor>.<osminor>.300 version number, but that
-# version scheme has been changed, where the third digit from now on will
-# always be 0 in the assembly version. However, this means that until Apple
-# releases new OS versions (and we bind those versions), the assembly version
-# will be lower than the stable version wherever we've implemented the new
-# versioning scheme. This complicates testing, so just bump the third digit to
-# 600 until we're using a new Xcode (and thus presumably new OS versions as
-# well). This workaround can be removed at that point, but implement it so
-# that it will just be skipped/ignored if it isn't removed.
-ifeq ($(XCODE_VERSION),13.3)
-NUGET_VERSION_THIRD_DIGIT_WORKAROUND=600
-else
-NUGET_VERSION_THIRD_DIGIT_WORKAROUND=0
-endif
-
 DOTNET_REFERENCES = \
 	/r:$(DOTNET_BCL_DIR)/System.Buffers.dll \
 	/r:$(DOTNET_BCL_DIR)/System.Collections.Concurrent.dll \
@@ -131,88 +103,57 @@ DOTNET_WARNINGS_TO_FIX = -nowarn:$(CSC_WARNINGS_TO_FIX)
 DOTNET_CORE_WARNINGS_TO_FIX = -nowarn:$(CSC_WARNINGS_TO_FIX),$(BGEN_WARNINGS_TO_FIX)
 
 include ./Makefile.generator
-include ./opentk.mk
-
 include ./generator-diff.mk
 
-COMMON_TARGET_DIRS = \
-	$(BUILD_DIR)                    \
-	$(BUILD_DIR)/common             \
-	$(BUILD_DIR)/common/NativeTypes \
-
-ARGS_32 = -define:ARCH_32
-ARGS_64 = -define:ARCH_64
-
-SHARED_SYSTEM_DRAWING_SOURCES = System.Drawing/PointSizeRectangleTypeForwarders.cs
 SHARED_RESX = $(TOP)/tools/mtouch/Errors.resx
-SHARED_DESIGNER_CS = $(BUILD_DIR)/common/Errors.Designer.cs
+SHARED_DESIGNER_CS = $(DOTNET_BUILD_DIR)/common/Errors.Designer.cs
 
-$(SHARED_DESIGNER_CS): $(SHARED_RESX)
+$(SHARED_DESIGNER_CS): $(SHARED_RESX) | $(DOTNET_BUILD_DIR)/common
 	$(Q_GEN) ./generate-errors.csharp > $(SHARED_DESIGNER_CS)
 
+DOTNET_TARGETS_DIRS += $(DOTNET_BUILD_DIR)/common
+
 #
-# Xamarin.iOS
+# iOS
 #
 
 # Add new bindings + source files in frameworks.sources, not here.
 
 IOS_DOTNET_EXTRA_SOURCES = \
-	$(IOS_BUILD_DIR)/Constants.cs    \
-	$(DOTNET_BUILD_DIR)/Constants.ios.generated.cs \
-	$(IOS_BUILD_DIR)/AssemblyInfo.cs \
-	$(SHARED_DESIGNER_CS) \
-
-IOS_EXTRA_SOURCES = \
-	$(IOS_OPENTK_1_0_CORE_SOURCES)   \
-	$(IOS_BUILD_DIR)/Constants.cs    \
-	$(BUILD_DIR)/Constants.ios.generated.cs \
-	$(IOS_BUILD_DIR)/AssemblyInfo.cs \
+	$(IOS_DOTNET_BUILD_DIR)/Constants.cs    \
+	$(IOS_DOTNET_BUILD_DIR)/Constants.generated.cs \
+	$(IOS_DOTNET_BUILD_DIR)/AssemblyInfo.cs \
 	$(SHARED_DESIGNER_CS) \
-	$(SHARED_SYSTEM_DRAWING_SOURCES) \
 
 IOS_DOTNET_HTTP_SOURCES = \
 	Foundation/NSUrlSessionHandler.cs \
 	System.Net.Http/CFContentStream.cs \
 	System.Net.Http/CFNetworkHandler.cs \
 
-IOS_HTTP_SOURCES = \
-	Foundation/NSUrlSessionHandler.cs \
-	System.Net.Http/CFContentStream.cs \
-	System.Net.Http/CFNetworkHandler.cs \
-
 IOS_DOTNET_CORE_SOURCES += $(IOS_DOTNET_EXTRA_SOURCES)
-IOS_CORE_SOURCES += $(IOS_EXTRA_SOURCES)
 
 IOS_DOTNET_SOURCES += $(IOS_DOTNET_EXTRA_SOURCES) $(IOS_DOTNET_HTTP_SOURCES)
-IOS_SOURCES += $(IOS_EXTRA_SOURCES) $(IOS_HTTP_SOURCES)
 
 IOS_GENERATOR_FLAGS = -inline-selectors -d:IOS -process-enums $(IOS_GENERATOR_WARNASERROR)
 IOS_DEFINES = -define:IPHONE -define:IOS -define:MONOTOUCH -d:__IOS__ -d:SYSTEM_NET_HTTP
-IOS_GENERATOR=$(BUILD_DIR)/common/bgen.exe
-IOS_GENERATE=$(SYSTEM_MONO) --debug $(IOS_GENERATOR)
 
 IOS_CORE_DEFINES=-define:COREBUILD $(IOS_DEFINES)
 
-$(IOS_BUILD_DIR)/Constants.cs: Constants.iOS.cs.in Makefile $(TOP)/Make.config.inc | $(IOS_BUILD_DIR)
+$(IOS_DOTNET_BUILD_DIR)/Constants.cs: Constants.iOS.cs.in Makefile $(TOP)/Make.config.inc | $(IOS_DOTNET_BUILD_DIR)
 	$(call Q_PROF_GEN,ios) sed \
-		-e "s/@VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \
+		-e "s/@VERSION@/$(IOS_NUGET_VERSION_MAJOR).$(IOS_NUGET_VERSION_MINOR).$(IOS_NUGET_VERSION_PATCH)/g" \
 		-e 's/@REVISION@/$(IOS_COMMIT_DISTANCE) ($(CURRENT_BRANCH_SED_ESCAPED): $(shell git log -1 --pretty=%h))/g' \
 		-e "s/@IOS_SDK_VERSION@/$(IOS_SDK_VERSION)/g" \
 		$< > $@
 
-$(IOS_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(IOS_BUILD_DIR)
+$(IOS_DOTNET_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(IOS_DOTNET_BUILD_DIR)
 	$(call Q_PROF_GEN,ios) sed \
 		-e 's|@PRODUCT_NAME@|$(IOS_PRODUCT)|g' \
 		-e 's|@PACKAGE_HEAD_REV@|$(PACKAGE_HEAD_REV)|g' \
 		-e 's|@PACKAGE_HEAD_BRANCH@|$(CURRENT_BRANCH_SED_ESCAPED)|g' \
-		-e 's|@PACKAGE_VERSION_MAJOR@|$(IOS_PACKAGE_VERSION_MAJOR)|g' \
-		-e 's|@PACKAGE_VERSION_MINOR@|$(IOS_PACKAGE_VERSION_MINOR)|g' \
-		-e 's|@PACKAGE_VERSION_REV@|$(IOS_PACKAGE_VERSION_REV)|g' \
-		-e 's|@PACKAGE_VERSION_BUILD@|$(IOS_PACKAGE_VERSION_BUILD)|g' \
 		-e 's|@NUGET_VERSION_NO_METADATA@|$(IOS_NUGET_VERSION_NO_METADATA)|g' \
 		-e 's|@NUGET_VERSION_MAJOR@|$(IOS_NUGET_VERSION_MAJOR)|g' \
 		-e 's|@NUGET_VERSION_MINOR@|$(IOS_NUGET_VERSION_MINOR)|g' \
-		-e 's|@NUGET_VERSION_THIRD_DIGIT_WORKAROUND@|$(NUGET_VERSION_THIRD_DIGIT_WORKAROUND)|g' \
 		-e 's|@NUGET_VERSION_REV@|$(IOS_NUGET_VERSION_PATCH)|g' \
 		-e 's|@NUGET_VERSION_BUILD@|$(IOS_NUGET_COMMIT_DISTANCE)|g' \
 		-e 's|@DOTNET_PLATFORM@|iOS|g' \
@@ -222,250 +163,31 @@ $(IOS_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(IOS_BUILD_DI
 	$(Q) rm -f $@.tmp
 	$(Q) touch $@
 
-# core.dll
-$(IOS_BUILD_DIR)/native/core.dll: $(IOS_CORE_SOURCES) frameworks.sources $(RSP_DIR)/ios-defines.rsp
-	$(Q) mkdir -p $(IOS_BUILD_DIR)native
-	$(call Q_PROF_CSC,ios) $(IOS_CSC) -nologo -out:$@ -target:library -debug -unsafe \
-		$(CORE_WARNINGS_TO_FIX) \
-		@$(RSP_DIR)/ios-defines.rsp \
-		$(IOS_CORE_DEFINES) \
-		$(IOS_CORE_SOURCES)
-
-# generated_sources
-$(IOS_BUILD_DIR)/native/generated_sources: $(IOS_GENERATOR) $(IOS_APIS) $(IOS_BUILD_DIR)/native/core.dll $(IOS_BUILD_DIR)/native/Xamarin.iOS.BindingAttributes.dll $(BUILD_DIR)/ios.rsp
-	$(call Q_PROF_GEN,ios) $(IOS_GENERATE) @$(BUILD_DIR)/ios.rsp
-
-$(BUILD_DIR)/ios.rsp: Makefile Makefile.generator frameworks.sources
-	$(Q_GEN) echo \
-		$(IOS_GENERATOR_FLAGS) \
-		-core \
-		-sourceonly=$(IOS_BUILD_DIR)/native/generated_sources \
-		-compiler=$(IOS_CSC) \
-		-nologo -nostdlib -noconfig \
-		-tmpdir=$(IOS_BUILD_DIR)/native \
-		-baselib=$(IOS_BUILD_DIR)/native/core.dll \
-		-attributelib=$(IOS_BUILD_DIR)/native/Xamarin.iOS.BindingAttributes.dll \
-		-native-exception-marshalling \
-		--ns=ObjCRuntime \
-		--target-framework=Xamarin.iOS,v1.0 \
-		$(IOS_APIS) \
-		@$(RSP_DIR)/ios-defines.rsp \
-		> $@
-
-define IOS_TARGETS_template
-# Xamarin.iOS.dll
-$(IOS_BUILD_DIR)/native-$(1)%Xamarin.iOS.dll $(IOS_BUILD_DIR)/native-$(1)%Xamarin.iOS.pdb $(4): $$(IOS_SOURCES) $(IOS_BUILD_DIR)/native/generated_sources $(PRODUCT_KEY_PATH) | $(IOS_BUILD_DIR)/reference
-	@mkdir -p $(IOS_BUILD_DIR)/native-$(1)
-	$$(call Q_PROF_CSC,ios/$(1) bit) $$(IOS_CSC) -nologo -out:$(IOS_BUILD_DIR)/native-$(1)/Xamarin.iOS.dll -target:library -debug -unsafe -optimize \
-		-deterministic \
-		$$(ARGS_$(1)) \
-		-publicsign -keyfile:$(PRODUCT_KEY_PATH) $$(IOS_DEFINES) \
-		$(5) \
-		$(WARNINGS_TO_FIX) \
-		-warnaserror:$(NULLABILITY_WARNINGS) \
-		$$(IOS_CSC_FLAGS_XI) \
-		@$(RSP_DIR)/ios-defines.rsp \
-		$$(IOS_SOURCES) @$(IOS_BUILD_DIR)/native/generated_sources
-endef
-
-$(IOS_BUILD_DIR)/compat/%: $(MACIOS_BINARIES_PATH)/% | $(IOS_BUILD_DIR)/compat
-	$(Q) $(CP) $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%: $(IOS_BUILD_DIR)/compat/%
-	$(Q) $(CP) $< $@
-
-$(eval $(call IOS_TARGETS_template,32))
-$(eval $(call IOS_TARGETS_template,64,,,$(IOS_BUILD_DIR)/reference%Xamarin.iOS.dll,-refout:$(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll))
-
-# MonoTouch.Dialog-1
-$(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll: $(MACIOS_BINARIES_PATH)/MonoTouch.Dialog-Unified/ios/MonoTouch.Dialog-1.dll | $(IOS_BUILD_DIR)/reference
-	$(Q) $(CP) $< $@
-
-$(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.pdb: $(MACIOS_BINARIES_PATH)/MonoTouch.Dialog-Unified/ios/MonoTouch.Dialog-1.pdb | $(IOS_BUILD_DIR)/reference
-	$(Q) $(CP) $< $@
-
-# MonoTouch.NUnitLite
-$(IOS_BUILD_DIR)/reference%MonoTouch.NUnitLite.dll $(IOS_BUILD_DIR)/reference%MonoTouch.NUnitLite.pdb: $(IOS_TOUCHUNIT_SOURCES) $(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll $(PRODUCT_KEY_PATH) $(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll
-	$(call Q_PROF_CSC,ios) $(IOS_CSC) -nologo -out:$(basename $@).dll -target:library -debug:portable -optimize -publicsign \
-		-deterministic \
-		-keyfile:$(PRODUCT_KEY_PATH) -r:$(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll -define:MONO -r:$(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Xml.dll \
-		-r:$(MONOTOUCH_MONO_PATH)/System.Core.dll \
-		-nowarn:3006,612,649,414,1635,659 \
-		-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(IOS_DEFINES) \
-		-define:XAMCORE_2_0,__UNIFIED__ \
-		$(IOS_TOUCHUNIT_SOURCES)
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/% : $(MACIOS_BINARIES_PATH)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
-	$(Q) $(CP) $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/Facades/% : $(MACIOS_BINARIES_PATH)/Facades/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/Facades
-	$(Q) $(CP) $< $@
-
-$(IOS_BUILD_DIR)/compat/%: $(MACIOS_BINARIES_PATH)/% | $(IOS_BUILD_DIR)/compat
-	$(Q) $(CP) $< $@
-
-clean-local::
-	rm -rf build
-	rm -f $(IOS_TARGETS) generated_sources *.mdb *.pdb
-
-ifdef INCLUDE_IOS
-IOS_TARGETS_DIRS += \
-	$(IOS_BUILD_DIR)                                           \
-	$(IOS_BUILD_DIR)/compat                                    \
-	$(IOS_BUILD_DIR)/compat/Facades                            \
-	$(IOS_BUILD_DIR)/reference                                 \
-	$(IOS_BUILD_DIR)/reference/Facades                         \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin                      \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/share/doc/MonoTouch      \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS     \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/iOS           \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS           \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1             \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/Facades     \
-
-IOS_TARGETS += \
-	$(PROJECT_DIR)/xamios.csproj                                                   \
-	$(PROJECT_DIR)/MonoTouch.NUnitLite.csproj                                      \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/monotouch.dll                   \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/monotouch.dll.mdb               \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/OpenTK.dll                      \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/OpenTK.pdb                      \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/OpenTK-1.0.dll                  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/OpenTK-1.0.pdb                  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/OpenTK-1.0.dll.config           \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/MonoTouch.Dialog-1.dll          \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/MonoTouch.Dialog-1.pdb          \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/MonoTouch.NUnitLite.dll         \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/MonoTouch.NUnitLite.pdb         \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/Facades/System.Drawing.Primitives.dll     \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/Facades/netstandard.dll         \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll         \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/MonoTouch.Dialog-1.dll  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/MonoTouch.Dialog-1.pdb  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/MonoTouch.NUnitLite.dll \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/MonoTouch.NUnitLite.pdb \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/OpenTK-1.0.dll          \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/OpenTK-1.0.pdb          \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/OpenTK-1.0.dll.config   \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS/Xamarin.iOS.dll               \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS/Xamarin.iOS.pdb               \
-
-ifdef IOS_SUPPORTS_32BIT_ARCHITECTURES
-IOS_TARGETS += \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/iOS/Xamarin.iOS.dll               \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/iOS/Xamarin.iOS.pdb               \
-
-endif
-
-endif
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%.dll: $(IOS_BUILD_DIR)/compat/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/Facades
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%.pdb: $(IOS_BUILD_DIR)/compat/%.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%.mdb: $(IOS_BUILD_DIR)/compat/%.mdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%.config: $(IOS_BUILD_DIR)/compat/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/share/doc/MonoTouch/%: api-diffs/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/share/doc/MonoTouch
-	$(Q) install -m 0644 $< $@
-
-# reference assemblies, this is just for compilation with XS
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.dll: $(IOS_BUILD_DIR)/reference/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/Facades
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.pdb: $(IOS_BUILD_DIR)/reference/%.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.config: $(IOS_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
-	$(Q) install -m 0644 $< $@
-
-# the actual architecture-specific versions
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/iOS/Xamarin.iOS.dll: $(IOS_BUILD_DIR)/native-32/Xamarin.iOS.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/iOS
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/iOS/Xamarin.iOS.pdb: $(IOS_BUILD_DIR)/native-32/Xamarin.iOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/iOS
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS/Xamarin.iOS.dll: $(IOS_BUILD_DIR)/native-64/Xamarin.iOS.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS/Xamarin.iOS.pdb: $(IOS_BUILD_DIR)/native-64/Xamarin.iOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS
-	$(Q) install -m 0644 $< $@
-
-$(IOS_TARGETS_DIRS):
-	$(Q) mkdir -p $@
-
-$(PROJECT_DIR)/xamios.csproj: xamios.tmpl.csproj Makefile $(wildcard $(TOP)/src/*.sources)
-	@sed -e 's*<!--%FILES%-->*$(foreach file,$(IOS_SOURCES),<Compile Include="$(file)"/>)*' -e 's*<!--%APIS%-->*$(foreach file,$(IOS_APIS),<None Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-$(PROJECT_DIR)/MonoTouch.NUnitLite.csproj: MonoTouch.NUnitLite.templ.csproj Makefile touch-unit.sources $(TOP)/Make.config $(TOP)/mk/mono.mk
-	$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(IOS_TOUCHUNIT_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-PROJECT_FILES += $(PROJECT_DIR)/xamios.csproj $(PROJECT_DIR)/MonoTouch.NUnitLite.csproj
-
-ifdef INCLUDE_IOS
-all-ios: $(IOS_TARGETS)
-install-ios: $(IOS_TARGETS)
-endif
-
-ifdef INCLUDE_XAMARIN_LEGACY
-ifdef INCLUDE_IOS
-INSTALL_TARGETS+=install-ios
-ALL_TARGETS+=all-ios
-endif
-endif
-
 #
-# Xamarin.Mac
+# macOS
 #
 
 MAC_COMMON_DEFINES = -define:MONOMAC -d:__MACOS__
-MAC_full_ARGS = -define:NO_SYSTEM_DRAWING -define:XAMMAC_SYSTEM_MONO
-MAC_mobile_ARGS = 
 MACOS_GENERATOR_FLAGS = -d:MONOMAC -d:__MACOS__
 MACOS_CORE_DEFINES = $(MAC_COMMON_DEFINES),COREBUILD
 MACOS_DEFINES = $(MAC_COMMON_DEFINES) -D:XAMARIN_MODERN
 
-$(MACOS_BUILD_DIR)/$(1)/$(3).pdb: $(MACOS_BUILD_DIR)/$(1)/$(3).dll
-
 SN_KEY = $(PRODUCT_KEY_PATH)
 
 MAC_DOTNET_EXTRA_CORE_SOURCES += \
-	$(MACOS_BUILD_DIR)/Constants.cs \
-	$(DOTNET_BUILD_DIR)/Constants.macos.generated.cs \
-
-MAC_EXTRA_CORE_SOURCES += \
-	$(MACOS_BUILD_DIR)/Constants.cs \
-	$(BUILD_DIR)/Constants.macos.generated.cs \
+	$(MACOS_DOTNET_BUILD_DIR)/Constants.cs \
+	$(MACOS_DOTNET_BUILD_DIR)/Constants.generated.cs \
 
 # Add new bindings + source files in frameworks.sources, not here.
 
 MACOS_DOTNET_CORE_SOURCES += \
 	$(MAC_DOTNET_EXTRA_CORE_SOURCES) \
 
-MACOS_CORE_SOURCES += \
-	$(MAC_EXTRA_CORE_SOURCES) \
-
 MACOS_DOTNET_SOURCES += \
 	$(MAC_DOTNET_EXTRA_CORE_SOURCES) \
-	$(MACOS_BUILD_DIR)/AssemblyInfo.cs \
+	$(MACOS_DOTNET_BUILD_DIR)/AssemblyInfo.cs \
 	$(SHARED_DESIGNER_CS) \
 
-MACOS_SOURCES += \
-	$(MAC_EXTRA_CORE_SOURCES) \
-	$(MACOS_BUILD_DIR)/AssemblyInfo.cs \
-	$(SHARED_DESIGNER_CS) \
-
-# CFNetwork is shipped:
-# * In a separate library (XamMac.CFNetwork.dll) for Classic.
-# * Inside the other platform assemblies (Xamarin.Mac.dll) for all the other profiles.
-# This means we can't use the standard framework logic for these sources.
-
 MAC_CFNETWORK_SOURCES = \
 	CFNetwork/Content.cs \
 	CFNetwork/MessageHandler.cs \
@@ -482,32 +204,21 @@ MACOS_DOTNET_SOURCES += \
 	$(MAC_CFNETWORK_SOURCES) \
 	$(MAC_HTTP_SOURCES) \
 
-$(MACOS_BUILD_DIR)/Constants.cs: Constants.mac.cs.in Makefile $(TOP)/Make.config.inc | $(MACOS_BUILD_DIR)
+$(MACOS_DOTNET_BUILD_DIR)/Constants.cs: Constants.mac.cs.in Makefile $(TOP)/Make.config.inc | $(MACOS_DOTNET_BUILD_DIR)
 	$(Q) sed \
-			-e "s/@VERSION@/$(MAC_PACKAGE_VERSION_MAJOR).$(MAC_PACKAGE_VERSION_MINOR).$(MAC_PACKAGE_VERSION_REV)/g" \
+			-e "s/@VERSION@/$(MACOS_NUGET_VERSION_MAJOR).$(MACOS_NUGET_VERSION_MINOR).$(MACOS_NUGET_VERSION_PATCH)/g" \
 			-e 's/@REVISION@/$(MAC_COMMIT_DISTANCE) ($(CURRENT_BRANCH_SED_ESCAPED): $(shell git log -1 --pretty=%h))/g' \
 			-e "s/@MACOS_SDK_VERSION@/$(MACOS_SDK_VERSION)/g" \
 			-e "s/@MIN_XM_MONO_VERSION@/$(MIN_XM_MONO_VERSION)/g" \
 		$< > $@
 
-$(PROJECT_DIR)/xammac.csproj: xammac.tmpl.csproj Makefile $(wildcard $(TOP)/src/*.sources)
-	@sed -e 's*<!--%FILES%-->*$(foreach file,$(MACOS_SOURCES) $(SHARED_SYSTEM_DRAWING_SOURCES),<Compile Include="$(file)"/>)*' -e 's*<!--%APIS%-->*$(foreach file,$(MACOS_APIS),<None Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-PROJECT_FILES += $(PROJECT_DIR)/xammac.csproj
-
-$(MACOS_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(MACOS_BUILD_DIR)
+$(MACOS_DOTNET_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(MACOS_DOTNET_BUILD_DIR)
 	$(call Q_PROF_GEN,mac) sed \
 		-e 's|@PRODUCT_NAME@|$(MAC_PRODUCT)|g' \
 		-e 's|@PACKAGE_HEAD_REV@|$(PACKAGE_HEAD_REV)|g' \
-		-e 's|@PACKAGE_HEAD_BRANCH@|$(CURRENT_BRANCH_SED_ESCAPED)|g' \
-		-e 's|@PACKAGE_VERSION_MAJOR@|$(MAC_PACKAGE_VERSION_MAJOR)|g' \
-		-e 's|@PACKAGE_VERSION_MINOR@|$(MAC_PACKAGE_VERSION_MINOR)|g' \
-		-e 's|@PACKAGE_VERSION_REV@|$(MAC_PACKAGE_VERSION_REV)|g' \
-		-e 's|@PACKAGE_VERSION_BUILD@|$(MAC_PACKAGE_VERSION_BUILD)|g' \
 		-e 's|@NUGET_VERSION_NO_METADATA@|$(MACOS_NUGET_VERSION_NO_METADATA)|g' \
 		-e 's|@NUGET_VERSION_MAJOR@|$(MACOS_NUGET_VERSION_MAJOR)|g' \
 		-e 's|@NUGET_VERSION_MINOR@|$(MACOS_NUGET_VERSION_MINOR)|g' \
-		-e 's|@NUGET_VERSION_THIRD_DIGIT_WORKAROUND@|$(NUGET_VERSION_THIRD_DIGIT_WORKAROUND)|g' \
 		-e 's|@NUGET_VERSION_REV@|$(MACOS_NUGET_VERSION_PATCH)|g' \
 		-e 's|@NUGET_VERSION_BUILD@|$(MACOS_NUGET_COMMIT_DISTANCE)|g' \
 		-e 's|@DOTNET_PLATFORM@|macOS|g' \
@@ -517,394 +228,23 @@ $(MACOS_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(MACOS_BUIL
 	$(Q) rm -f $@.tmp
 	$(Q) touch $@
 
-# We can't pass the --target-framework values as parameters to the templates, because the commas interfere with Make's parameter parsing.
-xm_full_profile=--target-framework=Xamarin.Mac,Version=v4.5,Profile=Full
-xm_mobile_profile=--target-framework=Xamarin.Mac,Version=v2.0,Profile=Mobile
-
-MAC_GENERATOR=$(BUILD_DIR)/common/bgen.exe
-MAC_GENERATE=$(SYSTEM_MONO) --debug $(MAC_GENERATOR)
-
-define MAC_GENERATOR_template
-$(MACOS_BUILD_DIR)/$(1)/core.dll: $(MACOS_CORE_SOURCES) frameworks.sources $(RSP_DIR)/macos-defines.rsp
-	@mkdir -p $(MACOS_BUILD_DIR)/$(1)
-	$$(call Q_PROF_CSC,mac/$(1)) \
-		$$(MAC_$(1)_CSC) -nologo -out:$$@ -target:library -debug -unsafe $(CORE_WARNINGS_TO_FIX) \
-		@$(RSP_DIR)/macos-defines.rsp \
-		$$(MACOS_CORE_DEFINES) \
-		$(2) \
-		$$(MACOS_CORE_SOURCES)
-
-$(MACOS_BUILD_DIR)/$(1)/generated-sources: $$(MAC_GENERATOR) $(MACOS_APIS) $(MACOS_BUILD_DIR)/$(1)/core.dll $(MACOS_BUILD_DIR)/Xamarin.Mac-$(1).BindingAttributes.dll $(BUILD_DIR)/mac-$(1).rsp
-	$$(call Q_PROF_GEN,mac/$(1)) $$(MAC_GENERATE) @$(BUILD_DIR)/mac-$(1).rsp
-
-$(BUILD_DIR)/mac-$(1).rsp: Makefile Makefile.generator frameworks.sources
-	$$(Q_GEN) echo \
-		$(MACOS_GENERATOR_FLAGS) \
-		-compiler:$$(MAC_$(1)_CSC) \
-		-nologo \
-		-process-enums \
-		$(MACOS_GENERATOR_WARNASERROR) \
-		-native-exception-marshalling \
-		-core \
-		-sourceonly:$(MACOS_BUILD_DIR)/$(1)/generated-sources \
-		-tmpdir:$(MACOS_BUILD_DIR)/$(1) \
-		-baselib:$(MACOS_BUILD_DIR)/$(1)/core.dll \
-		-attributelib:$(MACOS_BUILD_DIR)/Xamarin.Mac-$(1).BindingAttributes.dll \
-		-d:NO_SYSTEM_DRAWING \
-		--ns=ObjCRuntime \
-		$(2) \
-		$(xm_$(1)_profile) \
-		$(MACOS_APIS) \
-		@$(RSP_DIR)/macos-defines.rsp \
-		> $$@
-endef
-
-$(eval $(call MAC_GENERATOR_template,full,-d:NO_SYSTEM_DRAWING))
-$(eval $(call MAC_GENERATOR_template,mobile,$(SHARED_SYSTEM_DRAWING_SOURCES)))
-
-define MACOS_TARGETS_template
-$(MACOS_BUILD_DIR)/$(1)-64/Xamarin.Mac%dll $(MACOS_BUILD_DIR)/$(1)-64/Xamarin.Mac%pdb: $(MACOS_BUILD_DIR)/$(1)/generated-sources $(MACOS_SOURCES) $(MAC_CFNETWORK_SOURCES) $(MAC_CLASSIC_SOURCES) $(SN_KEY)
-	@mkdir -p $(MACOS_BUILD_DIR)/$(1)-64
-	$$(call Q_PROF_CSC,mac/$(1)-64) \
-		$$(MAC_$(1)_CSC) -nologo -out:$$(basename $$@).dll -target:library -debug -unsafe \
-		-deterministic \
-		$$(MAC_COMMON_DEFINES) \
-		$$(MAC_$(1)_ARGS) \
-		$$(ARGS_64) \
-		-publicsign -keyfile:$(SN_KEY) \
-		$(WARNINGS_TO_FIX) \
-		-warnaserror:$(NULLABILITY_WARNINGS) \
-		$$(MAC_CSC_FLAGS_XM) \
-		$(MAC_CFNETWORK_SOURCES) $(MAC_HTTP_SOURCES) \
-		$(2) \
-		$$(MACOS_SOURCES) \
-		@$(RSP_DIR)/macos-defines.rsp \
-		@$$<
-
-endef
-
-$(eval $(call MACOS_TARGETS_template,mobile,$(SHARED_SYSTEM_DRAWING_SOURCES)))
-$(eval $(call MACOS_TARGETS_template,full,))
-
-$(MACOS_BUILD_DIR)/%-reference/Xamarin.Mac.dll: $(MACOS_BUILD_DIR)/%-64/Xamarin.Mac.dll
-	@mkdir -p $(@D)
-	$(Q) $(CP) $^ $@
-
-$(MACOS_BUILD_DIR)/%-reference/Xamarin.Mac.pdb: $(MACOS_BUILD_DIR)/%-64/Xamarin.Mac.pdb
-	@mkdir -p $(@D)
-	$(Q) $(CP) $^ $@
-
-MAC_VARIANTS_TARGETS = \
-	$(MACOS_BUILD_DIR)/mobile-64/Xamarin.Mac.dll \
-	$(MACOS_BUILD_DIR)/full-64/Xamarin.Mac.dll \
-	$(MACOS_BUILD_DIR)/mobile-reference/Xamarin.Mac.dll \
-	$(MACOS_BUILD_DIR)/full-reference/Xamarin.Mac.dll \
-
-ifdef INCLUDE_XAMARIN_LEGACY
-ifdef INCLUDE_MAC
-INSTALL_TARGETS+=install-mac
-ALL_TARGETS+=all-mac
-endif
-endif
-
-MACOS_TARGETS_DIRS += \
-	$(MACOS_BUILD_DIR) \
-	$(MACOS_BUILD_DIR)/mobile \
-	$(MACOS_BUILD_DIR)/mobile/Facades \
-	$(MACOS_BUILD_DIR)/full \
-	$(MACOS_BUILD_DIR)/compat \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile    \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full      \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full   \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/net_4_5   \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono             \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5         \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin                  \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig        \
-
-MACOS_TARGETS += \
-	$(PROJECT_DIR)/xammac.csproj                                                        \
-	$(MAC_VARIANTS_TARGETS)                                                             \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/XamMac.dll                      \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile/Xamarin.Mac.dll     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile/Xamarin.Mac.pdb     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full/Xamarin.Mac.dll       \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full/Xamarin.Mac.pdb       \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile/Xamarin.Mac.dll        \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile/Xamarin.Mac.pdb        \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full/Xamarin.Mac.dll          \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full/Xamarin.Mac.pdb          \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/Xamarin.Mac.dll     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/Xamarin.Mac.pdb     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.dll             \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.pdb             \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig/xammac.pc
-
-# The XamMac.dll file must exist for VSfM to be able to open XM/Classic projects (so that people can use the migration wizard)
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/XamMac.dll: $(MACIOS_BINARIES_PATH)/XamMac.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono
-	$(Q) install -m 0755 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile/Xamarin.Mac.dll: $(MACOS_BUILD_DIR)/mobile-reference/Xamarin.Mac.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile
-	$(Q) install -m 0755 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile/Xamarin.Mac.pdb: $(MACOS_BUILD_DIR)/mobile-reference/Xamarin.Mac.pdb | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile
-	$(Q) install -m 0644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile/Xamarin.Mac.dll: $(MACOS_BUILD_DIR)/mobile-64/Xamarin.Mac.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile
-	$(Q) install -m 0755 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile/Xamarin.Mac.pdb: $(MACOS_BUILD_DIR)/mobile-64/Xamarin.Mac.pdb | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile
-	$(Q) install -m 0644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full/Xamarin.Mac.dll: $(MACOS_BUILD_DIR)/full-reference/Xamarin.Mac.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full
-	$(Q) install -m 0755 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full/Xamarin.Mac.pdb : $(MACOS_BUILD_DIR)/full-reference/Xamarin.Mac.pdb | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full
-	$(Q) install -m 0644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full/Xamarin.Mac.dll: $(MACOS_BUILD_DIR)/full-64/Xamarin.Mac.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full
-	$(Q) install -m 0755 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full/Xamarin.Mac.pdb: $(MACOS_BUILD_DIR)/full-64/Xamarin.Mac.pdb | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full
-	$(Q) install -m 0644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/Xamarin.Mac.dll $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/Xamarin.Mac.pdb: | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac
-	$(Q) ln -sF ../../reference/mobile/$(@F) $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.dll $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.pdb: | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
-	$(Q) ln -sF ../../reference/full/$(@F) $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig/xammac.pc: $(TOP)/Make.config | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig
-	$(Q) sed -e "s/@PACKAGE_VERSION@/$(MAC_PACKAGE_VERSION)/g" xammac.pc.in > $@
-	$(Q) chmod 0644 $@
-
-$(MACOS_TARGETS_DIRS):
-	$(Q) mkdir -p $@
-
-ifdef INCLUDE_MAC
-install-mac: $(MACOS_TARGETS)
-all-mac: $(MACOS_TARGETS)
-endif
-
-#
-# Xamarin.WatchOS
-#
-
-WATCH_DEFINES = -define:IPHONE -define:MONOTOUCH -d:WATCH -d:XAMCORE_3_0 -d:__WATCHOS__ -d:SYSTEM_NET_HTTP
-WATCH_GENERATOR=$(BUILD_DIR)/common/bgen.exe
-WATCH_GENERATE=$(SYSTEM_MONO) --debug $(WATCH_GENERATOR)
-WATCH_GENERATED_DEFINES= -d:WATCH -d:XAMCORE_3_0
-
-WATCHOS_CORE_DEFINES = $(WATCH_DEFINES) -define:COREBUILD
-
-WATCHOS_EXTRA_CORE_SOURCES = \
-    $(WATCH_BUILD_DIR)/Constants.cs    \
-    $(BUILD_DIR)/Constants.watchos.generated.cs \
-    $(WATCH_BUILD_DIR)/AssemblyInfo.cs \
-    $(IOS_OPENTK_1_0_CORE_SOURCES)     \
-    AudioToolbox/AudioBuffers.cs       \
-    AudioToolbox/AudioType.cs          \
-    AudioToolbox/AudioFormat.cs          \
-    $(SHARED_SYSTEM_DRAWING_SOURCES)   \
-    System.Drawing/ColorKnownColorTypeForwarders.cs \
-
-WATCHOS_HTTP_SOURCES = \
-	Foundation/NSUrlSessionHandler.cs \
-
-WATCHOS_CORE_SOURCES +=           \
-    $(WATCHOS_EXTRA_CORE_SOURCES) \
-
-WATCHOS_SOURCES +=                \
-    $(WATCHOS_EXTRA_CORE_SOURCES) \
-    $(WATCHOS_HTTP_SOURCES)        \
-    $(SHARED_DESIGNER_CS) \
-
-$(WATCH_BUILD_DIR)/Constants.cs: $(TOP)/src/Constants.watch.cs.in Makefile $(TOP)/Make.config.inc | $(WATCH_BUILD_DIR)
-	$(call Q_PROF_GEN,watch) sed \
-		-e "s/@VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \
-		-e 's/@REVISION@/$(IOS_COMMIT_DISTANCE) ($(CURRENT_BRANCH_SED_ESCAPED): $(shell git log -1 --pretty=%h))/g' \
-		-e "s/@WATCH_SDK_VERSION@/$(WATCH_SDK_VERSION)/g" \
-		$< > $@
-
-$(WATCH_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/Make.config  $(GIT_DIRECTORY)/HEAD | $(WATCH_BUILD_DIR)
-	$(call Q_PROF_GEN,watch) sed \
-		-e 's|@PRODUCT_NAME@|Xamarin.WatchOS|g' \
-		-e 's|@PACKAGE_HEAD_REV@|$(PACKAGE_HEAD_REV)|g' \
-		-e 's|@PACKAGE_HEAD_BRANCH@|$(CURRENT_BRANCH_SED_ESCAPED)|g' \
-		-e 's|@PACKAGE_VERSION_MAJOR@|$(IOS_PACKAGE_VERSION_MAJOR)|g' \
-		-e 's|@PACKAGE_VERSION_MINOR@|$(IOS_PACKAGE_VERSION_MINOR)|g' \
-		-e 's|@PACKAGE_VERSION_REV@|$(IOS_PACKAGE_VERSION_REV)|g' \
-		-e 's|@PACKAGE_VERSION_BUILD@|$(IOS_PACKAGE_VERSION_BUILD)|g' \
-		-e 's|@XCODE_VERSION@|$(subst .,_,$(XCODE_VERSION))|g' \
-		$< > $@.tmp
-	$(Q) diff $@ $@.tmp >/dev/null 2>&1 || mv -f $@.tmp $@
-	$(Q) rm -f $@.tmp
-	$(Q) touch $@
-
-$(WATCH_BUILD_DIR)/watch/core.dll: $(WATCHOS_CORE_SOURCES) frameworks.sources $(RSP_DIR)/watchos-defines.rsp | $(WATCH_BUILD_DIR)/watch
-	@mkdir -p $(WATCH_BUILD_DIR)/watch
-	$(call Q_PROF_CSC,watch) $(WATCH_CSC) -nologo -out:$@ -target:library -debug -unsafe \
-		$(CORE_WARNINGS_TO_FIX) \
-		@$(RSP_DIR)/watchos-defines.rsp \
-		$(WATCHOS_CORE_DEFINES)     \
-		$(WATCHOS_CORE_SOURCES)
-
-# generated_sources
-$(WATCH_BUILD_DIR)/watch/generated_sources: $(WATCH_GENERATOR) $(WATCHOS_APIS) $(WATCH_BUILD_DIR)/watch/core.dll $(WATCH_BUILD_DIR)/Xamarin.WatchOS.BindingAttributes.dll $(BUILD_DIR)/watchos.rsp
-	$(call Q_PROF_GEN,watch) $(WATCH_GENERATE) @$(BUILD_DIR)/watchos.rsp
-
-$(BUILD_DIR)/watchos.rsp: Makefile Makefile.generator frameworks.sources
-	$(Q_GEN) echo  \
-		-inline-selectors                                        \
-		-process-enums                                           \
-		$(WATCH_GENERATOR_WARNASERROR)                           \
-		-core                                                    \
-		-sourceonly=$(WATCH_BUILD_DIR)/watch/generated_sources   \
-		-compiler=$(WATCH_CSC) \
-		-nologo -nostdlib -noconfig                              \
-		-tmpdir=$(WATCH_BUILD_DIR)/watch                         \
-		-baselib=$(WATCH_BUILD_DIR)/watch/core.dll               \
-		-attributelib=$(WATCH_BUILD_DIR)/Xamarin.WatchOS.BindingAttributes.dll \
-		-native-exception-marshalling                            \
-		$(WATCH_GENERATED_DEFINES)				\
-		--ns:ObjCRuntime                                         \
-		$(WATCHOS_APIS)                                            \
-		--target-framework=Xamarin.WatchOS,v1.0                     \
-		@$(RSP_DIR)/watchos-defines.rsp                        \
-		> $@
-
-$(WATCH_BUILD_DIR)/watch-32/Xamarin.WatchOS%dll $(WATCH_BUILD_DIR)/watch-32/Xamarin.WatchOS%pdb: $(WATCHOS_SOURCES) $(WATCH_BUILD_DIR)/watch/generated_sources $(PRODUCT_KEY_PATH) | $(WATCH_BUILD_DIR)/watch-32
-	$(call Q_PROF_CSC,watch) $(WATCH_CSC) -nologo -out:$(basename $@).dll -target:library -debug -unsafe -optimize \
-		-publicsign -keyfile:$(PRODUCT_KEY_PATH) $(WATCH_DEFINES) \
-		-deterministic \
-		$(ARGS_32) \
-		$(WARNINGS_TO_FIX) \
-		@$(RSP_DIR)/watchos-defines.rsp \
-		$(WATCHOS_SOURCES) @$(WATCH_BUILD_DIR)/watch/generated_sources
-
-$(WATCH_BUILD_DIR)/watch-64/Xamarin.WatchOS%dll $(WATCH_BUILD_DIR)/watch-64/Xamarin.WatchOS%pdb $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS%dll: $(WATCHOS_SOURCES) $(WATCH_BUILD_DIR)/watch/generated_sources $(PRODUCT_KEY_PATH) | $(WATCH_BUILD_DIR)/watch-64 $(WATCH_BUILD_DIR)/reference
-	$(call Q_PROF_CSC,watch) $(WATCH_CSC) -nologo -out:$(WATCH_BUILD_DIR)/watch-64/Xamarin.WatchOS.dll -target:library -debug -unsafe -optimize \
-		-publicsign -keyfile:$(PRODUCT_KEY_PATH) $(WATCH_DEFINES) \
-		-deterministic \
-		$(ARGS_64) \
-		$(WARNINGS_TO_FIX) \
-		@$(RSP_DIR)/watchos-defines.rsp \
-		-refout:$(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll \
-		$(WATCHOS_SOURCES) @$(WATCH_BUILD_DIR)/watch/generated_sources
-
-# MonoTouch.NUnitLite
-$(WATCH_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(WATCH_BUILD_DIR)/reference/MonoTouch.NUnitLite%pdb: $(WATCHOS_TOUCHUNIT_SOURCES) $(PRODUCT_KEY_PATH) $(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll
-	$(call Q_PROF_CSC,watch) $(SYSTEM_CSC) -features:strict -nologo -out:$(basename $@).dll -target:library -debug:portable -optimize -publicsign -noconfig -nostdlib \
-		-keyfile:$(PRODUCT_KEY_PATH) -r:$(WATCH_BUILD_DIR)/reference/Xamarin.WatchOS.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Xml.dll \
-		-r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Core.dll \
-		-nowarn:3006,612,649,414,1635,659 \
-		-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(WATCH_DEFINES) \
-		-define:XAMCORE_2_0,__UNIFIED__ \
-		-deterministic \
-		$(WATCHOS_TOUCHUNIT_SOURCES)
-
-$(PROJECT_DIR)/xamwatch.csproj: xamwatch.tmpl.csproj Makefile $(wildcard $(TOP)/*.sources)
-	@sed -e 's*<!--%FILES%-->*$(foreach file,$(WATCHOS_SOURCES),<Compile Include="$(file)"/>)*' -e 's*<!--%APIS%-->*$(foreach file,$(WATCHOS_APIS),<None Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-$(PROJECT_DIR)/MonoTouch.NUnitLite.watchos.csproj: MonoTouch.NUnitLite.watchos.templ.csproj Makefile touch-unit.sources $(TOP)/Make.config $(TOP)/mk/mono.mk
-	$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(WATCHOS_TOUCHUNIT_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-PROJECT_FILES += $(PROJECT_DIR)/xamwatch.csproj $(PROJECT_DIR)/MonoTouch.NUnitLite.watchos.csproj
-
-clean-watch:
-	$(Q) rm -rf $(WATCH_BUILD_DIR)
-	$(Q) rm -f $(WATCH_TARGETS)
-
-WATCH_TARGETS_DIRS +=                                          \
-	$(WATCH_BUILD_DIR)                                         \
-	$(WATCH_BUILD_DIR)/watch                                   \
-	$(WATCH_BUILD_DIR)/watch-32                                \
-	$(WATCH_BUILD_DIR)/watch-64                                \
-	$(WATCH_BUILD_DIR)/reference                               \
-	$(WATCH_BUILD_DIR)/reference/Facades                       \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/share/doc/Xamarin.WatchOS\
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/watchOS       \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/watchOS       \
-
-WATCH_TARGETS += \
-	$(PROJECT_DIR)/xamwatch.csproj                                                          \
-	$(PROJECT_DIR)/MonoTouch.NUnitLite.watchos.csproj                                       \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/Xamarin.WatchOS.dll          \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/watchOS/Xamarin.WatchOS.dll                \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/watchOS/Xamarin.WatchOS.dll                \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/watchOS/Xamarin.WatchOS.pdb                \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/watchOS/Xamarin.WatchOS.pdb                \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/MonoTouch.NUnitLite.dll      \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/MonoTouch.NUnitLite.pdb
-
-# reference assemblies, this is just for compilation with XS
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.dll: $(WATCH_BUILD_DIR)/reference/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/Facades
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.pdb: $(WATCH_BUILD_DIR)/reference/%.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.config: $(WATCH_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
-	$(Q) install -m 0644 $< $@
-
-# the actual architecture-specific versions
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/watchOS/Xamarin.WatchOS.dll: $(WATCH_BUILD_DIR)/watch-32/Xamarin.WatchOS.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/watchOS
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/watchOS/Xamarin.WatchOS.dll: $(WATCH_BUILD_DIR)/watch-64/Xamarin.WatchOS.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/watchOS
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/watchOS/Xamarin.WatchOS.pdb: $(WATCH_BUILD_DIR)/watch-32/Xamarin.WatchOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/watchOS
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/watchOS/Xamarin.WatchOS.pdb: $(WATCH_BUILD_DIR)/watch-64/Xamarin.WatchOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/watchOS
-	$(Q) install -m 0644 $< $@
-
-$(WATCH_TARGETS_DIRS):
-	$(Q) mkdir -p $@
-
-all-watch: $(WATCH_TARGETS)
-install-watch: $(WATCH_TARGETS)
-
-ifdef INCLUDE_XAMARIN_LEGACY
-ifdef INCLUDE_WATCH
-ALL_TARGETS += all-watch
-INSTALL_TARGETS += install-watch
-endif
-endif
-
 #
-# Xamarin.TVOS
+# tvOS
 #
 
 TVOS_DEFINES = -define:IPHONE -define:MONOTOUCH -d:TVOS -d:XAMCORE_3_0 -d:__TVOS__ -d:SYSTEM_NET_HTTP
-TVOS_GENERATOR=$(BUILD_DIR)/common/bgen.exe
-TVOS_GENERATE=$(SYSTEM_MONO) --debug $(TVOS_GENERATOR)
 
 TVOS_CORE_DEFINES=$(TVOS_DEFINES) -d:COREBUILD
 TVOS_GENERATOR_FLAGS = -d:TVOS -d:XAMCORE_3_0 -inline-selectors
 
 TVOS_DOTNET_EXTRA_CORE_SOURCES = \
-	$(TVOS_BUILD_DIR)/Constants.cs    \
-	$(DOTNET_BUILD_DIR)/Constants.tvos.generated.cs \
-	$(TVOS_BUILD_DIR)/AssemblyInfo.cs \
-
-TVOS_EXTRA_CORE_SOURCES = \
-	$(TVOS_BUILD_DIR)/Constants.cs    \
-	$(BUILD_DIR)/Constants.tvos.generated.cs \
-    $(TVOS_BUILD_DIR)/AssemblyInfo.cs \
-	$(IOS_OPENTK_1_0_CORE_SOURCES)    \
-	$(SHARED_SYSTEM_DRAWING_SOURCES) \
+	$(TVOS_DOTNET_BUILD_DIR)/Constants.cs    \
+	$(TVOS_DOTNET_BUILD_DIR)/Constants.generated.cs \
+	$(TVOS_DOTNET_BUILD_DIR)/AssemblyInfo.cs \
 
 TVOS_DOTNET_CORE_SOURCES += \
 	$(TVOS_DOTNET_EXTRA_CORE_SOURCES) \
 
-TVOS_CORE_SOURCES +=           \
-	$(TVOS_EXTRA_CORE_SOURCES) \
-
 TVOS_DOTNET_HTTP_SOURCES = \
 	Foundation/NSUrlSessionHandler.cs \
 	System.Net.Http/CFContentStream.cs \
@@ -921,30 +261,21 @@ TVOS_DOTNET_SOURCES += \
 	$(TVOS_DOTNET_EXTRA_CORE_SOURCES) \
 	$(TVOS_HTTP_SOURCES)     \
 
-TVOS_SOURCES +=                \
-	$(TVOS_EXTRA_CORE_SOURCES) \
-	$(TVOS_HTTP_SOURCES)     \
-
-$(TVOS_BUILD_DIR)/Constants.cs: $(TOP)/src/Constants.tvos.cs.in Makefile $(TOP)/Make.config.inc | $(TVOS_BUILD_DIR)
+$(TVOS_DOTNET_BUILD_DIR)/Constants.cs: $(TOP)/src/Constants.tvos.cs.in Makefile $(TOP)/Make.config.inc | $(TVOS_DOTNET_BUILD_DIR)
 	$(call Q_PROF_GEN,tvos) sed \
-		-e "s/@VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \
+		-e "s/@VERSION@/$(TVOS_NUGET_VERSION_MAJOR).$(TVOS_NUGET_VERSION_MINOR).$(TVOS_NUGET_VERSION_PATCH)/g" \
 		-e 's/@REVISION@/$(IOS_COMMIT_DISTANCE) ($(CURRENT_BRANCH_SED_ESCAPED): $(shell git log -1 --pretty=%h))/g' \
 		-e "s/@TVOS_SDK_VERSION@/$(TVOS_SDK_VERSION)/g" \
 		$< > $@
 
-$(TVOS_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/Make.config  $(GIT_DIRECTORY)/HEAD | $(TVOS_BUILD_DIR)
+$(TVOS_DOTNET_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/Make.config  $(GIT_DIRECTORY)/HEAD | $(TVOS_DOTNET_BUILD_DIR)
 	$(call Q_PROF_GEN,tvos) sed \
 		-e 's|@PRODUCT_NAME@|Xamarin.TVOS|g' \
 		-e 's|@PACKAGE_HEAD_REV@|$(PACKAGE_HEAD_REV)|g' \
 		-e 's|@PACKAGE_HEAD_BRANCH@|$(CURRENT_BRANCH_SED_ESCAPED)|g' \
-		-e 's|@PACKAGE_VERSION_MAJOR@|$(IOS_PACKAGE_VERSION_MAJOR)|g' \
-		-e 's|@PACKAGE_VERSION_MINOR@|$(IOS_PACKAGE_VERSION_MINOR)|g' \
-		-e 's|@PACKAGE_VERSION_REV@|$(IOS_PACKAGE_VERSION_REV)|g' \
-		-e 's|@PACKAGE_VERSION_BUILD@|$(IOS_PACKAGE_VERSION_BUILD)|g' \
 		-e 's|@NUGET_VERSION_NO_METADATA@|$(TVOS_NUGET_VERSION_NO_METADATA)|g' \
 		-e 's|@NUGET_VERSION_MAJOR@|$(TVOS_NUGET_VERSION_MAJOR)|g' \
 		-e 's|@NUGET_VERSION_MINOR@|$(TVOS_NUGET_VERSION_MINOR)|g' \
-		-e 's|@NUGET_VERSION_THIRD_DIGIT_WORKAROUND@|$(NUGET_VERSION_THIRD_DIGIT_WORKAROUND)|g' \
 		-e 's|@NUGET_VERSION_REV@|$(TVOS_NUGET_VERSION_PATCH)|g' \
 		-e 's|@NUGET_VERSION_BUILD@|$(TVOS_NUGET_COMMIT_DISTANCE)|g' \
 		-e 's|@DOTNET_PLATFORM@|tvOS|g' \
@@ -954,120 +285,20 @@ $(TVOS_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/Make.con
 	$(Q) rm -f $@.tmp
 	$(Q) touch $@
 
-$(TVOS_BUILD_DIR)/tvos/core.dll: $(TVOS_CORE_SOURCES) frameworks.sources Makefile $(RSP_DIR)/tvos-defines.rsp | $(TVOS_BUILD_DIR)/tvos
-	@mkdir -p $(TVOS_BUILD_DIR)/tvos
-	$(call Q_PROF_CSC,tvos) $(TV_CSC) -nologo -out:$@ -target:library -debug -unsafe \
-		$(CORE_WARNINGS_TO_FIX) \
-		@$(RSP_DIR)/tvos-defines.rsp \
-		$(TVOS_CORE_DEFINES)     \
-		$(TVOS_CORE_SOURCES)
-
-# generated_sources
-$(TVOS_BUILD_DIR)/tvos/generated_sources: $(TVOS_GENERATOR) $(TVOS_APIS) $(TVOS_BUILD_DIR)/tvos/core.dll $(TVOS_BUILD_DIR)/Xamarin.TVOS.BindingAttributes.dll $(BUILD_DIR)/tvos.rsp
-	$(call Q_PROF_GEN,tvos) $(TVOS_GENERATE) @$(BUILD_DIR)/tvos.rsp
-
-$(BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.sources
-	$(Q_GEN) echo \
-		-inline-selectors                                        \
-		-process-enums                                           \
-		$(TVOS_GENERATOR_WARNASERROR)                            \
-		-core                                                    \
-		-sourceonly=$(TVOS_BUILD_DIR)/tvos/generated_sources     \
-		-compiler=$(TV_CSC) \
-		-nologo -nostdlib -noconfig                              \
-		-tmpdir=$(TVOS_BUILD_DIR)/tvos                         \
-		-baselib=$(TVOS_BUILD_DIR)/tvos/core.dll               \
-		-attributelib=$(TVOS_BUILD_DIR)/Xamarin.TVOS.BindingAttributes.dll \
-		$(TVOS_GENERATOR_FLAGS)				\
-		-native-exception-marshalling                            \
-		--ns:ObjCRuntime                                         \
-		$(TVOS_APIS)                                            \
-		--target-framework=Xamarin.TVOS,v1.0                     \
-		@$(RSP_DIR)/tvos-defines.rsp                           \
-		> $@
-
-$(TVOS_BUILD_DIR)/tvos-64/Xamarin.TVOS%dll $(TVOS_BUILD_DIR)/tvos-64/Xamarin.TVOS%pdb $(TVOS_BUILD_DIR)/reference/Xamarin.TVOS%dll: $(TVOS_SOURCES) $(TVOS_BUILD_DIR)/tvos/generated_sources $(PRODUCT_KEY_PATH) | $(TVOS_BUILD_DIR)/tvos-64 $(TVOS_BUILD_DIR)/reference
-	$(call Q_PROF_CSC,tvos) $(TV_CSC) -nologo -out:$(TVOS_BUILD_DIR)/tvos-64/Xamarin.TVOS.dll -target:library -debug -unsafe -optimize \
-		-publicsign -keyfile:$(PRODUCT_KEY_PATH) $(TVOS_DEFINES) \
-		-deterministic \
-		$(ARGS_64) \
-		$(WARNINGS_TO_FIX) \
-		@$(RSP_DIR)/tvos-defines.rsp \
-		-refout:$(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll \
-		$(TVOS_SOURCES) @$(TVOS_BUILD_DIR)/tvos/generated_sources
-
-# MonoTouch.NUnitLite
-$(TVOS_BUILD_DIR)/reference/MonoTouch.NUnitLite%dll $(TVOS_BUILD_DIR)/reference/MonoTouch.NUnitLite%pdb: $(TVOS_TOUCHUNIT_SOURCES) $(PRODUCT_KEY_PATH) $(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll $(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll
-	$(call Q_PROF_CSC,tvos) $(SYSTEM_CSC) -features:strict -nologo -r:$(MONOTOUCH_TV_MONO_PATH)/mscorlib.dll -out:$(basename $@).dll -target:library -debug:portable -optimize -noconfig -nostdlib -publicsign \
-		-keyfile:$(PRODUCT_KEY_PATH) -r:$(TVOS_BUILD_DIR)/reference/Xamarin.TVOS.dll -r:$(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Xml.dll \
-		-r:$(MONOTOUCH_TV_MONO_PATH)/System.Core.dll \
-		-nowarn:3006,612,649,414,1635,659 \
-		-define:NUNITLITE,CLR_4_0,NET_4_5,__MOBILE__,MONO $(TVOS_DEFINES) \
-		-define:XAMCORE_2_0,__UNIFIED__ \
-		-deterministic \
-		$(TVOS_TOUCHUNIT_SOURCES)
-
-# MonoTouch.Dialog-1
-$(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll: $(MACIOS_BINARIES_PATH)/MonoTouch.Dialog-Unified/tvos/MonoTouch.Dialog-1.dll | $(TVOS_BUILD_DIR)/reference
-	$(Q) $(CP) $< $@
-
-$(TVOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.pdb: $(MACIOS_BINARIES_PATH)/MonoTouch.Dialog-Unified/tvos/MonoTouch.Dialog-1.pdb | $(TVOS_BUILD_DIR)/reference
-	$(Q) $(CP) $< $@
-
-$(PROJECT_DIR)/xamtvos.csproj: xamtvos.tmpl.csproj Makefile $(wildcard $(TOP)/*.sources)
-	@sed -e 's*<!--%FILES%-->*$(foreach file,$(TVOS_SOURCES),<Compile Include="$(file)"/>)*' -e 's*<!--%APIS%-->*$(foreach file,$(TVOS_APIS),<None Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-$(PROJECT_DIR)/MonoTouch.NUnitLite.tvos.csproj: MonoTouch.NUnitLite.tvos.templ.csproj Makefile touch-unit.sources $(TOP)/Make.config $(TOP)/mk/mono.mk
-	$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(TVOS_TOUCHUNIT_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-PROJECT_FILES += $(PROJECT_DIR)/xamtvos.csproj $(PROJECT_DIR)/MonoTouch.NUnitLite.tvos.csproj
-
-clean-tvos:
-	$(Q) rm -rf $(TVOS_BUILD_DIR)
-	$(Q) rm -f $(TVOS_TARGETS)
-
-TVOS_TARGETS_DIRS +=                                          \
-	$(TVOS_BUILD_DIR)                                         \
-	$(TVOS_BUILD_DIR)/tvos                                    \
-	$(TVOS_BUILD_DIR)/tvos-64                                 \
-	$(TVOS_BUILD_DIR)/reference                               \
-	$(TVOS_BUILD_DIR)/reference/Facades                       \
-	$(TVOS_BUILD_DIR)/NativeTypes                             \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS   \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/Facades \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/share/doc/Xamarin.TVOS  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS         \
-
-TVOS_TARGETS += \
-	$(PROJECT_DIR)/xamtvos.csproj                                                        \
-	$(PROJECT_DIR)/MonoTouch.NUnitLite.tvos.csproj                                       \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/Xamarin.TVOS.dll             \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS/Xamarin.TVOS.dll                   \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS/Xamarin.TVOS.pdb                   \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/OpenTK-1.0.dll               \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/OpenTK-1.0.pdb               \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/OpenTK-1.0.dll.config        \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/MonoTouch.Dialog-1.dll       \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/MonoTouch.Dialog-1.pdb       \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/MonoTouch.NUnitLite.dll      \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/MonoTouch.NUnitLite.pdb
-
 #
-# Xamarin.MacCatalyst
+# Mac Catalyst
 #
 
 # MacCatalyst is a variant of iOS, so it defines the iOS variables as well.
 MACCATALYST_DEFINES = -define:IPHONE -define:IOS -define:MONOTOUCH -d:__IOS__ -d:__MACCATALYST__ -d:SYSTEM_NET_HTTP
-MACCATALYST_GENERATOR=$(BUILD_DIR)/common/bgen.exe
-MACCATALYST_GENERATE=$(SYSTEM_MONO) --debug $(MACCATALYST_GENERATOR)
 
 MACCATALYST_CORE_DEFINES=$(MACCATALYST_DEFINES) -d:COREBUILD
 MACCATALYST_GENERATOR_FLAGS = -d:__MACCATALYST__ -d:IOS -inline-selectors
 
 MACCATALYST_DOTNET_EXTRA_CORE_SOURCES = \
-	$(MACCATALYST_BUILD_DIR)/Constants.cs    \
-	$(DOTNET_BUILD_DIR)/Constants.maccatalyst.generated.cs \
-	$(MACCATALYST_BUILD_DIR)/AssemblyInfo.cs \
+	$(MACCATALYST_DOTNET_BUILD_DIR)/Constants.cs    \
+	$(MACCATALYST_DOTNET_BUILD_DIR)/Constants.generated.cs \
+	$(MACCATALYST_DOTNET_BUILD_DIR)/AssemblyInfo.cs \
 
 MACCATALYST_DOTNET_CORE_SOURCES += \
 	$(MACCATALYST_DOTNET_EXTRA_CORE_SOURCES) \
@@ -1078,40 +309,25 @@ MACCATALYST_DOTNET_HTTP_SOURCES = \
 	System.Net.Http/CFNetworkHandler.cs \
 	$(SHARED_DESIGNER_CS) \
 
-MACCATALYST_HTTP_SOURCES = \
-	Foundation/NSUrlSessionHandler.cs \
-	System.Net.Http/CFContentStream.cs \
-	System.Net.Http/CFNetworkHandler.cs \
-	$(SHARED_DESIGNER_CS) \
-
 MACCATALYST_DOTNET_SOURCES += \
 	$(MACCATALYST_DOTNET_EXTRA_CORE_SOURCES) \
 	$(MACCATALYST_DOTNET_HTTP_SOURCES) \
 
-MACCATALYST_SOURCES +=                \
-	$(MACCATALYST_EXTRA_CORE_SOURCES) \
-	$(MACCATALYST_HTTP_SOURCES)     \
-
-$(MACCATALYST_BUILD_DIR)/Constants.cs: $(TOP)/src/Constants.maccatalyst.cs.in Makefile $(TOP)/Make.config.inc | $(MACCATALYST_BUILD_DIR)
+$(MACCATALYST_DOTNET_BUILD_DIR)/Constants.cs: $(TOP)/src/Constants.maccatalyst.cs.in Makefile $(TOP)/Make.config.inc | $(MACCATALYST_DOTNET_BUILD_DIR)
 	$(call Q_PROF_GEN,maccatalyst) sed \
-		-e "s/@VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \
+		-e "s/@VERSION@/$(MACCATALYST_NUGET_VERSION_MAJOR).$(MACCATALYST_NUGET_VERSION_MINOR).$(MACCATALYST_NUGET_VERSION_PATCH)/g" \
 		-e 's/@REVISION@/$(IOS_COMMIT_DISTANCE) ($(CURRENT_BRANCH_SED_ESCAPED): $(shell git log -1 --pretty=%h))/g' \
 		-e "s/@MACCATALYST_SDK_VERSION@/$(MACCATALYST_SDK_VERSION)/g" \
 		$< > $@
 
-$(MACCATALYST_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/Make.config  $(GIT_DIRECTORY)/HEAD | $(MACCATALYST_BUILD_DIR)
+$(MACCATALYST_DOTNET_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/Make.config  $(GIT_DIRECTORY)/HEAD | $(MACCATALYST_DOTNET_BUILD_DIR)
 	$(call Q_PROF_GEN,maccatalyst) sed \
 		-e 's|@PRODUCT_NAME@|Xamarin.MacCatalyst|g' \
 		-e 's|@PACKAGE_HEAD_REV@|$(PACKAGE_HEAD_REV)|g' \
 		-e 's|@PACKAGE_HEAD_BRANCH@|$(CURRENT_BRANCH_SED_ESCAPED)|g' \
-		-e 's|@PACKAGE_VERSION_MAJOR@|$(IOS_PACKAGE_VERSION_MAJOR)|g' \
-		-e 's|@PACKAGE_VERSION_MINOR@|$(IOS_PACKAGE_VERSION_MINOR)|g' \
-		-e 's|@PACKAGE_VERSION_REV@|$(IOS_PACKAGE_VERSION_REV)|g' \
-		-e 's|@PACKAGE_VERSION_BUILD@|$(IOS_PACKAGE_VERSION_BUILD)|g' \
 		-e 's|@NUGET_VERSION_NO_METADATA@|$(MACCATALYST_NUGET_VERSION_NO_METADATA)|g' \
 		-e 's|@NUGET_VERSION_MAJOR@|$(MACCATALYST_NUGET_VERSION_MAJOR)|g' \
 		-e 's|@NUGET_VERSION_MINOR@|$(MACCATALYST_NUGET_VERSION_MINOR)|g' \
-		-e 's|@NUGET_VERSION_THIRD_DIGIT_WORKAROUND@|$(NUGET_VERSION_THIRD_DIGIT_WORKAROUND)|g' \
 		-e 's|@NUGET_VERSION_REV@|$(MACCATALYST_NUGET_VERSION_PATCH)|g' \
 		-e 's|@NUGET_VERSION_BUILD@|$(MACCATALYST_NUGET_COMMIT_DISTANCE)|g' \
 		-e 's|@DOTNET_PLATFORM@|MacCatalyst|g' \
@@ -1121,49 +337,6 @@ $(MACCATALYST_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/M
 	$(Q) rm -f $@.tmp
 	$(Q) touch $@
 
-$(PROJECT_DIR)/xammaccatalyst.csproj: xammaccatalyst.tmpl.csproj Makefile $(wildcard $(TOP)/*.sources)
-	@sed -e 's*<!--%FILES%-->*$(foreach file,$(MACCATALYST_SOURCES),<Compile Include="$(file)"/>)*' -e 's*<!--%APIS%-->*$(foreach file,$(MACCATALYST_APIS),<None Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-$(PROJECT_DIR)/MonoTouch.NUnitLite.maccatalyst.csproj: MonoTouch.NUnitLite.maccatalyst.templ.csproj Makefile touch-unit.sources $(TOP)/Make.config $(TOP)/mk/mono.mk
-	$(Q) sed -e 's*<!--%FILES%-->*$(foreach file,$(MACCATALYST_TOUCHUNIT_SOURCES),<Compile Include="$(file)"/>)*' $< | xmllint --format - > $@
-
-MACCATALYST_TARGETS_DIRS +=                                                 \
-	$(MACCATALYST_BUILD_DIR)                                                \
-
-# reference assemblies, this is just for compilation with XS
-$(MACCATALYST_TARGETS_DIRS):
-	$(Q) mkdir -p $@
-
-# reference assemblies, this is just for compilation with XS
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.dll: $(TVOS_BUILD_DIR)/reference/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/Facades
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.pdb: $(TVOS_BUILD_DIR)/reference/%.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
-	$(Q) install -m 0644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.config: $(TVOS_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
-	$(Q) install -m 0644 $< $@
-
-# the actual architecture-specific versions
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS/Xamarin.TVOS.dll: $(TVOS_BUILD_DIR)/tvos-64/Xamarin.TVOS.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS
-	$(Q) install -m 0755 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS/Xamarin.TVOS.pdb: $(TVOS_BUILD_DIR)/tvos-64/Xamarin.TVOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS
-	$(Q) install -m 0644 $< $@
-
-$(TVOS_TARGETS_DIRS):
-	$(Q) mkdir -p $@
-
-all-tvos: $(TVOS_TARGETS)
-install-tvos: $(TVOS_TARGETS)
-
-ifdef INCLUDE_XAMARIN_LEGACY
-ifdef INCLUDE_TVOS
-ALL_TARGETS += all-tvos
-INSTALL_TARGETS += install-tvos
-endif
-endif
-
 ### .NET ###
 
 define BuildDotNetIntermediateAssembly
@@ -1345,9 +518,6 @@ SHARED_PATH := ../runtime
 $(SHARED_PATH)/Delegates.generated.cs: $(SHARED_PATH)/Delegates.cs.t4 $(SHARED_PATH)/delegates.t4
 	$(Q) $(MAKE) -C $(SHARED_PATH) Delegates.generated.cs
 
-$(BUILD_DIR)/common/NativeTypes/%.cs: $(TOP)/src/NativeTypes/%.tt | $(BUILD_DIR)/common/NativeTypes
-	$(Q_GEN) $(TT) $(abspath $<) -o $(abspath $@) 1>/dev/null
-
 $(COMMON_TARGET_DIRS):
 	$(Q) mkdir -p $@
 
@@ -1356,24 +526,14 @@ $(DOTNET_COMPILER): Makefile $(TOP)/Make.config | $(DOTNET_BUILD_DIR)
 	$(Q) echo "exec $(DOTNET_CSC) $(DOTNET_FLAGS) \"\$$@\"" >> $@
 	$(Q) chmod +x $@
 
-GENERATE_FRAMEWORKS_CONSTANTS=generate-frameworks-constants/legacy/bin/Debug/generate-frameworks-constants.exe
 DOTNET_GENERATE_FRAMEWORKS_CONSTANTS=generate-frameworks-constants/dotnet/bin/Debug/$(DOTNET_TFM)/generate-frameworks-constants.dll
 
-$(GENERATE_FRAMEWORKS_CONSTANTS): $(wildcard generate-frameworks-constants/*.cs*) $(TOP)/tools/common/Frameworks.cs Makefile
-	$(Q) $(SYSTEM_MSBUILD) "/bl:$@.binlog" /r generate-frameworks-constants/legacy/generate-frameworks-constants.csproj $(MSBUILD_VERBOSITY)
-	$(Q) touch $@ # Running MSBuild doesn't always touch the target, so make sure we do here, otherwise make can end up confused.
-
 $(DOTNET_GENERATE_FRAMEWORKS_CONSTANTS): $(wildcard generate-frameworks-constants/*.cs*) $(TOP)/tools/common/Frameworks.cs Makefile
 	$(Q) $(DOTNET) build "/bl:$@.binlog" /r generate-frameworks-constants/dotnet/generate-frameworks-constants.csproj $(MSBUILD_VERBOSITY)
 	$(Q) touch $@ # Running 'dotnet build' doesn't always touch the target, so make sure we do here, otherwise make can end up confused.
 
 # This rule means: generate a Constants.<platform>.generated.cs for the frameworks in the variable <PLATFORM>_FRAMEWORKS
-$(BUILD_DIR)/Constants.%.generated.cs: Makefile $(GENERATE_FRAMEWORKS_CONSTANTS) | $(BUILD_DIR)
-	$(Q) mono --debug $(GENERATE_FRAMEWORKS_CONSTANTS) "$*" "$@.tmp"
-	$(Q) mv "$@.tmp" "$@"
-
-# This rule means: generate a Constants.<platform>.generated.cs for the frameworks in the variable <PLATFORM>_FRAMEWORKS
-$(DOTNET_BUILD_DIR)/Constants.%.generated.cs: Makefile $(DOTNET_GENERATE_FRAMEWORKS_CONSTANTS) | $(DOTNET_BUILD_DIR)
+$(DOTNET_BUILD_DIR)/%/Constants.generated.cs: Makefile $(DOTNET_GENERATE_FRAMEWORKS_CONSTANTS) | $(DOTNET_BUILD_DIR)
 	$(Q) $(DOTNET) $(DOTNET_GENERATE_FRAMEWORKS_CONSTANTS) "$*" "$@.tmp"
 	$(Q) mv "$@.tmp" "$@"
 
@@ -1383,7 +543,6 @@ all-local:: $(ALL_TARGETS)
 $(DOTNET_TARGETS_DIRS):
 	$(Q) mkdir -p $@
 
-ifdef ENABLE_DOTNET
 define DotNetProjectFiles
 $(DOTNET_BUILD_DIR)/projects/$(1)/$(1).csproj: dotnet.tmpl.csproj Makefile $$(wildcard $(CURDIR)/*.sources)
 	@mkdir -p $$(dir $$@)
@@ -1396,12 +555,9 @@ $(DOTNET_BUILD_DIR)/projects/$(1)/$(1).csproj: dotnet.tmpl.csproj Makefile $$(wi
 PROJECT_FILES += $(DOTNET_BUILD_DIR)/projects/$(1)/$(1).csproj
 endef
 $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call DotNetProjectFiles,$(platform),$(shell echo $(platform) | tr '[:lower:]' '[:upper:]'))))
-endif
 
 dotnet: $(DOTNET_TARGETS)
-ifdef ENABLE_DOTNET
 all-local:: $(DOTNET_TARGETS)
-endif
 
 project-files: $(PROJECT_FILES)
 
diff --git a/src/Makefile.generator b/src/Makefile.generator
index 7a7eb098880a..a88c56ec1d50 100644
--- a/src/Makefile.generator
+++ b/src/Makefile.generator
@@ -2,41 +2,21 @@
 # Generator
 #
 
-# copy generator.csproj to the build dir so that we can use our shared .csproj.inc target from rules.mk to create generator.csproj.inc
-# we need any generated files in this directory to go into the build directory, and the shared target will output the csproj.inc into the same directory as the csproj
-$(BUILD_DIR)/generator.csproj: generator.csproj | $(BUILD_DIR)
-	$(Q) $(CP) $< $@
-
-# generator.csproj.inc contains the generator_dependencies variable used to determine if the generator needs to be rebuilt or not.
-$(BUILD_DIR)/generator.csproj.inc: export BUILD_VERBOSITY=$(MSBUILD_VERBOSITY)
--include $(BUILD_DIR)/generator.csproj.inc
+bgen.csproj.inc: export BUILD_EXECUTABLE=$(DOTNET) build
+bgen.csproj.inc: export BUILD_VERBOSITY=$(MSBUILD_VERBOSITY)
 
-$(BUILD_DIR)/common/bgen.exe: $(generator_dependencies) Makefile.generator $(BUILD_DIR)/generator-frameworks.g.cs
-	$(Q_GEN) $(SYSTEM_MSBUILD) "/bl:$@.binlog" $(XBUILD_VERBOSITY) /p:Configuration=Debug generator.csproj /p:IntermediateOutputPath=$(BUILD_DIR)/IDE/obj/common/ /p:OutputPath=$(BUILD_DIR)/common /restore
-
-# copy generator.csproj to the build dir so that we can use our shared .csproj.inc target from rules.mk to create generator.csproj.inc
-# we need any generated files in this directory to go into the build directory, and the shared target will output the csproj.inc into the same directory as the csproj
-$(DOTNET_BUILD_DIR)/bgen.csproj: $(BUILD_DIR)/generator.csproj | $(BUILD_DIR)
+# bgen.csproj.inc contains the generator_dependencies variable used to determine if the generator needs to be rebuilt or not.
+$(DOTNET_BUILD_DIR)/bgen.csproj.inc: bgen/bgen.csproj.inc
 	$(Q) $(CP) $< $@
 
-# bgen.csproj.inc contains the generator_dependencies variable used to determine if the generator needs to be rebuilt or not.
-$(DOTNET_BUILD_DIR)/bgen.csproj.inc: export BUILD_VERBOSITY=$(MSBUILD_VERBOSITY)
 -include $(DOTNET_BUILD_DIR)/bgen.csproj.inc
 
-$(DOTNET_BUILD_DIR)/bgen/bgen:  $(bgen_dependencies) Makefile.generator $(BUILD_DIR)/generator-frameworks.g.cs | $(DOTNET_BUILD_DIR)/bgen
+$(DOTNET_BUILD_DIR)/bgen/bgen:  $(bgen_dependencies) Makefile.generator $(DOTNET_BUILD_DIR)/generator-frameworks.g.cs | $(DOTNET_BUILD_DIR)/bgen
 	$(Q_DOTNET_BUILD) $(DOTNET) publish bgen/bgen.csproj $(DOTNET_BUILD_VERBOSITY) /p:Configuration=Debug /p:IntermediateOutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/obj/common/bgen)/ /p:OutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/bin/common/bgen/)/
 	$(Q) $(CP) $(DOTNET_BUILD_DIR)/IDE/bin/common/bgen/publish/* $(dir $@)
 	$(Q) printf 'exec $(DOTNET) "$$(dirname "$$0")"/bgen.dll $$@\n' > $@
 	$(Q) chmod +x $@
 
-# Serialize the building of the legacy bgen and the .NET version, because they can both try to restore the same NuGet package at the same time, and that runs into race conditions
-# This is done by adding a dependency from the legacy bgen to the .NET bgen, so the legacy bgen doesn't start building until the .NET one is done.
-ifdef INCLUDE_XAMARIN_LEGACY
-ifdef ENABLE_DOTNET
-$(BUILD_DIR)/common/bgen.exe: $(DOTNET_BUILD_DIR)/bgen/bgen
-endif
-endif
-
 define BGenTargets
 $(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/tools/lib/bgen/bgen: $(DOTNET_BUILD_DIR)/bgen/bgen | $(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/tools/lib/bgen
 	$$(Q) rm -Rf "$$(dir $$@)"
@@ -72,7 +52,7 @@ DOTNET_TARGETS_DIRS += \
 # Common
 #
 
-$(BUILD_DIR)/generator-frameworks.g.cs: frameworks.sources Makefile.generator generate-frameworks.csharp
+$(DOTNET_BUILD_DIR)/generator-frameworks.g.cs: frameworks.sources Makefile.generator generate-frameworks.csharp
 	@mkdir -p $(dir $@)
 	$(Q) ./generate-frameworks.csharp $@.tmp '$(IOS_FRAMEWORKS)' '$(MACOS_FRAMEWORKS)' '$(WATCHOS_FRAMEWORKS)' '$(TVOS_FRAMEWORKS)' '$(MACCATALYST_FRAMEWORKS)'
 	$(Q) if ! diff $@ $@.tmp >/dev/null; then $(CP) $@.tmp $@; git diff "$@"; echo "The file $@ has been automatically re-generated; please commit the changes."; exit 1; fi
@@ -93,169 +73,3 @@ $(RSP_DIR)/dotnet/%-defines-dotnet.rsp: frameworks.sources Makefile.generator ge
 $(DOTNET_BUILD_DIR)/Xamarin.Apple.BindingAttributes.dll: bgen/Attributes.cs Makefile.generator | $(DOTNET_BUILD_DIR)
 	$(Q_DOTNET_BUILD) $(SYSTEM_CSC) $(DOTNET_FLAGS) -out:$@ $<
 
-#
-# Xamarin.iOS (btouch)
-#
-
-IOS_TARGETS_DIRS +=                              \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/btouch \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen   \
-
-IOS_TARGETS +=                                                          \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.iOS.BindingAttributes.dll \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/bgen.exe                 \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/bgen                          \
-
-IOS_TARGETS += \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/btouch                        \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/btouch-native                 \
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/bgen: bgen/bgen | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin
-	$(Q) $(CP) $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/btouch: Makefile.generator | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin
-	$(Q_GEN) printf "#!/bin/sh -e\n\necho \"error BI0088: btouch: MonoTouch binding projects are not supported anymore. Please upgrade the binding project to a Xamarin.iOS (Unified) binding project.\"\nexit 1\n" > $@
-	$(Q) chmod +x $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/btouch-native: btouch-native | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin
-	$(Q) $(CP) $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/%.dll: $(IOS_BUILD_DIR)/native/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen
-	$(Q) install -m 0755 $< $@
-	$(Q) install -m 0644 $(<:.dll=.pdb) $(@:.dll=.pdb)
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/bgen.exe: $(BUILD_DIR)/common/bgen.exe | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen
-	$(Q) install -m 0755 $< $@
-	$(Q) install -m 0644 $< $(@:.exe=.pdb)
-	$(Q) install -m 0755 "$(dir $<)"/*.dll "$(dir $@)"
-
-$(IOS_BUILD_DIR)/native/Xamarin.iOS.BindingAttributes.dll: bgen/Attributes.cs Makefile.generator
-	$(Q) mkdir -p $(dir $@)
-	$(Q_GEN) $(IOS_CSC) -features:strict -nologo -out:$@ -debug bgen/Attributes.cs -target:library -deterministic
-
-#
-# Xamarin.Watch (bwatch)
-#
-
-WATCH_TARGETS_DIRS +=                            \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bwatch \
-
-WATCH_TARGETS +=                                                        \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.WatchOS.BindingAttributes.dll \
-
-WATCH_TARGETS +=                                                        \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/bwatch                        \
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/bwatch: bwatch | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin
-	$(Q) $(CP) $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/%.dll: $(WATCH_BUILD_DIR)/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen
-	$(Q) install -m 0755 $< $@
-	$(Q) install -m 0644 $(<:.dll=.pdb) $(@:.dll=.pdb)
-
-$(WATCH_BUILD_DIR)/Xamarin.WatchOS.BindingAttributes.dll: bgen/Attributes.cs Makefile.generator
-	$(Q) mkdir -p $(dir $@)
-	$(Q_GEN) $(WATCH_CSC) -features:strict -nologo -debug -out:$@ -debug bgen/Attributes.cs -target:library -deterministic
-
-# #
-# # Xamarin.TVOS (btv)
-# #
-
-TVOS_TARGETS_DIRS +=                          \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/btv \
-
-TVOS_TARGETS +=                                                  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.TVOS.BindingAttributes.dll \
-
-TVOS_TARGETS +=                                                  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/btv                    \
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/btv: btv | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin
-	$(Q) $(CP) $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/%.dll: $(TVOS_BUILD_DIR)/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen
-	$(Q) install -m 0755 $< $@
-	$(Q) install -m 0644 $(<:.dll=.pdb) $(@:.dll=.pdb)
-
-$(TVOS_BUILD_DIR)/Xamarin.TVOS.BindingAttributes.dll: bgen/Attributes.cs Makefile.generator
-	$(Q) mkdir -p $(dir $@)
-	$(Q_GEN) $(TV_CSC) -features:strict -nologo -debug -out:$@ -debug bgen/Attributes.cs -target:library -deterministic
-
-#
-# Xamarin.MacCatalyst
-#
-
-MACCATALYST_TARGETS +=                                                  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.MacCatalyst.BindingAttributes.dll \
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/%.dll: $(MACCATALYST_BUILD_DIR)/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen
-	$(Q) install -m 0755 $< $@
-	$(Q) install -m 0644 $(<:.dll=.pdb) $(@:.dll=.pdb)
-
-$(MACCATALYST_BUILD_DIR)/Xamarin.MacCatalyst.BindingAttributes.dll: bgen/Attributes.cs Makefile.generator
-	$(Q) mkdir -p $(dir $@)
-	$(Q_GEN) $(MACCATALYST_CSC) -features:strict -nologo -debug -out:$@ -debug bgen/Attributes.cs -target:library -deterministic
-
-#
-# Xamarin.Mac (bmac)
-#
-
-MACOS_TARGETS_DIRS +=                                     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bmac \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen \
-
-MACOS_TARGETS += \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin/bgen                     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin/bgen-classic             \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/bgen.exe            \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/Xamarin.Mac-full.BindingAttributes.dll     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/Xamarin.Mac-mobile.BindingAttributes.dll     \
-
-MACOS_TARGETS += \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin/bmac                     \
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin/bgen: bgen/bgen | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin
-	$(Q) $(CP) $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin/bgen-classic: Makefile.generator | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin
-	$(Q_GEN) printf "#!/bin/sh -e\n\necho \"error BI0087: bgen-classic: Xamarin.Mac Classic binding projects are not supported anymore. Please upgrade the binding project to a Xamarin.Mac Unified binding project.\"\nexit 1\n" > $@
-	$(Q) chmod +x $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin/bmac: bmac.ikvm | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin
-	$(Q) install -m 0755 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/%.dll: $(MACOS_BUILD_DIR)/%.dll | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen
-	$(Q) install -m 0755 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/%.pdb: $(MACOS_BUILD_DIR)/%.pdb | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen
-	$(Q) install -m 0644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/%.mdb: $(MACOS_BUILD_DIR)/%.mdb | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen
-	$(Q) install -m 0644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/%.exe: $(BUILD_DIR)/common/bgen.exe | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen
-	$(Q) install -m 0755 $< $@
-	$(Q) install -m 0644 $< $(@:.exe=.pdb)
-	$(Q) install -m 0755 "$(dir $<)"/*.dll "$(dir $@)"
-
-define MAC_BINDINGATTRIBUTES_template
-$$(MACOS_BUILD_DIR)/Xamarin.Mac-$(1).BindingAttributes.dll: bgen/Attributes.cs Makefile.generator
-	$$(Q) mkdir -p $$(dir $$@)
-	$$(Q_GEN) $$(MAC_$(1)_CSC) -features:strict -nologo -debug -out:$$@ -debug bgen/Attributes.cs -target:library -deterministic
-endef
-
-$(eval $(call MAC_BINDINGATTRIBUTES_template,full))
-$(eval $(call MAC_BINDINGATTRIBUTES_template,mobile))
-
-install-bgen:	\
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/bin/bgen                     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/bgen.exe            \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/Xamarin.Mac-full.BindingAttributes.dll     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/bgen/Xamarin.Mac-mobile.BindingAttributes.dll     \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.iOS.BindingAttributes.dll \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.TVOS.BindingAttributes.dll \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.WatchOS.BindingAttributes.dll \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/Xamarin.MacCatalyst.BindingAttributes.dll \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/bgen/bgen.exe                 \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/bin/bgen                          \
-
diff --git a/src/MetalPerformanceShaders/MPSDefs.cs b/src/MetalPerformanceShaders/MPSDefs.cs
index 913747b86cbc..13b39da667a5 100644
--- a/src/MetalPerformanceShaders/MPSDefs.cs
+++ b/src/MetalPerformanceShaders/MPSDefs.cs
@@ -130,11 +130,7 @@ public struct MPSImageRegion {
 	public struct MPSImageHistogramInfo {
 		[FieldOffset (0)]
 		public nuint NumberOfHistogramEntries;
-#if ARCH_64
 		[FieldOffset (8)]
-#else
-		[FieldOffset (4)]
-#endif
 		public bool HistogramForAlpha;
 		[FieldOffset (16)]
 		public Vector4 MinPixelValue;
diff --git a/src/MonoTouch.NUnitLite.maccatalyst.templ.csproj b/src/MonoTouch.NUnitLite.maccatalyst.templ.csproj
deleted file mode 100644
index 955ca3dff852..000000000000
--- a/src/MonoTouch.NUnitLite.maccatalyst.templ.csproj
+++ /dev/null
@@ -1,46 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>MonoTouch.NUnitLite</AssemblyName>
-    <UseMSBuildEngine>True</UseMSBuildEngine>
-    <DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;XAMCORE_2_0;MONOTOUCH;MONO</DefineConstants>
-    <OutputPath>build\maccatalyst\reference</OutputPath>
-    <IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode'  ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.MacCatalyst" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <!--%FILES%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
diff --git a/src/MonoTouch.NUnitLite.templ.csproj b/src/MonoTouch.NUnitLite.templ.csproj
deleted file mode 100644
index 61eefd2debf1..000000000000
--- a/src/MonoTouch.NUnitLite.templ.csproj
+++ /dev/null
@@ -1,47 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>MonoTouch.NUnitLite</AssemblyName>
-    <UseMSBuildEngine>True</UseMSBuildEngine>
-    <DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;XAMCORE_2_0;MONOTOUCH;MONO</DefineConstants>
-    <OutputPath>build\ios\reference</OutputPath>
-    <IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode'  ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.iOS" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="MonoTouch.Dialog-1" />
-  </ItemGroup>
-  <ItemGroup>
-    <!--%FILES%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
diff --git a/src/MonoTouch.NUnitLite.tvos.templ.csproj b/src/MonoTouch.NUnitLite.tvos.templ.csproj
deleted file mode 100644
index 2ab13b9dc27f..000000000000
--- a/src/MonoTouch.NUnitLite.tvos.templ.csproj
+++ /dev/null
@@ -1,47 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{072C1DD1-7566-4387-B9EC-466891558ACC}</ProjectGuid>
-    <ProjectTypeGuids>{06FA79CB-D6CD-4721-BB4B-1BD202089C55};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>MonoTouch.NUnitLite</AssemblyName>
-    <UseMSBuildEngine>True</UseMSBuildEngine>
-    <DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;XAMCORE_2_0;XAMCORE_3_0;MONOTOUCH;MONO</DefineConstants>
-    <OutputPath>build\tvos\reference</OutputPath>
-    <IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode'  ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.TVOS" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="MonoTouch.Dialog-1" />
-  </ItemGroup>
-  <ItemGroup>
-    <!--%FILES%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
-</Project>
diff --git a/src/MonoTouch.NUnitLite.watchos.templ.csproj b/src/MonoTouch.NUnitLite.watchos.templ.csproj
deleted file mode 100644
index a38f936b4fee..000000000000
--- a/src/MonoTouch.NUnitLite.watchos.templ.csproj
+++ /dev/null
@@ -1,46 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B84C539D-971D-4703-8ABC-E1077FDA651C}</ProjectGuid>
-    <ProjectTypeGuids>{FC940695-DFE0-4552-9F25-99AF4A5619A1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>MonoTouch.NUnitLite</AssemblyName>
-    <UseMSBuildEngine>True</UseMSBuildEngine>
-    <DefineConstants>NUNITLITE;CLR_4_0;NET_4_5;XAMCORE_2_0;XAMCORE_3_0;MONOTOUCH;MONO</DefineConstants>
-    <OutputPath>build\watch\reference</OutputPath>
-    <IntermediateOutputPath>$(OutputPath)</IntermediateOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'Release32' Or '$(Configuration)' == 'Release64' Or '$(Configuration)' == 'Release-bitcode'  ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.WatchOS" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <!--%FILES%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.CSharp.targets" />
-</Project>
diff --git a/src/NativeTypes/Makefile b/src/NativeTypes/Makefile
deleted file mode 100644
index 154598184c4b..000000000000
--- a/src/NativeTypes/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: all test clean
-
-all: test.exe
-
-test.exe: ../build/common/NativeTypes/Primitives.cs ../build/common/NativeTypes/Drawing.cs test.cs
-	mcs -unsafe -debug -out:$@ $+ -r:System.Drawing
-
-test: test.exe
-	mono --debug $<
-
-clean:
-	rm -f test.exe{,.mdb}
diff --git a/src/NativeTypes/Primitives.tt b/src/NativeTypes/Primitives.tt
deleted file mode 100644
index e78013356d2f..000000000000
--- a/src/NativeTypes/Primitives.tt
+++ /dev/null
@@ -1,455 +0,0 @@
-// !!! WARNING - GENERATED CODE - DO NOT EDIT !!!
-//
-// Generated by Primitives.tt, a T4 template.
-//
-// Primitives.cs: basic types with 32 or 64 bit sizes:
-//
-//   - nint
-//   - nuint
-//   - nfloat
-//
-// The primitive n* types are optimized by the Mono JIT to perform
-// at native int/long/float/double speeds. When NINT_JIT_OPTIMIZED
-// is defined, all operators will throw NotImplementedException to
-// ensure the JIT works as expected. Otherwise operations are
-// carried out slowly using managed code.
-//
-// If ARCH_32 is defined, the underlying types for n* types will be
-// 32 bit (int, uint, float). If not defined, the underlying types
-// will be 64 bit (long, ulong, double).
-//
-// Authors:
-//   Aaron Bockover <abock@xamarin.com>
-//
-// Copyright 2013 Xamarin, Inc. All rights reserved.
-//
-
-#if NET
-#define OBJCRUNTIME_nfloat
-#endif
-
-<#@ template language="C#v3.5" #>
-<#@ import namespace="System" #>
-<#@ import namespace="System.Collections.Generic" #>
-
-#if !NET
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime.InteropServices;
-
-using ObjCRuntime;
-
-<#
-	foreach (var type in new [] {
-		new { NSName = "nint", CilName32 = "Int32", CilName64 = "Int64", IsIntegerType = true },
-		new { NSName = "nuint", CilName32 = "UInt32", CilName64 = "UInt64", IsIntegerType = true },
-		new { NSName = "nfloat", CilName32 = "Single", CilName64 = "Double", IsIntegerType = false }
-	}) {
-		var unops = new List<string> { "+" };
-		if (type.NSName != "nuint") {
-			unops.Add ("-");
-		}
-
-		if (type.IsIntegerType) {
-			unops.Add ("~");
-		}
-
-		var binops = new List<string> { "+", "-", "*", "/", "%" };
-		if (type.IsIntegerType) {
-			binops.Add ("&");
-			binops.Add ("|");
-			binops.Add ("^");
-		}
-#>
-#if OBJCRUNTIME_<#= type.NSName #>
-namespace ObjCRuntime
-#else
-namespace System
-#endif
-{
-#if !SKIP_<#= type.NSName #>
-	[Serializable]
-	[DebuggerDisplay ("{v,nq}")]
-	public unsafe struct <#= type.NSName #> : IFormattable, IConvertible, IComparable, IComparable<<#= type.NSName #>>, IEquatable <<#= type.NSName #>>
-	{
-		internal <#= type.NSName #> (<#= type.NSName #> v) { this.v = v.v; }
-		public <#= type.NSName #> (<#= type.CilName32 #> v) { this.v = v; }
-
-#if ARCH_32
-		public static readonly int Size = 4;
-
-		public static readonly <#= type.NSName #> MaxValue = <#= type.CilName32 #>.MaxValue;
-		public static readonly <#= type.NSName #> MinValue = <#= type.CilName32 #>.MinValue;
-<# if (type.NSName == "nfloat") { #>
-		public static readonly nfloat Epsilon = (nfloat)<#= type.CilName32 #>.Epsilon;
-		public static readonly nfloat NaN = (nfloat)<#= type.CilName32 #>.NaN;
-		public static readonly nfloat NegativeInfinity = (nfloat)<#= type.CilName32 #>.NegativeInfinity;
-		public static readonly nfloat PositiveInfinity = (nfloat)<#= type.CilName32 #>.PositiveInfinity;
-<# } #>
-
-		[DebuggerBrowsable (DebuggerBrowsableState.Never)]
-		internal <#= type.CilName32 #> v;
-
-		public <#= type.NSName #> (<#= type.CilName64 #> v) { this.v = (<#= type.CilName32 #>)v; }
-#else
-		public static readonly int Size = 8;
-
-		public static readonly <#= type.NSName #> MaxValue = (<#= type.NSName #>) <#= type.CilName64 #>.MaxValue; // 64-bit only codepath
-		public static readonly <#= type.NSName #> MinValue = (<#= type.NSName #>) <#= type.CilName64 #>.MinValue; // 64-bit only codepath
-<# if (type.NSName == "nfloat") { #>
-		public static readonly nfloat Epsilon = (nfloat)<#= type.CilName64 #>.Epsilon;
-		public static readonly nfloat NaN = (nfloat)<#= type.CilName64 #>.NaN;
-		public static readonly nfloat NegativeInfinity = (nfloat)<#= type.CilName64 #>.NegativeInfinity;
-		public static readonly nfloat PositiveInfinity = (nfloat)<#= type.CilName64 #>.PositiveInfinity;
-<# } #>
-
-		[DebuggerBrowsable (DebuggerBrowsableState.Never)]
-		internal <#= type.CilName64 #> v;
-
-		public <#= type.NSName #> (<#= type.CilName64 #> v) { this.v = v; }
-#endif
-
-<#
-	Action<string, string, string> Conversion = (conversionKind, fromType, toType) => {
-		// Console.Error.WriteLine ("{0}\t{1}\t{2}", conversionKind, fromType, toType);
-
-		WriteLine ("\t\tpublic static {0} operator {1} ({2} v)\n\t\t{{", conversionKind, toType, fromType);
-
-		Func<int, string> Cast = arch => {
-			switch (toType) {
-			case "nint":
-				return arch == 32 ? "int" : "long";
-			case "nuint":
-				return arch == 32 ? "uint" : "ulong";
-			case "nfloat":
-				return arch == 32 ? "float" : "double";
-			default:
-				return toType;
-			}
-		};
-
-		WriteLine ("#if NINT_JIT_OPTIMIZED");
-		WriteLine ("\t\t\tthrow new NotImplementedException ();");
-		WriteLine ("#elif ARCH_32");
-
-		foreach (var arch in new [] { 32, 64 }) {
-			Write ("\t\t\treturn ");
-
-			var closeParen = false;
-			switch (toType) {
-			case "nint":
-			case "nuint":
-			case "nfloat":
-				closeParen = true;
-				Write ("new {0} (", toType);
-				break;
-			}
-
-			if (fromType == "IntPtr" || fromType == "UIntPtr") {
-				Write ("*(({0} *)&v)", Cast (arch));
-			} else if (toType == "IntPtr" || toType == "UIntPtr") {
-				Write ("*(({0} *)&v.v)", toType);
-			} else {
-				Write ("({0})", Cast (arch));
-
-				switch (fromType) {
-				case "nint":
-				case "nuint":
-				case "nfloat":
-					Write ("v.v");
-					break;
-				default:
-					Write ("v");
-					break;
-				}
-			}
-
-			if (closeParen)
-				Write (")");
-
-			WriteLine (";");
-
-			if (arch == 32)
-				WriteLine ("#else");
-		}
-
-		WriteLine ("#endif");
-		WriteLine ("\t\t}\n");
-	};
-
-	Action<string, string> Exp = (from, to) => Conversion ("explicit", from, to);
-	Action<string, string> Imp = (from, to) => Conversion ("implicit", from, to);
-
-	switch (type.NSName) {
-	case "nint":
-		Exp ("nuint", "nint");
-		Exp ("nint", "nuint");
-		Exp ("nfloat", "nint");
-		Imp ("nint", "nfloat");
-		Exp ("IntPtr", "nint");
-		Exp ("nint", "IntPtr");
-		Imp ("sbyte", "nint");
-		Exp ("nint", "sbyte");
-		Imp ("byte", "nint");
-		Exp ("nint", "byte");
-		Imp ("char", "nint");
-		Exp ("nint", "char");
-		Imp ("short", "nint");
-		Exp ("nint", "short");
-		Exp ("ushort", "nint");
-		Exp ("nint", "ushort");
-		Imp ("int", "nint");
-		Exp ("nint", "int");
-		Exp ("uint", "nint");
-		Exp ("nint", "uint");
-		Exp ("long", "nint");
-		Imp ("nint", "long");
-		Exp ("ulong", "nint");
-		Exp ("nint", "ulong");
-		Exp ("float", "nint");
-		Imp ("nint", "float");
-		Exp ("double", "nint");
-		Imp ("nint", "double");
-		Exp ("decimal", "nint");
-		Imp ("nint", "decimal");
-		break;
-	case "nuint":
-		Exp ("nfloat", "nuint");
-		Imp ("nuint", "nfloat");
-		Exp ("IntPtr", "nuint");
-		Exp ("nuint", "IntPtr");
-		Exp ("UIntPtr", "nuint");
-		Exp ("nuint", "UIntPtr");
-		Exp ("sbyte", "nuint");
-		Exp ("nuint", "sbyte");
-		Imp ("byte", "nuint");
-		Exp ("nuint", "byte");
-		Imp ("char", "nuint");
-		Exp ("nuint", "char");
-		Exp ("short", "nuint");
-		Exp ("nuint", "short");
-		Imp ("ushort", "nuint");
-		Exp ("nuint", "ushort");
-		Exp ("int", "nuint");
-		Exp ("nuint", "int");
-		Imp ("uint", "nuint");
-		Exp ("nuint", "uint");
-		Exp ("long", "nuint");
-		Exp ("nuint", "long");
-		Exp ("ulong", "nuint");
-		Imp ("nuint", "ulong");
-		Exp ("float", "nuint");
-		Imp ("nuint", "float");
-		Exp ("double", "nuint");
-		Imp ("nuint", "double");
-		Exp ("decimal", "nuint");
-		Imp ("nuint", "decimal");
-		break;
-	case "nfloat":
-		Exp ("IntPtr", "nfloat");
-		Exp ("nfloat", "IntPtr");
-		Imp ("sbyte", "nfloat");
-		Exp ("nfloat", "sbyte");
-		Imp ("byte", "nfloat");
-		Exp ("nfloat", "byte");
-		Imp ("char", "nfloat");
-		Exp ("nfloat", "char");
-		Imp ("short", "nfloat");
-		Exp ("nfloat", "short");
-		Imp ("ushort", "nfloat");
-		Exp ("nfloat", "ushort");
-		Imp ("int", "nfloat");
-		Exp ("nfloat", "int");
-		Imp ("uint", "nfloat");
-		Exp ("nfloat", "uint");
-		Imp ("long", "nfloat");
-		Exp ("nfloat", "long");
-		Imp ("ulong", "nfloat");
-		Exp ("nfloat", "ulong");
-		Imp ("float", "nfloat");
-		Exp ("nfloat", "float");
-		Exp ("double", "nfloat");
-		Imp ("nfloat", "double");
-		Exp ("decimal", "nfloat");
-		Exp ("nfloat", "decimal");
-		break;
-	}
-#>
-#if NINT_JIT_OPTIMIZED
-<# foreach (var op in unops) { #>
-		public static <#= type.NSName #> operator <#= op #> (<#= type.NSName #> v) { throw new NotImplementedException (); }
-<# } #>
-#else
-<# foreach (var op in unops) { #>
-		public static <#= type.NSName #> operator <#= op #> (<#= type.NSName #> v) { return new <#= type.NSName #> (<#= op #>v.v); }
-<# } #>
-#endif
-
-#if NINT_JIT_OPTIMIZED
-<# foreach (var op in new [] { '+', '-' }) { #>
-		public static <#= type.NSName #> operator <#= op #><#= op #> (<#= type.NSName #> v) { throw new NotImplementedException (); }
-<# } #>
-#else
-<# foreach (var op in new [] { '+', '-' }) { #>
-		public static <#= type.NSName #> operator <#= op #><#= op #> (<#= type.NSName #> v) { return new <#= type.NSName #> (v.v <#= op #> 1); }
-<# } #>
-#endif
-
-#if NINT_JIT_OPTIMIZED
-<# foreach (var op in binops) { #>
-		public static <#= type.NSName #> operator <#= op #> (<#= type.NSName #> l, <#= type.NSName #> r) { throw new NotImplementedException (); }
-<# } #>
-<# if (type.IsIntegerType) { #>
-
-<# foreach (var op in new [] { "<<", ">>" }) { #>
-		public static <#= type.NSName #> operator <#= op #> (<#= type.NSName #> l, int r) { throw new NotImplementedException (); }
-<# } } #>
-#else
-<# foreach (var op in binops) { #>
-		public static <#= type.NSName #> operator <#= op #> (<#= type.NSName #> l, <#= type.NSName #> r) { return new <#= type.NSName #> (l.v <#= op #> r.v); }
-<# } #>
-<# if (type.IsIntegerType) { #>
-
-<# foreach (var op in new [] { "<<", ">>" }) { #>
-		public static <#= type.NSName #> operator <#= op #> (<#= type.NSName #> l, int r) { return new <#= type.NSName #> (l.v <#= op #> r); }
-<# } } #>
-#endif
-
-#if NINT_JIT_OPTIMIZED
-<# foreach (var op in new [] { "==", "!=", "<", ">", "<=", ">=" }) { #>
-		public static bool operator <#= op.PadRight (2) #> (<#= type.NSName #> l, <#= type.NSName #> r) { throw new NotImplementedException (); }
-<# } #>
-#else
-<# foreach (var op in new [] { "==", "!=", "<", ">", "<=", ">=" }) { #>
-		public static bool operator <#= op.PadRight (2) #> (<#= type.NSName #> l, <#= type.NSName #> r) { return l.v <#= op #> r.v; }
-<# } #>
-#endif
-
-		public int CompareTo (<#= type.NSName #> value) { return v.CompareTo (value.v); }
-		public int CompareTo (object value)
-		{
-			if (value is <#= type.NSName #>)
-				return v.CompareTo (((<#= type.NSName #>) value).v);
-			return v.CompareTo (value);
-		}
-		public bool Equals (<#= type.NSName #> obj) { return v.Equals (obj.v); }
-		public override bool Equals (object obj)
-		{
-			if (obj is <#= type.NSName #>)
-				return v.Equals (((<#= type.NSName #>) obj).v);
-			return v.Equals (obj);
-		}
-		public override int GetHashCode () { return v.GetHashCode (); }
-
-#if ARCH_32
-<# foreach (var cilName in new [] { type.CilName32, type.CilName64 }) { #>
-<# if (type.NSName == "nfloat") { #>
-		public static bool IsNaN              (nfloat f) { return <#= cilName #>.IsNaN ((<#= cilName #>)f); }
-		public static bool IsInfinity         (nfloat f) { return <#= cilName #>.IsInfinity ((<#= cilName #>)f); }
-		public static bool IsPositiveInfinity (nfloat f) { return <#= cilName #>.IsPositiveInfinity ((<#= cilName #>)f); }
-		public static bool IsNegativeInfinity (nfloat f) { return <#= cilName #>.IsNegativeInfinity ((<#= cilName #>)f); }
-
-<# } #>
-		public static <#= type.NSName #> Parse (string s, IFormatProvider provider) { return (<#= type.NSName #>)<#= cilName #>.Parse (s, provider); }
-		public static <#= type.NSName #> Parse (string s, NumberStyles style) { return (<#= type.NSName #>)<#= cilName #>.Parse (s, style); }
-		public static <#= type.NSName #> Parse (string s) { return (<#= type.NSName #>)<#= cilName #>.Parse (s); }
-		public static <#= type.NSName #> Parse (string s, NumberStyles style, IFormatProvider provider) {
-			return (<#= type.NSName #>)<#= cilName #>.Parse (s, style, provider);
-		}
-
-		public static bool TryParse (string s, out <#= type.NSName #> result)
-		{
-			<#= cilName #> v;
-			var r = <#= cilName #>.TryParse (s, out v);
-			result = (<#= type.NSName #>)v;
-			return r;
-		}
-
-		public static bool TryParse (string s, NumberStyles style, IFormatProvider provider, out <#= type.NSName #> result)
-		{
-			<#= cilName #> v;
-			var r = <#= cilName #>.TryParse (s, style, provider, out v);
-			result = (<#= type.NSName #>)v;
-			return r;
-		}
-<# if (cilName == type.CilName32) { #>
-#else
-<# } } #>
-#endif
-
-		public override string ToString () { return v.ToString (); }
-		public string ToString (IFormatProvider provider) { return v.ToString (provider); }
-		public string ToString (string format) { return v.ToString (format); }
-		public string ToString (string format, IFormatProvider provider) { return v.ToString (format, provider); }
-
-		public TypeCode GetTypeCode () { return v.GetTypeCode (); }
-
-		bool     IConvertible.ToBoolean  (IFormatProvider provider) { return ((IConvertible)v).ToBoolean (provider); }
-		byte     IConvertible.ToByte     (IFormatProvider provider) { return ((IConvertible)v).ToByte (provider); }
-		char     IConvertible.ToChar     (IFormatProvider provider) { return ((IConvertible)v).ToChar (provider); }
-		DateTime IConvertible.ToDateTime (IFormatProvider provider) { return ((IConvertible)v).ToDateTime (provider); }
-		decimal  IConvertible.ToDecimal  (IFormatProvider provider) { return ((IConvertible)v).ToDecimal (provider); }
-		double   IConvertible.ToDouble   (IFormatProvider provider) { return ((IConvertible)v).ToDouble (provider); }
-		short    IConvertible.ToInt16    (IFormatProvider provider) { return ((IConvertible)v).ToInt16 (provider); }
-		int      IConvertible.ToInt32    (IFormatProvider provider) { return ((IConvertible)v).ToInt32 (provider); }
-		long     IConvertible.ToInt64    (IFormatProvider provider) { return ((IConvertible)v).ToInt64 (provider); }
-		sbyte    IConvertible.ToSByte    (IFormatProvider provider) { return ((IConvertible)v).ToSByte (provider); }
-		float    IConvertible.ToSingle   (IFormatProvider provider) { return ((IConvertible)v).ToSingle (provider); }
-		ushort   IConvertible.ToUInt16   (IFormatProvider provider) { return ((IConvertible)v).ToUInt16 (provider); }
-		uint     IConvertible.ToUInt32   (IFormatProvider provider) { return ((IConvertible)v).ToUInt32 (provider); }
-		ulong    IConvertible.ToUInt64   (IFormatProvider provider) { return ((IConvertible)v).ToUInt64 (provider); }
-
-		object IConvertible.ToType (Type targetType, IFormatProvider provider) {
-			return ((IConvertible)v).ToType (targetType, provider);
-		}
-
-		[Obsolete ("This API is not available in .NET, use Buffer.MemoryCopy instead.")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public static void CopyArray (IntPtr source, <#= type.NSName #> [] destination, int startIndex, int length)
-		{
-			if (source == IntPtr.Zero)
-				throw new ArgumentNullException ("source");
-			if (destination is null)
-				throw new ArgumentNullException ("destination");
-			if (destination.Rank != 1)
-				throw new ArgumentException ("destination", "array is multi-dimensional");
-			if (startIndex < 0)
-				throw new ArgumentException ("startIndex", "must be >= 0");
-			if (length < 0)
-				throw new ArgumentException ("length", "must be >= 0");
-			if (startIndex + length > destination.Length)
-				throw new ArgumentException ("length", "startIndex + length > destination.Length");
-
-			for (int i = 0; i < length; i++)
-				destination [i + startIndex] = (<#= type.NSName #>)Marshal.ReadIntPtr (source, i * <#= type.NSName #>.Size);
-		}
-
-		[Obsolete ("This API is not available in .NET, use Buffer.MemoryCopy instead.")]
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public static void CopyArray (<#= type.NSName #> [] source, int startIndex, IntPtr destination, int length)
-		{
-			if (source is null)
-				throw new ArgumentNullException ("source");
-			if (destination == IntPtr.Zero)
-				throw new ArgumentNullException ("destination");
-			if (source.Rank != 1)
-				throw new ArgumentException ("source", "array is multi-dimensional");
-			if (startIndex < 0)
-				throw new ArgumentException ("startIndex", "must be >= 0");
-			if (length < 0)
-				throw new ArgumentException ("length", "must be >= 0");
-			if (startIndex + length > source.Length)
-				throw new ArgumentException ("length", "startIndex + length > source.Length");
-
-			for (int i = 0; i < length; i++)
-				Marshal.WriteIntPtr (destination, i * <#= type.NSName #>.Size, (IntPtr)source [i + startIndex]);
-		}
-	}
-#endif // !SKIP_<#= type.NSName #>
-}
-<# } #>
-
-#endif // !NET
diff --git a/src/NativeTypes/TODO b/src/NativeTypes/TODO
deleted file mode 100644
index ea63abc9b0b8..000000000000
--- a/src/NativeTypes/TODO
+++ /dev/null
@@ -1,31 +0,0 @@
-- Determine namespace
-	+ No namespace
-	+ System
-	+ MonoTouch/MonoMac.Foundation
-
-- Implement extra interfaces?
-	+ Currently:
-		struct NSInteger : IComparable<NSInteger>, IEquatable<NSInteger>
-	+ Should we also add?
-		: IComparable<int>, IEquatable<int> ... on 32
-		: IComparable<long>, IEquatable<long> ... on 64
-
-- Verify constructors
-
-- Verify explicit/implicit
-
-- Add explicit/implicit?
-	+ explicit: CGPoint -> PointF
-	+ implicit: PointF -> CGPoint
-	...
-	This will take a dep on System.Drawing though
-
-- Remove implicit Rectangle->CGRect?
-
-- Drop some methods?
-	+ CGSize.ToRoundedCGSize
-	+ CGSize.ToSize (obsoleted for ToRoundedSize)
-	+ CGSize.ToCGPoint
-	+ CGSize.ToPointF (obsoleted for ToCGPoint)
-
-- Write tests
diff --git a/src/NativeTypes/test.cs b/src/NativeTypes/test.cs
deleted file mode 100644
index c2c3ab33ef70..000000000000
--- a/src/NativeTypes/test.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-#nullable enable
-
-using System;
-using System.Drawing;
-using CoreGraphics;
-namespace Foundation {
-	public class NSDictionary { }
-}
-
-unsafe static class Test {
-	static void Main ()
-	{
-		nint a = 55;
-		a *= 3;
-		Console.WriteLine (a + 32);
-		Console.WriteLine (a.GetType ());
-
-		short s = 100;
-		nint b = s;
-		Console.WriteLine (b);
-
-		Console.WriteLine (sizeof (nint));
-
-
-		var fr = new RectangleF (1.5f, 2.5f, 3.5f, 4.5f);
-		var dr = fr;
-		Console.WriteLine (fr);
-		Console.WriteLine (dr);
-		fr = (RectangleF) dr;
-		Console.WriteLine (fr);
-
-	}
-}
diff --git a/src/ObjCRuntime/Runtime.cs b/src/ObjCRuntime/Runtime.cs
index 2286d7909f90..5db823dfa3e1 100644
--- a/src/ObjCRuntime/Runtime.cs
+++ b/src/ObjCRuntime/Runtime.cs
@@ -2722,22 +2722,12 @@ public static void ThrowException (IntPtr gchandle)
 		[EditorBrowsable (EditorBrowsableState.Advanced)]
 		public static ulong ConvertNativeEnumValueToManaged (nuint value, bool targetTypeHasMaxValue)
 		{
-#if ARCH_32
-			// Check if we got UInt32.MaxValue, which should probably be UInt64.MaxValue
-			if (targetTypeHasMaxValue && value == nuint.MaxValue)
-				return ulong.MaxValue;
-#endif
 			return (ulong) value;
 		}
 
 		[EditorBrowsable (EditorBrowsableState.Advanced)]
 		public static long ConvertNativeEnumValueToManaged (nint value, bool targetTypeHasMaxValue)
 		{
-#if ARCH_32
-			// Check if we got Int32.MaxValue, which should probably be Int64.MaxValue
-			if (targetTypeHasMaxValue && value == nint.MaxValue)
-				return long.MaxValue;
-#endif
 			return (long) value;
 		}
 
diff --git a/src/OpenTK.dll.sources b/src/OpenTK.dll.sources
deleted file mode 100644
index 5f7d803b3133..000000000000
--- a/src/OpenTK.dll.sources
+++ /dev/null
@@ -1,56 +0,0 @@
-System.Drawing/ColorKnownColorTypeForwarders.cs
-OpenGLES/OpenTK/Audio/AudioContext.cs
-OpenGLES/OpenTK/Audio/AudioContextException.cs
-OpenGLES/OpenTK/Audio/AudioDeviceEnumerator.cs
-OpenGLES/OpenTK/Audio/AudioDeviceErrorChecker.cs
-OpenGLES/OpenTK/Audio/AudioDeviceException.cs
-OpenGLES/OpenTK/Audio/AudioException.cs
-OpenGLES/OpenTK/Audio/AudioValueException.cs
-OpenGLES/OpenTK/Audio/OpenAL/AL/AL.cs
-OpenGLES/OpenTK/Audio/OpenAL/AL/ALEnums.cs
-OpenGLES/OpenTK/Audio/OpenAL/AL/EffectsExtension.cs
-OpenGLES/OpenTK/Audio/OpenAL/AL/EffectsExtensionEnums.cs
-OpenGLES/OpenTK/Audio/OpenAL/AL/EffectsExtensionPresets.cs
-OpenGLES/OpenTK/Audio/OpenAL/AL/XRamExtension.cs
-OpenGLES/OpenTK/Audio/OpenAL/Alc/Alc.cs
-OpenGLES/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs
-OpenGLES/OpenTK/AutoGeneratedAttribute.cs
-OpenGLES/OpenTK/BlittableValueType.cs
-OpenGLES/OpenTK/Configuration.cs
-OpenGLES/OpenTK/ContextHandle.cs
-OpenGLES/OpenTK/ContextHandleEqualityComparer.cs
-OpenGLES/OpenTK/DisplayResolution.cs
-OpenGLES/OpenTK/FrameEventArgs.cs
-OpenGLES/OpenTK/Graphics/ColorFormat.cs
-OpenGLES/OpenTK/Graphics/ES11.iPhone/Enums.cs
-OpenGLES/OpenTK/Graphics/ES11.iPhone/GL.Core.cs
-OpenGLES/OpenTK/Graphics/ES11.iPhone/GL.cs
-OpenGLES/OpenTK/Graphics/ES11.iPhone/GL.Delegates.cs
-OpenGLES/OpenTK/Graphics/ES11.iPhone/Helper.cs
-OpenGLES/OpenTK/Graphics/ES20.iPhone/Enums.cs
-OpenGLES/OpenTK/Graphics/ES20.iPhone/GL.Core.cs
-OpenGLES/OpenTK/Graphics/ES20.iPhone/GL.cs
-OpenGLES/OpenTK/Graphics/ES20.iPhone/GL.Delegates.cs
-OpenGLES/OpenTK/Graphics/ES20.iPhone/Helper.cs
-OpenGLES/OpenTK/Graphics/GraphicsContext.cs
-OpenGLES/OpenTK/Graphics/GraphicsContextException.cs
-OpenGLES/OpenTK/Graphics/GraphicsContextFlags.cs
-OpenGLES/OpenTK/Graphics/GraphicsContextMissingException.cs
-OpenGLES/OpenTK/Graphics/GraphicsMode.cs
-OpenGLES/OpenTK/Graphics/GraphicsModeException.cs
-OpenGLES/OpenTK/Graphics/IGraphicsContext.cs
-OpenGLES/OpenTK/Graphics/IGraphicsMode.cs
-OpenGLES/OpenTK/IGameWindow.cs
-OpenGLES/OpenTK/INativeWindow.cs
-OpenGLES/OpenTK/KeyPressEventArgs.cs
-OpenGLES/OpenTK/Minimal.cs
-OpenGLES/OpenTK/Platform/Factory.iPhone.cs
-OpenGLES/OpenTK/Platform/iPhoneOS/iPhoneOSGameView.cs
-OpenGLES/OpenTK/Platform/iPhoneOS/iPhoneOSGraphicsContext.cs
-OpenGLES/OpenTK/Platform/iPhoneOS/iPhoneOSGraphicsMode.cs
-OpenGLES/OpenTK/Platform/IWindowInfo.cs
-OpenGLES/OpenTK/Platform/Utilities.iPhone.cs
-OpenGLES/OpenTK/WindowBorder.cs
-OpenGLES/OpenTK/WindowState.cs
-CoreVideo/CVOpenGLESTexture.cs
-CoreVideo/CVOpenGLESTextureCache.cs
diff --git a/src/README.md b/src/README.md
index e0bab7d651f1..af322faa3ea4 100644
--- a/src/README.md
+++ b/src/README.md
@@ -178,19 +178,8 @@ conditional compilation:
 | Variable  | Description |
 | --------- | ------------|
 | `MONOMAC` | defined for Xamarin.Mac builds; not defined for Xamarin.iOS |
-| `ARCH_32` | defined when the target architecture is 32-bit; this will be defined for Classic and the Unified 32-bit assemblies |
-| `ARCH_64` | defined when the target architecture is 64-bit; this will be defined only for the Unified 64-bit assembly |
 | `COREBUILD` | defined when building the intermediate `core.dll` assembly against which the code generator will produce bindings |
 
-For example, to build an API for all of iOS but only 64-bit OS X (Xamarin.Mac):
-
-```csharp
-#if !MONOMAC || (MONOMAC && ARCH_64)
-...
-#endif
-```
-
-
 ## Source Localization ##
 Coming soon!
 
diff --git a/src/System.Drawing/PointSizeRectangleTypeForwarders.cs b/src/System.Drawing/PointSizeRectangleTypeForwarders.cs
deleted file mode 100644
index 858b1015f841..000000000000
--- a/src/System.Drawing/PointSizeRectangleTypeForwarders.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-#if !NET
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo (typeof (System.Drawing.Point))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo (typeof (System.Drawing.PointF))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo (typeof (System.Drawing.Rectangle))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo (typeof (System.Drawing.RectangleF))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo (typeof (System.Drawing.Size))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo (typeof (System.Drawing.SizeF))]
-#endif
diff --git a/src/UIKit/NSLayoutManager.cs b/src/UIKit/NSLayoutManager.cs
index 87c53b998421..ad558cc45887 100644
--- a/src/UIKit/NSLayoutManager.cs
+++ b/src/UIKit/NSLayoutManager.cs
@@ -51,15 +51,8 @@ public unsafe nuint GetGlyphs (
 
 			fixed (short* glyphs = glyphBuffer) {
 				nuint rv;
-#if ARCH_32
-				// Unified/32: the output array is not the correct size, it needs to be int[], and it's an array of NSGlyphProperty (which is long)
-				nint[] tmpArray = null;
-				if (props is not null)
-					tmpArray = new nint [props.Length];
-#else
 				// Unified/64 + Classic: the input array is the correct size
 				var tmpArray = props;
-#endif
 				fixed (void* properties = tmpArray) {
 					fixed (nuint* charIBuffer = charIndexBuffer) {
 						fixed (byte* bidi = bidiLevelBuffer) {
@@ -67,13 +60,6 @@ public unsafe nuint GetGlyphs (
 						}
 					}
 				}
-#if ARCH_32
-				// Marshal back from the tmpArray.
-				if (tmpArray is not null) {
-					for (int i = 0; i < props.Length; i++)
-						props [i] = (NSGlyphProperty) (long) tmpArray [i];
-				}
-#endif
 
 				return rv;
 			}
diff --git a/src/Version.in b/src/Version.in
deleted file mode 100644
index d78bda93422e..000000000000
--- a/src/Version.in
+++ /dev/null
@@ -1 +0,0 @@
-@VERSION@
diff --git a/src/bgen/Generator.cs b/src/bgen/Generator.cs
index 6752ee0530a7..763083595515 100644
--- a/src/bgen/Generator.cs
+++ b/src/bgen/Generator.cs
@@ -1144,24 +1144,6 @@ bool GetNativeEnumToManagedExpression (Type enumType, out string preExpression,
 			postExpression = string.Empty;
 		}
 
-		// Check if we got UInt32.MaxValue, which should probably be UInt64.MaxValue (if the enum
-		// in question actually has that value at least). Same goes for Int32.MinValue/Int64.MinValue.
-		// var isDefined = enumType.IsEnumDefined (maxValue);
-		var definedMaxField = enumType.GetFields ().Where (v => v.IsLiteral).FirstOrDefault (isMaxDefinedFunc);
-		if (definedMaxField is not null && postproc is not null) {
-			postproc.AppendLine ("#if ARCH_32");
-			postproc.AppendFormat ("if (({0}) ret == ({0}) {1}.MaxValue)\n", underlyingTypeName, itype);
-			postproc.AppendFormat ("\tret = {0}.{1}; // = {2}.MaxValue\n", renderedEnumType, definedMaxField.Name, underlyingTypeName);
-			if (underlyingEnumType == TypeCache.System_Int64) {
-				var definedMinField = enumType.GetFields ().Where (v => v.IsLiteral).FirstOrDefault (isMinDefinedFunc);
-				if (definedMinField is not null) {
-					postproc.AppendFormat ("else if (({0}) ret == ({0}) {1}.MinValue)\n", underlyingTypeName, itype);
-					postproc.AppendFormat ("\tret = {0}.{1}; // = {2}.MinValue\n", renderedEnumType, definedMinField.Name, underlyingTypeName);
-				}
-			}
-			postproc.AppendLine ("#endif");
-		}
-
 		return true;
 	}
 
@@ -3253,22 +3235,6 @@ AvailabilityBaseAttribute GetIntroduced (MethodInfo mi, PropertyInfo pi)
 		return mi.GetAvailability (AvailabilityKind.Introduced, this) ?? pi.GetAvailability (AvailabilityKind.Introduced, this);
 	}
 
-	bool Is64BitiOSOnly (ICustomAttributeProvider provider)
-	{
-		if (BindThirdPartyLibrary)
-			return false;
-		if (BindingTouch.CurrentPlatform != PlatformName.iOS)
-			return false;
-		var attrib = provider.GetAvailability (AvailabilityKind.Introduced, this);
-		if (attrib is null) {
-			var minfo = provider as MemberInfo;
-			if (minfo is not null && minfo.DeclaringType is not null)
-				return Is64BitiOSOnly (minfo.DeclaringType);
-			return false;
-		}
-		return attrib.Version?.Major >= 11;
-	}
-
 	//
 	// Generates the code necessary to lower the MonoTouch-APIs to something suitable
 	// to be passed to Objective-C.
@@ -4205,12 +4171,6 @@ void GenerateProperty (Type type, PropertyInfo pi, List<string> instance_fields_
 #endif
 			} else {
 				print ("get {");
-				var is32BitNotSupported = Is64BitiOSOnly (pi);
-				if (is32BitNotSupported) {
-					print ("#if ARCH_32");
-					print ("\tthrow new PlatformNotSupportedException (\"This API is not supported on this version of iOS\");");
-					print ("#else");
-				}
 				if (debug)
 					print ("Console.WriteLine (\"In {0}\");", pi.GetGetMethod ());
 				if (is_model)
@@ -4237,8 +4197,6 @@ void GenerateProperty (Type type, PropertyInfo pi, List<string> instance_fields_
 						indent--;
 					}
 				}
-				if (is32BitNotSupported)
-					print ("#endif");
 				print ("}\n");
 			}
 		}
@@ -4279,12 +4237,6 @@ void GenerateProperty (Type type, PropertyInfo pi, List<string> instance_fields_
 #endif
 			} else {
 				print ("set {");
-				var is32BitNotSupported = Is64BitiOSOnly (pi);
-				if (is32BitNotSupported) {
-					print ("#if ARCH_32");
-					print ("\tthrow new PlatformNotSupportedException (\"This API is not supported on this version of iOS\");");
-					print ("#else");
-				}
 				if (debug)
 					print ("Console.WriteLine (\"In {0}\");", pi.GetSetMethod ());
 
@@ -4312,8 +4264,6 @@ void GenerateProperty (Type type, PropertyInfo pi, List<string> instance_fields_
 						}
 					}
 				}
-				if (is32BitNotSupported)
-					print ("#endif");
 				print ("}");
 			}
 		}
@@ -4655,12 +4605,6 @@ void GenerateMethod (MemberInformation minfo)
 
 			print ("{");
 
-			var is32BitNotSupported = Is64BitiOSOnly ((ICustomAttributeProvider) minfo.Method ?? minfo.Property);
-			if (is32BitNotSupported) {
-				print ("#if ARCH_32");
-				print ("\tthrow new PlatformNotSupportedException (\"This API is not supported on this version of iOS\");");
-				print ("#else");
-			}
 			if (debug)
 				print ("\tConsole.WriteLine (\"In {0}\");", mi);
 
@@ -4703,8 +4647,6 @@ void GenerateMethod (MemberInformation minfo)
 					indent--;
 				}
 			}
-			if (is32BitNotSupported)
-				print ("#endif");
 			print ("}\n");
 		}
 
@@ -5957,18 +5899,7 @@ public void Generate (Type type)
 
 				if (!is_model) {
 					print_generated_code ();
-					var is32BitNotSupported = Is64BitiOSOnly (type);
-					if (is32BitNotSupported) {
-						// potentially avoid a .cctor and extra, unusable code
-						print ("#if ARCH_32");
-						print ("#pragma warning disable {0}", is_static_class ? "169" : "649");
-						print ("static readonly {0} class_ptr;", NativeHandleType);
-						print ("#pragma warning restore {0}", is_static_class ? "169" : "649");
-						print ("#else");
-					}
 					print ("static readonly {1} class_ptr = Class.GetHandle (\"{0}\");", objc_type_name, NativeHandleType);
-					if (is32BitNotSupported)
-						print ("#endif");
 					print ("");
 				}
 			}
@@ -6016,7 +5947,6 @@ public void Generate (Type type)
 					var initSelector = (InlineSelectors || BindThirdPartyLibrary) ? "Selector.GetHandle (\"init\")" : "Selector.Init";
 					var initWithCoderSelector = (InlineSelectors || BindThirdPartyLibrary) ? "Selector.GetHandle (\"initWithCoder:\")" : "Selector.InitWithCoder";
 					string v = (class_mod == "abstract " && default_ctor_visibility is null) ? "protected" : ctor_visibility;
-					var is32BitNotSupported = Is64BitiOSOnly (type);
 					if (external) {
 						if (!disable_default_ctor) {
 							if (BindingTouch.SupportsXmlDocumentation) {
@@ -6029,19 +5959,12 @@ public void Generate (Type type)
 							sw.WriteLine ("\t\t[Export (\"init\")]");
 							sw.WriteLine ("\t\t{0} {1} () : base (NSObjectFlag.Empty)", v, TypeName);
 							sw.WriteLine ("\t\t{");
-							if (is32BitNotSupported) {
-								sw.WriteLine ("\t\t#if ARCH_32");
-								sw.WriteLine ("\tthrow new PlatformNotSupportedException (\"This API is not supported on this version of iOS\");");
-								sw.WriteLine ("\t\t#else");
-							}
 							if (is_direct_binding_value is not null)
 								sw.WriteLine ("\t\t\tIsDirectBinding = {0};", is_direct_binding_value);
 							if (debug)
 								sw.WriteLine ("\t\t\tConsole.WriteLine (\"{0}.ctor ()\");", TypeName);
 							sw.WriteLine ("\t\t\tInitializeHandle (global::{1}.IntPtr_objc_msgSend (this.Handle, global::ObjCRuntime.{0}), \"init\");", initSelector, NamespaceCache.Messaging);
 							sw.WriteLine ("\t\t\t");
-							if (is32BitNotSupported)
-								sw.WriteLine ("\t\t#endif");
 							sw.WriteLine ("\t\t}");
 						}
 					} else {
@@ -6056,11 +5979,6 @@ public void Generate (Type type)
 							sw.WriteLine ("\t\t[Export (\"init\")]");
 							sw.WriteLine ("\t\t{0} {1} () : base (NSObjectFlag.Empty)", v, TypeName);
 							sw.WriteLine ("\t\t{");
-							if (is32BitNotSupported) {
-								sw.WriteLine ("\t\t#if ARCH_32");
-								sw.WriteLine ("\tthrow new PlatformNotSupportedException (\"This API is not supported on this version of iOS\");");
-								sw.WriteLine ("\t\t#else");
-							}
 							if (type_needs_thread_checks) {
 								sw.Write ("\t\t\t");
 								GenerateThreadCheck (sw);
@@ -6071,8 +5989,6 @@ public void Generate (Type type)
 														   () => string.Format ("InitializeHandle (global::{1}.IntPtr_objc_msgSendSuper (this.SuperHandle, global::ObjCRuntime.{0}), \"init\");", initSelector, NamespaceCache.Messaging));
 
 							WriteMarkDirtyIfDerived (sw, type);
-							if (is32BitNotSupported)
-								sw.WriteLine ("\t\t#endif");
 							sw.WriteLine ("\t\t}");
 							sw.WriteLine ();
 						}
@@ -6093,11 +6009,6 @@ public void Generate (Type type)
 							sw.WriteLine ("\t\t[Export (\"initWithCoder:\")]");
 							sw.WriteLine ("\t\t{0} {1} (NSCoder coder) : base (NSObjectFlag.Empty)", v, TypeName);
 							sw.WriteLine ("\t\t{");
-							if (is32BitNotSupported) {
-								sw.WriteLine ("\t\t#if ARCH_32");
-								sw.WriteLine ("\tthrow new PlatformNotSupportedException (\"This API is not supported on this version of iOS\");");
-								sw.WriteLine ("\t\t#else");
-							}
 							if (nscoding) {
 								if (debug)
 									sw.WriteLine ("\t\t\tConsole.WriteLine (\"{0}.ctor (NSCoder)\");", TypeName);
@@ -6113,8 +6024,6 @@ public void Generate (Type type)
 							} else {
 								sw.WriteLine ("\t\t\tthrow new InvalidOperationException (\"Type does not conform to NSCoding\");");
 							}
-							if (is32BitNotSupported)
-								sw.WriteLine ("\t\t#endif");
 							sw.WriteLine ("\t\t}");
 							sw.WriteLine ();
 						}
diff --git a/src/bgen/bgen.csproj b/src/bgen/bgen.csproj
index db14ea38600f..1444c86b365a 100644
--- a/src/bgen/bgen.csproj
+++ b/src/bgen/bgen.csproj
@@ -34,7 +34,7 @@
     <Compile Include="$(RepositoryPath)\tools\common\ApplePlatform.cs" />
     <Compile Include="$(RepositoryPath)\tools\common\TargetFramework.cs" />
     <Compile Include="$(RepositoryPath)\tools\common\StringUtils.cs" />
-    <Compile Include="$(BuildDir)\generator-frameworks.g.cs" />
+    <Compile Include="$(DotNetBuildDir)\generator-frameworks.g.cs" />
     <Compile Include="$(RepositoryPath)\src\Foundation\AdviceAttribute.cs" />
     <Compile Include="$(RepositoryPath)\src\Foundation\ExportAttribute.cs" />
     <Compile Include="$(RepositoryPath)\src\Foundation\FieldAttribute.cs" />
diff --git a/src/bmac.ikvm b/src/bmac.ikvm
deleted file mode 100755
index d7b17b1f3b94..000000000000
--- a/src/bmac.ikvm
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-sdk=
-new_style=
-refs=
-full_profile=
-mobile_profile=
-
-BIN_DIR=`dirname $0`
-if [ `basename $BIN_DIR` == "Commands" ]; then
-BIN_DIR="`dirname $BIN_DIR`/Versions/Current/bin"
-fi
-
-ROOT_DIR=$BIN_DIR/..
-
-bgen_path=$BIN_DIR/bgen
-
-btouch_arguments=()
-for arg in "$@"; do
-	if [[ $sdk == next-arg ]]; then
-		sdk=$arg
-	elif [[ $arg =~ ^(/|-{1,2})sdk ]]; then
-		sdk=${arg#*=}; sdk=${sdk#*:}
-		if [[ $sdk == $arg ]]; then
-			sdk=next-arg
-		fi
-	elif [[ $arg =~ ^(/|-{1,2})new-style$ ]]; then
-		new_style=1
-		mobile_profile=1
-		continue
-	elif [[ $arg =~ ^(/|-{1,2})unified-full-profile$ ]]; then
-		full_profile=1
-		new_style=1
-	elif [[ $arg =~ ^(/|-{1,2})unified-mobile-profile$ ]]; then
-		mobile_profile=1
-		new_style=1
-	fi
-	btouch_arguments+=("${arg}")
-done
-
-sdk=$(echo $sdk | tr '[:upper:]' '[:lower:]')
-
-case $sdk in
-xammac)
-	echo "error BI0087: bgen-classic: Xamarin.Mac Classic binding projects are not supported anymore. Please upgrade the binding project to a Xamarin.Mac Unified binding project."
-	exit 1
-	;;
-mobile|xamarin.mac)
-	refs="--target-framework=Xamarin.Mac,Version=v2.0,Profile=Mobile"
-	;;
-*)
-	if [[ -z "$new_style" ]]; then
-		echo "error BI0087: bgen-classic: Xamarin.Mac Classic binding projects are not supported anymore. Please upgrade the binding project to a Xamarin.Mac Unified binding project."
-		exit 1
-	else
-		if [[ "$full_profile" -eq 1 ]]; then
-			refs="--target-framework=Xamarin.Mac,Version=v4.5,Profile=Full"
-		elif [[ "$mobile_profile" -eq 1 ]]; then
-			refs="--target-framework=Xamarin.Mac,Version=v2.0,Profile=Mobile"
-		else
-			refs="--target-framework=Xamarin.Mac,Version=v4.5,Profile=System"
-		fi
-	fi
-	;;
-esac
-
-exec $bgen_path $refs "${btouch_arguments[@]}"
diff --git a/src/btouch-native b/src/btouch-native
deleted file mode 100755
index 20078f9d54b5..000000000000
--- a/src/btouch-native
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-pushd "$(dirname "$0")/.." > /dev/null
-MONOTOUCH_PREFIX=$(pwd -P)
-popd > /dev/null
-
-exec /Library/Frameworks/Mono.framework/Commands/mono64 --debug "$MONOTOUCH_PREFIX/lib/bgen/bgen.exe" --target-framework=Xamarin.iOS,v1.0 "$@"
diff --git a/src/btouch-native.in b/src/btouch-native.in
deleted file mode 100644
index da7fddb2805a..000000000000
--- a/src/btouch-native.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-MONO_PATH=@MONOTOUCH_PREFIX@/lib/mono/Xamarin.iOS @MONOTOUCH_PREFIX@/bin/btouch-mono --debug @MONOTOUCH_PREFIX@/lib/btouch/btouch-native.exe  --target-framework=Xamarin.iOS,v1.0 "$@"
diff --git a/src/btv b/src/btv
deleted file mode 100755
index a39374179b10..000000000000
--- a/src/btv
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-pushd "$(dirname "$0")/.." > /dev/null
-MONOTOUCH_PREFIX=$(pwd -P)
-popd > /dev/null
-
-exec /Library/Frameworks/Mono.framework/Commands/mono64 --debug "$MONOTOUCH_PREFIX/lib/bgen/bgen.exe" --target-framework=Xamarin.TVOS,v1.0 "$@"
diff --git a/src/build/generator-frameworks.g.cs b/src/build/dotnet/generator-frameworks.g.cs
similarity index 100%
rename from src/build/generator-frameworks.g.cs
rename to src/build/dotnet/generator-frameworks.g.cs
diff --git a/src/bwatch b/src/bwatch
deleted file mode 100755
index f5cefb38821c..000000000000
--- a/src/bwatch
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-pushd "$(dirname "$0")/.." > /dev/null
-MONOTOUCH_PREFIX=$(pwd -P)
-popd > /dev/null
-
-exec /Library/Frameworks/Mono.framework/Commands/mono64 --debug "$MONOTOUCH_PREFIX/lib/bgen/bgen.exe" --target-framework=Xamarin.WatchOS,v1.0 "$@"
diff --git a/src/bwatch.in b/src/bwatch.in
deleted file mode 100644
index dc8a288442aa..000000000000
--- a/src/bwatch.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-MONO_PATH=@MONOTOUCH_PREFIX@/lib/mono/Xamarin.WatchOS @MONOTOUCH_PREFIX@/bin/bwatch-mono --debug @MONOTOUCH_PREFIX@/lib/bwatch/bwatch.exe "$@"
-
diff --git a/src/custom-make.sh b/src/custom-make.sh
deleted file mode 100755
index 4a258c3834a3..000000000000
--- a/src/custom-make.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -ex
-
-#
-# This is a hack to make monotouch.csproj compile in XS. A big hack.
-#
-
-make -j20
\ No newline at end of file
diff --git a/src/frameworks.sources b/src/frameworks.sources
index 4de299e162b0..e129ca7cd91b 100644
--- a/src/frameworks.sources
+++ b/src/frameworks.sources
@@ -2012,7 +2012,6 @@ SHARED_CORE_SOURCES = \
 	DotNetGlobals.cs \
 	MinimumVersions.cs \
 	MonoPInvokeCallbackAttribute.cs \
-	$(BUILD_DIR)/common/NativeTypes/Primitives.cs \
 	ObjCRuntime/ArgumentSemantic.cs \
 	ObjCRuntime/BindAsAttribute.cs \
 	ObjCRuntime/Blocks.cs \
diff --git a/src/generator.csproj b/src/generator.csproj
deleted file mode 100644
index 04b1bb76380d..000000000000
--- a/src/generator.csproj
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="4.0">
-  <Import Project="..\packages\XliffTasks.1.0.0-beta.19607.1\build\XliffTasks.props" Condition="Exists('..\packages\XliffTasks.1.0.0-beta.19607.1\build\XliffTasks.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D2EE02C0-9BFD-477D-AC92-4DE2D8490790}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AssemblyName>bgen</AssemblyName>
-    <RootNamespace>bgen</RootNamespace>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <BuildDir Condition="'$(BUILD_DIR)' != ''">$(BUILD_DIR)\</BuildDir>
-    <BuildDir Condition="'$(BUILD_DIR)' == ''">build\</BuildDir>
-    <LangVersion>latest</LangVersion>
-    <NoWarn>8601,8618</NoWarn>
-    <WarningsAsErrors>Nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>build\common</OutputPath>
-    <IntermediateOutputPath>build\IDE\obj\common\</IntermediateOutputPath>
-    <DefineConstants>DEBUG;BGENERATOR;NET_4_0;NO_AUTHENTICODE;STATIC;NO_SYMBOL_WRITER</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Deterministic>True</Deterministic>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.7.2" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
-    <StartAction>Project</StartAction>
-    <StartArguments />
-    <StartWorkingDirectory>$(ProjectDir)</StartWorkingDirectory>
-    <EnvironmentVariables>
-      <Variable name="MD_MTOUCH_SDK_ROOT" value="../_ios-build//Library/Frameworks/Xamarin.iOS.framework/Versions/git" />
-      <Variable name="XamarinMacFrameworkRoot" value="../_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/Current" />
-    </EnvironmentVariables>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'ios' ">
-    <StartAction>Project</StartAction>
-    <StartArguments>@build/$(RunConfiguration).rsp</StartArguments>
-    <StartWorkingDirectory>$(ProjectDir)</StartWorkingDirectory>
-    <EnvironmentVariables>
-      <Variable name="MD_MTOUCH_SDK_ROOT" value="../_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git" />
-    </EnvironmentVariables>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'maccatalyst' ">
-    <StartAction>Project</StartAction>
-    <StartArguments>@build/$(RunConfiguration).rsp</StartArguments>
-    <StartWorkingDirectory>$(ProjectDir)</StartWorkingDirectory>
-    <EnvironmentVariables>
-      <Variable name="MD_MTOUCH_SDK_ROOT" value="../_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git" />
-    </EnvironmentVariables>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'tvos' ">
-    <StartAction>Project</StartAction>
-    <StartArguments>@build/$(RunConfiguration).rsp</StartArguments>
-    <StartWorkingDirectory>$(ProjectDir)</StartWorkingDirectory>
-    <EnvironmentVariables>
-      <Variable name="MD_MTOUCH_SDK_ROOT" value="../_ios-build//Library/Frameworks/Xamarin.iOS.framework/Versions/git" />
-    </EnvironmentVariables>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'watchos' ">
-    <StartAction>Project</StartAction>
-    <StartArguments>@build/$(RunConfiguration).rsp</StartArguments>
-    <StartWorkingDirectory>$(ProjectDir)</StartWorkingDirectory>
-    <EnvironmentVariables>
-      <Variable name="MD_MTOUCH_SDK_ROOT" value="../_ios-build//Library/Frameworks/Xamarin.iOS.framework/Versions/git" />
-    </EnvironmentVariables>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'mac-mobile' ">
-    <StartAction>Project</StartAction>
-    <StartArguments>@build/$(RunConfiguration).rsp</StartArguments>
-    <StartWorkingDirectory>$(ProjectDir)</StartWorkingDirectory>
-    <EnvironmentVariables>
-      <Variable name="XamarinMacFrameworkRoot" value="../_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/Current" />
-    </EnvironmentVariables>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'mac-full' ">
-    <StartAction>Project</StartAction>
-    <StartArguments>@build/$(RunConfiguration).rsp</StartArguments>
-    <StartWorkingDirectory>$(ProjectDir)</StartWorkingDirectory>
-    <EnvironmentVariables>
-      <Variable name="XamarinMacFrameworkRoot" value="../_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/Current" />
-    </EnvironmentVariables>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\docs\website\generator-errors.md">
-      <Link>generator-errors.md</Link>
-    </None>
-    <Compile Include="..\src\error.cs" />
-    <Compile Include="..\src\ObjCRuntime\Stret.cs" />
-    <Compile Include="..\src\bgen\AttributeConversionManager.cs" />
-    <Compile Include="..\src\bgen\AttributeManager.cs" />
-    <Compile Include="..\src\bgen\Attributes.cs" />
-    <Compile Include="..\src\bgen\AttributeFactory.ConstructorArguments.cs" />
-    <Compile Include="..\src\bgen\AttributeFactory.cs" />
-    <Compile Include="..\src\bgen\BindingTouch.cs" />
-    <Compile Include="..\src\bgen\DocumentationManager.cs" />
-    <Compile Include="..\src\bgen\Enums.cs" />
-    <Compile Include="..\src\bgen\Frameworks.cs" />
-    <Compile Include="..\src\bgen\Filters.cs" />
-    <Compile Include="..\src\bgen\GeneratedType.cs" />
-    <Compile Include="..\src\bgen\GeneratedTypes.cs" />
-    <Compile Include="..\src\bgen\Generator.cs" />
-    <Compile Include="..\src\bgen\Generator.PrintAttributes.cs" />
-    <Compile Include="..\src\bgen\IMemberGatherer.cs" />
-    <Compile Include="..\src\bgen\LibraryManager.cs" />
-    <Compile Include="..\src\bgen\Nomenclator.cs" />
-    <Compile Include="..\src\bgen\NullabilityInfoContext.cs" />
-    <Compile Include="..\src\bgen\ReferenceFixer.cs" />
-    <Compile Include="..\src\bgen\SearchPathsAssemblyResolver.cs" />
-    <Compile Include="..\src\bgen\TypeManager.cs" />
-    <Compile Include="..\tools\common\ApplePlatform.cs" />
-    <Compile Include="..\tools\common\TargetFramework.cs" />
-    <Compile Include="..\tools\common\StringUtils.cs" />
-    <Compile Include="$(BuildDir)generator-frameworks.g.cs" />
-    <Compile Include="..\src\Foundation\AdviceAttribute.cs" />
-    <Compile Include="..\src\Foundation\ExportAttribute.cs" />
-    <Compile Include="..\src\Foundation\FieldAttribute.cs" />
-    <Compile Include="..\src\Foundation\ModelAttribute.cs" />
-    <Compile Include="..\src\Foundation\NotImplementedAttribute.cs" />
-    <Compile Include="..\src\Foundation\PreserveAttribute.cs" />
-    <Compile Include="..\src\Foundation\ProtocolAttribute.cs" />
-    <Compile Include="..\src\Foundation\RegisterAttribute.cs" />
-    <Compile Include="..\src\Foundation\XpcInterfaceAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\ArgumentSemantic.cs" />
-    <Compile Include="..\src\ObjCRuntime\BindAsAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\BindingImplAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\BlockCallbackAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\CCallbackAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\LinkWithAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\NativeAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\NativeNameAttribute.cs" />
-    <Compile Include="..\src\ObjCRuntime\PlatformAvailability2.cs" />
-    <Compile Include="..\src\ObjCRuntime\PlatformAvailabilityShadow.cs" />
-    <Compile Include="..\src\ObjCRuntime\Registrar.core.cs" />
-    <Compile Include="..\src\ObjCRuntime\RequiresSuperAttribute.cs" />
-    <Compile Include="..\tools\common\Execution.cs">
-      <Link>Execution.cs</Link>
-    </Compile>
-    <Compile Include="..\tools\common\NullableAttributes.cs">
-      <Link>NullableAttributes.cs</Link>
-    </Compile>
-    <Compile Include="bgen\Caches\NamespaceCache.cs" />
-    <Compile Include="bgen\Caches\TypeCache.cs" />
-    <Compile Include="bgen\Enums\AsyncMethodKind.cs" />
-    <Compile Include="bgen\Enums\BodyOption.cs" />
-    <Compile Include="bgen\Enums\ThreadCheck.cs" />
-    <Compile Include="bgen\Extensions\CollectionsExtensions.cs" />
-    <Compile Include="bgen\Extensions\CustomAttributeDataExtensions.cs" />
-    <Compile Include="bgen\Extensions\ExtensionMethods.cs" />
-    <Compile Include="bgen\Extensions\PlatformNameExtensions.cs" />
-    <Compile Include="bgen\Extensions\StringExtensions.cs" />
-    <Compile Include="bgen\Extensions\TypeExtensions.cs" />
-    <Compile Include="bgen\Models\Api.cs" />
-    <Compile Include="bgen\Models\AsyncMethodInfo.cs" />
-    <Compile Include="bgen\Models\BindingTouchConfig.cs" />
-    <Compile Include="bgen\Models\LibraryInfo.cs" />
-    <Compile Include="bgen\Models\MarshalInfo.cs" />
-    <Compile Include="bgen\Models\MarshalType.cs" />
-    <Compile Include="bgen\Models\MarshalTypeList.cs" />
-    <Compile Include="bgen\Models\MemberInformation.cs" />
-    <Compile Include="bgen\Models\TrampolineInfo.cs" />
-    <Compile Include="bgen\Models\WrapPropMemberInformation.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <None Include="packages.config" />
-    <Compile Include="..\tools\common\Driver.execution.cs">
-      <Link>Driver.execution.cs</Link>
-    </Compile>
-    <Compile Include="..\tools\common\SdkVersions.cs">
-      <Link>SdkVersions.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Target Name="AfterBuild">
-    <!-- Only run 'make bgen' if we're not executed as part of 'make' (i.e. MAKEFLAGS is empty) -->
-    <Exec Command="make bgen" Condition="'$(MAKEFLAGS)' == ''" />
-  </Target>
-  <Import Project="..\packages\XliffTasks.1.0.0-beta.19607.1\build\XliffTasks.targets" Condition="Exists('..\packages\XliffTasks.1.0.0-beta.19607.1\build\XliffTasks.targets')" />
-</Project>
diff --git a/src/generator.sln b/src/generator.sln
deleted file mode 100644
index b46f33d7e410..000000000000
--- a/src/generator.sln
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator.csproj", "{D2EE02C0-9BFD-477D-AC92-4DE2D8490790}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator-tests", "..\tests\generator\generator-tests.csproj", "{10790816-D00E-40A0-8653-2A8AB4DD33A9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D2EE02C0-9BFD-477D-AC92-4DE2D8490790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2EE02C0-9BFD-477D-AC92-4DE2D8490790}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2EE02C0-9BFD-477D-AC92-4DE2D8490790}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2EE02C0-9BFD-477D-AC92-4DE2D8490790}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10790816-D00E-40A0-8653-2A8AB4DD33A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10790816-D00E-40A0-8653-2A8AB4DD33A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10790816-D00E-40A0-8653-2A8AB4DD33A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10790816-D00E-40A0-8653-2A8AB4DD33A9}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		Policies = $0
-		$0.TextStylePolicy = $1
-		$1.FileWidth = 180
-		$1.TabWidth = 8
-		$1.IndentWidth = 8
-		$1.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $2
-		$2.IndentSwitchSection = False
-		$2.NewLinesForBracesInProperties = False
-		$2.NewLinesForBracesInAccessors = False
-		$2.NewLinesForBracesInAnonymousMethods = False
-		$2.NewLinesForBracesInControlBlocks = False
-		$2.NewLinesForBracesInAnonymousTypes = False
-		$2.NewLinesForBracesInObjectCollectionArrayInitializers = False
-		$2.NewLinesForBracesInLambdaExpressionBody = False
-		$2.NewLineForElse = False
-		$2.NewLineForCatch = False
-		$2.NewLineForFinally = False
-		$2.NewLineForMembersInObjectInit = False
-		$2.NewLineForMembersInAnonymousTypes = False
-		$2.NewLineForClausesInQuery = False
-		$2.SpacingAfterMethodDeclarationName = True
-		$2.SpaceAfterMethodCallName = True
-		$2.SpaceBeforeOpenSquareBracket = True
-		$2.scope = text/x-csharp
-		$2.SpaceAfterCast = True
-	EndGlobalSection
-EndGlobal
diff --git a/src/opentk.csproj b/src/opentk.csproj
deleted file mode 100644
index 0be562e39c3c..000000000000
--- a/src/opentk.csproj
+++ /dev/null
@@ -1,246 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D7E171B6-4B94-49FB-87CC-006B906FBECC}</ProjectGuid>
-    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>opentk</RootNamespace>
-    <AssemblyName>opentk</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>IPHONE;MINIMAL;MONOTOUCH</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-    <NoWarn>3021,3014,3003</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="monotouch" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\AudioContext.cs">
-      <Link>OpenGLES\OpenTK\Audio\AudioContext.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\AudioContextException.cs">
-      <Link>OpenGLES\OpenTK\Audio\AudioContextException.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\AudioDeviceEnumerator.cs">
-      <Link>OpenGLES\OpenTK\Audio\AudioDeviceEnumerator.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\AudioDeviceErrorChecker.cs">
-      <Link>OpenGLES\OpenTK\Audio\AudioDeviceErrorChecker.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\AudioDeviceException.cs">
-      <Link>OpenGLES\OpenTK\Audio\AudioDeviceException.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\AudioException.cs">
-      <Link>OpenGLES\OpenTK\Audio\AudioException.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\AudioValueException.cs">
-      <Link>OpenGLES\OpenTK\Audio\AudioValueException.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\AL\AL.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\AL\AL.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\AL\ALEnums.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\AL\ALEnums.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\AL\EffectsExtension.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\AL\EffectsExtension.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\AL\EffectsExtensionEnums.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\AL\EffectsExtensionEnums.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\AL\EffectsExtensionPresets.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\AL\EffectsExtensionPresets.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\AL\XRamExtension.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\AL\XRamExtension.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\Alc\Alc.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\Alc\Alc.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Audio\OpenAL\Alc\AlcEnums.cs">
-      <Link>OpenGLES\OpenTK\Audio\OpenAL\Alc\AlcEnums.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\AutoGeneratedAttribute.cs">
-      <Link>OpenGLES\OpenTK\AutoGeneratedAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\BlittableValueType.cs">
-      <Link>OpenGLES\OpenTK\BlittableValueType.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Configuration.cs">
-      <Link>OpenGLES\OpenTK\Configuration.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\ContextHandle.cs">
-      <Link>OpenGLES\OpenTK\ContextHandle.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\DisplayResolution.cs">
-      <Link>OpenGLES\OpenTK\DisplayResolution.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\FrameEventArgs.cs">
-      <Link>OpenGLES\OpenTK\FrameEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\IGameWindow.cs">
-      <Link>OpenGLES\OpenTK\IGameWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\INativeWindow.cs">
-      <Link>OpenGLES\OpenTK\INativeWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\KeyPressEventArgs.cs">
-      <Link>OpenGLES\OpenTK\KeyPressEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Minimal.cs">
-      <Link>OpenGLES\OpenTK\Minimal.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\WindowBorder.cs">
-      <Link>OpenGLES\OpenTK\WindowBorder.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\WindowState.cs">
-      <Link>OpenGLES\OpenTK\WindowState.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\Color4.cs">
-      <Link>OpenGLES\OpenTK\Graphics\Color4.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ColorFormat.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ColorFormat.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\GraphicsContext.cs">
-      <Link>OpenGLES\OpenTK\Graphics\GraphicsContext.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\GraphicsContextException.cs">
-      <Link>OpenGLES\OpenTK\Graphics\GraphicsContextException.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\GraphicsContextFlags.cs">
-      <Link>OpenGLES\OpenTK\Graphics\GraphicsContextFlags.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\GraphicsContextMissingException.cs">
-      <Link>OpenGLES\OpenTK\Graphics\GraphicsContextMissingException.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\GraphicsMode.cs">
-      <Link>OpenGLES\OpenTK\Graphics\GraphicsMode.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\GraphicsModeException.cs">
-      <Link>OpenGLES\OpenTK\Graphics\GraphicsModeException.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\IGraphicsContext.cs">
-      <Link>OpenGLES\OpenTK\Graphics\IGraphicsContext.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\IGraphicsMode.cs">
-      <Link>OpenGLES\OpenTK\Graphics\IGraphicsMode.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\IWindowInfo.cs">
-      <Link>OpenGLES\OpenTK\Platform\IWindowInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Toolkit.cs">
-      <Link>OpenGLES\OpenTK\Toolkit.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES11\Helper.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES11.iPhone\Helper.cs</Link>
-    </Compile>
-    <Compile Include="CoreVideo\CVOpenGLESTexture.cs" />
-    <Compile Include="CoreVideo\CVOpenGLESTextureCache.cs" />
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\iPhoneOS\BindingsBase.iPhone.cs">
-      <Link>OpenGLES\OpenTK\Platform\iPhoneOS\BindingsBase.iPhone.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\iPhoneOS\Factory.iPhone.cs">
-      <Link>OpenGLES\OpenTK\Platform\iPhoneOS\Factory.iPhone.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\iPhoneOS\GraphicsBindingsBase.iPhone.cs">
-      <Link>OpenGLES\OpenTK\Platform\iPhoneOS\GraphicsBindingsBase.iPhone.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\iPhoneOS\Utilities.iPhone.cs">
-      <Link>OpenGLES\OpenTK\Platform\iPhoneOS\Utilities.iPhone.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\iPhoneOS\iPhoneOSGameView.cs">
-      <Link>OpenGLES\OpenTK\Platform\iPhoneOS\iPhoneOSGameView.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\iPhoneOS\iPhoneOSGraphicsContext.cs">
-      <Link>OpenGLES\OpenTK\Platform\iPhoneOS\iPhoneOSGraphicsContext.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Platform\iPhoneOS\iPhoneOSGraphicsMode.cs">
-      <Link>OpenGLES\OpenTK\Platform\iPhoneOS\iPhoneOSGraphicsMode.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES11.iPhone\Core.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES11.iPhone\Core.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES11.iPhone\Delegates.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES11.iPhone\Delegates.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES11.iPhone\ES.Obsolete.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES11.iPhone\ES.Obsolete.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES11.iPhone\ES.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES11.iPhone\ES.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES11.iPhone\Enums.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES11.iPhone\Enums.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES20.iPhone\Core.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES20.iPhone\Core.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES20.iPhone\Delegates.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES20.iPhone\Delegates.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES20.iPhone\ES.Obsolete.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES20.iPhone\ES.Obsolete.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES20.iPhone\ES.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES20.iPhone\ES.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES20.iPhone\Enums.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES20.iPhone\Enums.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES20\Helper.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES20.iPhone\Helper.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES30.iPhone\Core.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES30.iPhone\Core.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES30.iPhone\Delegates.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES30.iPhone\Delegates.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES30.iPhone\ES.Obsolete.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES30.iPhone\ES.Obsolete.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES30.iPhone\ES.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES30.iPhone\ES.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES30.iPhone\Enums.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES30.iPhone\Enums.cs</Link>
-    </Compile>
-    <Compile Include="..\external\opentk\Source\OpenTK\Graphics\ES30.iPhone\Helper.cs">
-      <Link>OpenGLES\OpenTK\Graphics\ES30.iPhone\Helper.cs</Link>
-    </Compile>
-    <Compile Include="..\src\System.Drawing\ColorKnownColorTypeForwarders.cs">
-      <Link>System.Drawing\ColorKnownColorTypeForwarders.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="OpenGLES\OpenTK\Platform\iPhoneOS\" />
-    <Folder Include="OpenGLES\OpenTK\Graphics\ES11.iPhone\" />
-    <Folder Include="OpenGLES\OpenTK\Graphics\ES20.iPhone\" />
-  </ItemGroup>
-</Project>
diff --git a/src/opentk.mk b/src/opentk.mk
deleted file mode 100644
index 293fa73ab85d..000000000000
--- a/src/opentk.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#
-# OpenTK[-1.0]
-#
-IOS_OPENTK_1_0_CORE_SOURCES = \
-	$(OPENTK_PATH)/Source/OpenTK/Math/BezierCurve.cs			\
-	$(OPENTK_PATH)/Source/OpenTK/Math/BezierCurveCubic.cs		\
-	$(OPENTK_PATH)/Source/OpenTK/Math/BezierCurveQuadric.cs		\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Box2.cs					\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Functions.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Half.cs					\
-	$(OPENTK_PATH)/Source/OpenTK/Math/MathHelper.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Matrix2.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Matrix3.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Matrix3d.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Matrix4.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Matrix4d.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Quaternion.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Quaterniond.cs			\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector2.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector2d.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector2h.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector3.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector3d.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector3h.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector4.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector4d.cs				\
-	$(OPENTK_PATH)/Source/OpenTK/Math/Vector4h.cs				\
-	OpenGLES/OpenTK/Math/Vector2i.cs					\
-	OpenGLES/OpenTK/Math/Vector3i.cs					\
-	OpenGLES/OpenTK/Math/Vector4i.cs					\
-
-# Xamarin.iOS
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/OpenTK-1.0%: $(MACIOS_BINARIES_PATH)/OpenTK/ios/OpenTK-1.0%
-	$(Q) $(CP) $< $@
-
-# Xamarin.TVOS
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/OpenTK-1.0%: $(MACIOS_BINARIES_PATH)/OpenTK/tvos/OpenTK-1.0%
-	$(Q) $(CP) $< $@
-
-# Xamarin.Mac
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/%: $(MACIOS_BINARIES_PATH)/OpenTK/macos/lib/%
-	$(Q) mkdir -p $(dir $@)
-	$(Q) $(CP) $^ $@
-
-MACOS_TARGETS += \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile/OpenTK.dll     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/mobile/OpenTK.pdb     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile/OpenTK.dll        \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/mobile/OpenTK.pdb        \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full/OpenTK.dll       \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/full/OpenTK.pdb       \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full/OpenTK.dll          \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/64bits/full/OpenTK.pdb          \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/OpenTK.dll     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/OpenTK.pdb     \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/net_4_5/OpenTK.dll    \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/reference/net_4_5/OpenTK.pdb	   \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/OpenTK.dll             \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/OpenTK.pdb             \
diff --git a/src/packages.config b/src/packages.config
deleted file mode 100644
index 59a196a90eb2..000000000000
--- a/src/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.DiaSymReader.Pdb2Pdb" version="1.1.0-beta2-19521-03" targetFramework="net46" />
-  <package id="XliffTasks" version="1.0.0-beta.19607.1" targetFramework="net46" />
-</packages>
\ No newline at end of file
diff --git a/src/rosetta.pl b/src/rosetta.pl
deleted file mode 100644
index 4feeec8db8fd..000000000000
--- a/src/rosetta.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-print "<html><head><title>MonoTouch Rosetta Stone</title><link rel='stylesheet' href='global.css' type='text/css' /></head><body>";
-
-while (<>){
-    print "<h1>Namespace $1</h1>\n" if $_ =~ /namespace(.*){/; 
-    print "<h3>Class $1</h3>\n" if $_ =~ /interface (.*){/; 
-    
-    if (/Export/){ 
-        ($sel) = $_ =~ /"(.*)"/; 
-        chop; 
-        $a = <>; 
-        chop $a; 
-        $a =~ s/^[ \t]*//; 
-	if ($a =~ /get;|set;/){
-	    $t = "Property:";
-	} else {
-	    $t = "Method:";
-	}
-        print "\t<div class='selector'>Selector: <b><tt>$sel</tt></b>\t<br>\n\t$t <b><tt>$a</tt></b></div>\n";
-    }
-}
-print "</body></html>";
diff --git a/src/touch-unit.sources b/src/touch-unit.sources
deleted file mode 100644
index e6fbbbb5c5f8..000000000000
--- a/src/touch-unit.sources
+++ /dev/null
@@ -1,299 +0,0 @@
-NUNITLITE_SOURCES = \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/AssemblyInfo.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Assert.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/AssertionHelper.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Assume.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Contains.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Env.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/GlobalSettings.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Guard.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Has.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/IExpectException.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Is.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Iz.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/ListMapper.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/MessageMatch.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/ObjectList.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/SpecialValue.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/TestCaseData.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/TestContext.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Throws.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ExpectedExceptionData.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/IParameterDataSource.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/IPropertyBag.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITest.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestAssemblyBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestAssemblyRunner.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestCaseData.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestCaseSource.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestCaseSourceProvider.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestListener.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ITestResult.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/IXmlNodeBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/PropertyEntry.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/ResultState.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/RunState.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/TestOutput.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/TestStatus.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Api/XmlNode.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/CategoryAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/CombinatorialAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/CultureAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/DataAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/DatapointAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/DatapointSourceAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/DatapointsAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/DescriptionAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/ExpectedExceptionAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/ExplicitAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/IgnoreAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/IncludeExcludeAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/MaxTimeAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/NUnitAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/PairwiseAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/PlatformAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/PropertyAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/RandomAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/RangeAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/RepeatAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/SequentialAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/SetCultureAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/SetUICultureAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/SetUpAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TearDownAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TestAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TestCaseAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TestCaseSourceAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TestFixtureAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TestFixtureSetUpAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TestFixtureTearDownAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TheoryAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/TimeoutAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/ValueSourceAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Attributes/ValuesAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/AllItemsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/AndConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/AssignableFromConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/AssignableToConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/AttributeConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/AttributeExistsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/BasicConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/BinaryConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/BinarySerializableConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/CollectionConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/CollectionContainsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/CollectionEquivalentConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/CollectionItemsEqualConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/CollectionOrderedConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/CollectionSubsetConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/CollectionTally.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ComparisonAdapter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ComparisonConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Constraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ConstraintBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ConstraintExpression.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ConstraintExpressionBase.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ConstraintFactory.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ContainsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/DelayedConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/EmptyCollectionConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/EmptyConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/EmptyDirectoryConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/EmptyStringConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/EndsWithConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/EqualConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/EqualityAdapter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ExactCountConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ExactTypeConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ExceptionTypeConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/FalseConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/FloatingPointNumerics.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/GreaterThanConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/GreaterThanOrEqualConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/IResolveConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/InstanceOfTypeConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/LessThanConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/LessThanOrEqualConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/MessageWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/MsgUtils.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/NUnitComparer.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/NUnitEqualityComparer.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/NaNConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/NoItemConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/NotConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/NullConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/NullOrEmptyStringConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Numerics.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/OrConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/PathConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/PredicateConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/PrefixConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/PropertyConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/PropertyExistsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/RangeConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/RegexConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ResolvableConstraintExpression.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ReusableConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/SameAsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/SamePathConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/SamePathOrUnderConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/SomeItemsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/StartsWithConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/StringConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/SubstringConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ThrowsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ThrowsNothingConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Tolerance.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/ToleranceMode.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/TrueConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/TypeConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/UniqueItemsConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/XmlSerializableConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/AndOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/AttributeOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/BinaryOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/CollectionOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/ConstraintOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/ExactCountOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/NotOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/OrOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/PrefixOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/PropOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/SelfResolvingOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/ThrowsOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/WithOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Exceptions/AssertionException.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Exceptions/IgnoreException.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Exceptions/InconclusiveException.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Exceptions/SuccessException.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Extensibility/IParameterDataProvider.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Extensibility/ISuiteBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Extensibility/ITestCaseBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Extensibility/ITestCaseProvider.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/FinallyDelegate.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/AssemblyHelper.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/CultureDetector.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/ExceptionHelper.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/IApplyToContext.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/IApplyToTest.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/InvalidTestFixtureException.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/MethodHelper.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/NUnitException.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/NUnitLiteTestAssemblyBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/NUnitLiteTestAssemblyRunner.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/OSPlatform.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/ParameterSet.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/PlatformHelper.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/PropertyBag.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/PropertyNames.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Randomizer.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Reflect.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/RuntimeFramework.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/StackFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/TestExecutionContext.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/TestFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/TestFixtureBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/TestListener.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/TextMessageWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/ThreadUtility.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/TypeHelper.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/CombinatorialStrategy.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/CombinatorialTestCaseProvider.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/CombiningStrategy.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/DataAttributeTestCaseProvider.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/DatapointProvider.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/NUnitTestCaseBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/NUnitTestFixtureBuilder.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/PairwiseStrategy.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/ParameterDataProvider.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/ProviderCache.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Builders/SequentialStrategy.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/ApplyChangesToContextCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/CommandDecoratorList.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/CommandStage.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/DelegatingTestCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/ExpectedExceptionCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/ICommandDecorator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/MaxTimeCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/RepeatedTestCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/SetUpTearDownCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/SkipCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/TestCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/TestMethodCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Extensibility/ParameterDataProviders.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Extensibility/TestCaseProviders.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Filters/AndFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Filters/CategoryExpression.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Filters/CategoryFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Filters/NotFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Filters/OrFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Filters/SimpleNameFilter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Results/TestCaseResult.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Results/TestResult.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Results/TestSuiteResult.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Tests/ParameterizedFixtureSuite.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Tests/ParameterizedMethodSuite.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Tests/Test.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Tests/TestAssembly.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Tests/TestFixture.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Tests/TestMethod.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Tests/TestSuite.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/WorkItems/CompositeWorkItem.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/WorkItems/CountdownEvent.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/WorkItems/SimpleWorkItem.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/WorkItems/WorkItem.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/WorkItems/WorkItemState.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/CommandLineOptions.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/ConsoleWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/DebugWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/ResultSummary.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/TcpWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/OutputWriters/NUnit2XmlOutputWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/OutputWriters/NUnit3XmlOutputWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/OutputWriters/OutputWriter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/AllOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/NoneOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/Operators/SomeOperator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/FailurePoint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Constraints/SubPathConstraint.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Compatibility/SerializableAttribute.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Runner/ResultReporter.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/AsyncInvocationRegion.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/AsyncSynchronizationContext.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/RandomGenerator.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/StringUtil.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/FlakyTestRetriesCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/OneTimeSetUpCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/OneTimeTearDownCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Commands/TheoryResultCommand.cs \
-	$(MONO_IOS_SDK_DESTDIR)/ios-sources/external/nunit-lite/NUnitLite-1.0.0/src/framework/Internal/Filters/SimpleCategoryExpression.cs \
-
-IOS_TOUCHUNIT_SOURCES = \
-	$(NUNITLITE_SOURCES) \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/HttpTextWriter.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/Options.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/NUnitOutputTextWriter.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TestCaseElement.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TestElement.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TestSuiteElement.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TouchRunner.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TouchViewController.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TcpTextWriter.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TouchOptions.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TestRocks.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TestResultElement.cs \
-
-TVOS_TOUCHUNIT_SOURCES = \
-	$(IOS_TOUCHUNIT_SOURCES) \
-
-
-WATCHOS_TOUCHUNIT_SOURCES = \
-	$(NUNITLITE_SOURCES) \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/HttpTextWriter.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/Options.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/NUnitOutputTextWriter.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TouchRunner.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TcpTextWriter.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TouchOptions.cs \
-	$(TOUCH_UNIT_PATH)/NUnitLite/TouchRunner/TestRocks.cs \
diff --git a/src/xamios.tmpl.csproj b/src/xamios.tmpl.csproj
deleted file mode 100644
index 00ed0609ff1d..000000000000
--- a/src/xamios.tmpl.csproj
+++ /dev/null
@@ -1,56 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>Xamarin.iOS</AssemblyName>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <IntermediateOutputPath>build\IDE\obj\iOS\$(Configuration)</IntermediateOutputPath>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\iOS\Debug</OutputPath>
-    <DefineConstants>IPHONE;IOS;MINIMAL;MONOTOUCH</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-    <NoWarn>3021,3014,3003</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\iOS\Release</OutputPath>
-    <DefineConstants>IPHONE;IOS;MINIMAL;MONOTOUCH</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="build\ios\native\**\*.cs">
-      <Link>build\ios\native\%(RecursiveDir)%(Filename).cs</Link>
-    </Compile>
-    <!--%FILES%-->
-    <!--%APIS%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
diff --git a/src/xammac.pc.in b/src/xammac.pc.in
deleted file mode 100644
index 04dfc44e23a9..000000000000
--- a/src/xammac.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/mono
-GacPackage=false
-
-Name: Xamarin.Mac
-Description: Xamarin.Mac
-Version: @PACKAGE_VERSION@
-Libs: -r:${libdir}/XamMac.dll
diff --git a/src/xammac.tmpl.csproj b/src/xammac.tmpl.csproj
deleted file mode 100644
index 0887b24c5441..000000000000
--- a/src/xammac.tmpl.csproj
+++ /dev/null
@@ -1,53 +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>
-    <ProjectGuid>{87042AD2-CDC9-4A53-9193-56226B668B88}</ProjectGuid>
-    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>Xamarin.Mac</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <IntermediateOutputPath>build\IDE\obj\macOS-mobile\$(Configuration)</IntermediateOutputPath>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\macOS-mobile\Debug</OutputPath>
-    <DefineConstants>DEBUG;MONOMAC;NO_SYSTEM_DRAWING</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>build\IDE\bin\macOS-mobile\Release</OutputPath>
-    <DefineConstants>MONOMAC;NO_SYSTEM_DRAWING</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="build\mac\mobile\**\*.cs">
-      <Link>build\mac\mobile\%(RecursiveDir)%(Filename).cs</Link>
-    </Compile>
-    <!--%FILES%-->
-    <!--%APIS%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-</Project>
diff --git a/src/xammaccatalyst.tmpl.csproj b/src/xammaccatalyst.tmpl.csproj
deleted file mode 100644
index a1d610867f5d..000000000000
--- a/src/xammaccatalyst.tmpl.csproj
+++ /dev/null
@@ -1,56 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E1F334C3-8F77-46C9-A28B-A8E9BAEA9FE5}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>Xamarin.MacCatalyst</AssemblyName>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <IntermediateOutputPath>build\IDE\obj\MacCatalyst\$(Configuration)</IntermediateOutputPath>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\MacCatalyst\Debug</OutputPath>
-    <DefineConstants>IPHONE;MACCATALYST;MINIMAL;MONOTOUCH</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-    <NoWarn>3021,3014,3003</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\MacCatalyst\Release</OutputPath>
-    <DefineConstants>IPHONE;MACCATALYST;MINIMAL;MONOTOUCH</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="build\maccatalyst\native\**\*.cs">
-      <Link>build\maccatalyst\native\%(RecursiveDir)%(Filename).cs</Link>
-    </Compile>
-    <!--%FILES%-->
-    <!--%APIS%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
diff --git a/src/xamtvos.tmpl.csproj b/src/xamtvos.tmpl.csproj
deleted file mode 100644
index be995872e0f3..000000000000
--- a/src/xamtvos.tmpl.csproj
+++ /dev/null
@@ -1,56 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{072C1DD1-7566-4387-B9EC-466891558ACC}</ProjectGuid>
-    <ProjectTypeGuids>{06FA79CB-D6CD-4721-BB4B-1BD202089C55};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>Xamarin.TVOS</AssemblyName>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <IntermediateOutputPath>build\IDE\obj\tvOS\$(Configuration)</IntermediateOutputPath>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\tvOS\Debug</OutputPath>
-    <DefineConstants>MONOTOUCH;IPHONE;TVOS;XAMCORE_3_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-    <NoWarn>3021,3014,3003</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\tvOS\Release</OutputPath>
-    <DefineConstants>MONOTOUCH;TVOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="build\tvos\tvos\**\*.cs">
-      <Link>build\tvos\tvos\%(RecursiveDir)%(Filename).cs</Link>
-    </Compile>
-    <!--%FILES%-->
-    <!--%APIS%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
-</Project>
diff --git a/src/xamwatch.tmpl.csproj b/src/xamwatch.tmpl.csproj
deleted file mode 100644
index 1f6b12d370f4..000000000000
--- a/src/xamwatch.tmpl.csproj
+++ /dev/null
@@ -1,56 +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>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B84C539D-971D-4703-8ABC-E1077FDA651C}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace></RootNamespace>
-    <AssemblyName>Xamarin.WatchOS</AssemblyName>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\product.snk</AssemblyOriginatorKeyFile>
-    <IntermediateOutputPath>build\IDE\obj\watchOS\$(Configuration)</IntermediateOutputPath>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\watchOS\Debug</OutputPath>
-    <DefineConstants>MONOTOUCH;WATCH;XAMCORE_3_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentation>True</GenerateDocumentation>
-    <NoWarn>3021,3014,3003</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\IDE\bin\watchOS\Release</OutputPath>
-    <DefineConstants>MONOTOUCH;WATCH;XAMCORE_3_0</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="build\watch\watch\**\*.cs">
-      <Link>build\watch\watch\%(RecursiveDir)%(Filename).cs</Link>
-    </Compile>
-    <!--%FILES%-->
-    <!--%APIS%-->
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.CSharp.targets" />
-</Project>
diff --git a/tools/common/Make.common b/tools/common/Make.common
index 838256b0934d..530d21d7e4cd 100644
--- a/tools/common/Make.common
+++ b/tools/common/Make.common
@@ -1,6 +1,6 @@
 # We check in SdkVersions.cs so that it's easier to use this file when building tests on Windows.
 
-../common/SdkVersions.cs: ../common/SdkVersions.in.cs Makefile $(TOP)/Make.config $(TOP)/Make.versions
+$(abspath ../common/SdkVersions.cs): ../common/SdkVersions.in.cs Makefile $(TOP)/Make.config $(TOP)/Make.versions
 	$(Q_GEN) sed \
 		-e 's/@IOS_SDK_VERSION@/$(IOS_SDK_VERSION)/g' -e 's/@WATCHOS_SDK_VERSION@/$(WATCH_SDK_VERSION)/' -e 's/@TVOS_SDK_VERSION@/$(TVOS_SDK_VERSION)/' -e 's/@MACOS_SDK_VERSION@/$(MACOS_SDK_VERSION)/' \
 		-e 's/@MACCATALYST_SDK_VERSION@/$(MACCATALYST_SDK_VERSION)/g' \
@@ -63,7 +63,7 @@
 	$(Q) if ! diff $@ $@.tmp >/dev/null; then $(CP) $@.tmp $@; git diff "$@"; echo "The file $(TOP)/tools/common/SdkVersions.cs has been automatically re-generated; please commit the changes."; exit 1; fi
 	$(Q) touch $@
 
-../common/ProductConstants.cs: ../common/ProductConstants.in.cs Makefile $(TOP)/Make.config $(GIT_DIRECTORY)/index
+$(abspath ../common/ProductConstants.cs): ../common/ProductConstants.in.cs Makefile $(TOP)/Make.config $(GIT_DIRECTORY)/index
 	$(Q_GEN) sed \
 		-e "s/@IOS_VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \
 		-e "s/@TVOS_VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \
diff --git a/tools/common/ProjectInspector.csproj b/tools/common/ProjectInspector.csproj
index 4dfa51eabbc8..0d6674088a90 100644
--- a/tools/common/ProjectInspector.csproj
+++ b/tools/common/ProjectInspector.csproj
@@ -23,7 +23,7 @@
 	<Target Name="WriteInputs">
 		<WriteLinesToFile
 			File="$(InputsPath)"
-			Lines="@(ProjectReference);@(Compile);@(EmbeddedResource)"
+			Lines="@(ProjectReference->'%(FullPath)');@(Compile->'%(FullPath)');@(EmbeddedResource->'%(FullPath)')"
 			Overwrite="True"
 		/>
 	</Target>
diff --git a/tools/devops/automation/templates/tests/run-tests.yml b/tools/devops/automation/templates/tests/run-tests.yml
index f625ab48d289..9f5943d59514 100644
--- a/tools/devops/automation/templates/tests/run-tests.yml
+++ b/tools/devops/automation/templates/tests/run-tests.yml
@@ -108,15 +108,6 @@ steps:
   env:
     MACIOS_UPLOAD_PREFIX: ${{ parameters.uploadPrefix }}
 
-- bash: |
-    set -x
-    set -e
-
-    make -C src build/ios.rsp
-  workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-macios
-  displayName: Generate rsp files
-  timeoutInMinutes: 30
-
 - bash: |
     set -x
     set -e
diff --git a/tools/mmp/mmp.csproj b/tools/mmp/mmp.csproj
index c8522084c3b8..46ac1152a2a9 100644
--- a/tools/mmp/mmp.csproj
+++ b/tools/mmp/mmp.csproj
@@ -318,8 +318,8 @@
     <Compile Include="..\linker\MonoTouch.Tuner\PreserveSmartEnumConversions.cs">
       <Link>tools\linker\MonoTouch.Tuner\PreserveSmartEnumConversions.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\build\mac\Constants.cs">
-      <Link>src\build\mac\Constants.cs</Link>
+    <Compile Include="..\..\src\build\dotnet\macos\Constants.cs">
+      <Link>src\build\dotnet\macos\Constants.cs</Link>
     </Compile>
     <Compile Include="..\..\src\ObjCRuntime\Constants.cs">
       <Link>src\ObjCRuntime\Constants.cs</Link>
diff --git a/tools/mtouch/Makefile b/tools/mtouch/Makefile
index b09ac77dff9a..6e63837bae44 100644
--- a/tools/mtouch/Makefile
+++ b/tools/mtouch/Makefile
@@ -238,7 +238,7 @@ mtouch.csproj.inc: export BUILD_VERBOSITY=$(MSBUILD_VERBOSITY)
 $(MTOUCH_DIR)/mtouch.exe: $(mtouch_dependencies)
 	$(Q_GEN) $(SYSTEM_MSBUILD) mtouch.csproj /r $(XBUILD_VERBOSITY) /p:Configuration=$(MTOUCH_CONF)
 
-Constants.cs: Constants.cs.in Makefile $(TOP)/Make.config.inc
+$(abspath Constants.cs): Constants.cs.in Makefile $(TOP)/Make.config.inc
 	$(Q_GEN) sed \
 		-e "s/@VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \
 		-e 's/@REVISION@/$(IOS_COMMIT_DISTANCE) ($(CURRENT_BRANCH_SED_ESCAPED): $(CURRENT_HASH))/g' \