[src] Remove legacy build logic. (#21353)

2024-10-10 11:26:25 +02:00 · 2024-10-10 11:26:25 +02:00 · 953a2b4564
--- 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
--- a/src/AddressBook/ABPerson.cs
+++ b/src/AddressBook/ABPerson.cs
@ -1021,11 +1021,7 @@ namespace AddressBook {

 		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)]
--- 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
--- a/src/Constants.watch.cs.in
+++ b/src/Constants.watch.cs.in
@ -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
-	}
-}
--- a/src/Foundation/NSIndexPath.cs
+++ b/src/Foundation/NSIndexPath.cs
@ -40,12 +40,7 @@ namespace Foundation {
 			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 @@ namespace Foundation {
 			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);
 		}

--- a/src/Foundation/NSNumber2.cs
+++ b/src/Foundation/NSNumber2.cs
@ -131,31 +131,19 @@ namespace Foundation {
 		}

 		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 ()
--- a/src/ImageIO/CGImageAnimation.cs
+++ b/src/ImageIO/CGImageAnimation.cs
@ -67,9 +67,6 @@ namespace ImageIO {
 		[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 @@ namespace ImageIO {
 #endif
 				return CGAnimateImageAtURLWithBlock (url.Handle, options.GetHandle (), &block);
 			}
-#endif
 		}

 #if NET
@ -101,9 +97,6 @@ namespace ImageIO {
 		[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 @@ namespace ImageIO {
 #endif
 				return CGAnimateImageDataWithBlock (data.Handle, options.GetHandle (), &block);
 			}
-#endif
 		}

 		//
--- a/src/Makefile
+++ b/src/Makefile
--- 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
-
-$(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)
-	$(Q) $(CP) $< $@
+bgen.csproj.inc: export BUILD_EXECUTABLE=$(DOTNET) build
+bgen.csproj.inc: export BUILD_VERBOSITY=$(MSBUILD_VERBOSITY)

 # 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)
+$(DOTNET_BUILD_DIR)/bgen.csproj.inc: bgen/bgen.csproj.inc
+	$(Q) $(CP) $< $@
+
 -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                          \
-
--- a/src/MetalPerformanceShaders/MPSDefs.cs
+++ b/src/MetalPerformanceShaders/MPSDefs.cs
@ -130,11 +130,7 @@ namespace MetalPerformanceShaders {
 	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;
--- a/src/MonoTouch.NUnitLite.maccatalyst.templ.csproj
+++ b/src/MonoTouch.NUnitLite.maccatalyst.templ.csproj
@ -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>
--- a/src/MonoTouch.NUnitLite.templ.csproj
+++ b/src/MonoTouch.NUnitLite.templ.csproj
@ -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>
--- a/src/MonoTouch.NUnitLite.tvos.templ.csproj
+++ b/src/MonoTouch.NUnitLite.tvos.templ.csproj
@ -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>
--- a/src/MonoTouch.NUnitLite.watchos.templ.csproj
+++ b/src/MonoTouch.NUnitLite.watchos.templ.csproj
@ -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>
--- a/src/NativeTypes/Makefile
+++ b/src/NativeTypes/Makefile
@ -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}
--- a/src/NativeTypes/Primitives.tt
+++ b/src/NativeTypes/Primitives.tt
@ -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
--- a/src/NativeTypes/TODO
+++ b/src/NativeTypes/TODO
@ -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
--- a/src/NativeTypes/test.cs
+++ b/src/NativeTypes/test.cs
@ -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);
-
-	}
-}
--- a/src/ObjCRuntime/Runtime.cs
+++ b/src/ObjCRuntime/Runtime.cs
@ -2722,22 +2722,12 @@ namespace ObjCRuntime {
 		[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;
 		}

--- a/src/OpenTK.dll.sources
+++ b/src/OpenTK.dll.sources
@ -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
--- 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!

--- a/src/System.Drawing/PointSizeRectangleTypeForwarders.cs
+++ b/src/System.Drawing/PointSizeRectangleTypeForwarders.cs
@ -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
--- a/src/UIKit/NSLayoutManager.cs
+++ b/src/UIKit/NSLayoutManager.cs
@ -51,15 +51,8 @@ namespace UIKit {

 			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 @@ namespace UIKit {
 						}
 					}
 				}
-#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;
 			}
--- a/src/Version.in
+++ b/src/Version.in
@ -1 +0,0 @@
-@VERSION@
--- a/src/bgen/Generator.cs
+++ b/src/bgen/Generator.cs
@ -1144,24 +1144,6 @@ public partial class Generator : IMemberGatherer {
 			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 @@ public partial class Generator : IMemberGatherer {
 		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 @@ public partial class Generator : IMemberGatherer {
 #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 @@ public partial class Generator : IMemberGatherer {
 						indent--;
 					}
 				}
-				if (is32BitNotSupported)
-					print ("#endif");
 				print ("}\n");
 			}
 		}
@ -4279,12 +4237,6 @@ public partial class Generator : IMemberGatherer {
 #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 @@ public partial class Generator : IMemberGatherer {
 						}
 					}
 				}
-				if (is32BitNotSupported)
-					print ("#endif");
 				print ("}");
 			}
 		}
@ -4655,12 +4605,6 @@ public partial class Generator : IMemberGatherer {

 			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 @@ public partial class Generator : IMemberGatherer {
 					indent--;
 				}
 			}
-			if (is32BitNotSupported)
-				print ("#endif");
 			print ("}\n");
 		}

@ -5957,18 +5899,7 @@ public partial class Generator : IMemberGatherer {

 				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 partial class Generator : IMemberGatherer {
 					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 partial class Generator : IMemberGatherer {
 							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 partial class Generator : IMemberGatherer {
 							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 partial class Generator : IMemberGatherer {
 														   () => 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 partial class Generator : IMemberGatherer {
 							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 partial class Generator : IMemberGatherer {
 							} 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 ();
 						}
--- 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" />
--- a/src/bmac.ikvm
+++ b/src/bmac.ikvm
@ -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[@]}"
--- a/src/btouch-native
+++ b/src/btouch-native
@ -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 "$@"
--- a/src/btouch-native.in
+++ b/src/btouch-native.in
@ -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 "$@"
--- a/src/btv
+++ b/src/btv
@ -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 "$@"
--- a/src/build/dotnet/generator-frameworks.g.cs
+++ b/src/build/dotnet/generator-frameworks.g.cs
--- a/src/bwatch
+++ b/src/bwatch
@ -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 "$@"
--- a/src/bwatch.in
+++ b/src/bwatch.in
@ -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 "$@"
-
--- a/src/custom-make.sh
+++ b/src/custom-make.sh
@ -1,7 +0,0 @@
-#!/bin/bash -ex
-
-#
-# This is a hack to make monotouch.csproj compile in XS. A big hack.
-#
-
-make -j20
--- 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 \
--- a/src/generator.csproj
+++ b/src/generator.csproj
@ -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>
--- a/src/generator.sln
+++ b/src/generator.sln
@ -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
--- a/src/opentk.csproj
+++ b/src/opentk.csproj
@ -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>
--- a/src/opentk.mk
+++ b/src/opentk.mk
@ -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             \
--- a/src/packages.config
+++ b/src/packages.config
@ -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>
--- a/src/rosetta.pl
+++ b/src/rosetta.pl
@ -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>";
--- a/src/touch-unit.sources
+++ b/src/touch-unit.sources
@ -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 \
--- a/src/xamios.tmpl.csproj
+++ b/src/xamios.tmpl.csproj
@ -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>
--- a/src/xammac.pc.in
+++ b/src/xammac.pc.in
@ -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
--- a/src/xammac.tmpl.csproj
+++ b/src/xammac.tmpl.csproj
@ -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>
--- a/src/xammaccatalyst.tmpl.csproj
+++ b/src/xammaccatalyst.tmpl.csproj
@ -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>
--- a/src/xamtvos.tmpl.csproj
+++ b/src/xamtvos.tmpl.csproj
@ -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>
--- a/src/xamwatch.tmpl.csproj
+++ b/src/xamwatch.tmpl.csproj
@ -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>
--- 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" \
--- 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>
--- 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
--- 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>
--- 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' \