From c4981a6f2342f69c9affea9df580509132e2cfd8 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 4 Dec 2024 17:41:30 +0100
Subject: [PATCH 01/11] [CoreVideo] Add CVMetalBufferCache.TryCreate overloads
 and use these to improve tests. (#21757)

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
---
 src/CoreVideo/CVMetalBufferCache.cs           | 43 +++++++++--
 .../CoreVideo/CVMetalBufferCacheTest.cs       | 76 ++++++++++++++++---
 .../CoreVideo/CVMetalBufferTest.cs            |  4 +-
 3 files changed, 103 insertions(+), 20 deletions(-)

diff --git a/src/CoreVideo/CVMetalBufferCache.cs b/src/CoreVideo/CVMetalBufferCache.cs
index ae0562fa29d..ecbb025b6f2 100644
--- a/src/CoreVideo/CVMetalBufferCache.cs
+++ b/src/CoreVideo/CVMetalBufferCache.cs
@@ -1,5 +1,8 @@
 #if !WATCH
 using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 using CoreFoundation;
@@ -51,16 +54,44 @@ public static nint GetTypeId ()
 
 		static IntPtr Create (IMTLDevice device, NSDictionary? attributes)
 		{
-			IntPtr handle;
-			CVReturn res;
-			unsafe {
-				res = CVMetalBufferCacheCreate (IntPtr.Zero, attributes.GetHandle (), device.GetNonNullHandle (nameof (device)), &handle);
-			}
-			if (res != CVReturn.Success)
+			if (!TryCreateHandle (device, attributes, out IntPtr handle, out var res))
 				throw new Exception ($"Could not create CVMetalBufferCache, CVMetalBufferCacheCreate returned: {res}");
 			return handle;
 		}
 
+		/// <summary>Try to create a new <see cref="CVMetalBufferCache" /> instance.</summary>
+		/// <param name="device">The Metal device to create the <see cref="CVMetalBufferCache" /> instance for.</param>
+		/// <param name="attributes">An optional dictionary of attributes to apply to the cache.</param>
+		/// <param name="metalBufferCache">The new <see cref="CVMetalBufferCache" /> instance, if successful, null otherwise.</param>
+		/// <param name="status">An error code if failed, or <see cref="CVReturn.Success" /> if successful.</param>
+		/// <returns>True if successful, otherwise false.</returns>
+		public static bool TryCreate (IMTLDevice device, NSDictionary? attributes, [NotNullWhen (true)] out CVMetalBufferCache? metalBufferCache, out CVReturn status)
+		{
+			var rv = TryCreateHandle (device, attributes, out IntPtr handle, out status);
+			if (rv) {
+				metalBufferCache = new CVMetalBufferCache (handle, true);
+			} else {
+				metalBufferCache = null;
+			}
+			return rv;
+		}
+
+		/// <summary>Try to create a new <see cref="CVMetalBufferCache" /> instance.</summary>
+		/// <param name="device">The Metal device to create the <see cref="CVMetalBufferCache" /> instance for.</param>
+		/// <param name="attributes">An optional dictionary of attributes to apply to the cache.</param>
+		/// <param name="handle">The pointer to the new <see cref="CVMetalBufferCache" /> instance, if successful.</param>
+		/// <param name="status">An error code if failed, or <see cref="CVReturn.Success" /> if successful.</param>
+		/// <returns>True if successful, otherwise false.</returns>
+		[EditorBrowsable (EditorBrowsableState.Never)]
+		public static bool TryCreateHandle (IMTLDevice device, NSDictionary? attributes, out IntPtr handle, out CVReturn status)
+		{
+			handle = IntPtr.Zero;
+			unsafe {
+				status = CVMetalBufferCacheCreate (IntPtr.Zero, attributes.GetHandle (), device.GetNonNullHandle (nameof (device)), (IntPtr*) Unsafe.AsPointer<IntPtr> (ref handle));
+			}
+			return status == CVReturn.Success;
+		}
+
 		/// <summary>Create a new <see cref="CVMetalBufferCache" /> instance.</summary>
 		/// <param name="device">The Metal device to create the <see cref="CVMetalBufferCache" /> instance for.</param>
 		/// <param name="attributes">An optional dictionary of attributes to apply to the cache.</param>
diff --git a/tests/monotouch-test/CoreVideo/CVMetalBufferCacheTest.cs b/tests/monotouch-test/CoreVideo/CVMetalBufferCacheTest.cs
index d13352af1c8..d1bbb2e8ee5 100644
--- a/tests/monotouch-test/CoreVideo/CVMetalBufferCacheTest.cs
+++ b/tests/monotouch-test/CoreVideo/CVMetalBufferCacheTest.cs
@@ -19,6 +19,29 @@ namespace MonoTouchFixtures.CoreVideo {
 	[Preserve (AllMembers = true)]
 	public class CVMetalBufferCacheTests {
 
+		static bool? supported;
+		public static bool Supported {
+			get {
+				if (supported is null) {
+					using var device = MTLDevice.SystemDefault;
+					if (device is null) {
+						supported = false;
+					} else {
+						supported = CVMetalBufferCache.TryCreate (device, (NSDictionary) null, out var cache, out var _);
+						cache?.Dispose ();
+					}
+				}
+				return supported.Value;
+			}
+		}
+
+		public static void AssertSupported ()
+		{
+			if (Supported)
+				return;
+			Assert.Ignore ("CVMetalBufferCache is not supported on this machine.");
+		}
+
 		[Test]
 		public void GetTypeIdTest ()
 		{
@@ -31,24 +54,59 @@ public void GetTypeIdTest ()
 		public void CtorTest_NSDictionary ()
 		{
 			TestRuntime.AssertXcodeVersion (16, 0);
+			AssertSupported ();
 
 			using var device = MTLDevice.SystemDefault;
-			if (device is null)
-				Assert.Ignore ("Metal is not supported on this device.");
-
 			using var cache = new CVMetalBufferCache (device, (NSDictionary) null);
 			Assert.IsNotNull (cache);
 		}
 
 		[Test]
-		public void CtorTest_CVMetalBufferCacheAttributes ()
+		public void TryCreate ()
 		{
 			TestRuntime.AssertXcodeVersion (16, 0);
+			using var device = MTLDevice.SystemDefault;
+			if (device is null)
+				Assert.Ignore ("Metal is not supported on this machine.");
+
+			var rv = CVMetalBufferCache.TryCreate (device, (NSDictionary) null, out var metalBufferCache, out var status);
+			if (rv) {
+				Assert.AreEqual (CVReturn.Success, status, "Status A");
+				Assert.IsNotNull (metalBufferCache, "MetalBufferCache A");
+			} else {
+				Assert.AreEqual (CVReturn.Unsupported, status, "Status B");
+				Assert.IsNull (metalBufferCache, "MetalBufferCache B");
+			}
+			metalBufferCache?.Dispose ();
+		}
 
+		[Test]
+		public void TryCreateHandle ()
+		{
+			TestRuntime.AssertXcodeVersion (16, 0);
 			using var device = MTLDevice.SystemDefault;
 			if (device is null)
-				Assert.Ignore ("Metal is not supported on this device.");
+				Assert.Ignore ("Metal is not supported on this machine.");
+
+			var rv = CVMetalBufferCache.TryCreateHandle (device, (NSDictionary) null, out var metalBufferCache, out var status);
+			if (rv) {
+				Assert.AreEqual (CVReturn.Success, status, "Status A");
+				Assert.AreNotEqual (IntPtr.Zero, metalBufferCache, "MetalBufferCache A");
+			} else {
+				Assert.AreEqual (CVReturn.Unsupported, status, "Status B");
+				Assert.AreEqual (IntPtr.Zero, metalBufferCache, "MetalBufferCache B");
+			}
+			if (metalBufferCache != IntPtr.Zero)
+				TestRuntime.CFRelease (metalBufferCache);
+		}
+
+		[Test]
+		public void CtorTest_CVMetalBufferCacheAttributes ()
+		{
+			TestRuntime.AssertXcodeVersion (16, 0);
+			AssertSupported ();
 
+			using var device = MTLDevice.SystemDefault;
 			using var cache = new CVMetalBufferCache (device, (CVMetalBufferCacheAttributes) null);
 			Assert.IsNotNull (cache);
 		}
@@ -60,11 +118,9 @@ public void CreateBufferFromImageTest (CVPixelFormatType pft)
 		{
 			TestRuntime.AssertXcodeVersion (16, 0);
 			TestRuntime.AssertNotSimulator (); // metal api not supported in the simulator
+			AssertSupported ();
 
 			using var device = MTLDevice.SystemDefault;
-			if (device is null)
-				Assert.Ignore ("Metal is not supported on this device.");
-
 			using var cache = new CVMetalBufferCache (device, (CVMetalBufferCacheAttributes) null);
 			var dict = new CVPixelBufferAttributes () {
 				MetalCompatibility = true,
@@ -79,11 +135,9 @@ public void CreateBufferFromImageTest (CVPixelFormatType pft)
 		public void FlushTest ()
 		{
 			TestRuntime.AssertXcodeVersion (16, 0);
+			AssertSupported ();
 
 			using var device = MTLDevice.SystemDefault;
-			if (device is null)
-				Assert.Ignore ("Metal is not supported on this device.");
-
 			using var cache = new CVMetalBufferCache (device, (CVMetalBufferCacheAttributes) null);
 			cache.Flush ();
 			cache.Flush (CVOptionFlags.None);
diff --git a/tests/monotouch-test/CoreVideo/CVMetalBufferTest.cs b/tests/monotouch-test/CoreVideo/CVMetalBufferTest.cs
index 104d232fe54..aaa4694729b 100644
--- a/tests/monotouch-test/CoreVideo/CVMetalBufferTest.cs
+++ b/tests/monotouch-test/CoreVideo/CVMetalBufferTest.cs
@@ -35,11 +35,9 @@ public void GetMetalBufferTest (CVPixelFormatType pft)
 		{
 			TestRuntime.AssertXcodeVersion (16, 0);
 			TestRuntime.AssertNotSimulator (); // metal api not supported in the simulator
+			CVMetalBufferCacheTests.AssertSupported ();
 
 			using var device = MTLDevice.SystemDefault;
-			if (device is null)
-				Assert.Ignore ("Metal is not supported on this device.");
-
 			using var cache = new CVMetalBufferCache (device, (CVMetalBufferCacheAttributes) null);
 			var dict = new CVPixelBufferAttributes () {
 				MetalCompatibility = true,

From 803d0fdae264a9dd3a517a026105df0548b53185 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 4 Dec 2024 18:46:32 +0100
Subject: [PATCH 02/11] [Foundation] Fix memory leak in
 NSArray.ArrayFromHandle<T> (#21749)

---
 src/Foundation/NSArray.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Foundation/NSArray.cs b/src/Foundation/NSArray.cs
index 8dc5654cfe4..028be3f6c5d 100644
--- a/src/Foundation/NSArray.cs
+++ b/src/Foundation/NSArray.cs
@@ -407,7 +407,7 @@ static public T [] ArrayFromHandle<T> (NativeHandle handle, Converter<NativeHand
 		static public T [] ArrayFromHandle<T> (NativeHandle handle, Converter<NativeHandle, T> creator, bool releaseHandle)
 		{
 			var rv = ArrayFromHandle<T> (handle, creator);
-			if (releaseHandle && handle == NativeHandle.Zero)
+			if (releaseHandle && handle != NativeHandle.Zero)
 				NSObject.DangerousRelease (handle);
 			return rv;
 		}

From 55b75a4f8b19bb247e780b66a8599e1b604303d3 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 4 Dec 2024 18:46:45 +0100
Subject: [PATCH 03/11] Update DOWNLOADS doc regarding legacy Xamarin
 deprecation. (#21751)

Fixes #21744.
---
 DOWNLOADS.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/DOWNLOADS.md b/DOWNLOADS.md
index aa856d54429..d36c1c43a4f 100644
--- a/DOWNLOADS.md
+++ b/DOWNLOADS.md
@@ -1,3 +1,10 @@
+> [!NOTE]
+> This page lists Xamarin.iOS and Xamarin.Mac downloads, which are both discontinued.
+> 
+> If you're looking for how to install a specific version of the iOS, tvOS, Mac Catalyst or macOS workloads (for .NET),
+> please [file an issue](https://github.com/xamarin/xamarin-macios/issues/new/choose) explaining what you need
+> (they're shipped as .NET workloads, and not installable from packages).
+
 # Xamarin.iOS
 
 | Date | Version | Package | Release Notes |

From 3959953bb2fd64979c7755a3c6a853d0e51a902a Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 4 Dec 2024 18:49:36 +0100
Subject: [PATCH 04/11] Bump Xamarin.MacDev. (#21743)

New commits in xamarin/Xamarin.MacDev:

* xamarin/Xamarin.MacDev@25c687f Remove SQLite.cs (not used anymore)
* xamarin/Xamarin.MacDev@7be3e79 Update NUnit to 4.x (and the tests)

Diff: https://github.com/xamarin/Xamarin.MacDev/compare/bd3d13362bfda48a34fa0cc419744c4a1f4dc45a..25c687f14f4dacb90d13b7671c78c3742e3c06e5

From 001f1efceee0aafd6702044e5fcedac67f4bce56 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 4 Dec 2024 18:56:48 +0100
Subject: [PATCH 05/11] [msbuild] Remove a lot of legacy logic + a few
 improvements. (#21742)

* Remove a lot of legacy build logc.
* Unify the installed files: we now install all files on all platforms (except
  files related to remote windows support). This simplifies the build logic,
  and doesn't increase the nupkg size in any significant way, because these
  are tiny text files.
* Completely merge Xamarin.iOS.Tasks.dll and Xamarin.Mac.Tasks.dll into
  Xamarin.MacDev.Tasks.dll, and remove the two former assemblies. This also
  simplifies a lot of build logic.
* Ship the translations for our task assemblies in .NET (seems like this was
  overlooked in the .NET migration).
---
 dotnet/Makefile                               |   4 +-
 .../targets/Microsoft.iOS.Sdk.props           |   2 +-
 .../targets/Microsoft.iOS.Windows.Sdk.props   |   4 +-
 .../targets/Microsoft.iOS.Windows.Sdk.targets |  16 +-
 dotnet/Workloads/SignList.xml                 |  22 +-
 dotnet/targets/Xamarin.Shared.Sdk.props       |   3 +-
 dotnet/targets/Xamarin.Shared.Sdk.targets     |   2 +-
 msbuild/ILMerge.targets                       |   5 +-
 msbuild/Makefile                              | 408 ++----------------
 .../Xamarin.Messaging.Build.csproj            |   6 +-
 msbuild/Xamarin.HotRestart.PreBuilt/Makefile  |   6 +-
 .../Properties/AssemblyInfo.cs                |  10 -
 .../Xamarin.Mac.Tasks.csproj                  |  41 --
 msbuild/Xamarin.MacDev.Tasks.sln              |  20 -
 .../Properties/AssemblyInfo.cs                |  15 +-
 msbuild/Xamarin.MacDev.Tasks/Tasks/Archive.cs |   2 +-
 .../Tasks/CompileAppManifest.cs               |  15 +-
 .../Tasks/ComputeRemoteGeneratorProperties.cs |  46 +-
 .../Tasks/DetectSigningIdentity.cs            |  11 +-
 .../Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs |  19 +-
 .../Tasks/XamarinToolTask.cs                  |  18 +-
 .../Xamarin.MacDev.Tasks.csproj               |  41 +-
 .../Xamarin.ImplicitFacade.targets            | 111 -----
 .../Xamarin.Mac-Full-FrameworkList.xml.in     | 191 --------
 .../Xamarin.Mac-Mobile-FrameworkList.xml.in   | 190 --------
 .../Xamarin.Mac.AppExtension.CSharp.targets   |   3 +-
 ...marin.Mac.AppExtension.VisualBasic.targets |   1 -
 .../Xamarin.Shared/Xamarin.Mac.CSharp.targets |   2 -
 .../Xamarin.Shared/Xamarin.Mac.Common.targets |  32 --
 .../Xamarin.Mac.ObjCBinding.CSharp.targets    |  20 +-
 .../Xamarin.Mac.VisualBasic.targets           |   2 -
 .../Xamarin.MacCatalyst-FrameworkList.xml.in  | 192 ---------
 .../Xamarin.MacCatalyst.CSharp.targets        |   2 -
 .../Xamarin.MacCatalyst.Common.targets        |   2 +-
 ...rin.MacCatalyst.ObjCBinding.CSharp.targets |   2 +-
 .../Xamarin.MacCatalyst.VisualBasic.targets   |   2 -
 .../Xamarin.MonoTouch.CSharp.targets          |  20 -
 .../Xamarin.MonoTouch.FSharp.targets          |  20 -
 .../Xamarin.Shared.ObjCBinding.targets        |  18 -
 msbuild/Xamarin.Shared/Xamarin.Shared.props   |  30 +-
 msbuild/Xamarin.Shared/Xamarin.Shared.targets |  53 +--
 .../Xamarin.TVOS-FrameworkList.xml.in         | 191 --------
 .../Xamarin.TVOS.AppExtension.CSharp.targets  |   3 +-
 ...arin.TVOS.AppExtension.VisualBasic.targets |   1 -
 .../Xamarin.TVOS.CSharp.targets               |   1 -
 .../Xamarin.TVOS.Common.targets               |   2 +-
 .../Xamarin.TVOS.ObjCBinding.CSharp.targets   |   4 +-
 .../Xamarin.TVOS.VisualBasic.targets          |   1 -
 .../Xamarin.WatchOS-FrameworkList.xml.in      | 187 --------
 .../Xamarin.WatchOS.App.CSharp.targets        |   1 -
 .../Xamarin.WatchOS.App.Common.targets        |   2 +-
 ...amarin.WatchOS.AppExtension.CSharp.targets |   3 +-
 ...amarin.WatchOS.AppExtension.Common.targets |   4 +-
 .../Xamarin.WatchOS.CSharp.targets            |   3 +-
 .../Xamarin.WatchOS.Common.targets            |   4 +-
 ...Xamarin.WatchOS.ObjCBinding.CSharp.targets |   4 +-
 .../Xamarin.iOS-FrameworkList.xml.in          | 191 --------
 .../Xamarin.iOS.AppExtension.CSharp.targets   |   3 +-
 ...marin.iOS.AppExtension.VisualBasic.targets |   1 -
 .../Xamarin.Shared/Xamarin.iOS.CSharp.targets |   1 -
 .../Xamarin.Shared/Xamarin.iOS.Common.props   |   8 -
 .../Xamarin.Shared/Xamarin.iOS.Common.targets |  55 ---
 .../Xamarin.iOS.ObjCBinding.CSharp.targets    |   3 +-
 .../Xamarin.iOS.VisualBasic.targets           |   1 -
 .../Xamarin.iOS.WatchApp.CSharp.targets       |   3 +-
 .../Xamarin.iOS.Common.After.targets          |  16 +-
 .../Xamarin.iOS.Common.Before.targets         |   2 +-
 .../Xamarin.iOS.HotRestart.targets            |  12 +-
 ...marin.iOS.ObjCBinding.CSharp.After.targets |   2 +-
 .../Xamarin.iOS.Windows.props                 |   4 +-
 .../Properties/AssemblyInfo.cs                |  10 -
 .../Xamarin.iOS.Tasks.csproj                  |  75 ----
 .../Xamarin.MacDev.Tasks.Tests.csproj         |  12 +-
 tools/autoformat.sh                           |   2 -
 74 files changed, 193 insertions(+), 2228 deletions(-)
 delete mode 100644 msbuild/Xamarin.Mac.Tasks/Properties/AssemblyInfo.cs
 delete mode 100644 msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.ImplicitFacade.targets
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.Mac-Full-FrameworkList.xml.in
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.Mac-Mobile-FrameworkList.xml.in
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.MacCatalyst-FrameworkList.xml.in
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.MonoTouch.CSharp.targets
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.MonoTouch.FSharp.targets
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.TVOS-FrameworkList.xml.in
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.WatchOS-FrameworkList.xml.in
 delete mode 100644 msbuild/Xamarin.Shared/Xamarin.iOS-FrameworkList.xml.in
 delete mode 100644 msbuild/Xamarin.iOS.Tasks/Properties/AssemblyInfo.cs
 delete mode 100644 msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj

diff --git a/dotnet/Makefile b/dotnet/Makefile
index baf94c9ceae..1e34e33d16d 100644
--- a/dotnet/Makefile
+++ b/dotnet/Makefile
@@ -58,7 +58,7 @@ $(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call DefineWindowsTarget
 ifdef INCLUDE_HOTRESTART
 
 iOS_WINDOWS_NUGET_TARGETS += \
-	$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip \
+	$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip \
 
 endif
 
@@ -511,7 +511,7 @@ clean-local::
 	$(Q) $(DOTNET) restore package/workaround-for-maccore-issue-2427/restore.csproj /bl:package/workaround-for-maccore-issue-2427/restore.binlog $(MSBUILD_VERBOSITY)
 	$(Q) touch $@
 
-$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip: .stamp-install-workloads
+$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip: .stamp-install-workloads
 	$(Q) $(MAKE) -C $(TOP)/msbuild/Xamarin.HotRestart.PreBuilt all
 	$(Q) touch $@
 
diff --git a/dotnet/Microsoft.iOS.Sdk/targets/Microsoft.iOS.Sdk.props b/dotnet/Microsoft.iOS.Sdk/targets/Microsoft.iOS.Sdk.props
index ac5d7a75729..5caef63a2a1 100644
--- a/dotnet/Microsoft.iOS.Sdk/targets/Microsoft.iOS.Sdk.props
+++ b/dotnet/Microsoft.iOS.Sdk/targets/Microsoft.iOS.Sdk.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <_PlatformName>iOS</_PlatformName>
     <!-- Used by Microsoft.iOS.Windows.Sdk -->
-    <CoreiOSSdkDirectory>$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\</CoreiOSSdkDirectory>
+    <CoreiOSSdkDirectory>$(MSBuildThisFileDirectory)..\tools\msbuild\</CoreiOSSdkDirectory>
   </PropertyGroup>
 
   <Import Project="Xamarin.Shared.Sdk.props" Condition="'$(_IsWorkloadEol)' != 'true'" />
diff --git a/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.props b/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.props
index 57f86c3eed6..dee6672eade 100644
--- a/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.props
+++ b/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.Before.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.Before.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.Before.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.Before.targets" />
 
   <PropertyGroup>
     <_DotNetRootRemoteDirectory Condition="$(_DotNetRootRemoteDirectory) == ''">/usr/local/share/dotnet/</_DotNetRootRemoteDirectory>
diff --git a/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.targets b/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.targets
index 56d2e29bae7..1790114a195 100644
--- a/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.targets
+++ b/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.targets
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.After.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.After.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.After.targets" />
 
   <!-- Note: The following pack files are not yet imported in .NET 6:
 
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.Common.After.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.Common.After.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.Common.Before.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.CSharp.After.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.CSharp.After.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.WatchApp.Common.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.Common.After.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.Common.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.Common.Before.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.CSharp.After.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.CSharp.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.WatchApp.Common.After.targets" />
 
   -->
 
diff --git a/dotnet/Workloads/SignList.xml b/dotnet/Workloads/SignList.xml
index fae12d42c70..f90d7e6391e 100644
--- a/dotnet/Workloads/SignList.xml
+++ b/dotnet/Workloads/SignList.xml
@@ -3,17 +3,17 @@
   <ItemGroup>
     <Skip Include="System.Reflection.MetadataLoadContext.dll" />
     <!-- Microsoft.iOS.Windows.Sdk content -->
-    <Skip Include="tools\msbuild\iOS\Microsoft.Win32.Registry.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Buffers.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Formats.Asn1.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Memory.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Numerics.Vectors.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Runtime.CompilerServices.Unsafe.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.AccessControl.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.Cryptography.Pkcs.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.Cryptography.ProtectedData.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.Principal.Windows.dll" />
-    <Skip Include="tools\msbuild\iOS\ws2_32.dll" />
+    <Skip Include="tools\msbuild\Microsoft.Win32.Registry.dll" />
+    <Skip Include="tools\msbuild\System.Buffers.dll" />
+    <Skip Include="tools\msbuild\System.Formats.Asn1.dll" />
+    <Skip Include="tools\msbuild\System.Memory.dll" />
+    <Skip Include="tools\msbuild\System.Numerics.Vectors.dll" />
+    <Skip Include="tools\msbuild\System.Runtime.CompilerServices.Unsafe.dll" />
+    <Skip Include="tools\msbuild\System.Security.AccessControl.dll" />
+    <Skip Include="tools\msbuild\System.Security.Cryptography.Pkcs.dll" />
+    <Skip Include="tools\msbuild\System.Security.Cryptography.ProtectedData.dll" />
+    <Skip Include="tools\msbuild\System.Security.Principal.Windows.dll" />
+    <Skip Include="tools\msbuild\ws2_32.dll" />
     <!-- Broker.zip -->
     <Skip Include="Broker\Newtonsoft.Json.dll" />
     <Skip Include="Broker\System.Net.Mqtt.dll" />
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
index cdea9479e7f..badf92982b6 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.props
+++ b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -29,8 +29,7 @@
 		<_XamarinRelativeSdkRootDirectory Condition="'$(_XamarinRelativeSdkRootDirectory)' == ''">$(XamarinRelativeSdkRootDirectory)</_XamarinRelativeSdkRootDirectory>
 		<!-- This is the location of the Microsoft.<platform>.Sdk NuGet on macOS, this value will be overriden from Windows  -->
 		<_XamarinSdkRootDirectoryOnMac>$(_XamarinSdkRootDirectory)</_XamarinSdkRootDirectoryOnMac>
-		<_XamarinTaskAssembly Condition="'$(_PlatformName)' != 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\iOS\Xamarin.iOS.Tasks.dll</_XamarinTaskAssembly>
-		<_XamarinTaskAssembly Condition="'$(_PlatformName)' == 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\macOS\Xamarin.Mac.Tasks.dll</_XamarinTaskAssembly>
+		<_XamarinTaskAssembly>$(_XamarinSdkRootDirectory)\tools\msbuild\Xamarin.MacDev.Tasks.dll</_XamarinTaskAssembly>
 
 		<!--
 			PublishAot should only take effect when doing 'dotnet publish', not when doing 'dotnet build'. We distinguish these cases using the '_IsPublishing' property,
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 1504cb8c6a9..4b9f0bb694d 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -2458,7 +2458,7 @@ global using nfloat = global::System.Runtime.InteropServices.NFloat%3B
 		<_ProjectLanguage Condition="'$(_ProjectLanguage)' == 'F#' ">FSharp</_ProjectLanguage>
 		<_ProjectLanguage Condition="'$(_ProjectLanguage)' == 'VB' ">VisualBasic</_ProjectLanguage>
 
-		<_TargetsDirectory>$(_XamarinSdkRootDirectory)\tools\msbuild\$(_PlatformName)\</_TargetsDirectory>
+		<_TargetsDirectory>$(_XamarinSdkRootDirectory)\tools\msbuild\</_TargetsDirectory>
 	</PropertyGroup>
 
 	<Import Project="$(_TargetsDirectory)Xamarin.iOS.$(_ProjectLanguage).targets"                  Condition="'$(_ProjectType)' == 'iOSExecutableProject' Or '$(_ProjectType)' == 'iOSClassLibrary' " />
diff --git a/msbuild/ILMerge.targets b/msbuild/ILMerge.targets
index 47b66b86d1f..98fe656bdb0 100644
--- a/msbuild/ILMerge.targets
+++ b/msbuild/ILMerge.targets
@@ -27,11 +27,10 @@
     <ItemGroup Condition="$(TargetFramework.StartsWith ('netstandard'))">
       <!-- I don't like to have a hard-coded list of assemblies to merge, but I couldn't find a way to calculate it -->
       <MergedAssemblies Include="@(ReferenceDependencyPaths)" Condition="'%(FileName)' == 'AssemblyStripper'" />
-      <MergedAssemblies Include="@(ReferenceDependencyPaths)" Condition="'%(FileName)' == 'MonoTargetsTasks'" />
-      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Xamarin.MacDev.Tasks'" />
+      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'MonoTargetsTasks'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Xamarin.MacDev'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'DotNetZip'" />
-      <MergedAssemblies Include="@(ReferenceDependencyPaths)" Condition="'%(FileName)' == 'ILLink.Tasks'" />
+      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'ILLink.Tasks'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'ILStrip'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Renci.SshNet'" />
diff --git a/msbuild/Makefile b/msbuild/Makefile
index 37ed2199d9c..c9c13719326 100644
--- a/msbuild/Makefile
+++ b/msbuild/Makefile
@@ -13,12 +13,10 @@ ifdef INCLUDE_MACCATALYST
 BUILD_IOS=1
 endif
 
-#
-# To add a new MSBuild assembly, add the base name to the corresponding [IOS|MAC]_[BINDING]_TASK_ASSEMBLIES variable.
 #
 # New .targets and .props files are picked up automatically if they're in a directory with already
-# existing .targets or .props files. If .targets or .props are added in a new directory, add that
-# directory using a wildcard function to the corresponding [IOS|MAC]_TARGETS variable.
+# existing .targets or .props files. If .targets or .props are added in a new directory, consider
+# changing your mind and putting them with any existing .targets or .props files.
 #
 
 ##
@@ -27,8 +25,6 @@ endif
 
 MSBUILD_PRODUCTS             = 
 MSBUILD_DIRECTORIES          =
-MSBUILD_SYMLINKS             =
-MSBUILD_TASK_ASSEMBLIES      =
 
 ALL_SOURCES:= \
 	$(shell git ls-files | sed 's/ /\\ /g') \
@@ -41,379 +37,66 @@ CONFIG      = Debug
 TARGETFRAMEWORK = netstandard2.0
 WINDOWSRUNTIMEIDENTIFIER = win
 
+LOCALIZATION_LANGUAGES=cs de es fr it ja ko pl pt-BR ru tr zh-Hans zh-Hant
+TRANSLATED_ASSEMBLIES = $(foreach locale,$(LOCALIZATION_LANGUAGES),$(locale)/Xamarin.Localization.MSBuild)
+LOCALIZATION_ASSEMBLIES = Xamarin.Localization.MSBuild
+
 ##
-## XI definitions
+## iOS definitions
 ## 
 
-IOS_TARGETS =                                                      \
-	$(wildcard Xamarin.Shared/Xamarin.MonoTouch.*.targets) \
-	$(wildcard Xamarin.Shared/Xamarin.iOS.*.props)         \
-	$(wildcard Xamarin.Shared/Xamarin.iOS.*.targets)       \
-	$(wildcard Xamarin.Shared/Xamarin.Shared*.props)       \
-	$(wildcard Xamarin.Shared/Xamarin.Shared*.targets)       \
-	$(wildcard Xamarin.Shared/Xamarin.ImplicitFacade.targets) \
-
 IOS_WINDOWS_TARGETS =                                                      \
 	$(wildcard Xamarin.iOS.Tasks.Windows/Xamarin.*.props)       \
 	$(wildcard Xamarin.iOS.Tasks.Windows/Xamarin.*.targets)       \
 	$(wildcard Xamarin.iOS.Tasks.Windows/bin/$(CONFIG)/$(TARGETFRAMEWORK)/$(WINDOWSRUNTIMEIDENTIFIER)/Xamarin.*.props)       \
 	$(wildcard Xamarin.iOS.Tasks.Windows/bin/$(CONFIG)/$(TARGETFRAMEWORK)/$(WINDOWSRUNTIMEIDENTIFIER)/Xamarin.*.targets)       \
 
-IOS_BINDING_TARGETS = $(wildcard Xamarin.ObjcBinding.Tasks/*.targets)
-
-LOCALIZATION_LANGUAGES=cs de es fr it ja ko pl pt-BR ru tr zh-Hans zh-Hant
-TRANSLATED_ASSEMBLIES = $(foreach locale,$(LOCALIZATION_LANGUAGES),$(locale)/Xamarin.Localization.MSBuild)
-LOCALIZATION_ASSEMBLIES = Xamarin.Localization.MSBuild
-IOS_TASK_ASSEMBLIES = Xamarin.iOS.Tasks $(LOCALIZATION_ASSEMBLIES)
+TASK_ASSEMBLIES = Xamarin.MacDev.Tasks $(LOCALIZATION_ASSEMBLIES)
 IOS_WINDOWS_TASK_ASSEMBLIES = Xamarin.iOS.Tasks.Windows
 IOS_WINDOWS_DEPENDENCIES = Xamarin.iOS.Windows.Client iSign.Core ws2_32 System.Diagnostics.Tracer System.Formats.Asn1 System.Buffers System.Memory System.Numerics.Vectors System.Runtime.CompilerServices.Unsafe System.Security.Cryptography.ProtectedData System.Security.Cryptography.Pkcs Microsoft.Win32.Registry System.Security.AccessControl System.Security.Principal.Windows
 IOS_WINDOWS_MOBILEDEVICE_TOOLS = iMobileDevice-net bz2 getopt ideviceactivation idevicebackup idevicebackup2 idevicecrashreport idevicedate idevicedebug idevicedebugserverproxy idevicediagnostics ideviceenterrecovery ideviceimagemounter ideviceinfo ideviceinstaller idevicename idevicenotificationproxy idevicepair ideviceprovision idevicerestore idevicescreenshot idevicesyslog idevice_id imobiledevice-net-lighthouse imobiledevice ios_webkit_debug_proxy iproxy irecovery irecovery libcharset libcurl LIBEAY32 libiconv libusb-1.0 libusb0 libxml2 lzma pcre pcreposix plist plistutil plist_cmp plist_test pthreadVC3 readline SSLEAY32 usbmuxd usbmuxd vcruntime140 zip zlib1
 
-IOS_DIRECTORIES =                                                                                           \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS                                                  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/RedistList                                       \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS                                                           \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.iOS/v1.0/RedistList \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin                                \
-	$(foreach language,$(LOCALIZATION_LANGUAGES),$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/$(language)) \
-
-IOS_2_1_SYMLINKS = \
-	$(foreach target,$(IOS_BINDING_TARGETS)       ,$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/$(notdir $(target)))       \
-
-# these point to a file in /Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.iOS
-IOS_X_I_SYMLINKS = \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/RedistList/FrameworkList.xml                                                                \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.iOS/v1.0/RedistList/FrameworkList.xml                          \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS                                                                       \
-
-IOS_SYMLINKS = $(IOS_X_I_SYMLINKS) $(IOS_2_1_SYMLINKS)
-
-IOS_PRODUCTS =                                                                                                         \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/FrameworkList.xml                                                       \
-	$(foreach target,$(IOS_TARGETS)               ,$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/$(notdir $(target)))     \
-	$(foreach target,$(IOS_BINDING_TARGETS)       ,$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/$(notdir $(target)))     \
-	$(foreach dll,$(IOS_TASK_ASSEMBLIES)          ,$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/$(dll).dll)              \
-	$(foreach dll,$(IOS_TASK_ASSEMBLIES)          ,$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/$(dll).pdb)              \
-	$(foreach dll,$(TRANSLATED_ASSEMBLIES)        ,$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/$(dll).resources.dll)    \
-	$(IOS_SYMLINKS)
-
-all-ios: $(IOS_PRODUCTS)
-symlinks-ios: $(IOS_SYMLINKS)
-
-ifdef BUILD_IOS
-MSBUILD_PRODUCTS += all-ios
-MSBUILD_SYMLINKS += symlinks-ios
-MSBUILD_TASK_ASSEMBLIES += $(IOS_TASK_ASSEMBLIES) $(IOS_WINDOWS_TASK_ASSEMBLIES)
-MSBUILD_DIRECTORIES += $(IOS_DIRECTORIES)
-endif
-
-
-##
-## MacCatalyst definitions
-##
-
-MACCATALYST_TARGETS =                                                \
-	$(wildcard Xamarin.Shared/Xamarin.MacCatalyst.*.props)   \
-	$(wildcard Xamarin.Shared/Xamarin.MacCatalyst.*.targets) \
-	$(wildcard Xamarin.Shared/Xamarin.ImplicitFacade.targets) \
-
-MACCATALYST_DIRECTORIES = \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.MacCatalyst/RedistList                                       \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst                                                       \
-
-MACCATALYST_SYMLINKS = \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.MacCatalyst/RedistList/FrameworkList.xml                                                                \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList/FrameworkList.xml                          \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/MacCatalyst                                                                       \
-
-MACCATALYST_PRODUCTS += \
-	$(MACCATALYST_SYMLINKS) \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml                                            \
-	$(foreach target,$(MACCATALYST_TARGETS),$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/$(notdir $(target))) \
-
-all-maccatalyst: $(MACCATALYST_PRODUCTS)
-symlinks-maccatalyst: $(MACCATALYST_SYMLINKS)
-
-ifdef INCLUDE_MACCATALYST
-MSBUILD_PRODUCTS += all-maccatalyst
-MSBUILD_DIRECTORIES += $(MACCATALYST_DIRECTORIES)
-MSBUILD_SYMLINKS += symlinks-maccatalyst
-endif
-
-##
-## Xamarin.TVOS definitions
-##
-
-TVOS_TARGETS =                                                \
-	$(wildcard Xamarin.Shared/Xamarin.TVOS.*.props)   \
-	$(wildcard Xamarin.Shared/Xamarin.TVOS.*.targets) \
-	$(wildcard Xamarin.Shared/Xamarin.ImplicitFacade.targets) \
-
-TVOS_DIRECTORIES =                                                                                           \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/RedistList                                       \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.TVOS/v1.0/RedistList \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS                                                       \
-
-# Xamarin.TVOS symlinks the entire $(MONOTOUCH_PREFIX)/lib/msbuild/TVOS directory to 
-# /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/TVOS instead of 
-# each separate file (like XI does).
-
-TVOS_SYMLINKS =                                                                                                                  \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/RedistList/FrameworkList.xml                                       \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.TVOS/v1.0/RedistList/FrameworkList.xml \
-	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/TVOS                                              \
-
-TVOS_PRODUCTS =                                                                                                                \
-	$(TVOS_SYMLINKS)                                                                                                           \
-	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/FrameworkList.xml                                                     \
-	$(foreach target,$(TVOS_TARGETS)               ,$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/$(notdir $(target))) \
-
-all-tvos: $(TVOS_PRODUCTS)
-symlinks-tvos: $(TVOS_SYMLINKS)
-
-ifdef INCLUDE_TVOS
-MSBUILD_PRODUCTS += all-tvos
-MSBUILD_DIRECTORIES += $(TVOS_DIRECTORIES)
-MSBUILD_SYMLINKS += symlinks-tvos
-endif
-
-##
-## XM definitions
-##
-
-MAC_TARGETS = \
-	$(wildcard Xamarin.Shared/Xamarin.Mac.*.props) \
-	$(wildcard Xamarin.Shared/Xamarin.Mac.*.targets) \
-	$(wildcard Xamarin.Shared/Xamarin.Shared*.props) \
-	$(wildcard Xamarin.Shared/Xamarin.Shared*.targets) \
-	$(wildcard Xamarin.Shared/Xamarin.ImplicitFacade.targets) \
-
-MAC_BINDING_TARGETS =
-
-MAC_TASK_ASSEMBLIES = Xamarin.Mac.Tasks $(LOCALIZATION_ASSEMBLIES)
-
-MAC_DIRECTORIES =                                                                                           \
-	$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin                                \
-	$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.Mac/v2.0/RedistList \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/RedistList                              \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild                                                  \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/RedistList                                      \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/etc/mono/4.5                                                 \
-	$(foreach language,$(LOCALIZATION_LANGUAGES),$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/$(language)) \
-
-MAC_SYMLINKS =                                                                                                                                       \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/RedistList/FrameworkList.xml                                                     \
-	$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.Mac/v2.0/RedistList/FrameworkList.xml                        \
-	$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac                                                                     \
-
-MAC_PRODUCTS =                                                                                                                 \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/FrameworkList.xml                                                   \
-	$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/RedistList/FrameworkList.xml                                       \
-	$(foreach target,$(MAC_TARGETS)               ,$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/$(notdir $(target))) \
-	$(foreach target,$(MAC_BINDING_TARGETS)       ,$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/$(notdir $(target))) \
-	$(foreach dll,$(MAC_TASK_ASSEMBLIES)          ,$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/$(dll).dll)          \
-	$(foreach dll,$(MAC_TASK_ASSEMBLIES)          ,$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/$(dll).pdb)          \
-	$(MAC_SYMLINKS)                                                                                                            \
-	$(foreach dll,$(TRANSLATED_ASSEMBLIES)        ,$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/$(dll).resources.dll)\
-
-all-mac: $(MAC_PRODUCTS)
-symlinks-mac: $(MAC_SYMLINKS)
-
-ifdef INCLUDE_MAC
-MSBUILD_PRODUCTS += all-mac
-MSBUILD_DIRECTORIES += $(MAC_DIRECTORIES)
-MSBUILD_SYMLINKS += symlinks-mac
-MSBUILD_TASK_ASSEMBLIES += $(MAC_TASK_ASSEMBLIES)
-endif
-
-##
-## Common definitions
-##
-
-##
-## XI ##
-##
-
-# Symlinks
-#
-# Everything in /Library/Frameworks/Mono.framework/External are links into /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
-# This makes it easy to switch XI, by just pointing /Library/Frameworks/Xamarin.iOS.framework/Versions/Current somewhere else
-
-$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.iOS/v1.0/RedistList/FrameworkList.xml: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.iOS/v1.0/RedistList
-	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/iOS/$(notdir $@) $@
-
-$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
-	$(Q) ln -Fhs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/iOS $@
-
-$(IOS_2_1_SYMLINKS): | $(IOS_DIRECTORIES)
-	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/iOS/$(notdir $@) $@
-
-# The actual content goes into /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/FrameworkList.xml: Xamarin.Shared/Xamarin.iOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
-	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.iOS@' $< > $@
+PROPS_AND_TARGETS = \
+	$(wildcard Xamarin.Shared/*.props)   \
+	$(wildcard Xamarin.Shared/*.targets) \
+	$(wildcard Xamarin.ObjcBinding.Tasks/*.targets) \
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/RedistList/FrameworkList.xml: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/FrameworkList.xml | $(IOS_DIRECTORIES)
-	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/iOS/$(notdir $@) $@ 
+MSBUILD_TASK_ASSEMBLIES += $(TASK_ASSEMBLIES)
 
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.ObjcBinding.Tasks/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
-	$(Q) install -m 644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.MacDev.Tasks/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
-	$(Q) install -m 644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.Shared/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
-	$(Q) install -m 644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.iOS.Tasks/bin/$(CONFIG)/$(TARGETFRAMEWORK)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS $(foreach language,$(LOCALIZATION_LANGUAGES),$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/$(language))
-	$(Q) install -m 644 $< $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.Localization.MSBuild/bin/$(CONFIG)/$(TARGETFRAMEWORK)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
-	$(Q) install -m 644 $< $@
-
-##
-## MacCatalyst
-##
-
-$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList/FrameworkList.xml: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList
-	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/MacCatalyst/$(notdir $@) $@
-
-$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/MacCatalyst: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
-	$(Q) ln -Fhs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/MacCatalyst $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml: Xamarin.Shared/Xamarin.MacCatalyst-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
-	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.MacCatalyst@' $< > $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.MacCatalyst/RedistList/FrameworkList.xml: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml | $(MACCATALYST_DIRECTORIES)
-	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/MacCatalyst/$(notdir $@) $@ 
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/%: Xamarin.Shared/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
-	$(Q) install -m 644 $< $@
-
-##
-## Xamarin.TVOS
-##
-
-$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.TVOS/v1.0/RedistList/FrameworkList.xml: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.TVOS/v1.0/RedistList
-	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/TVOS/$(notdir $@) $@
-
-$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/TVOS: $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
-	$(Q) ln -Fhs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/TVOS $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/FrameworkList.xml: Xamarin.Shared/Xamarin.TVOS-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS
-	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.TVOS@' $< > $@
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/RedistList/FrameworkList.xml: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/FrameworkList.xml | $(TVOS_DIRECTORIES)
-	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/TVOS/$(notdir $@) $@ 
-
-$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/%: Xamarin.Shared/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS
-	$(Q) install -m 644 $< $@
-
-##
-## XM ##
-##
-
-# Symlinks
-#
-# Everything in /Library/Frameworks/Mono.framework/External are links into /Library/Frameworks/Xamarin.Mac.framework/Versions/Current
-# This makes it easy to switch XM, by just pointing /Library/Frameworks/Xamarin.Mac.framework/Versions/Current somewhere else
-
-$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac: $(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
-	$(Q) ln -Fhs $(MAC_TARGETDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/msbuild $@
-
-$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.Mac/v2.0/RedistList/FrameworkList.xml: | $(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.Mac/v2.0/RedistList
-	$(Q) ln -fs $(MAC_TARGETDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/msbuild/$(notdir $@) $@
-
-# The actual content goes into /Library/Frameworks/Xamarin.Mac.framework/Versions/Current
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/FrameworkList.xml: Xamarin.Shared/Xamarin.Mac-Mobile-FrameworkList.xml.in Makefile | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild
-	$(Q) sed 's@%TargetFrameworkDirectory%@$(MAC_TARGETDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/mono/Xamarin.Mac@' $< > $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/RedistList/FrameworkList.xml: $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/FrameworkList.xml | $(MAC_DIRECTORIES)
-	$(Q) ln -fs $(MAC_TARGETDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/msbuild/$(notdir $@) $@ 
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/RedistList/FrameworkList.xml: Xamarin.Shared/Xamarin.Mac-Full-FrameworkList.xml.in Makefile | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/RedistList
-	$(Q) sed 's@%TargetFrameworkDirectory%@$(MAC_TARGETDIR)/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/mono/4.5@' $< > $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/%: Xamarin.Mac.Tasks/% | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild
-	$(Q) install -m 644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/%: Xamarin.Shared/% | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild
-	$(Q) install -m 644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/%: Xamarin.Mac.Tasks/bin/$(CONFIG)/$(TARGETFRAMEWORK)/% | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild $(foreach language,$(LOCALIZATION_LANGUAGES),$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/$(language))
-	$(Q) install -m 644 $< $@
-
-$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/%: Xamarin.Localization.MSBuild/bin/$(CONFIG)/$(TARGETFRAMEWORK)/% | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild
-	$(Q) install -m 644 $< $@
 ##
-## net5 targets ##
+## .NET targets ##
 ##
 
-# tvOS ships most of the iOS targets as well  (for now, we don't need all of these, so this is optimizable)
-DOTNET_SHARED_FILES = $(IOS_TARGETS) $(IOS_BINDING_TARGETS) $(foreach dll,$(IOS_TASK_ASSEMBLIES),$(dll).dll $(dll).pdb)
-DOTNET_IOS_FILES = $(DOTNET_SHARED_FILES) FrameworkList.xml
-DOTNET_TVOS_FILES = $(TVOS_TARGETS) FrameworkList.xml
-DOTNET_MACOS_FILES = $(MAC_TARGETS) $(MAC_BINDING_TARGETS) $(foreach dll,$(MAC_TASK_ASSEMBLIES),$(dll).dll $(dll).pdb) FrameworkList.xml
-DOTNET_MACCATALYST_FILES = $(MACCATALYST_TARGETS) FrameworkList.xml
+DOTNET_SHARED_FILES = \
+	$(PROPS_AND_TARGETS) \
+	$(foreach dll,$(MSBUILD_TASK_ASSEMBLIES),$(dll).dll $(dll).pdb)
 
-# iOS
-ifdef INCLUDE_IOS
-DOTNET_TARGETS += \
-	$(foreach target,$(DOTNET_IOS_FILES)          ,$(DOTNET_DESTDIR)/$(IOS_NUGET_SDK_NAME)/tools/msbuild/iOS/$(notdir $(target)))               \
+define InstallFiles
 
-endif
-
-# tvOS: contains all of the files for iOS as well (for now, we don't need all of them, so this is optimizable)
-ifdef INCLUDE_TVOS
 DOTNET_TARGETS += \
-	$(foreach target,$(DOTNET_SHARED_FILES)       ,$(DOTNET_DESTDIR)/$(TVOS_NUGET_SDK_NAME)/tools/msbuild/iOS/$(notdir $(target)))              \
-	$(foreach target,$(DOTNET_TVOS_FILES)         ,$(DOTNET_DESTDIR)/$(TVOS_NUGET_SDK_NAME)/tools/msbuild/tvOS/$(notdir $(target)))             \
+	$(foreach target,$(DOTNET_SHARED_FILES),$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild/$(notdir $(target))) \
+	$(foreach dll,$(TRANSLATED_ASSEMBLIES),$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild/$(dll).resources.dll) \
 
-endif
+DOTNET_DIRECTORIES_$(1) += \
+	$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild \
+	$(foreach locale,$(LOCALIZATION_LANGUAGES),$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild/$(locale)) \
 
-# macOS
-ifdef INCLUDE_MAC
-DOTNET_TARGETS += \
-	$(foreach target,$(DOTNET_MACOS_FILES)        ,$(DOTNET_DESTDIR)/$(MACOS_NUGET_SDK_NAME)/tools/msbuild/macOS/$(notdir $(target)))           \
-
-endif
+DOTNET_DIRECTORIES += $$(DOTNET_DIRECTORIES_$(1))
 
-# Mac Catalyst
-ifdef INCLUDE_MACCATALYST
-DOTNET_TARGETS += \
-	$(foreach target,$(DOTNET_SHARED_FILES)       ,$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET_SDK_NAME)/tools/msbuild/iOS/$(notdir $(target)))              \
-	$(foreach target,$(DOTNET_MACCATALYST_FILES)  ,$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET_SDK_NAME)/tools/msbuild/MacCatalyst/$(notdir $(target)))      \
-
-endif
+$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild/%: Xamarin.Shared/% | $(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild
+	$$(Q) install -m 644 $$< $$@
 
-DOTNET_DIRECTORIES += \
-	$(DOTNET_DESTDIR)/$(IOS_NUGET_SDK_NAME)/tools/msbuild/iOS \
-	$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS \
-	$(DOTNET_DESTDIR)/$(TVOS_NUGET_SDK_NAME)/tools/msbuild/iOS \
-	$(DOTNET_DESTDIR)/$(TVOS_NUGET_SDK_NAME)/tools/msbuild/tvOS \
-	$(DOTNET_DESTDIR)/$(MACOS_NUGET_SDK_NAME)/tools/msbuild/macOS \
-	$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET_SDK_NAME)/tools/msbuild/iOS \
-	$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET_SDK_NAME)/tools/msbuild/MacCatalyst \
+$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild/%: Xamarin.MacDev.Tasks/bin/$(CONFIG)/$(TARGETFRAMEWORK)/% | $$(DOTNET_DIRECTORIES_$(1))
+	$$(Q) install -m 644 $$< $$@
 
-$(DOTNET_DESTDIR)/$(MACOS_NUGET_SDK_NAME)/tools/msbuild/macOS/%: $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/msbuild/% | $(DOTNET_DIRECTORIES)
-	$(Q) $(CP) $< $@
+$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild/%: Xamarin.Localization.MSBuild/bin/$(CONFIG)/$(TARGETFRAMEWORK)/% | $$(DOTNET_DIRECTORIES_$(1))
+	$$(Q) install -m 644 $$< $$@
 
-$(DOTNET_DESTDIR)/$(IOS_NUGET_SDK_NAME)/tools/msbuild/%: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/% | $(DOTNET_DIRECTORIES)
-	$(Q) $(CP) $< $@
+$(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild/%: Xamarin.ObjcBinding.Tasks/% | $(DOTNET_DESTDIR)/$($(2)_NUGET_SDK_NAME)/tools/msbuild
+	$$(Q) install -m 644 $$< $$@
+endef
 
-$(DOTNET_DESTDIR)/$(TVOS_NUGET_SDK_NAME)/tools/msbuild/%: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/% | $(DOTNET_DIRECTORIES)
-	$(Q) $(CP) $< $@
-
-$(DOTNET_DESTDIR)/$(TVOS_NUGET_SDK_NAME)/tools/msbuild/tvOS/%: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/TVOS/% | $(DOTNET_DIRECTORIES)
-	$(Q) $(CP) $< $@
-
-$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET_SDK_NAME)/tools/msbuild/%: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/% | $(DOTNET_DIRECTORIES)
-	$(Q) $(CP) $< $@
-
-$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET_SDK_NAME)/tools/msbuild/MacCatalyst/%: $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/% | $(DOTNET_DIRECTORIES)
-	$(Q) $(CP) $< $@
+$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call InstallFiles,$(platform),$(shell echo $(platform) | tr 'a-z' 'A-Z'))))
 
 MSBUILD_DIRECTORIES += $(DOTNET_DIRECTORIES)
 
@@ -432,12 +115,12 @@ DOTNET_IOS_WINDOWS_MOBILEDEVICE_TOOLS_X86 = $(foreach file,$(IOS_WINDOWS_MOBILED
 DOTNET_IOS_WINDOWS_MOBILEDEVICE_TOOLS_X64 = $(foreach file,$(IOS_WINDOWS_MOBILEDEVICE_TOOLS),Xamarin.iOS.Tasks.Windows/bin/$(CONFIG)/$(TARGETFRAMEWORK)/$(WINDOWSRUNTIMEIDENTIFIER)/imobiledevice-x64/$(file).*)
 
 .copy-windows-files: .build-stamp
-	$(Q) mkdir -p $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS
-	$(Q) $(CP) $(DOTNET_IOS_WINDOWS_FILES) $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/
-	$(Q) mkdir -p $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/imobiledevice-x86
-	$(Q) $(CP) $(DOTNET_IOS_WINDOWS_MOBILEDEVICE_TOOLS_X86) $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/imobiledevice-x86/
-	$(Q) mkdir -p $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/imobiledevice-x64
-	$(Q) $(CP) $(DOTNET_IOS_WINDOWS_MOBILEDEVICE_TOOLS_X64) $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/imobiledevice-x64/
+	$(Q) mkdir -p $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild
+	$(Q) $(CP) $(DOTNET_IOS_WINDOWS_FILES) $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/
+	$(Q) mkdir -p $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/imobiledevice-x86
+	$(Q) $(CP) $(DOTNET_IOS_WINDOWS_MOBILEDEVICE_TOOLS_X86) $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/imobiledevice-x86/
+	$(Q) mkdir -p $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/imobiledevice-x64
+	$(Q) $(CP) $(DOTNET_IOS_WINDOWS_MOBILEDEVICE_TOOLS_X64) $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/imobiledevice-x64/
 
 .dotnet-windows: .build-stamp .copy-windows-files
 
@@ -462,16 +145,11 @@ all-local:: $(MSBUILD_PRODUCTS) .stamp-test-xml
 $(foreach dll,$(MSBUILD_TASK_ASSEMBLIES),$(dll)/bin/$(CONFIG)/$(TARGETFRAMEWORK)/$(dll).dll $(dll)/bin/$(CONFIG)/$(TARGETFRAMEWORK)/$(dll).pdb): .build-stamp
 $(foreach dll,$(TRANSLATED_ASSEMBLIES),Xamarin.Localization.MSBuild/bin/$(CONFIG)/$(TARGETFRAMEWORK)/$(dll).resources.dll): .build-stamp
 
-# Always remake the symlinks
-.PHONY: $(MSBUILD_SYMLINKS)
-
 # this is a directory-creating target.
 # we sort to remove duplicates, which can happen if MAC_DESTDIR and IOS_DESTDIR are the same (both create a '/Library/Frameworks/Mono.framework/External/xbuild/Xamarin' target)
-$(sort $(MSBUILD_DIRECTORIES)) build:
+$(sort $(MSBUILD_DIRECTORIES)):
 	$(Q) mkdir -p $@
 
-install-symlinks: $(MSBUILD_SYMLINKS)
-
 install-local:: $(MSBUILD_PRODUCTS)
 
 .stamp-test-xml: $(wildcard */*.targets) $(wildcard */*.props)
@@ -501,7 +179,3 @@ Versions.g.cs: Makefile $(TOP)/Make.config.inc
 	$(Q) mv $@.tmp $@
 
 dotnet:: $(DOTNET_TARGETS)
-
-# make will automatically consider files created in chained implicit rules as temporary files, and delete them afterwards
-# marking those files as .SECONDARY will prevent that deletion.
-.SECONDARY: $(foreach file,$(MSBUILD_TASK_ASSEMBLIES),unbuild/$(file).dll) $(foreach file,$(MSBUILD_TASK_ASSEMBLIES),build/$(file).dll)
diff --git a/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj b/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj
index b46d9a83e98..d568407094b 100644
--- a/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj
+++ b/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj
@@ -56,14 +56,14 @@
   <ItemGroup>
     <!-- The iOS.Tasks assembly was ILRepacked to include MacDev.Tasks, if we use the references from the project we'get both and the types will collide -->
     <!-- We still need the project reference to mantain the build order dependency, but we add a reference to the assembly explicitly -->
-    <ProjectReference Include="..\..\Xamarin.iOS.Tasks\Xamarin.iOS.Tasks.csproj">
+    <ProjectReference Include="..\..\Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Xamarin.iOS.Tasks">
-      <HintPath>..\..\Xamarin.iOS.Tasks\bin\$(Configuration)\netstandard2.0\Xamarin.iOS.Tasks.dll</HintPath>
+    <Reference Include="Xamarin.MacDev.Tasks">
+      <HintPath>..\..\Xamarin.MacDev.Tasks\bin\$(Configuration)\netstandard2.0\Xamarin.MacDev.Tasks.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>
diff --git a/msbuild/Xamarin.HotRestart.PreBuilt/Makefile b/msbuild/Xamarin.HotRestart.PreBuilt/Makefile
index c6f332b111f..0d9848230c5 100644
--- a/msbuild/Xamarin.HotRestart.PreBuilt/Makefile
+++ b/msbuild/Xamarin.HotRestart.PreBuilt/Makefile
@@ -16,10 +16,10 @@ $(TOP)/tests/dotnet/%:
 	$(Q_GEN) if ! $(DOTNET) build Xamarin.PreBuilt.iOS/Xamarin.PreBuilt.iOS.csproj "/bl:$(abspath ./msbuild.binlog)" $(DOTNET_BUILD_VERBOSITY); then echo "Binlog: $(abspath ./msbuild.binlog)"; exit 1; fi
 	$(Q) touch $@
 
-$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip: Xamarin.PreBuilt.iOS.app.zip
+$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip: Xamarin.PreBuilt.iOS.app.zip
 	$(Q) mkdir -p $(dir $@)
 	$(Q) $(CP) $< $@
 
-all-local:: $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip
+all-local:: $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip
 
-install-local:: $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip
+install-local:: $(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip
diff --git a/msbuild/Xamarin.Mac.Tasks/Properties/AssemblyInfo.cs b/msbuild/Xamarin.Mac.Tasks/Properties/AssemblyInfo.cs
deleted file mode 100644
index 552667a2136..00000000000
--- a/msbuild/Xamarin.Mac.Tasks/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyCompanyAttribute ("Microsoft Corp.")]
-[assembly: AssemblyFileVersionAttribute (VersionConstants.XamarinMacVersion)]
-[assembly: AssemblyInformationalVersionAttribute (VersionConstants.XamarinMacVersion + "." + VersionConstants.NuGetPrereleaseIdentifier + "+" + VersionConstants.NuGetBuildMetadata)]
-[assembly: AssemblyProductAttribute ("Xamarin.Mac.Tasks")]
-[assembly: AssemblyTitleAttribute ("Xamarin.Mac.Tasks")]
-[assembly: AssemblyVersionAttribute (VersionConstants.XamarinMacVersion)]
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
deleted file mode 100644
index 964685d2f06..00000000000
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../product.snk</AssemblyOriginatorKeyFile>
-    <NoWarn>$(NoWarn);8002</NoWarn> <!-- Referenced projects aren't signed: this doesn't matter, because we use ILMerge to merge into a single assembly which we sign -->
-    <LangVersion>latest</LangVersion>
-    <WarningsAsErrors>Nullable</WarningsAsErrors>
-    <NoWarn>$(NoWarn);NU1603</NoWarn> <!-- Xamarin.Messaging.Build.Common 1.6.24 depends on Merq (>= 1.1.0) but Merq 1.1.0 was not found. An approximate best match of Merq 1.1.4 was resolved. -->
-    <NoWarn>$(NoWarn);MSB3277</NoWarn> <!-- warning MSB3277: Found conflicts between different versions of "System.Reflection.Metadata" that could not be resolved. -->
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Messaging.Build.Client" Version="$(MessagingVersion)" />
-    <!-- GitInfo is pulled in because of Xamarin.Messaging from above, but we don't want it, so just exclude all assets from it -->
-    <!-- This can be removed once our package references have been updated to not expose GitInfo -->
-    <PackageReference Include="GitInfo" Version="2.2.0" ExcludeAssets="all" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj" />
-    <ProjectReference Include="..\Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="*.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="*.props">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="../Xamarin.Shared/*.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="../Xamarin.Shared/*.props">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\ILMerge.targets" />
-</Project>
diff --git a/msbuild/Xamarin.MacDev.Tasks.sln b/msbuild/Xamarin.MacDev.Tasks.sln
index 6e2e63e8122..4b23455cffd 100644
--- a/msbuild/Xamarin.MacDev.Tasks.sln
+++ b/msbuild/Xamarin.MacDev.Tasks.sln
@@ -7,10 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.MacDev", "..\extern
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.MacDev.Tasks", "Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj", "{534D7C5A-0E1C-4C58-9E48-21B1A98919EB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Mac.Tasks", "Xamarin.Mac.Tasks\Xamarin.Mac.Tasks.csproj", "{C8D98DC1-5122-4B10-A152-17196C7BD9AC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.iOS.Tasks", "Xamarin.iOS.Tasks\Xamarin.iOS.Tasks.csproj", "{44605724-8002-48E1-895F-7CB068099B6A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Localization.MSBuild", "Xamarin.Localization.MSBuild\Xamarin.Localization.MSBuild.csproj", "{947E3C4C-8891-49D7-B665-23F785489D3F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D669990B-EE95-4282-AAC4-17CA05AE0575}"
@@ -49,22 +45,6 @@ Global
 		{534D7C5A-0E1C-4C58-9E48-21B1A98919EB}.Debug-net461|Any CPU.Build.0 = Debug|Any CPU
 		{534D7C5A-0E1C-4C58-9E48-21B1A98919EB}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
 		{534D7C5A-0E1C-4C58-9E48-21B1A98919EB}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Debug-net461|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Debug-net461|Any CPU.Build.0 = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8D98DC1-5122-4B10-A152-17196C7BD9AC}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Debug-net461|Any CPU.ActiveCfg = Debug|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Debug-net461|Any CPU.Build.0 = Debug|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
-		{44605724-8002-48E1-895F-7CB068099B6A}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
 		{947E3C4C-8891-49D7-B665-23F785489D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{947E3C4C-8891-49D7-B665-23F785489D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{947E3C4C-8891-49D7-B665-23F785489D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/msbuild/Xamarin.MacDev.Tasks/Properties/AssemblyInfo.cs b/msbuild/Xamarin.MacDev.Tasks/Properties/AssemblyInfo.cs
index 095d5877726..96ec1eed3bc 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Properties/AssemblyInfo.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Properties/AssemblyInfo.cs
@@ -32,20 +32,25 @@
 [assembly: AssemblyTitle ("Xamarin.MacDev.Tasks")]
 [assembly: AssemblyDescription ("")]
 [assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Xamarin Inc.")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Xamarin Inc.")]
-[assembly: AssemblyTrademark ("Xamarin Inc.")]
+[assembly: AssemblyCompany ("Microsoft Corp.")]
+[assembly: AssemblyProduct ("Xamarin.MacDev.Tasks")]
+[assembly: AssemblyCopyright ("Microsoft Corp.")]
+[assembly: AssemblyTrademark ("Microsoft Corp.")]
 [assembly: AssemblyCulture ("")]
 
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("1.0.0.0")]
+// We use the iOS version on all platforms (this way we only have to compile the tasks once)
+
+[assembly: AssemblyVersion (VersionConstants.XamarinIOSVersion)]
+[assembly: AssemblyFileVersion (VersionConstants.XamarinIOSVersion)]
+[assembly: AssemblyInformationalVersion (VersionConstants.XamarinIOSVersion + "." + VersionConstants.NuGetPrereleaseIdentifier + "+" + VersionConstants.NuGetBuildMetadata)]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
 
 //[assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyFile("")]
+
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/Archive.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/Archive.cs
index c64f862ea42..d49de77d7a0 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/Archive.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/Archive.cs
@@ -192,7 +192,7 @@ public override bool Execute ()
 				//arInfo.Add ("AppStoreFileSize", new PNumber (65535));
 				var props = new PDictionary ();
 				props.Add ("ApplicationPath", new PString (string.Format ("Applications/{0}", Path.GetFileName (AppBundleDir.ItemSpec))));
-				if (!string.IsNullOrEmpty (RuntimeIdentifiers) && IsDotNet) {
+				if (!string.IsNullOrEmpty (RuntimeIdentifiers)) {
 					var rids = RuntimeIdentifiers.Split (new char [] { ';' }, StringSplitOptions.RemoveEmptyEntries);
 					var array = new PArray ();
 					foreach (var rid in rids) {
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileAppManifest.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileAppManifest.cs
index f5daed95b54..1834210211c 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileAppManifest.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileAppManifest.cs
@@ -183,21 +183,10 @@ void AddXamarinVersionNumber (PDictionary plist)
 			if (IsWatchApp)
 				return;
 
-			string name;
-			string value;
-
 			// This key is our supported way of determining if an app
 			// was built with Xamarin, so it needs to be present in all apps.
-			if (TargetFramework.IsDotNet) {
-				value = DotNetVersion;
-				name = "com.microsoft." + Platform.AsString ().ToLowerInvariant ();
-			} else if (Platform != ApplePlatform.MacOSX) {
-				var version = Sdks.XamIOS.ExtendedVersion;
-				value = string.Format ("{0} ({1}: {2})", version.Version, version.Branch, version.Hash);
-				name = "com.xamarin.ios";
-			} else {
-				return;
-			}
+			var value = DotNetVersion;
+			var name = "com.microsoft." + Platform.AsString ().ToLowerInvariant ();
 
 			var dict = new PDictionary ();
 			dict.Add ("Version", new PString (value));
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/ComputeRemoteGeneratorProperties.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/ComputeRemoteGeneratorProperties.cs
index bbd2f68a456..a4bc99bc181 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/ComputeRemoteGeneratorProperties.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/ComputeRemoteGeneratorProperties.cs
@@ -55,63 +55,33 @@ void ComputeProperties ()
 			var projectPath = Path.Combine (projectDir, "ComputeRemoteGeneratorProperties.csproj");
 			var outputFile = Path.Combine (projectDir, "ComputedProperties.txt");
 			var binlog = Path.Combine (projectDir, "ComputeRemoteGeneratorProperties.binlog");
-			string executable;
 			string csproj;
 
 			if (Directory.Exists (projectDir))
 				Directory.Delete (projectDir, true);
 			Directory.CreateDirectory (projectDir);
 
-			if (IsDotNet) {
-				csproj = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+			csproj = $@"<?xml version=""1.0"" encoding=""utf-8""?>
 <Project Sdk=""Microsoft.NET.Sdk"">
 	<PropertyGroup>
 		<TargetFramework>net{TargetFramework.Version}-{PlatformName.ToLower ()}</TargetFramework>
 		<IsBindingProject>true</IsBindingProject>
 	</PropertyGroup>
 </Project>";
-			} else {
-				string targetsFile;
-				switch (Platform) {
-				case ApplePlatform.iOS:
-					targetsFile = $"$(MSBuildExtensionsPath)/Xamarin/iOS/Xamarin.iOS.ObjCBinding.CSharp.targets";
-					break;
-				case ApplePlatform.TVOS:
-					targetsFile = $"$(MSBuildExtensionsPath)/Xamarin/iOS/Xamarin.TVOS.ObjCBinding.CSharp.targets";
-					break;
-				case ApplePlatform.WatchOS:
-					targetsFile = $"$(MSBuildExtensionsPath)/Xamarin/iOS/Xamarin.WatchOS.ObjCBinding.CSharp.targets";
-					break;
-				case ApplePlatform.MacOSX:
-					targetsFile = "$(MSBuildExtensionsPath)/Xamarin/Mac/Xamarin.Mac.ObjCBinding.CSharp.targets";
-					break;
-				default:
-					throw new InvalidOperationException (string.Format (MSBStrings.InvalidPlatform, Platform));
-				}
-				csproj = $@"<?xml version=""1.0"" encoding=""utf-8""?>
-<Project DefaultTargets=""Build"" ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
-  <Import Project=""{targetsFile}"" />
-</Project>";
-			}
+
 			File.WriteAllText (projectPath, csproj);
 
 			var arguments = new List<string> ();
 			var environment = default (Dictionary<string, string?>);
-			string? workingDirectory = null;
+			var executable = this.GetDotNetPath ();
+			var workingDirectory = Path.GetDirectoryName (executable);
 
-			if (IsDotNet) {
-				executable = this.GetDotNetPath ();
-				workingDirectory = Path.GetDirectoryName (executable);
+			arguments.Add ("build");
 
-				arguments.Add ("build");
+			var customHome = Environment.GetEnvironmentVariable ("DOTNET_CUSTOM_HOME");
 
-				var customHome = Environment.GetEnvironmentVariable ("DOTNET_CUSTOM_HOME");
-
-				if (!string.IsNullOrEmpty (customHome)) {
-					environment = new Dictionary<string, string?> { { "HOME", customHome } };
-				}
-			} else {
-				executable = "/Library/Frameworks/Mono.framework/Commands/msbuild";
+			if (!string.IsNullOrEmpty (customHome)) {
+				environment = new Dictionary<string, string?> { { "HOME", customHome } };
 			}
 
 			arguments.Add ("/p:OutputFilePath=" + outputFile);
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSigningIdentity.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSigningIdentity.cs
index 12ddcdac336..6c2ee24e857 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSigningIdentity.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSigningIdentity.cs
@@ -189,14 +189,9 @@ public bool HasEntitlements {
 						// If no CodesignEntitlements was specified, we don't have any entitlements
 						hasEntitlements = false;
 					} else {
-						if (IsDotNet) {
-							// .NET: Check the file to see if there are any entitlements inside
-							var entitlements = PDictionary.FromFile (CodesignEntitlements.ItemSpec);
-							hasEntitlements = entitlements.Count > 0;
-						} else {
-							// Legacy Xamarin: to preserve backwards compat, consider the presence of a file enough to say we have entitlements.
-							hasEntitlements = true;
-						}
+						// Check the file to see if there are any entitlements inside
+						var entitlements = PDictionary.FromFile (CodesignEntitlements.ItemSpec);
+						hasEntitlements = entitlements.Count > 0;
 					}
 				}
 				return hasEntitlements.Value;
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs
index b4915d16b06..5264ede83cc 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs
@@ -32,20 +32,7 @@ void VerifyTargetFrameworkMoniker ()
 
 		public string Product {
 			get {
-				if (IsDotNet)
-					return "Microsoft." + PlatformName;
-
-				switch (Platform) {
-				case ApplePlatform.iOS:
-				case ApplePlatform.TVOS:
-				case ApplePlatform.WatchOS:
-				case ApplePlatform.MacCatalyst:
-					return "Xamarin.iOS";
-				case ApplePlatform.MacOSX:
-					return "Xamarin.Mac";
-				default:
-					throw new InvalidOperationException (string.Format (MSBStrings.InvalidPlatform, Platform));
-				}
+				return "Microsoft." + PlatformName;
 			}
 		}
 
@@ -71,10 +58,6 @@ public TargetFramework TargetFramework {
 			}
 		}
 
-		public bool IsDotNet {
-			get { return TargetFramework.IsDotNet; }
-		}
-
 		public string PlatformName {
 			get {
 				switch (Platform) {
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinToolTask.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinToolTask.cs
index 807f12d3597..bd85228b703 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinToolTask.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinToolTask.cs
@@ -27,19 +27,7 @@ void VerifyTargetFrameworkMoniker ()
 
 		public string Product {
 			get {
-				if (IsDotNet)
-					return "Microsoft." + PlatformName;
-
-				switch (Platform) {
-				case ApplePlatform.iOS:
-				case ApplePlatform.TVOS:
-				case ApplePlatform.WatchOS:
-					return "Xamarin.iOS";
-				case ApplePlatform.MacOSX:
-					return "Xamarin.Mac";
-				default:
-					throw new InvalidOperationException (string.Format (MSBStrings.InvalidPlatform, Platform));
-				}
+				return "Microsoft." + PlatformName;
 			}
 		}
 
@@ -63,10 +51,6 @@ public TargetFramework TargetFramework {
 			}
 		}
 
-		public bool IsDotNet {
-			get { return TargetFramework.IsDotNet; }
-		}
-
 		public string PlatformName {
 			get {
 				switch (Platform) {
diff --git a/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj b/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj
index 1e4b3dba3a6..d9c8ba3c26b 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj
+++ b/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj
@@ -4,12 +4,15 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IncludeMSBuildAssets Condition="'$(IncludeMSBuildAssets)' == ''">compile</IncludeMSBuildAssets>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../product.snk</AssemblyOriginatorKeyFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <WarningsAsErrors>Nullable</WarningsAsErrors>
     <DefineConstants>$(DefineConstants);MSBUILD_TASKS</DefineConstants>
     <NoWarn>$(NoWarn);NU1603</NoWarn> <!-- Xamarin.Messaging.Build.Common 1.6.24 depends on Merq (>= 1.1.0) but Merq 1.1.0 was not found. An approximate best match of Merq 1.1.4 was resolved. -->
     <NoWarn>$(NoWarn);MSB3277</NoWarn> <!-- warning MSB3277: Found conflicts between different versions of "System.Reflection.Metadata" that could not be resolved. -->
+    <NoWarn>$(NoWarn);8002</NoWarn> <!-- Referenced projects aren't signed: this doesn't matter, because we use ILMerge to merge into a single assembly which we sign -->
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -19,17 +22,14 @@
     <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
     <PackageReference Include="System.Text.Json" Version="4.7.0" />
     <PackageReference Include="Mono.Cecil" Version="$(MonoCecilPackageVersion)" />
-    <!-- Compile against Microsoft.Build* NuGet refs, but do not copy to OutputDir. -->
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" IncludeAssets="compile" Aliases="Microsoft_Build_Tasks_Core" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" IncludeAssets="compile" />
+    <!-- Compile against Microsoft.Build* NuGet refs, but do not copy to OutputDir if IncludeMSBuildAssets was not set. -->
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" Aliases="Microsoft_Build_Tasks_Core" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" />
     <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
     <PackageReference Include="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="$(MicrosoftNETRuntimeMonoTargetsSdkPackageVersion)" GeneratePathProperty="true"/>
     <PackageReference Include="Xamarin.Messaging.Build.Client" Version="$(MessagingVersion)" />
-    <!-- GitInfo is pulled in because of Xamarin.Messaging from above, but we don't want it, so just exclude all assets from it -->
-    <!-- This can be removed once our package references have been updated to not expose GitInfo -->
-    <PackageReference Include="GitInfo" Version="2.2.0" ExcludeAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj" />
@@ -45,6 +45,31 @@
       <HintPath>$(PkgMicrosoft_NET_Runtime_MonoTargets_Sdk)\tasks\net472\MonoTargetsTasks.dll</HintPath>
     </Reference>
   </ItemGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\ILMerge.targets" />
+
+  <!-- Replaces the ProtectedData assembly by the runtime implementation -->
+  <Target Name="CopyRuntimeAssemblies" BeforeTargets="ILRepack">
+    <ItemGroup>
+      <ReferenceCopyLocalToRemove Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Text.Encoding.CodePages'" />
+      <ReferenceCopyLocalToRemove Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
+
+      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalToRemove)" />
+
+      <ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(FileName)' == 'System.Text.Encoding.CodePages'" />
+      <ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
+
+      <ReferencePath Remove="@(ReferencePathToRemove)" />
+
+      <ReferencePathToAdd Include="@(RuntimeTargetsCopyLocalItems)" Condition="'%(RuntimeIdentifier)' == 'win' And '%(FileName)' == 'System.Text.Encoding.CodePages'" />
+      <ReferencePathToAdd Include="@(RuntimeTargetsCopyLocalItems)" Condition="'%(RuntimeIdentifier)' == 'win' And '%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
+
+      <ReferencePath Include="@(ReferencePathToAdd)">
+        <DestinationSubDirectory />
+      </ReferencePath>
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <Compile Include="..\..\tools\common\ApplePlatform.cs">
       <Link>ApplePlatform.cs</Link>
diff --git a/msbuild/Xamarin.Shared/Xamarin.ImplicitFacade.targets b/msbuild/Xamarin.Shared/Xamarin.ImplicitFacade.targets
deleted file mode 100644
index 89eb410958e..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.ImplicitFacade.targets
+++ /dev/null
@@ -1,111 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.ImplicitFacade.targets
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-  created a backup copy.  Incorrect changes to this file will make it
-  impossible to load or build your projects from the command-line or the IDE.
-
-Copyright (c) 2017, 2020 Microsoft Corp. (www.microsoft.com)
-***********************************************************************************************
--->
-
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<!-- Support for netstandard
-		 This logic is a modified copy of the logic in Microsoft.NETFramework.CurrentVersion.targets.
-		 XI/XM Mobile/XM Modern builds do not import Microsoft.NETFramework.CurrentVersion.targets,
-		 since their TVI is not NETFramework. However it is needed to successfully consume netstandard
-		 nuget packages.
-	-->
-
-	<!-- Implicitly references all portable design-time facades if the user is referencing a System.Runtime-based portable library -->
-	<PropertyGroup>
-		<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
-		<CheckForSystemRuntimeDependency>true</CheckForSystemRuntimeDependency>
-
-		<ResolveReferencesDependsOn>
-			$(ResolveReferencesDependsOn);
-			ImplicitlyExpandDesignTimeFacades
-		</ResolveReferencesDependsOn>
-
-		<ImplicitlyExpandDesignTimeFacadesDependsOn>
-			$(ImplicitlyExpandDesignTimeFacadesDependsOn);
-			GetReferenceAssemblyPaths
-		</ImplicitlyExpandDesignTimeFacadesDependsOn>
-
-		<_NETBuildExtensionsTaskAssembly>$(MSBuildExtensionsPath)\Microsoft\Microsoft.NET.Build.Extensions\tools\net472\Microsoft.NET.Build.Extensions.Tasks.dll</_NETBuildExtensionsTaskAssembly>
-	</PropertyGroup>
-
-	<!-- Implicitly references all portable design-time facades if the user is referencing a System.Runtime-based portable library -->
-
-	<UsingTask
-		TaskName="GetDependsOnNETStandard"
-		Condition="Exists('$(_NETBuildExtensionsTaskAssembly)')"
-		AssemblyFile="$(_NETBuildExtensionsTaskAssembly)" />
-
-	<Target Name="ImplicitlyExpandDesignTimeFacades" DependsOnTargets="$(ImplicitlyExpandDesignTimeFacadesDependsOn)">
-		<ItemGroup>
-			<_Xamarin_CandidateNETStandardReferences Include="@(Reference);@(_ResolvedProjectReferencePaths)" />
-			<_Xamarin_InboxNETStandardFolders Include="$(TargetFrameworkDirectory)" />
-		</ItemGroup>
-
-		<PropertyGroup>
-			<!-- Does one of our dependencies reference a System.Runtime-based portable library? -->
-			<_HasReferenceToSystemRuntime Condition="'$(DependsOnSystemRuntime)' == 'true'">true</_HasReferenceToSystemRuntime>
-			<_HasReferenceToSystemRuntime Condition="'%(_ResolvedProjectReferencePaths.TargetPlatformIdentifier)' == 'Portable'">true</_HasReferenceToSystemRuntime>
-			<_HasReferenceToSystemRuntime Condition="'%(ReferenceDependencyPaths.Filename)' == 'System.Runtime'">true</_HasReferenceToSystemRuntime>
-
-			<_Xamarin_NETStandardInbox Condition="'$(_Xamarin_NETStandardInbox)' == '' and Exists('%(_Xamarin_InboxNETStandardFolders.Identity)\netstandard.dll')">true</_Xamarin_NETStandardInbox>
-
-			<!--
-				This is `true` if any of the references depends on `netstandard`.
-
-				In cases where `ResolveAssemblyReference` task does get run, it populates `$(_DependsOnNETStandard)` property, so we don't
-				need to check this again.
-			-->
-			<_Xamarin_DependsOnNETStandard Condition="'$(_Xamarin_DependsOnNETStandard)' == ''">$(_DependsOnNETStandard)</_Xamarin_DependsOnNETStandard>
-		</PropertyGroup>
-
-		<!--
-		     Facades are expanded if we have a reference that depends on System.Runtime .
-
-		     XI, XM/Mobile and XM/Modern projects have `$(TargetFrameworkIdentifier) != .NETFramework`, so Microsoft.NET.Build.Extensions
-		     (which provides support for ns 2.0 projects) doesn't get imported. And netstandard.dll reference, even if required, doesn't
-		     get added.
-
-		     So, we need to check if any references depend on `netstandard`. And if so, expand the facades, which include netstandard.dll .
-
-		     If $(_HasReferenceToSystemRuntime) is true, then the facades are going to be expanded anyway, so don't run this.
-		-->
-		<GetDependsOnNETStandard
-			Condition="'$(_HasReferenceToSystemRuntime)' != 'true' and '$(_Xamarin_DependsOnNETStandard)' == '' and '@(_Xamarin_CandidateNETStandardReferences)' != ''
-				and Exists('$(_NETBuildExtensionsTaskAssembly)')"
-			References="@(_Xamarin_CandidateNETStandardReferences)">
-			<Output TaskParameter="DependsOnNETStandard" PropertyName="_Xamarin_DependsOnNETStandard" />
-		</GetDependsOnNETStandard>
-
-		<ItemGroup Condition="'$(_HasReferenceToSystemRuntime)' == 'true' or ('$(_Xamarin_NETStandardInbox)' == 'true' and '$(_Xamarin_DependsOnNETStandard)' == 'true')">
-			<_DesignTimeFacadeAssemblies Include="%(DesignTimeFacadeDirectories.Identity)*.dll"/>
-
-			<_DesignTimeFacadeAssemblies_Names Include="@(_DesignTimeFacadeAssemblies->'%(FileName)')">
-				<OriginalIdentity>%(_DesignTimeFacadeAssemblies.Identity)</OriginalIdentity>
-			</_DesignTimeFacadeAssemblies_Names>
-
-			<_ReferencePath_Names Include="@(ReferencePath->'%(FileName)')">
-				<OriginalIdentity>%(ReferencePath.Identity)</OriginalIdentity>
-			</_ReferencePath_Names>
-
-			<_DesignTimeFacadeAssemblies_Names Remove="@(_ReferencePath_Names)"/>
-
-			<ReferencePath Include="@(_DesignTimeFacadeAssemblies_Names->'%(OriginalIdentity)')">
-				<WinMDFile>false</WinMDFile>
-				<CopyLocal>false</CopyLocal>
-				<ResolvedFrom>ImplicitlyExpandDesignTimeFacades</ResolvedFrom>
-			</ReferencePath>
-			<_ResolveAssemblyReferenceResolvedFiles Include="@(ReferencePath)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandDesignTimeFacades'" />
-		</ItemGroup>
-
-		<Message Importance="Low" Text="Including @(ReferencePath)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandDesignTimeFacades'" />
-	</Target>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac-Full-FrameworkList.xml.in b/msbuild/Xamarin.Shared/Xamarin.Mac-Full-FrameworkList.xml.in
deleted file mode 100644
index a97f4642477..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.Mac-Full-FrameworkList.xml.in
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FileList Name="Xamarin.Mac" TargetFrameworkDirectory="%TargetFrameworkDirectory%">
-  <File AssemblyName="FSharp.Core" Version="3.100.4.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.CJK" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.MidEast" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Other" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Rare" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.West" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.CSharp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CSharp" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CompilerServices.SymbolWriter" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Sqlite" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Tds" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Messaging" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Posix" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Security" Version="4.0.0.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="OpenTK" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Composition" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.DataAnnotations" Version="4.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Configuration.Install" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Configuration" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Core" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Linq" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.DataSetExtensions" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Services.Client" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.EnterpriseServices" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.FileSystem" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IdentityModel.Selectors" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IdentityModel" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Json" Version="4.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Messaging" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http.WinHttpHandler" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics.Vectors" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Context" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Formatters.Soap" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Internals" Version="0.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Web" Version="4.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Transactions" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Web.Services" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Windows" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Linq" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Serialization" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Xamarin.Mac" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="mscorlib" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry.AccessControl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.AppContext" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Concurrent" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.NonGeneric" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Specialized" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Annotations" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.EventBasedAsync" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Primitives" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.TypeConverter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Console" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Common" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.SqlClient" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Contracts" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Debug" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.FileVersionInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Process" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.StackTrace" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TextWriterTraceListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tools" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Extensions" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.ZipFile" Version="4.0.1.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.DriveInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Watcher" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.IsolatedStorage" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.MemoryMappedFiles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Pipes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.UnmanagedMemoryStream" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Expressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Queryable" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.AuthenticationManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Cache" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http.Rtc" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.HttpListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Mail" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NameResolution" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NetworkInformation" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Ping" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Primitives" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Requests" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.ServicePoint" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Sockets" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Utilities" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebHeaderCollection" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets.Client" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ObjectModel" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.ILGeneration" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.Lightweight" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Extensions" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.TypeExtensions" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Reader" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ReaderWriter" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ResourceManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Writer" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.CompilerServices.VisualC" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Extensions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Handles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.WindowsRuntime" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Numerics" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Formatters" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Json" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Primitives" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Xml" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.AccessControl" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Claims" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Algorithms" Version="4.3.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Csp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.DeriveBytes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encoding" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.Aes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDiffieHellman" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDsa" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing.Algorithms" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.ProtectedData" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RSA" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RandomNumberGenerator" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.X509Certificates" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal.Windows" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.SecureString" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Duplex" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Http" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.NetTcp" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Primitives" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Security" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceProcess.ServiceController" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.CodePages" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.Extensions" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.RegularExpressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Overlapped" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Thread" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.ThreadPool" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Timer" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ValueTuple" Version="4.0.3.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.ReaderWriter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XDocument" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XDocument" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-</FileList>
\ No newline at end of file
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac-Mobile-FrameworkList.xml.in b/msbuild/Xamarin.Shared/Xamarin.Mac-Mobile-FrameworkList.xml.in
deleted file mode 100644
index 47ddc8075a6..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.Mac-Mobile-FrameworkList.xml.in
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FileList Name="Xamarin.Mac" TargetFrameworkDirectory="%TargetFrameworkDirectory%">
-  <File AssemblyName="FSharp.Core" Version="3.99.4.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.CJK" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.MidEast" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Other" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Rare" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.West" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.CSharp" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CSharp" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CompilerServices.SymbolWriter" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Sqlite" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Tds" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Security" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="OpenTK" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.DataSetExtensions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IdentityModel" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Json" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http.WinHttpHandler" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics.Vectors" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Context" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Internals" Version="0.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Web" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Transactions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Web.Services" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Windows" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Linq" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Serialization" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Xamarin.Mac" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="mscorlib" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry.AccessControl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.AppContext" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Buffers" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Concurrent" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.NonGeneric" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Specialized" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Annotations" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.EventBasedAsync" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Primitives" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.TypeConverter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Console" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Common" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.SqlClient" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Contracts" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Debug" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.FileVersionInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Process" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.StackTrace" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TextWriterTraceListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tools" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Extensions" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.ZipFile" Version="4.0.1.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.DriveInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Watcher" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.IsolatedStorage" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.MemoryMappedFiles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Pipes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.UnmanagedMemoryStream" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Expressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Queryable" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Memory" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.AuthenticationManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Cache" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.HttpListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Mail" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NameResolution" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NetworkInformation" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Ping" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Primitives" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Requests" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.ServicePoint" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Sockets" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Utilities" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebHeaderCollection" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets.Client" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ObjectModel" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.DispatchProxy" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.ILGeneration" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.Lightweight" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Extensions" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.TypeExtensions" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Reader" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ReaderWriter" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ResourceManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Writer" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.CompilerServices.VisualC" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Extensions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Handles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.WindowsRuntime" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Loader" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Numerics" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Formatters" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Json" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Primitives" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Xml" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.AccessControl" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Claims" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Algorithms" Version="4.3.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Cng" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Csp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.DeriveBytes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encoding" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.Aes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDiffieHellman" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDsa" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing.Algorithms" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.OpenSsl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Pkcs" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.ProtectedData" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RSA" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RandomNumberGenerator" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.X509Certificates" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal.Windows" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.SecureString" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Duplex" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Http" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.NetTcp" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Primitives" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Security" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceProcess.ServiceController" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.CodePages" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.Extensions" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.RegularExpressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Overlapped" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Extensions" Version="4.2.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Thread" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.ThreadPool" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Timer" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ValueTuple" Version="4.0.3.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.ReaderWriter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XDocument" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XDocument" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XmlDocument" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-</FileList>
\ No newline at end of file
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.CSharp.targets
index ebc7aac79d7..a7191083812 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.Mac.AppExtension.CSharp.targets
 
@@ -30,7 +30,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.Mac.AppExtension.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.VisualBasic.targets
index fc6c8b8081a..4230af13f26 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.VisualBasic.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.VisualBasic.targets
@@ -30,7 +30,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.Mac.AppExtension.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.CSharp.targets
index 43c6e775201..ff5806d3d3e 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Mac.CSharp.targets
@@ -27,8 +27,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
-
 	<Import Project="Xamarin.Mac.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.Common.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.Common.targets
index 179f6cd5047..150c71b60b6 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Mac.Common.targets
@@ -29,38 +29,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 		<_PreparedResourceRules></_PreparedResourceRules>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<BuildDependsOn>
-			BuildOnlySettings;
-			_CollectBundleResources;
-			_PackLibraryResources;
-			_UnpackLibraryResources;
-			$(BuildDependsOn);
-			_GenerateBundleName;
-			_CreateAppBundle;
-			Codesign;
-			_CreateInstaller;
-			Archive;
-		</BuildDependsOn>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<CreateAppBundleDependsOn Condition="'$(UsingAppleNETSdk)' != 'true'">
-			$(CreateAppBundleDependsOn);
-			_DetectSigningIdentity;
-			_CopyResourcesToBundle;
-			_SmeltMetal;
-			_TemperMetal;
-			_CompileEntitlements;
-			_WriteAppManifest;
-			_ParseBundlerArguments;
-			_CompileToNative;
-			_CreatePkgInfo;
-			_CopyAppExtensionsToBundle;
-			_PostProcessAppBundle;
-		</CreateAppBundleDependsOn>
-	</PropertyGroup>
-
 	<PropertyGroup>
 		<CompileToNativeDependsOn>
 			_ComputeLinkMode;
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.ObjCBinding.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.ObjCBinding.CSharp.targets
index 30f5848b365..021a2a7cb10 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.ObjCBinding.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Mac.ObjCBinding.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.Mac.ObjcBinding.CSharp.targets
 
@@ -32,24 +32,6 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
 	Microsoft.CSharp.targets gives TargetFrameworkVersion / TargetFrameworkIdentifier default values, so we _must_ do this _before_ 
 	import Microsoft.CSharp.targets. However, we can't do most of Xamarin.Mac.ObjCBinding.CSharp.props before it. -->
 
-	<Choose>
-		<When Condition=" '$(UseXamMacFullFramework)' == '' And ( '$(TargetFrameworkVersion)' == 'v2.0' Or '$(TargetFrameworkVersion)' == '' ) And '$(UsingAppleNETSdk)' != 'true'">
-			<PropertyGroup>
-				<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-				<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
-			</PropertyGroup>
-		</When>
-		<When Condition="'$(UsingAppleNETSdk)' != 'true'">
-			<PropertyGroup>
-				<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-				<UseXamMacFullFramework>true</UseXamMacFullFramework>
-				<TargetFrameworkIdentifier></TargetFrameworkIdentifier>
-			</PropertyGroup>
-		</When>
-	</Choose>
-
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
-	
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.CSharp.props"/>
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.ObjCBinding.Common.targets" />
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.VisualBasic.targets
index eefbf4af7a3..35c87258aee 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.VisualBasic.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Mac.VisualBasic.targets
@@ -27,8 +27,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
-
 	<Import Project="Xamarin.Mac.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst-FrameworkList.xml.in b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst-FrameworkList.xml.in
deleted file mode 100644
index c2e04224193..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst-FrameworkList.xml.in
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FileList Name="Xamarin.MacCatalyst" TargetFrameworkDirectory="%TargetFrameworkDirectory%">
-  <File AssemblyName="FSharp.Core" Version="3.98.4.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.CJK" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.MidEast" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Other" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Rare" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.West" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.CSharp" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CSharp" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Sqlite" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Tds" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Security" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="MonoTouch.Dialog-1" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="MonoTouch.NUnitLite" Version="1.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="OpenTK-1.0" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.DataSetExtensions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IdentityModel" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Json" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http.WinHttpHandler" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics.Vectors" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Context" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Internals" Version="0.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Web" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Transactions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Web.Services" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Windows" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Linq" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Serialization" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Xamarin.MacCatalyst" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Xamarin.iOS" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="mscorlib" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry.AccessControl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.AppContext" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Buffers" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Concurrent" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.NonGeneric" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Specialized" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Annotations" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.EventBasedAsync" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Primitives" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.TypeConverter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Console" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Common" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.SqlClient" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Contracts" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Debug" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.FileVersionInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Process" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.StackTrace" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TextWriterTraceListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tools" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Extensions" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.ZipFile" Version="4.0.1.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.DriveInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Watcher" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.IsolatedStorage" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.MemoryMappedFiles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Pipes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.UnmanagedMemoryStream" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Expressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Queryable" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Memory" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.AuthenticationManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Cache" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.HttpListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Mail" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NameResolution" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NetworkInformation" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Ping" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Primitives" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Requests" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.ServicePoint" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Sockets" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Utilities" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebHeaderCollection" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets.Client" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ObjectModel" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.DispatchProxy" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.ILGeneration" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.Lightweight" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Extensions" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.TypeExtensions" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Reader" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ReaderWriter" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ResourceManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Writer" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.CompilerServices.VisualC" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Extensions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Handles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.WindowsRuntime" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Loader" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Numerics" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Formatters" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Json" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Primitives" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Xml" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.AccessControl" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Claims" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Algorithms" Version="4.3.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Cng" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Csp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.DeriveBytes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encoding" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.Aes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDiffieHellman" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDsa" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing.Algorithms" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.OpenSsl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Pkcs" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.ProtectedData" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RSA" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RandomNumberGenerator" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.X509Certificates" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal.Windows" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.SecureString" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Duplex" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Http" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.NetTcp" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Primitives" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Security" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceProcess.ServiceController" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.CodePages" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.Extensions" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.RegularExpressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Overlapped" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Extensions" Version="4.2.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Thread" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.ThreadPool" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Timer" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ValueTuple" Version="4.0.3.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.ReaderWriter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XDocument" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XDocument" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XmlDocument" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-</FileList>
diff --git a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.CSharp.targets
index ff147b8fe5f..34f1f243fb7 100644
--- a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.CSharp.targets
@@ -23,8 +23,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
-
 	<Import Project="Xamarin.MacCatalyst.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.Common.targets b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.Common.targets
index b40957ee392..170c9303263 100644
--- a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.Common.targets
@@ -21,7 +21,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
+	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
diff --git a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.ObjCBinding.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.ObjCBinding.CSharp.targets
index b54015742d4..b10c0f80037 100644
--- a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.ObjCBinding.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.ObjCBinding.CSharp.targets
@@ -28,7 +28,7 @@ Copyright (C) 2015-2016 Xamarin Inc. All rights reserved.
 		<AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
 	</PropertyGroup>
 
-	<Import Project="..\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets"/>
+	<Import Project="Xamarin.iOS.ObjCBinding.CSharp.targets"/>
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
diff --git a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.VisualBasic.targets
index 0c27ebabf29..a5ff6996f51 100644
--- a/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.VisualBasic.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.MacCatalyst.VisualBasic.targets
@@ -23,8 +23,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
-
 	<Import Project="Xamarin.MacCatalyst.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.MonoTouch.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.MonoTouch.CSharp.targets
deleted file mode 100644
index 726b1913fe8..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.MonoTouch.CSharp.targets
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.MonoTouch.CSharp.targets
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-  created a backup copy.  Incorrect changes to this file will make it
-  impossible to load or build your projects from the command-line or the IDE.
-
-This file imports the version- and platform-specific targets for the project importing
-this file. This file also defines targets to produce an error if the specified targets
-file does not exist, but the project is built anyway (command-line or IDE build).
-
-Copyright (C) 2013-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Target Name="Build">
-		<Error Text="Support for Classic applications (using monotouch.dll) is obsoleted in Xamarin.iOS 10.0+. Please migrate your project to Unified (Project &gt; Migrate to Xamarin.iOS Unified API)." />
-	</Target>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.MonoTouch.FSharp.targets b/msbuild/Xamarin.Shared/Xamarin.MonoTouch.FSharp.targets
deleted file mode 100644
index 04e22127af4..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.MonoTouch.FSharp.targets
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.MonoTouch.FSharp.targets
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-  created a backup copy.  Incorrect changes to this file will make it
-  impossible to load or build your projects from the command-line or the IDE.
-
-This file imports the version- and platform-specific targets for the project importing
-this file. This file also defines targets to produce an error if the specified targets
-file does not exist, but the project is built anyway (command-line or IDE build).
-
-Copyright (C) 2013-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Target Name="Build">
-		<Error Text="Support for Classic applications (using monotouch.dll) is obsoleted in Xamarin.iOS 10.0+. Please migrate your project to Unified (Project &gt; Migrate to Xamarin.iOS Unified API)." />
-	</Target>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
index 0859ac813c6..c1d1fc9408d 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
@@ -18,24 +18,6 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<!-- Add our own pre-build steps -->
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<BuildDependsOn>
-			BuildOnlySettings;
-			_CreateGeneratedSourcesDir;
-			_CreateEmbeddedResources;
-			$(BuildDependsOn)
-		</BuildDependsOn>
-	</PropertyGroup>
-
-	<!-- Add our own Clean steps -->
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<CleanDependsOn>
-			_CleanGeneratedSources;
-			$(CleanDependsOn)
-		</CleanDependsOn>
-	</PropertyGroup>
-
 	<!-- Create a directory to contain the generated sources -->
 	<Target Name="_CreateGeneratedSourcesDir">
 		<MakeDir Directories="$(GeneratedSourcesDir)" />
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.props b/msbuild/Xamarin.Shared/Xamarin.Shared.props
index de3df76b9fa..b49c25e93ff 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.props
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.props
@@ -92,15 +92,7 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 		<_XamarinBclPath Condition="'$(_PlatformName)' == 'tvOS'">$(_XamarinSdkRoot)/lib/mono/Xamarin.TVOS/</_XamarinBclPath>
 		<_XamarinBclPath Condition="'$(_PlatformName)' == 'watchOS'">$(_XamarinSdkRoot)/lib/mono/Xamarin.WatchOS/</_XamarinBclPath>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'MacCatalyst'">Xamarin.MacCatalyst.dll</_XamarinPlatformAssemblyName>
-		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'iOS'">Xamarin.iOS.dll</_XamarinPlatformAssemblyName>
-		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'tvOS'">Xamarin.TVOS.dll</_XamarinPlatformAssemblyName>
-		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'watchOS'">Xamarin.WatchOS.dll</_XamarinPlatformAssemblyName>
-		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'macOS'">Xamarin.Mac.dll</_XamarinPlatformAssemblyName>
-		<_XamarinPlatformAssemblyPath>$(_XamarinBclPath)$(_XamarinPlatformAssemblyName)</_XamarinPlatformAssemblyPath>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' == 'true'">
+	<PropertyGroup>
 		<_XamarinPlatformAssemblyPath>$(_XamarinBclPath)$(_PlatformAssemblyName).dll</_XamarinPlatformAssemblyPath>
 	</PropertyGroup>
 
@@ -134,7 +126,7 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 
 			Then we'll automatically set the CodesignEntitlements property to "Entitlements.plist"
 		-->
-		<CodesignEntitlements Condition="'$(UsingAppleNETSdk)' == 'true' And '$(CodesignEntitlements)' == '' And Exists('Entitlements.plist') And '$(EnableDefaultCodesignEntitlements)' != 'false'">Entitlements.plist</CodesignEntitlements>
+		<CodesignEntitlements Condition="'$(CodesignEntitlements)' == '' And Exists('Entitlements.plist') And '$(EnableDefaultCodesignEntitlements)' != 'false'">Entitlements.plist</CodesignEntitlements>
 
 		<!-- If we should automatically try to detect the app manifest (Info.plist) from any None, BundleResource or Content items -->
 		<!-- It might be desirable to turn off the automatic detection if the current logic detects Info.plist that aren't the app manifest -->
@@ -178,26 +170,10 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 		<_SpecifiedCodesignKey Condition="'$(_SpecifiedCodesignKey)' == ''">$(CodeSigningKey)</_SpecifiedCodesignKey>
 		<_SpecifiedCodesignKey Condition="'$(_SpecifiedCodesignKey)' == ''">$(CodesignKey)</_SpecifiedCodesignKey>
 
-		<!-- If we should create a .pkg or not (only relevant for macOS / Mac Catalyst) -->
-		<!-- The equivalent property for the other platforms is 'BuildIpa' -->
-		<CreatePackage Condition="'$(CreatePackage)' == '' And '$(UsingAppleNETSdk)' != 'true'">false</CreatePackage>
-
 		<!-- If the .pkg should be signed or not. Applicable to macOS and Mac Catalyst. Defaults to false. -->
 		<EnablePackageSigning Condition="'$(EnablePackageSigning)' == ''">false</EnablePackageSigning>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<!-- TargetArchitectures -->
-		<TargetArchitectures Condition="'$(TargetArchitectures)' == '' And '$(_PlatformName)' == 'macOS'">$(XamMacArch)</TargetArchitectures>
-		<TargetArchitectures Condition="'$(TargetArchitectures)' == '' And '$(_PlatformName)' != 'macOS'">$(MtouchArch)</TargetArchitectures>
-		<!-- The default architecture for Xamarin.Mac is x86_64 -->
-		<TargetArchitectures Condition="'$(TargetArchitectures)' == '' And '$(_PlatformName)' == 'macOS'">x86_64</TargetArchitectures>
-		<!-- There should always be an MtouchArch value in newer projects, but for older projects default to old values -->
-		<TargetArchitectures Condition="'$(TargetArchitectures)' == '' And '$(_PlatformName)' != 'macOS' And '$(ComputedPlatform)' == 'iPhoneSimulator'">x86_64</TargetArchitectures>
-		<TargetArchitectures Condition="'$(TargetArchitectures)' == '' And '$(_PlatformName)' != 'macOS' And '$(ComputedPlatform)' == 'iPhone' And '$(TargetFrameworkIdentifier)' == 'Xamarin.WatchOS'">ARMv7k</TargetArchitectures>
-		<TargetArchitectures Condition="'$(TargetArchitectures)' == '' And '$(_PlatformName)' != 'macOS' And '$(ComputedPlatform)' == 'iPhone'">ARM64</TargetArchitectures>
-	</PropertyGroup>
-
 	<PropertyGroup>
 		<ArchiveOnBuild Condition="'$(ArchiveOnBuild)' == ''">false</ArchiveOnBuild>
 		<IsAppExtension Condition="'$(IsAppExtension)' == ''">false</IsAppExtension>
@@ -334,7 +310,7 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 		<LangVersion>latest</LangVersion>
 
 		<!-- Default NoBindingEmbedding to 'true' for .NET projects, it's the new way -->
-		<NoBindingEmbedding Condition="'$(NoBindingEmbedding)' == '' And '$(UsingAppleNETSdk)' == 'true'">true</NoBindingEmbedding>
+		<NoBindingEmbedding Condition="'$(NoBindingEmbedding)' == ''">true</NoBindingEmbedding>
 	</PropertyGroup>
 
 	<Target Name="_ComputeTargetFrameworkMoniker" Condition="'$(_ComputedTargetFrameworkMoniker)' == ''">
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index 78529826d09..0de60c406da 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -19,8 +19,9 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<PropertyGroup Condition="'$(_TaskAssemblyName)' == ''">
-		<_TaskAssemblyName Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS' Or '$(_PlatformName)' == 'watchOS' Or '$(_PlatformName)' == 'MacCatalyst'">$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Tasks.dll</_TaskAssemblyName>
-		<_TaskAssemblyName Condition="'$(_PlatformName)' == 'macOS'">$(MSBuildThisFileDirectory)Xamarin.Mac.Tasks.dll</_TaskAssemblyName>
+		<_TaskAssemblyFileName>Xamarin.MacDev.Tasks.dll</_TaskAssemblyFileName>
+		<_TaskAssemblyFileNameWindows>Xamarin.iOS.Tasks.Windows.dll</_TaskAssemblyFileNameWindows>
+		<_TaskAssemblyName>$(MSBuildThisFileDirectory)\$(_TaskAssemblyFileName)</_TaskAssemblyName>
 	</PropertyGroup>
 
 	<!-- Tasks that override built-in tasks to support remoting from VS/Windows -->
@@ -93,7 +94,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.ReadItemsFromFile" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.ResolveNativeReferences" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.ResolveNativeWatchApp" AssemblyFile="$(_TaskAssemblyName)" />
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.ResolveUniversalTypeIdentifiers" AssemblyFile="Xamarin.iOS.Tasks.dll" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.ResolveUniversalTypeIdentifiers" AssemblyFile="Xamarin.MacDev.Tasks.dll" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.ScnTool" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.SmartCopy" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.SpotlightIndexer" AssemblyFile="$(_TaskAssemblyName)" />
@@ -184,8 +185,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			The default is 'false' for legacy Xamarin projects (for compatibility) and 'auto' for .NET projects (NuGet doesn't handle symlinks properly, so this way it's not necessary to set this property to create NuGets that work)
 		-->
 		<PropertyGroup Condition="'$(CompressBindingResourcePackage)' == ''">
-			<CompressBindingResourcePackage Condition="'$(UsingAppleNETSdk)' == 'true'">auto</CompressBindingResourcePackage>
-			<CompressBindingResourcePackage Condition="'$(UsingAppleNETSdk)' != 'true'">false</CompressBindingResourcePackage>
+			<CompressBindingResourcePackage>auto</CompressBindingResourcePackage>
 		</PropertyGroup>
 
 		<CreateBindingResourcePackage Condition="'$(IsMacEnabled)' == 'true'"
@@ -250,14 +250,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</PropertyGroup>
 		<Error Condition="'$(_HasOldStyleBindingItems)' == 'true'" Text="Creating a NuGet package is not supported for projects that have ObjcBindingNativeLibrary items. Migrate to use NativeReference items instead." />
 
-		<!-- The 'GetNuGetShortFolderName' task only exists for .NET, so hardcode values for _NuGetShortFolderName for legacy builds -->
-		<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-			<_NuGetShortFolderName Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">xamarinios10</_NuGetShortFolderName>
-			<_NuGetShortFolderName Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.TVOS'">xamarintvos10</_NuGetShortFolderName>
-			<_NuGetShortFolderName Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.WatchOS'">xamarinwatch10</_NuGetShortFolderName>
-			<_NuGetShortFolderName Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">xamarinmac10</_NuGetShortFolderName>
-		</PropertyGroup>
-
 		<!-- Figure out where to place the binding resources (see references above for more info) -->
 		<GetNuGetShortFolderName
 			TargetFrameworkMoniker="$(TargetFrameworkMoniker)"
@@ -416,13 +408,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="@(_IpaPackageFile)" />
 	</Target>
 
-	<Target Name="_AddExtraReferences" BeforeTargets="ResolveAssemblyReferences" Condition="'$(DisableExtraReferences)' != 'true' And '$(UsingAppleNETSdk)' != 'true'">
-		<ItemGroup>
-			<!-- https://github.com/mono/mono/issues/13483 -->
-			<Reference Include="System.Drawing.Common.dll" />
-		</ItemGroup>
-	</Target>
-
 	<PropertyGroup>
 		<!--
 			Custom targets that add items to the BundleResource or Content item groups must do so before the _CollectBundleResources target.
@@ -728,7 +713,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		DependsOnTargets="$(_CompileEntitlementsDependsOn)"
 		Outputs="$(_CompiledEntitlementsPath)">
 		<!-- Automatically add the 'allow-jit' entitlement for desktop release builds in .NET -->
-		<ItemGroup Condition="'$(Configuration)' == 'Release' And ('$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst') And '$(UsingAppleNETSdk)' == 'true'">
+		<ItemGroup Condition="'$(Configuration)' == 'Release' And ('$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst')">
 			<!-- We need to compare the result of AnyHaveMetadataValue to 'true', because if it's empty, the return value is not a boolean, it's an empty string -->
 			<CustomEntitlements Condition="'@(CustomEntitlements->AnyHaveMetadataValue('Identity','com.apple.security.cs.allow-jit'))' != 'true'" Include="com.apple.security.cs.allow-jit" Type="Boolean" Value="true" />
 		</ItemGroup>
@@ -1264,7 +1249,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<_ProcessedTextureAtlasesPath Condition="'$(_ProcessedTextureAtlasesPath)' == ''">$(DeviceSpecificIntermediateOutputPath)atlas\_ProcessedTextureAtlasesPath.items</_ProcessedTextureAtlasesPath>
 			<_ProcessedCoreMLModelsPath Condition="'$(_ProcessedCoreMLModelsPath)' == ''">$(DeviceSpecificIntermediateOutputPath)coremlc\_ProcessedCoreMLModelsPath.items</_ProcessedCoreMLModelsPath>
 			<_CompiledEntitlementsPath Condition="'$(_CompiledEntitlementsPath)' == ''">$(DeviceSpecificIntermediateOutputPath)Entitlements.xcent</_CompiledEntitlementsPath>
-			<_SaveProcessedItems Condition="'$(RuntimeIdentifiers)' != '' And '$(UsingAppleNETSdk)' == 'true'">true</_SaveProcessedItems>
+			<_SaveProcessedItems Condition="'$(RuntimeIdentifiers)' != ''">true</_SaveProcessedItems>
 		</PropertyGroup>
 
 		<!-- Create an item group of all the paths that convey information from an outer (universal) build to its inner (rid-specific) builds (but not between (incremental) builds) -->
@@ -1589,7 +1574,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			>
 			<Output TaskParameter="Item" PropertyName="AppBundleManifest" />
 		</FindItemWithLogicalName>
-		<Error Condition="'$(AppBundleManifest)' == '' And '$(_CanOutputAppBundle)' == 'true' And '$(UsingAppleNETSdk)' != 'true'" Text="Info.plist not found."/>
 		<PropertyGroup>
 			<_AppBundleManifestPath>$(_AppBundlePath)$(_AppBundleManifestRelativePath)Info.plist</_AppBundleManifestPath>
 			<!-- We should only write out a compiled app manifest if we're creating an app bundle -->
@@ -1754,12 +1738,12 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			$(_GenerateBindingsDependsOn);
 		</_GenerateBindingsDependsOn>
 
-		<_GenerateBindingsDependsOn Condition="'$(UsingAppleNETSdk)' == 'true'">
+		<_GenerateBindingsDependsOn>
 			_CompileApiDefinitions;
 			$(_GenerateBindingsDependsOn);
 		</_GenerateBindingsDependsOn>
 
-		<_WriteGeneratorPropertiesDependsOn Condition="'$(UsingAppleNETSdk)' == 'true'">
+		<_WriteGeneratorPropertiesDependsOn>
 			$(_WriteGeneratorPropertiesDependsOn);
 			_ComputeBindingVariables;
 		</_WriteGeneratorPropertiesDependsOn>
@@ -1778,7 +1762,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	</Target>
 
 	<PropertyGroup>
-		<_ComputeCompileApiDefinitionsInputsDependsOn Condition="'$(UsingAppleNETSdk)' == 'true'">
+		<_ComputeCompileApiDefinitionsInputsDependsOn>
 			$(_ComputeCompileApiDefinitionsInputsDependsOn);
 			_ComputeBindingVariables;
 		</_ComputeCompileApiDefinitionsInputsDependsOn>
@@ -1796,11 +1780,11 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<_CompiledApiDefinitionDocumentationFile>$(DeviceSpecificIntermediateOutputPath)compiled-api-definitions.xml</_CompiledApiDefinitionDocumentationFile>
 			<_CompiledApiDefinitionNoWarn>$(_CompiledApiDefinitionNoWarn);1591</_CompiledApiDefinitionNoWarn> <!-- Don't expect every public API to have documentation -->
 			<_CompiledApiDefinitionDefines>$(DefineConstants)</_CompiledApiDefinitionDefines>
-			<_CompiledApiDefinitionDefines Condition="'$(UsingAppleNETSdk)' == 'true'">$(_CompiledApiDefinitionDefines);NET</_CompiledApiDefinitionDefines>
+			<_CompiledApiDefinitionDefines>$(_CompiledApiDefinitionDefines);NET</_CompiledApiDefinitionDefines>
 
 			<_CompiledApiDefinitionLibPaths>$(AdditionalLibPaths);$([System.IO.Path]::GetDirectoryName('$(BaseLibDllPath)'))</_CompiledApiDefinitionLibPaths>
 
-			<_CompiledApiDefinitionGlobalUsingsFile Condition="'$(UsingAppleNETSdk)' == 'true' And '$(NoNFloatUsing)' != 'true'">$(DeviceSpecificIntermediateOutputPath)compiled-api-definitions-usings.cs</_CompiledApiDefinitionGlobalUsingsFile>
+			<_CompiledApiDefinitionGlobalUsingsFile Condition="'$(NoNFloatUsing)' != 'true'">$(DeviceSpecificIntermediateOutputPath)compiled-api-definitions-usings.cs</_CompiledApiDefinitionGlobalUsingsFile>
 		</PropertyGroup>
 
 
@@ -2475,14 +2459,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</_ComputeLinkModeDependsOn>
 	</PropertyGroup>
 	<Target Name="_ComputeLinkMode" DependsOnTargets="$(_ComputeLinkModeDependsOn)">
-		<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'"> <!-- this is already done outside of a target for .NET -->
-			<_LinkMode Condition="'$(_LinkMode)' == '' And '$(_PlatformName)' == 'macOS'">$(LinkMode)</_LinkMode>
-			<_LinkMode Condition="'$(_LinkMode)' == '' And '$(_PlatformName)' != 'macOS'">$(MtouchLink)</_LinkMode>
-			<_LinkMode Condition="'$(_LinkMode)' == ''">$(_DefaultLinkMode)</_LinkMode> <!-- Let the .NET targets chime in -->
-			<_LinkMode Condition="'$(_LinkMode)' == '' And '$(_PlatformName)' == 'macOS'">None</_LinkMode> <!-- Linking is off by default for macOS apps -->
-			<_LinkMode Condition="'$(_LinkMode)' == '' And '$(_PlatformName)' != 'macOS'">SdkOnly</_LinkMode> <!-- Default linking is SdkOnly for iOS/tvOS/watchOS apps -->
-		</PropertyGroup>
-
 		<PropertyGroup>
 			<!-- Determine if any assemblies are actually trimmed, or if we're in a "Don't link" scenario -->
 			<!-- We're in a "Don't link" scenario if both of the following are true:
@@ -2880,7 +2856,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			_GetNativeExecutableName;
 			_ParseBundlerArguments;
 		</GenerateDebugSymbolsDependsOn>
-		<GenerateDebugSymbolsDependsOn Condition="'$(UsingAppleNETSdk)' == 'true'">
+		<GenerateDebugSymbolsDependsOn>
 			$(GenerateDebugSymbolsDependsOn);
 			_CollectRidSpecificSymbolLists;
 			_CollectRidSpecificUserFrameworksWithoutDebugSymbols;
@@ -3202,9 +3178,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.ObjCBinding.targets" Condition="'$(IsBindingProject)' == 'true'" />
 
-	<!-- Xamarin.ImplicitFacade.targets will detect if we need to add an implicit reference to netstandard.dll -->
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.ImplicitFacade.targets" Condition="!('$(_PlatformName)' == 'macOS' And '$(TargetFrameworkName)' == 'System') And '$(UsingAppleNETSdk)' != 'true'"/>
-
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.Stubs.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS-FrameworkList.xml.in b/msbuild/Xamarin.Shared/Xamarin.TVOS-FrameworkList.xml.in
deleted file mode 100644
index 8d36f0df4c0..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS-FrameworkList.xml.in
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FileList Name="Xamarin.TVOS" TargetFrameworkDirectory="%TargetFrameworkDirectory%">
-  <File AssemblyName="FSharp.Core" Version="3.98.4.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.CJK" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.MidEast" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Other" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Rare" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.West" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.CSharp" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CSharp" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Sqlite" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Tds" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Security" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="MonoTouch.Dialog-1" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="MonoTouch.NUnitLite" Version="1.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="OpenTK-1.0" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.DataSetExtensions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IdentityModel" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Json" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http.WinHttpHandler" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics.Vectors" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Context" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Internals" Version="0.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Web" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Transactions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Web.Services" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Windows" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Linq" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Serialization" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Xamarin.TVOS" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="mscorlib" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry.AccessControl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.AppContext" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Buffers" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Concurrent" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.NonGeneric" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Specialized" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Annotations" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.EventBasedAsync" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Primitives" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.TypeConverter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Console" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Common" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.SqlClient" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Contracts" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Debug" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.FileVersionInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Process" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.StackTrace" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TextWriterTraceListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tools" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Extensions" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.ZipFile" Version="4.0.1.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.DriveInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Watcher" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.IsolatedStorage" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.MemoryMappedFiles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Pipes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.UnmanagedMemoryStream" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Expressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Queryable" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Memory" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.AuthenticationManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Cache" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.HttpListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Mail" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NameResolution" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NetworkInformation" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Ping" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Primitives" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Requests" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.ServicePoint" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Sockets" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Utilities" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebHeaderCollection" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets.Client" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ObjectModel" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.DispatchProxy" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.ILGeneration" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.Lightweight" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Extensions" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.TypeExtensions" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Reader" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ReaderWriter" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ResourceManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Writer" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.CompilerServices.VisualC" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Extensions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Handles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.WindowsRuntime" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Loader" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Numerics" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Formatters" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Json" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Primitives" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Xml" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.AccessControl" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Claims" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Algorithms" Version="4.3.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Cng" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Csp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.DeriveBytes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encoding" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.Aes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDiffieHellman" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDsa" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing.Algorithms" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.OpenSsl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Pkcs" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.ProtectedData" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RSA" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RandomNumberGenerator" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.X509Certificates" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal.Windows" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.SecureString" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Duplex" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Http" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.NetTcp" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Primitives" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Security" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceProcess.ServiceController" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.CodePages" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.Extensions" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.RegularExpressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Overlapped" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Extensions" Version="4.2.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Thread" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.ThreadPool" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Timer" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ValueTuple" Version="4.0.3.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.ReaderWriter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XDocument" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XDocument" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XmlDocument" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-</FileList>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.CSharp.targets
index 30f1a7e4e29..902799c5ddf 100644
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.TVOS.AppExtension.CSharp.targets
 
@@ -31,7 +31,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.TVOS.AppExtension.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.VisualBasic.targets
index 914f2d4b4f2..ee154a9e677 100644
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.VisualBasic.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.VisualBasic.targets
@@ -31,7 +31,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.TVOS.AppExtension.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.CSharp.targets
index a43191dacca..41f51fa77a5 100644
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.TVOS.CSharp.targets
@@ -27,7 +27,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.TVOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.Common.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.Common.targets
index c0a9da6d422..bd00085a5eb 100644
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.TVOS.Common.targets
@@ -19,7 +19,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.Common.props" />
 
-	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
+	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets" 
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.ObjCBinding.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.ObjCBinding.CSharp.targets
index 721814057d4..95981d68ca2 100644
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.ObjCBinding.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.TVOS.ObjCBinding.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.iOS.ObjcBinding.CSharp.targets
 
@@ -24,7 +24,7 @@ Copyright (C) 2015-2016 Xamarin Inc. All rights reserved.
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
 	</PropertyGroup>
 
-	<Import Project="..\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets"/>
+	<Import Project="Xamarin.iOS.ObjCBinding.CSharp.targets"/>
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.VisualBasic.targets
index db9e638d160..9f3bfba2f46 100644
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.VisualBasic.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.TVOS.VisualBasic.targets
@@ -27,7 +27,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.TVOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS-FrameworkList.xml.in b/msbuild/Xamarin.Shared/Xamarin.WatchOS-FrameworkList.xml.in
deleted file mode 100644
index 70834044bdc..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS-FrameworkList.xml.in
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FileList Name="Xamarin.WatchOS" TargetFrameworkDirectory="%TargetFrameworkDirectory%">
-  <File AssemblyName="FSharp.Core" Version="3.98.4.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.CJK" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.MidEast" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Other" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Rare" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.West" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.CSharp" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CSharp" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Sqlite" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="MonoTouch.NUnitLite" Version="1.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.DataSetExtensions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IdentityModel" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Json" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http.WinHttpHandler" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics.Vectors" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Context" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Internals" Version="0.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Web" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Transactions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Web.Services" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Windows" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Linq" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Serialization" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Xamarin.WatchOS" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="mscorlib" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry.AccessControl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.AppContext" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Buffers" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Concurrent" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.NonGeneric" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Specialized" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Annotations" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.EventBasedAsync" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Primitives" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.TypeConverter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Console" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Common" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.SqlClient" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Contracts" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Debug" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.FileVersionInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Process" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.StackTrace" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TextWriterTraceListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tools" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Extensions" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.ZipFile" Version="4.0.1.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.DriveInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Watcher" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.IsolatedStorage" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.MemoryMappedFiles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Pipes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.UnmanagedMemoryStream" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Expressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Queryable" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Memory" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.AuthenticationManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Cache" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.HttpListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Mail" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NameResolution" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NetworkInformation" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Ping" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Primitives" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Requests" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.ServicePoint" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Sockets" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Utilities" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebHeaderCollection" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets.Client" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ObjectModel" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.DispatchProxy" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.ILGeneration" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.Lightweight" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Extensions" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.TypeExtensions" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Reader" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ReaderWriter" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ResourceManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Writer" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.CompilerServices.VisualC" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Extensions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Handles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.WindowsRuntime" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Loader" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Numerics" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Formatters" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Json" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Primitives" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Xml" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.AccessControl" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Claims" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Algorithms" Version="4.3.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Cng" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Csp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.DeriveBytes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encoding" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.Aes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDiffieHellman" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDsa" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing.Algorithms" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.OpenSsl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Pkcs" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.ProtectedData" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RSA" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RandomNumberGenerator" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.X509Certificates" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal.Windows" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.SecureString" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Duplex" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Http" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.NetTcp" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Primitives" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Security" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceProcess.ServiceController" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.CodePages" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.Extensions" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.RegularExpressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Overlapped" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Extensions" Version="4.2.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Thread" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.ThreadPool" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Timer" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ValueTuple" Version="4.0.3.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.ReaderWriter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XDocument" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XDocument" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XmlDocument" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-</FileList>
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.CSharp.targets
index f09383c1566..d440ada4ef8 100644
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.CSharp.targets
@@ -26,7 +26,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.CSharp.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.WatchOS.App.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.Common.targets b/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.Common.targets
index baeb6674997..466aaa27fef 100644
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.WatchOS.App.Common.targets
@@ -23,7 +23,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<IOSDebugOverWiFi>True</IOSDebugOverWiFi>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
+	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.App.Common.props" />
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.CSharp.targets
index b6e547010b1..843cf051eba 100644
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.WatchOS.AppExtension.CSharp.targets
 
@@ -30,7 +30,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.CSharp.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.WatchOS.AppExtension.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.Common.targets b/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.Common.targets
index 1dbf302a488..83b05df1aff 100644
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.WatchOS.AppExtension.Common.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.WatchOS.AppExtension.Common.targets
 
@@ -30,7 +30,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
+	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.AppExtension.Common.props" />
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.WatchOS.CSharp.targets
index ca0914e960e..0e4b3f0413e 100644
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.WatchOS.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.WatchOS.CSharp.targets
 
@@ -26,7 +26,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.CSharp.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.WatchOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS.Common.targets b/msbuild/Xamarin.Shared/Xamarin.WatchOS.Common.targets
index 8b05a262725..c1d300239a7 100644
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.WatchOS.Common.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.WatchOS.Common.targets
 
@@ -15,7 +15,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 -->
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
+	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.WatchOS.Common.props" />
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.WatchOS.ObjCBinding.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.WatchOS.ObjCBinding.CSharp.targets
index 96ff4c41081..d570827bf5b 100644
--- a/msbuild/Xamarin.Shared/Xamarin.WatchOS.ObjCBinding.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.WatchOS.ObjCBinding.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.iOS.ObjcBinding.CSharp.targets
 
@@ -24,7 +24,7 @@ Copyright (C) 2014 Xamarin Inc. All rights reserved.
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
 	</PropertyGroup>
 
-	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets"/>
+	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.ObjCBinding.CSharp.targets"/>
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS-FrameworkList.xml.in b/msbuild/Xamarin.Shared/Xamarin.iOS-FrameworkList.xml.in
deleted file mode 100644
index dc6926755d2..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.iOS-FrameworkList.xml.in
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FileList Name="Xamarin.iOS" TargetFrameworkDirectory="%TargetFrameworkDirectory%">
-  <File AssemblyName="FSharp.Core" Version="3.98.4.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.CJK" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.MidEast" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Other" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.Rare" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N.West" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="I18N" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.CSharp" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.CSharp" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Sqlite" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Data.Tds" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Mono.Security" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="MonoTouch.Dialog-1" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="MonoTouch.NUnitLite" Version="1.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="OpenTK-1.0" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.DataSetExtensions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IdentityModel" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Json" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http.WinHttpHandler" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Http" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics.Vectors" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Numerics" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Context" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Internals" Version="0.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Web" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Transactions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Web.Services" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Windows" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Linq" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Serialization" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Xamarin.iOS" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="mscorlib" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry.AccessControl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="Microsoft.Win32.Registry" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.AppContext" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Buffers" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Concurrent" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.NonGeneric" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections.Specialized" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Collections" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Annotations" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.EventBasedAsync" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.Primitives" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel.TypeConverter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ComponentModel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Console" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.Common" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Data.SqlClient" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Contracts" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Debug" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.FileVersionInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Process" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.StackTrace" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TextWriterTraceListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tools" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization.Extensions" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Globalization" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Compression.ZipFile" Version="4.0.1.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.DriveInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem.Watcher" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.FileSystem" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.IsolatedStorage" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.MemoryMappedFiles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.Pipes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO.UnmanagedMemoryStream" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.IO" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Expressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq.Queryable" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Linq" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Memory" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.AuthenticationManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Cache" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.HttpListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Mail" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NameResolution" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.NetworkInformation" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Ping" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Primitives" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Requests" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.ServicePoint" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Sockets" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.Utilities" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebHeaderCollection" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets.Client" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Net.WebSockets" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ObjectModel" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.DispatchProxy" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.ILGeneration" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit.Lightweight" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Emit" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Extensions" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection.TypeExtensions" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Reflection" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Reader" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ReaderWriter" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.ResourceManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Resources.Writer" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.CompilerServices.VisualC" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Extensions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Handles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices.WindowsRuntime" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.InteropServices" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Loader" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Numerics" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Formatters" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Json" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Primitives" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime.Serialization.Xml" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Runtime" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.AccessControl" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Claims" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Algorithms" Version="4.3.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Cng" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Csp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.DeriveBytes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encoding" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.Aes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDiffieHellman" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption.ECDsa" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Encryption" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing.Algorithms" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Hashing" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.OpenSsl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Pkcs" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.ProtectedData" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RSA" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.RandomNumberGenerator" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Cryptography.X509Certificates" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal.Windows" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.Principal" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Security.SecureString" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Duplex" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Http" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.NetTcp" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Primitives" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceModel.Security" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ServiceProcess.ServiceController" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.CodePages" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding.Extensions" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.Encoding" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Text.RegularExpressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Overlapped" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Extensions" Version="4.2.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Tasks" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Thread" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.ThreadPool" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading.Timer" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Threading" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.ValueTuple" Version="4.0.3.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.ReaderWriter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XDocument" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XDocument" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath.XmlDocument" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XPath" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
-  <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
-</FileList>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.CSharp.targets
index 5df42dbc365..f52b337d7ba 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.iOS.AppExtension.CSharp.targets
 
@@ -43,7 +43,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.CSharp.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.VisualBasic.targets
index 4739f4b927f..2375ab7fa75 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.VisualBasic.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.VisualBasic.targets
@@ -43,7 +43,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.CSharp.targets
index 9d6ef19a02b..ad17485d2db 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.CSharp.targets
@@ -26,7 +26,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.CSharp.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.iOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.props b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.props
index 6fca99c819f..65b08057fe3 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.props
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.props
@@ -25,14 +25,12 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<MtouchProfiling Condition="'$(MtouchProfiling)' == ''">False</MtouchProfiling>
 		<MtouchLinkerDumpDependencies Condition="'$(MtouchLinkerDumpDependencies)' == ''">False</MtouchLinkerDumpDependencies>
 		<MtouchUseLlvm Condition="'$(MtouchUseLlvm)' == ''">False</MtouchUseLlvm>
-		<MtouchFloat32 Condition="'$(MtouchFloat32)' == '' And '$(UsingAppleNETSdk)' != 'true'">False</MtouchFloat32>
 		<MtouchEnableBitcode Condition="'$(MtouchEnableBitcode)' == ''">False</MtouchEnableBitcode>
 		<MtouchUseThumb Condition="'$(MtouchUseThumb)' == ''">False</MtouchUseThumb>
 		<MtouchProjectDirectory>$(MSBuildProjectDirectory)</MtouchProjectDirectory>
 		<MtouchVerbosity Condition="$(MtouchVerbosity) == ''">2</MtouchVerbosity>
 
 		<IpaIncludeArtwork Condition="'$(IpaIncludeArtwork)' == ''">False</IpaIncludeArtwork>
-		<BuildIpa Condition="'$(BuildIpa)' == '' And '$(UsingAppleNETSdk)' != 'true'">False</BuildIpa>
 		<BuildSessionId></BuildSessionId>
 
 		<!-- Backward Compatability -->
@@ -57,12 +55,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<AvailableItemName Include="BundleResource" />
 	</ItemGroup>
 
-	<!-- Do not resolve from the GAC under any circumstances in Mobile -->
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<AssemblySearchPaths>$([System.String]::Copy('$(AssemblySearchPaths)').Replace('{GAC}',''))</AssemblySearchPaths>
-		<AssemblySearchPaths Condition="'$(MSBuildRuntimeVersion)' != ''">$(AssemblySearchPaths.Split(';'))</AssemblySearchPaths>
-	</PropertyGroup>
-
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
index d2483014ceb..7ba92143423 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
@@ -29,61 +29,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<_PreparedResourceRules></_PreparedResourceRules>
 	</PropertyGroup>
 
-	<!-- Insert our app bundle generation step -->
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<BuildDependsOn>
-			BuildOnlySettings;
-			PrepareForBuild;
-			_CollectBundleResources;
-			_OptimizePngImages;
-			_OptimizePropertyLists;
-			_OptimizeLocalizationFiles;
-			_PackLibraryResources;
-			_UnpackLibraryResources;
-			$(BuildDependsOn);
-			_GenerateBundleName;
-			_CleanUploaded;
-			_CreateAppBundle;
-			Codesign;
-			CreateIpa;
-			Archive;
-		</BuildDependsOn>
-
-		<CleanDependsOn>
-			$(CleanDependsOn);
-			_ComputeTargetArchitectures;
-			_CleanUploaded;
-		</CleanDependsOn>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
-		<CreateAppBundleDependsOn>
-			$(CreateAppBundleDependsOn);
-			_DetectSigningIdentity;
-			_CopyResourcesToBundle;
-			_CreateAssetPackManifest;
-			_SmeltMetal;
-			_TemperMetal;
-			_CompileCoreMLModels;
-			_PrepareResourceRules;
-			_CompileEntitlements;
-			_WriteAppManifest;
-			_GetNativeExecutableName;
-			_ParseBundlerArguments;
-			_CompileToNative;
-			_CompileITunesMetadata;
-			_CollectITunesArtwork;
-			_CopyITunesArtwork;
-			_CreateDebugSettings;
-			_CreateDebugConfiguration;
-			_CreatePkgInfo;
-			_CopyAppExtensionsToBundle;
-			_CopyWatchOS2AppsToBundle;
-			_PostProcessAppBundle;
-			_ValidateAppBundle;
-		</CreateAppBundleDependsOn>
-	</PropertyGroup>
-
 	<PropertyGroup>
 		<CoreCodesignDependsOn>
 			$(_CodesignAppBundleDependsOn);
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.ObjCBinding.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.ObjCBinding.CSharp.targets
index c4caac30bce..40793f58305 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.ObjCBinding.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.ObjCBinding.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.iOS.ObjcBinding.CSharp.targets
 
@@ -20,7 +20,6 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
 
 	<Import Project="Xamarin.iOS.ObjCBinding.CSharp.props"/>
 
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.iOS.ObjCBinding.Common.targets" />
 	<Import Project="Xamarin.Shared.targets"/>
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.VisualBasic.targets
index 06545f5cd9b..5cc9aa08038 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.VisualBasic.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.VisualBasic.targets
@@ -26,7 +26,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.iOS.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.WatchApp.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.WatchApp.CSharp.targets
index 7debb931f91..57058621be9 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.WatchApp.CSharp.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.WatchApp.CSharp.targets
@@ -1,4 +1,4 @@
-<!--
+<!--
 ***********************************************************************************************
 Xamarin.iOS.WatchApp.CSharp.targets
 
@@ -26,7 +26,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<!-- This must be set before importing Microsoft.CSharp.targets -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
 	</PropertyGroup>
-	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(UsingAppleNETSdk)' != 'true'" />
 	<Import Project="Xamarin.iOS.WatchApp.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets
index 289c51ef5e4..79aba691267 100644
--- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets
@@ -12,14 +12,14 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
 ***********************************************************************************************
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.FindILLink" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.Unzip" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.WriteItemsToFile" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.Zip" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.CopyArchiveFiles" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.ILLink" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.iOS.Tasks.Windows.CreateArchiveDirectory" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
-	<UsingTask TaskName="Xamarin.iOS.Tasks.Windows.ResolveUniversalTypeIdentifiers" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.FindILLink" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.Unzip" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.WriteItemsToFile" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.Zip" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.CopyArchiveFiles" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.ILLink" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
+	<UsingTask TaskName="Xamarin.iOS.Tasks.Windows.CreateArchiveDirectory" AssemblyFile="$(_TaskAssemblyFileNameWindows)" />
+	<UsingTask TaskName="Xamarin.iOS.Tasks.Windows.ResolveUniversalTypeIdentifiers" AssemblyFile="$(_TaskAssemblyFileNameWindows)" />
 
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Messaging.Build.targets" Condition="Exists('$(MSBuildThisFileDirectory)Xamarin.Messaging.Build.targets') And '$(MessagingBuildTargetsImported)' != 'true'" />
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.After.targets" Condition="Exists('$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.After.targets')" />
diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.Before.targets b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.Before.targets
index 6b0915256fd..de017620711 100644
--- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.Before.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.Before.targets
@@ -14,7 +14,7 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.props" Condition="Exists('$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.props')" />
 
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.CollectMonotouchReferences" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.CollectMonotouchReferences" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
 	
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.Before.targets" Condition="Exists('$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.Before.targets')" />
 </Project>
diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.HotRestart.targets b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.HotRestart.targets
index e091f69fc75..f543eaef393 100644
--- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.HotRestart.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.HotRestart.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.CompileEntitlements" AssemblyFile="Xamarin.iOS.Tasks.dll" />
-	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CodesignHotRestartApp" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
-	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CompileHotRestartAppManifest" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
-	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.ComputeHotRestartBundleContents" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
-	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.DetectHotRestartSigningIdentity" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
-	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.PrepareAppBundle" AssemblyFile="Xamarin.iOS.Tasks.Windows.dll" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.CompileEntitlements" AssemblyFile="$(_TaskAssemblyFileName)" />
+	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CodesignHotRestartApp" AssemblyFile="$(_TaskAssemblyFileNameWindows)" />
+	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.CompileHotRestartAppManifest" AssemblyFile="$(_TaskAssemblyFileNameWindows)" />
+	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.ComputeHotRestartBundleContents" AssemblyFile="$(_TaskAssemblyFileNameWindows)" />
+	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.DetectHotRestartSigningIdentity" AssemblyFile="$(_TaskAssemblyFileNameWindows)" />
+	<UsingTask TaskName="Xamarin.iOS.HotRestart.Tasks.PrepareAppBundle" AssemblyFile="$(_TaskAssemblyFileNameWindows)" />
 	
 	<Import Project="Xamarin.iOS.HotRestart.props" />
 
diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.ObjCBinding.CSharp.After.targets b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.ObjCBinding.CSharp.After.targets
index 3cfba889961..d0ea8d93ef4 100644
--- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.ObjCBinding.CSharp.After.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.ObjCBinding.CSharp.After.targets
@@ -18,7 +18,7 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.props" Condition="Exists('$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.props')" />
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.After.targets" Condition="Exists('$(MSBuildThisFileDirectory)Xamarin.iOS.Windows.After.targets')" />
 
-	<UsingTask TaskName="Xamarin.MacDev.Tasks.PrepareObjCBindingNativeFrameworks" AssemblyFile="$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.PrepareObjCBindingNativeFrameworks" AssemblyFile="$(CoreiOSSdkDirectory)$(_TaskAssemblyFileName)" />
 	
 	<PropertyGroup Condition="'$(DesignTimeBuild)' != 'true'">
 		<CompileDependsOn>
diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Windows.props b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Windows.props
index 37ed00836aa..dd5f117865b 100644
--- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Windows.props
+++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Windows.props
@@ -13,10 +13,8 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
 -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<!-- $(CoreiOSSdkDirectory) is defined in Microsoft.iOS.Sdk.targets, from Microsoft.iOS.Sdk package -->
-		<CoreiOSSdkDirectory Condition=" '$(CoreiOSSdkDirectory)' == '' and '$(UsingAppleNETSdk)' != 'true' ">$(MSBuildThisFileDirectory)</CoreiOSSdkDirectory>
 		<!-- Property originally defined in Xamarin.Messaging.Build.targets, from Xamarin.Messaging.Build.Client package -->
-		<MessagingBuildClientAssemblyFile>$(CoreiOSSdkDirectory)Xamarin.iOS.Tasks.dll</MessagingBuildClientAssemblyFile>
+		<MessagingBuildClientAssemblyFile>$(CoreiOSSdkDirectory)Xamarin.MacDev.Tasks.dll</MessagingBuildClientAssemblyFile>
 		<MessagingAgentsDirectory>$(MSBuildThisFileDirectory)</MessagingAgentsDirectory>
 	</PropertyGroup>
 </Project>
diff --git a/msbuild/Xamarin.iOS.Tasks/Properties/AssemblyInfo.cs b/msbuild/Xamarin.iOS.Tasks/Properties/AssemblyInfo.cs
deleted file mode 100644
index f4fbada51c3..00000000000
--- a/msbuild/Xamarin.iOS.Tasks/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyCompanyAttribute ("Microsoft Corp.")]
-[assembly: AssemblyFileVersionAttribute (VersionConstants.XamarinIOSVersion)]
-[assembly: AssemblyInformationalVersionAttribute (VersionConstants.XamarinIOSVersion + "." + VersionConstants.NuGetPrereleaseIdentifier + "+" + VersionConstants.NuGetBuildMetadata)]
-[assembly: AssemblyProductAttribute ("Xamarin.iOS.Tasks")]
-[assembly: AssemblyTitleAttribute ("Xamarin.iOS.Tasks")]
-[assembly: AssemblyVersionAttribute (VersionConstants.XamarinIOSVersion)]
diff --git a/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj b/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
deleted file mode 100644
index ddebf2c99e6..00000000000
--- a/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <IncludeMSBuildAssets Condition="'$(IncludeMSBuildAssets)' == ''">compile</IncludeMSBuildAssets>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../product.snk</AssemblyOriginatorKeyFile>
-    <NoWarn>$(NoWarn);8002</NoWarn> <!-- Referenced projects aren't signed: this doesn't matter, because we use ILMerge to merge into a single assembly which we sign -->
-    <LangVersion>latest</LangVersion>
-    <WarningsAsErrors>Nullable</WarningsAsErrors>
-    <NoWarn>$(NoWarn);NU1603</NoWarn> <!-- Xamarin.Messaging.Build.Common 1.6.24 depends on Merq (>= 1.1.0) but Merq 1.1.0 was not found. An approximate best match of Merq 1.1.4 was resolved. -->
-    <NoWarn>$(NoWarn);MSB3277</NoWarn> <!-- warning MSB3277: Found conflicts between different versions of "System.Reflection.Metadata" that could not be resolved. -->
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\external\Xamarin.MacDev\Xamarin.MacDev\Xamarin.MacDev.csproj" />
-    <ProjectReference Include="..\Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <!-- Compile against Microsoft.Build* NuGet refs, but do not copy to OutputDir if IncludeMSBuildAssets was not set. -->
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" IncludeAssets="$(IncludeMSBuildAssets)" />
-    <PackageReference Include="Xamarin.Messaging.Build.Client" Version="$(MessagingVersion)" />
-    <!-- GitInfo is pulled in because of Xamarin.Messaging from above, but we don't want it, so just exclude all assets from it -->
-    <!-- This can be removed once our package references have been updated to not expose GitInfo -->
-    <PackageReference Include="GitInfo" Version="2.2.0" ExcludeAssets="all" />
-  </ItemGroup>
-
-
-  <ItemGroup>
-    <None Include="../Xamarin.Shared/NoCode.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="*.props">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="*.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="../Xamarin.Shared/*.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="../Xamarin.Shared/*.props">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\ILMerge.targets" />
-
-  <!-- Replaces the ProtectedData assembly by the runtime implementation -->
-  <Target Name="CopyRuntimeAssemblies" BeforeTargets="ILRepack">
-    <ItemGroup>
-      <ReferenceCopyLocalToRemove Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Text.Encoding.CodePages'" />
-      <ReferenceCopyLocalToRemove Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
-
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalToRemove)" />
-
-      <ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(FileName)' == 'System.Text.Encoding.CodePages'" />
-      <ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
-
-      <ReferencePath Remove="@(ReferencePathToRemove)" />
-
-      <ReferencePathToAdd Include="@(RuntimeTargetsCopyLocalItems)" Condition="'%(RuntimeIdentifier)' == 'win' And '%(FileName)' == 'System.Text.Encoding.CodePages'" />
-      <ReferencePathToAdd Include="@(RuntimeTargetsCopyLocalItems)" Condition="'%(RuntimeIdentifier)' == 'win' And '%(FileName)' == 'System.Security.Cryptography.ProtectedData'" />
-
-      <ReferencePath Include="@(ReferencePathToAdd)">
-        <DestinationSubDirectory />
-      </ReferencePath>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/Xamarin.MacDev.Tasks.Tests.csproj b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/Xamarin.MacDev.Tasks.Tests.csproj
index 33be922235b..4a8bafb836c 100644
--- a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/Xamarin.MacDev.Tasks.Tests.csproj
+++ b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/Xamarin.MacDev.Tasks.Tests.csproj
@@ -14,9 +14,9 @@
 
   <!--
 
-    The task assembly (Xamarin.iOS.Tasks.dll) is ILMerged, which really
+    The task assembly (Xamarin.MacDev.Tasks.dll) is ILMerged, which really
     confuses VSfM when using a project reference to the task assembly project
-    file, so instead use a reference to the final Xamarin.iOS.Tasks.dll
+    file, so instead use a reference to the final Xamarin.MacDev.Tasks.dll
     assembly instead. This approach requires us to manually build the task
     assembly before building the test assembly (the BuildTasksAssembly
     target).
@@ -28,8 +28,8 @@
     <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
     <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
     <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
-    <Reference Include="Xamarin.iOS.Tasks" HintPath="..\..\..\msbuild\Xamarin.iOS.Tasks\bin\$(Configuration)\netstandard2.0\Xamarin.iOS.Tasks.dll" />
-    <Reference Include="Xamarin.Localization.MSBuild" HintPath="..\..\..\msbuild\Xamarin.iOS.Tasks\bin\$(Configuration)\netstandard2.0\Xamarin.Localization.MSBuild.dll" />
+    <Reference Include="Xamarin.MacDev.Tasks" HintPath="..\..\..\msbuild\Xamarin.MacDev.Tasks\bin\$(Configuration)\netstandard2.0\Xamarin.MacDev.Tasks.dll" />
+    <Reference Include="Xamarin.Localization.MSBuild" HintPath="..\..\..\msbuild\Xamarin.MacDev.Tasks\bin\$(Configuration)\netstandard2.0\Xamarin.Localization.MSBuild.dll" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
@@ -41,8 +41,8 @@
   </ItemGroup>
 
   <Target Name="BuildTasksAssembly" AfterTargets="BeforeBuild">
-    <MSBuild Projects="..\..\..\msbuild\Xamarin.iOS.Tasks\Xamarin.iOS.Tasks.csproj" Targets="Restore" Properties="SomeGlobalPropertyToMakeThisUnique=RestoreMe" />
-    <MSBuild Projects="..\..\..\msbuild\Xamarin.iOS.Tasks\Xamarin.iOS.Tasks.csproj" />
+    <MSBuild Projects="..\..\..\msbuild\Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj" Targets="Restore" Properties="SomeGlobalPropertyToMakeThisUnique=RestoreMe" />
+    <MSBuild Projects="..\..\..\msbuild\Xamarin.MacDev.Tasks\Xamarin.MacDev.Tasks.csproj" />
   </Target>
 
   <ItemGroup>
diff --git a/tools/autoformat.sh b/tools/autoformat.sh
index 9d632006f51..9b13205fb02 100755
--- a/tools/autoformat.sh
+++ b/tools/autoformat.sh
@@ -41,10 +41,8 @@ dotnet format whitespace "$SRC_DIR/tests/cecil-tests/cecil-tests.csproj"
 dotnet format whitespace "$SRC_DIR/tests/dotnet/UnitTests/DotNetUnitTests.csproj"
 dotnet format whitespace "$SRC_DIR/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj"
 dotnet format whitespace "$SRC_DIR/msbuild/Xamarin.Localization.MSBuild/Xamarin.Localization.MSBuild.csproj"
-dotnet format whitespace "$SRC_DIR/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj"
 dotnet format whitespace "$SRC_DIR/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj"
 dotnet format whitespace "$SRC_DIR/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Tasks.Windows.csproj"
-dotnet format whitespace "$SRC_DIR/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj"
 dotnet format whitespace "$SRC_DIR/src/bgen/bgen.csproj"
 dotnet format whitespace "$SRC_DIR/tools/dotnet-linker/dotnet-linker.csproj"
 dotnet format whitespace "$SRC_DIR/tools/mmp/mmp.csproj"

From dcb8ce557b016533da07cac1451cf43aa0829aa7 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 5 Dec 2024 11:28:47 +0100
Subject: [PATCH 06/11] [tools] We need to tell the native linker to not remove
 the XamarinSwiftFunctions type if it's used. (#21750)

Fixes https://github.com/xamarin/xamarin-macios/issues/21410#issuecomment-2514836447.
---
 tests/dotnet/UnitTests/BundleStructureTest.cs |  1 +
 tests/dotnet/UnitTests/ProjectTest.cs         | 38 +++++++++++++++++++
 .../MonoTouch.Tuner/ListExportedSymbols.cs    | 15 ++++++--
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs
index 1d9fad2b36a..421f2b90f3b 100644
--- a/tests/dotnet/UnitTests/BundleStructureTest.cs
+++ b/tests/dotnet/UnitTests/BundleStructureTest.cs
@@ -425,6 +425,7 @@ static bool IsValidLoadLibrary (string library)
 			var valid_prefixes = new string [] {
 				"/System/Library/",
 				"/System/iOSSupport/System/Library/",
+				"/System/iOSSupport/usr/lib/swift/",
 				"/usr/lib/",
 				"@rpath",
 				"@executable_path",
diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index 2b74832e19d..de29a83e538 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -2546,10 +2546,19 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"/usr/lib/libicucore.A.dylib",
 			"/usr/lib/swift/libswiftCore.dylib",
 			"/usr/lib/swift/libswiftCoreFoundation.dylib",
+			"/usr/lib/swift/libswiftCoreImage.dylib",
 			"/usr/lib/swift/libswiftDarwin.dylib",
+			"/usr/lib/swift/libswiftDataDetection.dylib",
 			"/usr/lib/swift/libswiftDispatch.dylib",
+			"/usr/lib/swift/libswiftFileProvider.dylib",
 			"/usr/lib/swift/libswiftFoundation.dylib",
+			"/usr/lib/swift/libswiftMetal.dylib",
 			"/usr/lib/swift/libswiftObjectiveC.dylib",
+			"/usr/lib/swift/libswiftos.dylib",
+			"/usr/lib/swift/libswiftQuartzCore.dylib",
+			"/usr/lib/swift/libswiftUIKit.dylib",
+			"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
+			"/usr/lib/swift/libswiftXPC.dylib",
 		];
 
 		static string [] expectedFrameworks_iOS_Full = [
@@ -2659,10 +2668,16 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"/usr/lib/libz.1.dylib",
 			"/usr/lib/swift/libswiftCore.dylib",
 			"/usr/lib/swift/libswiftCoreFoundation.dylib",
+			"/usr/lib/swift/libswiftCoreImage.dylib",
 			"/usr/lib/swift/libswiftDarwin.dylib",
 			"/usr/lib/swift/libswiftDispatch.dylib",
 			"/usr/lib/swift/libswiftFoundation.dylib",
+			"/usr/lib/swift/libswiftMetal.dylib",
 			"/usr/lib/swift/libswiftObjectiveC.dylib",
+			"/usr/lib/swift/libswiftos.dylib",
+			"/usr/lib/swift/libswiftQuartzCore.dylib",
+			"/usr/lib/swift/libswiftUIKit.dylib",
+			"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
 		];
 
 		static string [] expectedFrameworks_tvOS_Full = [
@@ -2827,6 +2842,20 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"/usr/lib/libobjc.A.dylib",
 			"/usr/lib/libSystem.B.dylib",
 			"/usr/lib/libz.1.dylib",
+			"/usr/lib/swift/libswiftCore.dylib",
+			"/usr/lib/swift/libswiftCoreFoundation.dylib",
+			"/usr/lib/swift/libswiftCoreImage.dylib",
+			"/usr/lib/swift/libswiftDarwin.dylib",
+			"/usr/lib/swift/libswiftDispatch.dylib",
+			"/usr/lib/swift/libswiftFoundation.dylib",
+			"/usr/lib/swift/libswiftIOKit.dylib",
+			"/usr/lib/swift/libswiftMetal.dylib",
+			"/usr/lib/swift/libswiftObjectiveC.dylib",
+			"/usr/lib/swift/libswiftos.dylib",
+			"/usr/lib/swift/libswiftOSLog.dylib",
+			"/usr/lib/swift/libswiftQuartzCore.dylib",
+			"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
+			"/usr/lib/swift/libswiftXPC.dylib",
 		];
 
 		static string [] expectedFrameworks_macOS_Full = [
@@ -2998,13 +3027,22 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"/usr/lib/libobjc.A.dylib",
 			"/usr/lib/libSystem.B.dylib",
 			"/usr/lib/libz.1.dylib",
+			"/System/iOSSupport/usr/lib/swift/libswiftUIKit.dylib",
 			"/usr/lib/swift/libswiftCore.dylib",
 			"/usr/lib/swift/libswiftCoreFoundation.dylib",
+			"/usr/lib/swift/libswiftCoreImage.dylib",
 			"/usr/lib/swift/libswiftDarwin.dylib",
+			"/usr/lib/swift/libswiftDataDetection.dylib",
 			"/usr/lib/swift/libswiftDispatch.dylib",
+			"/usr/lib/swift/libswiftFileProvider.dylib",
 			"/usr/lib/swift/libswiftFoundation.dylib",
 			"/usr/lib/swift/libswiftIOKit.dylib",
+			"/usr/lib/swift/libswiftMetal.dylib",
 			"/usr/lib/swift/libswiftObjectiveC.dylib",
+			"/usr/lib/swift/libswiftos.dylib",
+			"/usr/lib/swift/libswiftOSLog.dylib",
+			"/usr/lib/swift/libswiftQuartzCore.dylib",
+			"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
 			"/usr/lib/swift/libswiftXPC.dylib",
 		];
 
diff --git a/tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs b/tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs
index 8f7d5eea35c..f0f775d63cd 100644
--- a/tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs
+++ b/tools/linker/MonoTouch.Tuner/ListExportedSymbols.cs
@@ -135,16 +135,23 @@ bool ProcessType (TypeDefinition type)
 					modified |= ProcessMethod (method);
 			}
 
-			// There are no Objective-C classes we need to keep from the platform assembly,
-			// so just skip in that case.
-			if (!is_product_assembly)
-				AddRequiredObjectiveCType (type);
+			AddRequiredObjectiveCType (type);
 
 			return modified;
 		}
 
 		void AddRequiredObjectiveCType (TypeDefinition type)
 		{
+			// The product assembly only has one type we may need to keep: XamarinSwiftFunctions
+			if (is_product_assembly) {
+				switch (type.Name) {
+				case "XamarinSwiftFunctions":
+					break;
+				default:
+					return;
+				}
+			}
+
 			var registerAttribute = DerivedLinkContext.StaticRegistrar?.GetRegisterAttribute (type);
 			if (registerAttribute is null)
 				return;

From 7f29a7a35e78dd6a2ac50f09939abf5f4deaca8e Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 5 Dec 2024 15:31:54 +0100
Subject: [PATCH 07/11] [src] Only print analyzer statistics if we're doing a
 verbose build. (#21756)

---
 src/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 62f4a5bf67b..ed7d1d7d20e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -461,8 +461,8 @@ $($(2)_DOTNET_BUILD_DIR)/$(4)/Microsoft.$(1)%dll $($(2)_DOTNET_BUILD_DIR)/$(4)/M
 		/analyzer:$(ROSLYN_GENERATOR) \
 		/analyzer:$(ROSLYN_ANALYZER) \
 		/generatedfilesout:$($(2)_DOTNET_BUILD_DIR)/generated-sources \
-		/reportanalyzer:$(ROSLYN_GENERATOR) \
-		/reportanalyzer:$(ROSLYN_ANALYZER) \
+		$$(if $(V),/reportanalyzer:$(ROSLYN_GENERATOR),) \
+		$$(if $(V),/reportanalyzer:$(ROSLYN_ANALYZER),) \
 		-unsafe \
 		-optimize \
 		$$(ARGS_$(1)) \

From e9ac75b42e432cfb4eac40da327e8662d6221a76 Mon Sep 17 00:00:00 2001
From: Alex Soto <alex@soto.dev>
Date: Thu, 5 Dec 2024 11:17:38 -0500
Subject: [PATCH 08/11] [tests] Add Sequoia macOS tests (#21683)

---
 .../pipelines/run-macos-tests-pipeline.yml         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/devops/automation/templates/pipelines/run-macos-tests-pipeline.yml b/tools/devops/automation/templates/pipelines/run-macos-tests-pipeline.yml
index 59b1c38fdf2..46131cf7f09 100644
--- a/tools/devops/automation/templates/pipelines/run-macos-tests-pipeline.yml
+++ b/tools/devops/automation/templates/pipelines/run-macos-tests-pipeline.yml
@@ -63,6 +63,20 @@ parameters:
           "Agent.HasDevices -equals False",
           "Agent.IsPaired -equals False"
         ]
+      },
+      {
+        stageName: 'mac_15_arm64',
+        displayName: 'arm64 - Mac Sequoia (15)',
+        macPool: 'VSEng-VSMac-Xamarin-Shared',
+        useImage: false,
+        statusContext: 'arm64 - Mac Sequoia (15)',
+        demands: [
+          "Agent.OS -equals Darwin",
+          "macOS.Name -equals Sequoia",
+          "macOS.Architecture -equals arm64",
+          "Agent.HasDevices -equals False",
+          "Agent.IsPaired -equals False"
+        ]
       }]
 
   - name: pool

From fe2471e446a600eae4e990c61471213d0074c87f Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 6 Dec 2024 08:38:40 +0100
Subject: [PATCH 09/11] [src/tests] Fix computing docid for generic method
 parameters. (#21761)

Roslyn's code for reference:

https://github.com/dotnet/roslyn/blob/bbff74e481aaf2c6d05949891a64c0d8ac533cf8/src/Compilers/CSharp/Portable/DocumentationComments/DocumentationCommentIDVisitor.PartVisitor.cs#L105-L109
---
 src/bgen/DocumentationManager.cs              |  6 ++-
 .../Documentation.KnownFailures.txt           | 48 +++++++++----------
 tests/cecil-tests/Documentation.cs            |  6 ++-
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/bgen/DocumentationManager.cs b/src/bgen/DocumentationManager.cs
index 5a552c4b5d4..b581e94fa38 100644
--- a/src/bgen/DocumentationManager.cs
+++ b/src/bgen/DocumentationManager.cs
@@ -123,7 +123,11 @@ static string GetDocId (Type tr)
 		var name = new StringBuilder ();
 
 		if (tr.IsGenericParameter) {
-			name.Append ('`');
+			if (tr.DeclaringMethod is not null) {
+				name.Append ("``");
+			} else {
+				name.Append ('`');
+			}
 			name.Append (tr.GenericParameterPosition);
 #if NET
 		} else if (tr.IsSZArray) {
diff --git a/tests/cecil-tests/Documentation.KnownFailures.txt b/tests/cecil-tests/Documentation.KnownFailures.txt
index aabe21aed21..1cbe6a90729 100644
--- a/tests/cecil-tests/Documentation.KnownFailures.txt
+++ b/tests/cecil-tests/Documentation.KnownFailures.txt
@@ -27572,7 +27572,7 @@ M:Contacts.CNChangeHistoryEventVisitor_Extensions.RemoveSubgroupFromGroup(Contac
 M:Contacts.CNChangeHistoryEventVisitor_Extensions.UpdateGroup(Contacts.ICNChangeHistoryEventVisitor,Contacts.CNChangeHistoryUpdateGroupEvent)
 M:Contacts.CNChangeHistoryFetchRequest.EncodeTo(Foundation.NSCoder)
 M:Contacts.CNContact.AreKeysAvailable(Contacts.CNContactOptions)
-M:Contacts.CNContact.AreKeysAvailable``1(`0[])
+M:Contacts.CNContact.AreKeysAvailable``1(``0[])
 M:Contacts.CNContact.Copy(Foundation.NSZone)
 M:Contacts.CNContact.EncodeTo(Foundation.NSCoder)
 M:Contacts.CNContact.GetItemProviderVisibilityForTypeIdentifier(System.String)
@@ -27592,9 +27592,9 @@ M:Contacts.CNContactProperty.Copy(Foundation.NSZone)
 M:Contacts.CNContactProperty.EncodeTo(Foundation.NSCoder)
 M:Contacts.CNContactRelation.Copy(Foundation.NSZone)
 M:Contacts.CNContactRelation.EncodeTo(Foundation.NSCoder)
-M:Contacts.CNContactStore.GetUnifiedContact``1(System.String,`0[],Foundation.NSError@)
-M:Contacts.CNContactStore.GetUnifiedContacts``1(Foundation.NSPredicate,`0[],Foundation.NSError@)
-M:Contacts.CNContactStore.GetUnifiedMeContact``1(`0[],Foundation.NSError@)
+M:Contacts.CNContactStore.GetUnifiedContact``1(System.String,``0[],Foundation.NSError@)
+M:Contacts.CNContactStore.GetUnifiedContacts``1(Foundation.NSPredicate,``0[],Foundation.NSError@)
+M:Contacts.CNContactStore.GetUnifiedMeContact``1(``0[],Foundation.NSError@)
 M:Contacts.CNContactStore.RequestAccessAsync(Contacts.CNEntityType)
 M:Contacts.CNContainer.Copy(Foundation.NSZone)
 M:Contacts.CNContainer.EncodeTo(Foundation.NSCoder)
@@ -28498,8 +28498,8 @@ M:CoreFoundation.CFAllocator.Deallocate(System.IntPtr)
 M:CoreFoundation.CFAllocator.GetTypeID
 M:CoreFoundation.CFArray.ArrayFromHandle``1(ObjCRuntime.NativeHandle,System.Boolean)
 M:CoreFoundation.CFArray.ArrayFromHandle``1(ObjCRuntime.NativeHandle)
-M:CoreFoundation.CFArray.ArrayFromHandleFunc``1(ObjCRuntime.NativeHandle,System.Func{ObjCRuntime.NativeHandle,`0},System.Boolean)
-M:CoreFoundation.CFArray.ArrayFromHandleFunc``1(ObjCRuntime.NativeHandle,System.Func{ObjCRuntime.NativeHandle,`0})
+M:CoreFoundation.CFArray.ArrayFromHandleFunc``1(ObjCRuntime.NativeHandle,System.Func{ObjCRuntime.NativeHandle,``0},System.Boolean)
+M:CoreFoundation.CFArray.ArrayFromHandleFunc``1(ObjCRuntime.NativeHandle,System.Func{ObjCRuntime.NativeHandle,``0})
 M:CoreFoundation.CFArray.Create(ObjCRuntime.INativeObject[])
 M:CoreFoundation.CFArray.Create(System.String[])
 M:CoreFoundation.CFArray.FromStrings(System.String[])
@@ -32998,7 +32998,7 @@ M:Foundation.ConnectAttribute.#ctor
 M:Foundation.ConnectAttribute.#ctor(System.String)
 M:Foundation.DictionaryContainer.#ctor
 M:Foundation.DictionaryContainer.#ctor(Foundation.NSDictionary)
-M:Foundation.DictionaryContainer.GetArray``1(Foundation.NSString,System.Func{ObjCRuntime.NativeHandle,`0})
+M:Foundation.DictionaryContainer.GetArray``1(Foundation.NSString,System.Func{ObjCRuntime.NativeHandle,``0})
 M:Foundation.DictionaryContainer.GetArray``1(Foundation.NSString)
 M:Foundation.DictionaryContainer.GetBoolValue(Foundation.NSString)
 M:Foundation.DictionaryContainer.GetCGPointValue(Foundation.NSString)
@@ -33018,7 +33018,7 @@ M:Foundation.DictionaryContainer.GetNUIntValue(Foundation.NSString)
 M:Foundation.DictionaryContainer.GetStringArrayValue(Foundation.NSString)
 M:Foundation.DictionaryContainer.GetStringValue(Foundation.NSString)
 M:Foundation.DictionaryContainer.GetStringValue(System.String)
-M:Foundation.DictionaryContainer.GetStrongDictionary``1(Foundation.NSString,System.Func{Foundation.NSDictionary,`0})
+M:Foundation.DictionaryContainer.GetStrongDictionary``1(Foundation.NSString,System.Func{Foundation.NSDictionary,``0})
 M:Foundation.DictionaryContainer.GetStrongDictionary``1(Foundation.NSString)
 M:Foundation.DictionaryContainer.GetUIEdgeInsets(Foundation.NSString)
 M:Foundation.DictionaryContainer.GetUInt32Value(Foundation.NSString)
@@ -33028,7 +33028,7 @@ M:Foundation.DictionaryContainer.RemoveValue(Foundation.NSString)
 M:Foundation.DictionaryContainer.SetArrayValue(Foundation.NSString,Foundation.NSNumber[])
 M:Foundation.DictionaryContainer.SetArrayValue(Foundation.NSString,ObjCRuntime.INativeObject[])
 M:Foundation.DictionaryContainer.SetArrayValue(Foundation.NSString,System.String[])
-M:Foundation.DictionaryContainer.SetArrayValue``1(Foundation.NSString,`0[])
+M:Foundation.DictionaryContainer.SetArrayValue``1(Foundation.NSString,``0[])
 M:Foundation.DictionaryContainer.SetBooleanValue(Foundation.NSString,System.Nullable{System.Boolean})
 M:Foundation.DictionaryContainer.SetCGPointValue(Foundation.NSString,System.Nullable{CoreGraphics.CGPoint})
 M:Foundation.DictionaryContainer.SetCGRectValue(Foundation.NSString,System.Nullable{CoreGraphics.CGRect})
@@ -33232,10 +33232,10 @@ M:Foundation.NSAffineTransform.Concat
 M:Foundation.NSAffineTransform.TransformBezierPath(AppKit.NSBezierPath)
 M:Foundation.NSAppleEventDescriptor.#ctor(Foundation.NSAppleEventDescriptorType)
 M:Foundation.NSArchiveReplaceEventArgs.#ctor(Foundation.NSObject,Foundation.NSObject)
-M:Foundation.NSArray.ArrayFromHandle``1(ObjCRuntime.NativeHandle,System.Converter{ObjCRuntime.NativeHandle,`0},System.Boolean)
-M:Foundation.NSArray.ArrayFromHandle``1(ObjCRuntime.NativeHandle,System.Converter{ObjCRuntime.NativeHandle,`0})
+M:Foundation.NSArray.ArrayFromHandle``1(ObjCRuntime.NativeHandle,System.Converter{ObjCRuntime.NativeHandle,``0},System.Boolean)
+M:Foundation.NSArray.ArrayFromHandle``1(ObjCRuntime.NativeHandle,System.Converter{ObjCRuntime.NativeHandle,``0})
 M:Foundation.NSArray.ArrayFromHandle``1(ObjCRuntime.NativeHandle)
-M:Foundation.NSArray.ArrayFromHandleFunc``1(ObjCRuntime.NativeHandle,System.Func{ObjCRuntime.NativeHandle,`0})
+M:Foundation.NSArray.ArrayFromHandleFunc``1(ObjCRuntime.NativeHandle,System.Func{ObjCRuntime.NativeHandle,``0})
 M:Foundation.NSArray.EnumsFromHandle``1(ObjCRuntime.NativeHandle)
 M:Foundation.NSArray.From(Foundation.NSObject[][])
 M:Foundation.NSArray.FromArray``1(Foundation.NSArray)
@@ -33246,11 +33246,11 @@ M:Foundation.NSArray.FromNSObjects(Foundation.NSObject[])
 M:Foundation.NSArray.FromNSObjects(ObjCRuntime.INativeObject[])
 M:Foundation.NSArray.FromNSObjects(System.Int32,Foundation.NSObject[])
 M:Foundation.NSArray.FromNSObjects(System.Int32,ObjCRuntime.INativeObject[])
-M:Foundation.NSArray.FromNSObjects``1(`0[])
-M:Foundation.NSArray.FromNSObjects``1(`0[][])
-M:Foundation.NSArray.FromNSObjects``1(`0[0:,0:])
-M:Foundation.NSArray.FromNSObjects``1(System.Func{`0,Foundation.NSObject},`0[])
-M:Foundation.NSArray.FromNSObjects``1(System.Int32,`0[])
+M:Foundation.NSArray.FromNSObjects``1(``0[])
+M:Foundation.NSArray.FromNSObjects``1(``0[][])
+M:Foundation.NSArray.FromNSObjects``1(``0[0:,0:])
+M:Foundation.NSArray.FromNSObjects``1(System.Func{``0,Foundation.NSObject},``0[])
+M:Foundation.NSArray.FromNSObjects``1(System.Int32,``0[])
 M:Foundation.NSArray.FromObjects(System.IntPtr,System.Object[])
 M:Foundation.NSArray.FromObjects(System.Object[])
 M:Foundation.NSArray.FromStrings(System.Collections.Generic.IReadOnlyList{System.String})
@@ -33602,7 +33602,7 @@ M:Foundation.NSItemProvider.LoadFileRepresentationAsync(System.String)
 M:Foundation.NSItemProvider.LoadInPlaceFileRepresentationAsync(System.String,Foundation.NSProgress@)
 M:Foundation.NSItemProvider.LoadInPlaceFileRepresentationAsync(System.String)
 M:Foundation.NSItemProvider.LoadItemAsync(System.String,Foundation.NSDictionary)
-M:Foundation.NSItemProvider.LoadObject``1(System.Action{`0,Foundation.NSError})
+M:Foundation.NSItemProvider.LoadObject``1(System.Action{``0,Foundation.NSError})
 M:Foundation.NSItemProvider.LoadObjectAsync(ObjCRuntime.Class,Foundation.NSProgress@)
 M:Foundation.NSItemProvider.LoadObjectAsync(ObjCRuntime.Class)
 M:Foundation.NSItemProvider.LoadObjectAsync``1
@@ -33935,7 +33935,7 @@ M:Foundation.NSOrderedSet.#ctor(System.String[])
 M:Foundation.NSOrderedSet.Contains(System.Object)
 M:Foundation.NSOrderedSet.Equals(System.Object)
 M:Foundation.NSOrderedSet.GetHashCode
-M:Foundation.NSOrderedSet.MakeNSOrderedSet``1(`0[])
+M:Foundation.NSOrderedSet.MakeNSOrderedSet``1(``0[])
 M:Foundation.NSOrderedSet.op_Addition(Foundation.NSOrderedSet,Foundation.NSOrderedSet)
 M:Foundation.NSOrderedSet.op_Addition(Foundation.NSOrderedSet,Foundation.NSSet)
 M:Foundation.NSOrderedSet.op_Equality(Foundation.NSOrderedSet,Foundation.NSOrderedSet)
@@ -34024,7 +34024,7 @@ M:Foundation.NSSet.#ctor(Foundation.NSObject[])
 M:Foundation.NSSet.#ctor(System.Object[])
 M:Foundation.NSSet.#ctor(System.String[])
 M:Foundation.NSSet.Contains(System.Object)
-M:Foundation.NSSet.MakeNSObjectSet``1(`0[])
+M:Foundation.NSSet.MakeNSObjectSet``1(``0[])
 M:Foundation.NSSet.op_Addition(Foundation.NSSet,Foundation.NSOrderedSet)
 M:Foundation.NSSet.op_Addition(Foundation.NSSet,Foundation.NSSet)
 M:Foundation.NSSet.op_Subtraction(Foundation.NSSet,Foundation.NSOrderedSet)
@@ -37959,7 +37959,7 @@ M:Metal.MTLDevice_Extensions.CreateAccelerationStructure(Metal.IMTLDevice,Metal.
 M:Metal.MTLDevice_Extensions.CreateAccelerationStructure(Metal.IMTLDevice,System.UIntPtr)
 M:Metal.MTLDevice_Extensions.CreateAccelerationStructureSizes(Metal.IMTLDevice,Metal.MTLAccelerationStructureDescriptor)
 M:Metal.MTLDevice_Extensions.CreateArgumentEncoder(Metal.IMTLDevice,Metal.IMTLBufferBinding)
-M:Metal.MTLDevice_Extensions.CreateBuffer``1(Metal.IMTLDevice,`0[],Metal.MTLResourceOptions)
+M:Metal.MTLDevice_Extensions.CreateBuffer``1(Metal.IMTLDevice,``0[],Metal.MTLResourceOptions)
 M:Metal.MTLDevice_Extensions.CreateLibraryAsync(Metal.IMTLDevice,Metal.MTLStitchedLibraryDescriptor)
 M:Metal.MTLDevice_Extensions.CreateLibraryAsync(Metal.IMTLDevice,System.String,Metal.MTLCompileOptions)
 M:Metal.MTLDevice_Extensions.CreateRasterizationRateMap(Metal.IMTLDevice,Metal.MTLRasterizationRateMapDescriptor)
@@ -40743,7 +40743,7 @@ M:NearbyInteraction.NISessionDelegate.DidUpdateAlgorithmConvergence(NearbyIntera
 M:NearbyInteraction.NISessionDelegate.SessionSuspensionEnded(NearbyInteraction.NISession)
 M:NearbyInteraction.NISessionDelegate.SessionWasSuspended(NearbyInteraction.NISession)
 M:Network.NSProtocolFramerOptions.GetValue``1(System.String)
-M:Network.NSProtocolFramerOptions.SetValue``1(System.String,`0)
+M:Network.NSProtocolFramerOptions.SetValue``1(System.String,``0)
 M:Network.NWAdvertiseDescriptor.#ctor(System.String)
 M:Network.NWAdvertiseDescriptor.CreateBonjourService(System.String,System.String,System.String)
 M:Network.NWAdvertiseDescriptor.SetTxtRecord(System.String)
@@ -42015,7 +42015,7 @@ M:PdfKit.PdfAnnotation.SetValue(CoreGraphics.CGRect,PdfKit.PdfAnnotationKey)
 M:PdfKit.PdfAnnotation.SetValue(System.Boolean,Foundation.NSString)
 M:PdfKit.PdfAnnotation.SetValue(System.Boolean,PdfKit.PdfAnnotationKey)
 M:PdfKit.PdfAnnotation.SetValue(System.String,PdfKit.PdfAnnotationKey)
-M:PdfKit.PdfAnnotation.SetValue``1(`0,PdfKit.PdfAnnotationKey)
+M:PdfKit.PdfAnnotation.SetValue``1(``0,PdfKit.PdfAnnotationKey)
 M:PdfKit.PdfAnnotationInk.AddBezierPath(AppKit.NSBezierPath)
 M:PdfKit.PdfAnnotationInk.RemoveBezierPath(AppKit.NSBezierPath)
 M:PdfKit.PdfAnnotationLink.SetHighlighted(System.Boolean)
@@ -45866,7 +45866,7 @@ M:UIKit.UIDocumentPickerViewController.remove_WasCancelled(System.EventHandler)
 M:UIKit.UIDocumentSendingToApplicationEventArgs.#ctor(System.String)
 M:UIKit.UIDocViewController.OpenDocumentAsync
 M:UIKit.UIDragDropSessionExtensions.CanLoadObjects(UIKit.IUIDragDropSession,System.Type)
-M:UIKit.UIDragDropSessionExtensions.LoadObjects``1(UIKit.IUIDropSession,System.Action{`0[]})
+M:UIKit.UIDragDropSessionExtensions.LoadObjects``1(UIKit.IUIDropSession,System.Action{``0[]})
 M:UIKit.UIDragInteraction.Dispose(System.Boolean)
 M:UIKit.UIDragInteractionDelegate_Extensions.GetItemsForAddingToSession(UIKit.IUIDragInteractionDelegate,UIKit.UIDragInteraction,UIKit.IUIDragSession,CoreGraphics.CGPoint)
 M:UIKit.UIDragInteractionDelegate_Extensions.GetPreviewForCancellingItem(UIKit.IUIDragInteractionDelegate,UIKit.UIDragInteraction,UIKit.UIDragItem,UIKit.UITargetedDragPreview)
diff --git a/tests/cecil-tests/Documentation.cs b/tests/cecil-tests/Documentation.cs
index 23b532ffe2b..288b9493773 100644
--- a/tests/cecil-tests/Documentation.cs
+++ b/tests/cecil-tests/Documentation.cs
@@ -235,7 +235,11 @@ static string GetDocId (TypeReference tr)
 			} else if (tr is ByReferenceType brt) {
 				name += brt.ElementType.Name + "@";
 			} else if (tr is GenericParameter gp) {
-				name = $"`{gp.Position}";
+				if (gp.DeclaringMethod is not null) {
+					name = $"``{gp.Position}";
+				} else {
+					name = $"`{gp.Position}";
+				}
 			} else if (tr is ArrayType at) {
 				name = GetDocId (at.ElementType);
 				if (at.Rank == 1) {

From 90b387ffe4ceb7917cd19bb76193608a91fb9164 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 6 Dec 2024 19:27:52 +0100
Subject: [PATCH 10/11] [MapKit] Manually make MKUserLocation implement the
 MKAnnotation protocol. Fixes #21759. (#21760)

It's important that MKUserLocation class implements the IMKAnnotation
interface, because a MKUserLocation instance might be passed as a parameter to
a function that takes an IMKAnnotation. If the managed class doesn't implement
the interface, this can result in an InvalidCastException at runtime.

Fixes https://github.com/xamarin/xamarin-macios/issues/21759.
---
 src/MapKit/MKUserLocation.cs                                | 6 ++++++
 src/frameworks.sources                                      | 1 +
 src/mapkit.cs                                               | 6 +++++-
 .../api-annotations-dotnet/common-MapKit.ignore             | 3 ---
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 src/MapKit/MKUserLocation.cs

diff --git a/src/MapKit/MKUserLocation.cs b/src/MapKit/MKUserLocation.cs
new file mode 100644
index 00000000000..8bcf9a3d264
--- /dev/null
+++ b/src/MapKit/MKUserLocation.cs
@@ -0,0 +1,6 @@
+#nullable enable
+
+namespace MapKit {
+	public partial class MKUserLocation : IMKAnnotation {
+	}
+}
diff --git a/src/frameworks.sources b/src/frameworks.sources
index 56377730368..59f18cf1af4 100644
--- a/src/frameworks.sources
+++ b/src/frameworks.sources
@@ -1168,6 +1168,7 @@ MAPKIT_SOURCES = \
 	MapKit/MKPointOfInterestFilter.cs \
 	MapKit/MKPolygon.cs \
 	MapKit/MKPolyline.cs \
+	MapKit/MKUserLocation.cs \
 
 # MediaAccessibility
 
diff --git a/src/mapkit.cs b/src/mapkit.cs
index e1c79774b80..1d8e8658c5e 100644
--- a/src/mapkit.cs
+++ b/src/mapkit.cs
@@ -1362,7 +1362,11 @@ interface MKMultiPoint : MKGeoJsonObject {
 	[NoWatch]
 	[BaseType (typeof (NSObject))]
 	[MacCatalyst (13, 1)]
-	interface MKUserLocation : IMKAnnotation { // This is wrong. It should be MKAnnotation but we can't due to API compat. When you fix this remove hack in generator.cs to enable warning again
+#if XAMCORE_5_0
+	interface MKUserLocation : MKAnnotation {
+#else
+	interface MKUserLocation : IMKAnnotation { // This is wrong. It should be MKAnnotation but we can't due to API compat. When you fix this remove hack in generator.cs to enable warning again. In the meantime, we're stating that MKUserLocation implements the IMKAnnotation protocol by using a manual binding.
+#endif
 		[Export ("updating")]
 		bool Updating { [Bind ("isUpdating")] get; }
 
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/common-MapKit.ignore b/tests/xtro-sharpie/api-annotations-dotnet/common-MapKit.ignore
index 0896680fdd5..9b3e4e3724b 100644
--- a/tests/xtro-sharpie/api-annotations-dotnet/common-MapKit.ignore
+++ b/tests/xtro-sharpie/api-annotations-dotnet/common-MapKit.ignore
@@ -13,8 +13,5 @@
 !deprecated-attribute-missing! MKMapView::showsTraffic missing a [Deprecated] attribute
 !deprecated-attribute-missing! MKMapView::setShowsTraffic: missing a [Deprecated] attribute
 
-## This is rather hard to fix: see comment in the generator (search for MKAnnotation to find it)
-!missing-protocol-conformance! MKUserLocation should conform to MKAnnotation
-
 ## The MKOverlay protocol implements the MKAnnotation protocol, which has a required 'coordinate' property, so the API is there.
 !missing-protocol-member! MKOverlay::coordinate not found

From a8e360d9883bcffd24c8f27258ea119084cf215c Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 6 Dec 2024 19:28:33 +0100
Subject: [PATCH 11/11] [bgen] Add support for [return: Release] for types
 subclassing NativeObject or implementing INativeObject. (#21752)

Add support for [return: Release] for types subclassing NativeObject or implementing INativeObject.

This was implemented by always passing a value for the "owns" parameter when
creating a managed wrapper for a given native pointer (and the passed in value
for the "owns" parameter honors the presence of the Release attribute)

This also required adding an overload taking an "owns" parameter for a few
types which didn't already have such an overload.
---
 src/AddressBook/ABRecord.cs                |  7 ++-
 src/AudioToolbox/MusicSequence.cs          |  7 ++-
 src/Foundation/NSArray.cs                  | 12 +++++
 src/MediaToolbox/MTAudioProcessingTap.cs   |  2 +-
 src/ObjCRuntime/Runtime.cs                 | 27 +++++++++-
 src/ObjCRuntime/Selector.cs                |  9 ++++
 src/bgen/Attributes.cs                     |  1 +
 src/bgen/Caches/TypeCache.cs               |  2 +
 src/bgen/Generator.cs                      | 58 ++++++++--------------
 src/bgen/Models/MarshalType.cs             |  4 +-
 src/bgen/Models/MarshalTypeList.cs         | 16 +++---
 src/bgen/Models/MemberInformation.cs       |  2 +-
 tests/generator/BGenTests.cs               | 38 ++++++++++++++
 tests/generator/tests/release-attribute.cs | 22 ++++++++
 14 files changed, 155 insertions(+), 52 deletions(-)
 create mode 100644 tests/generator/tests/release-attribute.cs

diff --git a/src/AddressBook/ABRecord.cs b/src/AddressBook/ABRecord.cs
index 115e759fec4..578d9811c7b 100644
--- a/src/AddressBook/ABRecord.cs
+++ b/src/AddressBook/ABRecord.cs
@@ -66,10 +66,15 @@ internal ABRecord (NativeHandle handle, bool owns)
 		}
 
 		public static ABRecord? FromHandle (IntPtr handle)
+		{
+			return FromHandle (handle, false);
+		}
+
+		internal static ABRecord? FromHandle (IntPtr handle, bool owns)
 		{
 			if (handle == IntPtr.Zero)
 				return null;
-			return FromHandle (handle, null, false);
+			return FromHandle (handle, null, owns);
 		}
 
 		internal static ABRecord FromHandle (IntPtr handle, ABAddressBook? addressbook, bool owns = true)
diff --git a/src/AudioToolbox/MusicSequence.cs b/src/AudioToolbox/MusicSequence.cs
index 2f2d70867d8..9aa73b7c5e3 100644
--- a/src/AudioToolbox/MusicSequence.cs
+++ b/src/AudioToolbox/MusicSequence.cs
@@ -111,6 +111,11 @@ protected override void Dispose (bool disposing)
 		static readonly Dictionary<IntPtr, WeakReference> sequenceMap = new Dictionary<IntPtr, WeakReference> (Runtime.IntPtrEqualityComparer);
 
 		internal static MusicSequence Lookup (IntPtr handle)
+		{
+			return Lookup (handle, false);
+		}
+
+		internal static MusicSequence Lookup (IntPtr handle, bool owns)
 		{
 			lock (sequenceMap) {
 				if (sequenceMap.TryGetValue (handle, out var weakRef)) {
@@ -120,7 +125,7 @@ internal static MusicSequence Lookup (IntPtr handle)
 					}
 					sequenceMap.Remove (handle);
 				}
-				var ms = new MusicSequence (handle, false);
+				var ms = new MusicSequence (handle, owns);
 				sequenceMap [handle] = new WeakReference (ms);
 				return ms;
 			}
diff --git a/src/Foundation/NSArray.cs b/src/Foundation/NSArray.cs
index 028be3f6c5d..fc054c8fbff 100644
--- a/src/Foundation/NSArray.cs
+++ b/src/Foundation/NSArray.cs
@@ -390,6 +390,18 @@ static public T [] ArrayFromHandleFunc<T> (NativeHandle handle, Func<NativeHandl
 			return ret;
 		}
 
+		/// <summary>Create a managed array from a pointer to a native NSArray instance.</summary>
+		/// <param name="handle">The pointer to the native NSArray instance.</param>
+		/// <param name="createObject">A callback that returns an instance of the type T for a given pointer (for an element in the NSArray).</param>
+		/// <param name="releaseHandle">Whether the native NSArray instance should be released before returning or not.</param>
+		public static T [] ArrayFromHandleFunc<T> (NativeHandle handle, Func<NativeHandle, T> createObject, bool releaseHandle)
+		{
+			var rv = ArrayFromHandleFunc<T> (handle, createObject);
+			if (releaseHandle && handle != NativeHandle.Zero)
+				NSObject.DangerousRelease (handle);
+			return rv;
+		}
+
 		static public T [] ArrayFromHandle<T> (NativeHandle handle, Converter<NativeHandle, T> creator)
 		{
 			if (handle == NativeHandle.Zero)
diff --git a/src/MediaToolbox/MTAudioProcessingTap.cs b/src/MediaToolbox/MTAudioProcessingTap.cs
index 1cf58dad97b..df910cd2e4a 100644
--- a/src/MediaToolbox/MTAudioProcessingTap.cs
+++ b/src/MediaToolbox/MTAudioProcessingTap.cs
@@ -87,7 +87,7 @@ delegate void MTAudioProcessingTapProcessCallbackProxy (/* MTAudioProcessingTapR
 
 		MTAudioProcessingTapCallbacks callbacks;
 		
-		internal static MTAudioProcessingTap? FromHandle (IntPtr handle)
+		internal static MTAudioProcessingTap? FromHandle (IntPtr handle, bool owns)
 		{
 			lock (handles){
 				if (handles.TryGetValue (handle, out var ret))
diff --git a/src/ObjCRuntime/Runtime.cs b/src/ObjCRuntime/Runtime.cs
index 5db823dfa3e..c5526b40c7d 100644
--- a/src/ObjCRuntime/Runtime.cs
+++ b/src/ObjCRuntime/Runtime.cs
@@ -1830,6 +1830,18 @@ static IntPtr CreateNSObject (IntPtr type_gchandle, IntPtr handle, NSObject.Flag
 		{
 			return GetNSObject ((IntPtr) ptr, MissingCtorResolution.ThrowConstructor1NotFound);
 		}
+
+		/// <summary>Wraps an unmanaged <see cref="NativeHandle" /> into a fully typed <see cref="NSObject" />, or returns an existing wrapper object if one already exists.</summary>
+		/// <param name="ptr">A pointer to an unmanaged <see cref="NSObject" /> or any class that derives from the Objective-C NSObject class.</param>
+		/// <param name="owns">Pass true if the caller has a reference to the native object, and wants to give it to the managed wrapper instance. Otherwise pass false (and the native object will be retained if needed).</param>
+		/// <returns>An instance of a class that derives <see cref="NSObject" />.</returns>
+		/// <remarks>
+		///   <para>The runtime create an instance of the most derived managed class.</para>
+		/// </remarks>
+		public static NSObject? GetNSObject (NativeHandle ptr, bool owns)
+		{
+			return GetNSObject ((IntPtr) ptr, owns, MissingCtorResolution.ThrowConstructor1NotFound);
+		}
 #endif
 
 		public static NSObject? GetNSObject (IntPtr ptr)
@@ -1838,16 +1850,27 @@ static IntPtr CreateNSObject (IntPtr type_gchandle, IntPtr handle, NSObject.Flag
 		}
 
 		internal static NSObject? GetNSObject (IntPtr ptr, MissingCtorResolution missingCtorResolution, bool evenInFinalizerQueue = false)
+		{
+			return GetNSObject (ptr, false, missingCtorResolution, evenInFinalizerQueue);
+		}
+
+		internal static NSObject? GetNSObject (IntPtr ptr, bool owns, MissingCtorResolution missingCtorResolution, bool evenInFinalizerQueue = false)
 		{
 			if (ptr == IntPtr.Zero)
 				return null;
 
 			var o = TryGetNSObject (ptr, evenInFinalizerQueue);
 
-			if (o is not null)
+			if (o is not null) {
+				if (owns)
+					o.DangerousRelease ();
 				return o;
+			}
 
-			return ConstructNSObject (ptr, Class.GetClassForObject (ptr), missingCtorResolution);
+			o = ConstructNSObject (ptr, Class.GetClassForObject (ptr), missingCtorResolution);
+			if (owns)
+				NSObject.DangerousRelease (ptr);
+			return o;
 		}
 
 		static public T? GetNSObject<T> (IntPtr ptr) where T : NSObject
diff --git a/src/ObjCRuntime/Selector.cs b/src/ObjCRuntime/Selector.cs
index 7643d6b4225..7f4326ad893 100644
--- a/src/ObjCRuntime/Selector.cs
+++ b/src/ObjCRuntime/Selector.cs
@@ -129,6 +129,15 @@ internal static string GetName (IntPtr handle)
 			return new Selector (sel, false);
 		}
 
+		/// <summary>Creates a managed Selector instance from a native selector.</summary>
+		/// <param name="selector">The native selector handle.</param>
+		/// <param name="owns">Whether the caller owns the native selector handle or not.</param>
+		/// <remarks>It's not possible to free a selector, so the <paramref name="owns" /> parameter is ignored.</remarks>
+		public static Selector? FromHandle (NativeHandle selector, bool owns)
+		{
+			return FromHandle (selector);
+		}
+
 		public static Selector Register (NativeHandle handle)
 		{
 			return new Selector (handle);
diff --git a/src/bgen/Attributes.cs b/src/bgen/Attributes.cs
index 9c5d819f727..89ac0ac635f 100644
--- a/src/bgen/Attributes.cs
+++ b/src/bgen/Attributes.cs
@@ -111,6 +111,7 @@ public RetainAttribute (string wrap)
 	public string WrapName { get; set; }
 }
 
+[AttributeUsage (AttributeTargets.ReturnValue, AllowMultiple = false)]
 public class ReleaseAttribute : Attribute {
 }
 
diff --git a/src/bgen/Caches/TypeCache.cs b/src/bgen/Caches/TypeCache.cs
index 6da8cb5f211..a97441c5a1c 100644
--- a/src/bgen/Caches/TypeCache.cs
+++ b/src/bgen/Caches/TypeCache.cs
@@ -35,6 +35,7 @@ public class TypeCache {
 	/* fundamental */
 	public Type NSObject { get; }
 	public Type INativeObject { get; }
+	public Type NativeObject { get; }
 
 	/* objcruntime */
 	public Type BlockLiteral { get; }
@@ -195,6 +196,7 @@ public TypeCache (MetadataLoadContext universe, Frameworks frameworks, PlatformN
 		/* fundamental */
 		NSObject = Lookup (platformAssembly, "Foundation", "NSObject");
 		INativeObject = Lookup (platformAssembly, "ObjCRuntime", "INativeObject");
+		NativeObject = Lookup (platformAssembly, "CoreFoundation", "NativeObject");
 
 		/* objcruntime */
 		BlockLiteral = Lookup (platformAssembly, "ObjCRuntime", "BlockLiteral");
diff --git a/src/bgen/Generator.cs b/src/bgen/Generator.cs
index 32d4ebc25e5..f07290779d3 100644
--- a/src/bgen/Generator.cs
+++ b/src/bgen/Generator.cs
@@ -57,6 +57,8 @@
 
 // Disable until we get around to enable + fix any issues.
 #nullable disable
+// but allow annotation source code with nullability info.
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
 public partial class Generator : IMemberGatherer {
 	internal bool IsPublicMode;
@@ -536,7 +538,7 @@ string GetFromBindAsWrapper (MemberInformation minfo, out string suffix)
 		return append;
 	}
 
-	public bool HasForcedAttribute (ICustomAttributeProvider cu, out string owns)
+	public bool HasForcedAttribute (ICustomAttributeProvider cu, out bool owns)
 	{
 		var att = AttributeManager.GetCustomAttribute<ForcedTypeAttribute> (cu);
 
@@ -547,11 +549,11 @@ public bool HasForcedAttribute (ICustomAttributeProvider cu, out string owns)
 		}
 
 		if (att is null) {
-			owns = "false";
+			owns = false;
 			return false;
 		}
 
-		owns = att.Owns ? "true" : "false";
+		owns = att.Owns;
 		return true;
 	}
 
@@ -606,8 +608,7 @@ public TrampolineInfo MakeTrampoline (Type t)
 		pars.Add (new TrampolineParameterInfo ("IntPtr", "block"));
 		var parameters = mi.GetParameters ();
 		foreach (var pi in parameters) {
-			string isForcedOwns;
-			var isForced = HasForcedAttribute (pi, out isForcedOwns);
+			var isForced = HasForcedAttribute (pi, out var isForcedOwns);
 
 			if (pi != parameters [0])
 				invoke.Append (", ");
@@ -619,7 +620,7 @@ public TrampolineInfo MakeTrampoline (Type t)
 				if (IsProtocolInterface (pi.ParameterType)) {
 					invoke.AppendFormat (" Runtime.GetINativeObject<{1}> ({0}, false)!", safe_name, pi.ParameterType);
 				} else if (isForced) {
-					invoke.AppendFormat (" Runtime.GetINativeObject<{1}> ({0}, true, {2})!", safe_name, TypeManager.RenderType (pi.ParameterType), isForcedOwns);
+					invoke.AppendFormat (" Runtime.GetINativeObject<{1}> ({0}, true, {2})!", safe_name, TypeManager.RenderType (pi.ParameterType), isForcedOwns ? "true" : "false");
 				} else if (IsNSObject (pi.ParameterType)) {
 					invoke.AppendFormat (" Runtime.GetNSObject<{1}> ({0})!", safe_name, TypeManager.RenderType (pi.ParameterType));
 				} else {
@@ -2886,6 +2887,7 @@ void GetReturnsWrappers (MethodInfo mi, MemberInformation minfo, Type declaringT
 		MarshalInfo mai = new MarshalInfo (this, mi);
 		MarshalType mt;
 
+		var owns = (minfo?.is_return_release == true) || (minfo?.is_forced_owns == true) ? "true" : "false";
 		if (GetNativeEnumToManagedExpression (mi.ReturnType, out cast_a, out cast_b, out var _, postproc)) {
 			// we're done here
 		} else if (mi.ReturnType.IsEnum) {
@@ -2893,15 +2895,15 @@ void GetReturnsWrappers (MethodInfo mi, MemberInformation minfo, Type declaringT
 			cast_b = "";
 		} else if (marshalTypes.TryGetMarshalType (mai.Type, out mt)) {
 			cast_a = mt.CreateFromRet;
-			cast_b = mt.ClosingCreate;
+			cast_b = mt.ClosingCreate?.Replace ("%OWNS%", owns) ?? string.Empty;
 		} else if (TypeManager.IsWrappedType (mi.ReturnType)) {
 			// protocol support means we can return interfaces and, as far as .NET knows, they might not be NSObject
 			if (IsProtocolInterface (mi.ReturnType)) {
 				cast_a = " Runtime.GetINativeObject<" + TypeManager.FormatType (minfo?.type ?? mi.DeclaringType, mi.ReturnType) + "> (";
-				cast_b = $", {(minfo?.is_return_release == true ? "true" : "false")})!";
+				cast_b = $", {owns})!";
 			} else if (minfo is not null && minfo.is_forced) {
 				cast_a = " Runtime.GetINativeObject<" + TypeManager.FormatType (minfo.type, mi.ReturnType) + "> (";
-				cast_b = $", true, {minfo.is_forced_owns})!";
+				cast_b = $", true, {owns})!";
 			} else if (minfo is not null && minfo.is_bindAs) {
 				var bindAs = GetBindAsAttribute (minfo.mi);
 				var nullableBindAsType = TypeManager.GetUnderlyingNullableType (bindAs.Type);
@@ -2915,27 +2917,27 @@ void GetReturnsWrappers (MethodInfo mi, MemberInformation minfo, Type declaringT
 					if (isNullable) {
 						print ("{0} retvaltmp;", NativeHandleType);
 						cast_a = "((retvaltmp = ";
-						cast_b = $") == IntPtr.Zero ? default ({formattedBindAsType}) : ({wrapper}Runtime.GetNSObject<{formattedReturnType}> (retvaltmp)!){suffix})";
+						cast_b = $") == IntPtr.Zero ? default ({formattedBindAsType}) : ({wrapper}Runtime.GetNSObject<{formattedReturnType}> (retvaltmp, {owns})!){suffix})";
 					} else {
 						cast_a = $"{wrapper}Runtime.GetNSObject<{formattedReturnType}> (";
-						cast_b = $")!{suffix}";
+						cast_b = $", {owns})!{suffix}";
 					}
 				} else {
 					var enumCast = (bindAsType.IsEnum && !minfo.type.IsArray) ? $"({formattedBindAsType}) " : string.Empty;
 					print ("{0} retvaltmp;", NativeHandleType);
 					cast_a = "((retvaltmp = ";
-					cast_b = $") == IntPtr.Zero ? default ({formattedBindAsType}) : ({enumCast}Runtime.GetNSObject<{formattedReturnType}> (retvaltmp)!{wrapper})){suffix}";
+					cast_b = $") == IntPtr.Zero ? default ({formattedBindAsType}) : ({enumCast}Runtime.GetNSObject<{formattedReturnType}> (retvaltmp, {owns})!{wrapper})){suffix}";
 				}
 			} else {
 				cast_a = " Runtime.GetNSObject<" + TypeManager.FormatType (minfo?.type ?? declaringType, mi.ReturnType) + "> (";
-				cast_b = ")!";
+				cast_b = $", {owns})!";
 			}
 		} else if (mi.ReturnType.IsGenericParameter) {
 			cast_a = " Runtime.GetINativeObject<" + mi.ReturnType.Name + "> (";
-			cast_b = ", false)!";
+			cast_b = $", {owns})!";
 		} else if (mai.Type == TypeCache.System_String && !mai.PlainString) {
 			cast_a = "CFString.FromHandle (";
-			cast_b = ")!";
+			cast_b = $", {owns})!";
 		} else if (mi.ReturnType.IsSubclassOf (TypeCache.System_Delegate)) {
 			cast_a = "";
 			cast_b = "";
@@ -2951,11 +2953,11 @@ void GetReturnsWrappers (MethodInfo mi, MemberInformation minfo, Type declaringT
 				print ("{0} retvalarrtmp;", NativeHandleType);
 				cast_a = "((retvalarrtmp = ";
 				cast_b = ") == IntPtr.Zero ? null! : (";
-				cast_b += $"NSArray.ArrayFromHandleFunc <{TypeManager.FormatType (bindAsT.DeclaringType, bindAsT)}> (retvalarrtmp, {GetFromBindAsWrapper (minfo, out suffix)})" + suffix;
-				cast_b += "))";
+				cast_b += $"NSArray.ArrayFromHandleFunc <{TypeManager.FormatType (bindAsT.DeclaringType, bindAsT)}> (retvalarrtmp, {GetFromBindAsWrapper (minfo, out suffix)}, {owns})" + suffix;
+				cast_b += $"))";
 			} else if (etype == TypeCache.System_String) {
 				cast_a = "CFArray.StringArrayFromHandle (";
-				cast_b = ")!";
+				cast_b = $", {owns})!";
 			} else if (etype == TypeCache.Selector) {
 				exceptions.Add (ErrorHelper.CreateError (1066, mai.Type.FullName, mi.DeclaringType.FullName, mi.Name));
 			} else {
@@ -2963,7 +2965,7 @@ void GetReturnsWrappers (MethodInfo mi, MemberInformation minfo, Type declaringT
 					cast_a = "CFArray.ArrayFromHandle<global::" + etype + ">(";
 				else
 					cast_a = "CFArray.ArrayFromHandle<" + TypeManager.FormatType (mi.DeclaringType, etype) + ">(";
-				cast_b = ")!";
+				cast_b = $", {owns})!";
 			}
 		} else if (mi.ReturnType.Namespace == "System" && mi.ReturnType.Name == "nint") {
 			cast_a = "(nint) ";
@@ -3418,7 +3420,7 @@ void GenerateTypeLowering (MethodInfo mi, bool null_allowed_override, out String
 				} else if (isINativeObjectSubclass) {
 					if (!pi.IsOut)
 						by_ref_processing.AppendFormat ("if ({0}Value != ({0} is null ? NativeHandle.Zero : {0}.Handle))\n\t", pi.Name.GetSafeParamName ());
-					by_ref_processing.AppendFormat ("{0} = Runtime.GetINativeObject<{1}> ({0}Value, {2}, {3})!;\n", pi.Name.GetSafeParamName (), TypeManager.RenderType (elementType), isForcedType ? "true" : "false", isForcedType ? isForcedOwns : "false");
+					by_ref_processing.AppendFormat ("{0} = Runtime.GetINativeObject<{1}> ({0}Value, {2}, {3})!;\n", pi.Name.GetSafeParamName (), TypeManager.RenderType (elementType), isForcedType ? "true" : "false", (isForcedType && isForcedOwns) ? "true" : "false");
 				} else {
 					throw ErrorHelper.CreateError (88, mai.Type, mi);
 				}
@@ -3650,22 +3652,6 @@ public void GenerateMethodBody (MemberInformation minfo, MethodInfo mi, string s
 		if (shouldMarshalNativeExceptions)
 			print ("Runtime.ThrowException (exception_gchandle);");
 
-		if (minfo.is_return_release && !IsProtocolInterface (mi.ReturnType)) {
-
-			// Make sure we generate the required signature in Messaging only if needed 
-			// bool_objc_msgSendSuper_IntPtr: for respondsToSelector:
-			if (!send_methods.ContainsKey ("void_objc_msgSend")) {
-				print (m, "[DllImport (LIBOBJC_DYLIB, EntryPoint=\"objc_msgSendSuper\")]");
-				print (m, "public extern static void void_objc_msgSend (IntPtr receiever, IntPtr selector);");
-				RegisterMethodName ("void_objc_msgSend");
-			}
-
-			print ("if (ret is not null)");
-			indent++;
-			print ("global::{0}.void_objc_msgSend (ret.Handle, Selector.GetHandle (\"release\"));", NamespaceCache.Messaging);
-			indent--;
-		}
-
 		Inject<PostSnippetAttribute> (mi);
 
 		if (disposes.Length > 0)
diff --git a/src/bgen/Models/MarshalType.cs b/src/bgen/Models/MarshalType.cs
index 20c6178c0f5..e6835861f95 100644
--- a/src/bgen/Models/MarshalType.cs
+++ b/src/bgen/Models/MarshalType.cs
@@ -9,14 +9,14 @@ public class MarshalType {
 	public string CreateFromRet { get; }
 	public string? ClosingCreate { get; }
 
-	public MarshalType (Type t, string? encode = null, string? fetch = null, string? create = null, string? closingCreate = ")")
+	public MarshalType (Type t, string? encode = null, string? fetch = null, string? create = null, string? closingCreate = ", %OWNS%)")
 	{
 		Type = t;
 		Encoding = encode ?? Generator.NativeHandleType;
 		ParameterMarshal = fetch ?? "{0}.Handle";
 		if (create is null) {
 			CreateFromRet = $"Runtime.GetINativeObject<global::{t.FullName}> (";
-			ClosingCreate = ", false)!";
+			ClosingCreate = ", %OWNS%)!";
 		} else {
 			CreateFromRet = create;
 			ClosingCreate = closingCreate;
diff --git a/src/bgen/Models/MarshalTypeList.cs b/src/bgen/Models/MarshalTypeList.cs
index b83110fe826..ea7a3250cad 100644
--- a/src/bgen/Models/MarshalTypeList.cs
+++ b/src/bgen/Models/MarshalTypeList.cs
@@ -10,8 +10,8 @@ public class MarshalTypeList : List<MarshalType> {
 
 	public void Load (TypeCache typeCache, Frameworks frameworks)
 	{
-		Add (new MarshalType (typeCache.NSObject, create: "Runtime.GetNSObject (", closingCreate: ")!"));
-		Add (new MarshalType (typeCache.Selector, create: "Selector.FromHandle (", closingCreate: ")!"));
+		Add (new MarshalType (typeCache.NSObject, create: "Runtime.GetNSObject (", closingCreate: ", %OWNS%)!"));
+		Add (new MarshalType (typeCache.Selector, create: "Selector.FromHandle (", closingCreate: ", %OWNS%)!"));
 		Add (new MarshalType (typeCache.BlockLiteral, "BlockLiteral", "{0}", "THIS_IS_BROKEN"));
 		if (typeCache.MusicSequence is not null)
 			Add (new MarshalType (typeCache.MusicSequence, create: "global::AudioToolbox.MusicSequence.Lookup ("));
@@ -42,15 +42,15 @@ public void Load (TypeCache typeCache, Frameworks frameworks)
 			Add (typeCache.CVImageBuffer);
 		}
 		if (frameworks.HaveMediaToolbox)
-			Add (new MarshalType (typeCache.MTAudioProcessingTap!, create: "MediaToolbox.MTAudioProcessingTap.FromHandle("));
+			Add (new MarshalType (typeCache.MTAudioProcessingTap!, create: "MediaToolbox.MTAudioProcessingTap.FromHandle (", closingCreate: ", %OWNS%)!"));
 		if (frameworks.HaveAddressBook) {
 			Add (typeCache.ABAddressBook);
-			Add (new MarshalType (typeCache.ABPerson!, create: "(ABPerson) ABRecord.FromHandle (", closingCreate: ")!"));
-			Add (new MarshalType (typeCache.ABRecord!, create: "ABRecord.FromHandle (", closingCreate: ")!"));
+			Add (new MarshalType (typeCache.ABPerson!, create: "(ABPerson) ABRecord.FromHandle (", closingCreate: ", %OWNS%)!"));
+			Add (new MarshalType (typeCache.ABRecord!, create: "ABRecord.FromHandle (", closingCreate: ", %OWNS%)!"));
 		}
 		if (frameworks.HaveCoreVideo) {
 			// owns `false` like ptr ctor https://github.com/xamarin/xamarin-macios/blob/6f68ab6f79c5f1d96d2cbb1e697330623164e46d/src/CoreVideo/CVBuffer.cs#L74-L90
-			Add (new MarshalType (typeCache.CVPixelBuffer!, create: "Runtime.GetINativeObject<CVPixelBuffer> (", closingCreate: ", false)!"));
+			Add (new MarshalType (typeCache.CVPixelBuffer!, create: "Runtime.GetINativeObject<CVPixelBuffer> (", closingCreate: ", %OWNS%)!"));
 		}
 		Add (typeCache.CGLayer);
 		if (frameworks.HaveCoreMedia)
@@ -63,7 +63,7 @@ public void Load (TypeCache typeCache, Frameworks frameworks)
 		if (frameworks.HaveAudioUnit)
 			Add (typeCache.AudioComponent);
 		if (frameworks.HaveCoreMedia) {
-			Add (new MarshalType (typeCache.CMFormatDescription!, create: "CMFormatDescription.Create (", closingCreate: ")!"));
+			Add (new MarshalType (typeCache.CMFormatDescription!, create: "CMFormatDescription.Create (", closingCreate: ", %OWNS%)!"));
 			Add (typeCache.CMAudioFormatDescription);
 			Add (typeCache.CMVideoFormatDescription);
 		}
@@ -77,7 +77,7 @@ public void Load (TypeCache typeCache, Frameworks frameworks)
 		Add (typeCache.SecProtocolOptions);
 		Add (typeCache.SecProtocolMetadata);
 		Add (typeCache.SecAccessControl);
-		Add (new MarshalType (typeCache.AudioBuffers, create: "new global::AudioToolbox.AudioBuffers (", closingCreate: ", false)"));
+		Add (new MarshalType (typeCache.AudioBuffers, create: "new global::AudioToolbox.AudioBuffers (", closingCreate: ", %OWNS%)"));
 		if (frameworks.HaveAudioUnit) {
 			Add (typeCache.AURenderEventEnumerator);
 		}
diff --git a/src/bgen/Models/MemberInformation.cs b/src/bgen/Models/MemberInformation.cs
index 9ece95b28fb..cc028bf5cbf 100644
--- a/src/bgen/Models/MemberInformation.cs
+++ b/src/bgen/Models/MemberInformation.cs
@@ -54,7 +54,7 @@ public class MemberInformation {
 	// know whether the code is to call the internal static method implementing a
 	// protocol member (in which case this property is true). See also is_protocol_implementation_method.
 	public bool call_protocol_implementation_method;
-	public string is_forced_owns;
+	public bool is_forced_owns;
 	public bool is_bindAs => Generator.HasBindAsAttribute (mi);
 	public bool generate_is_async_overload;
 
diff --git a/tests/generator/BGenTests.cs b/tests/generator/BGenTests.cs
index f13ef8f40a4..b8616ca3c53 100644
--- a/tests/generator/BGenTests.cs
+++ b/tests/generator/BGenTests.cs
@@ -1761,5 +1761,43 @@ public void DelegatesWithPointerTypes (Profile profile)
 				Assert.IsTrue (p.ParameterType.IsPointer, $"Pointer parameter type: {p.Name}");
 			}
 		}
+
+		[Test]
+		[TestCase (Profile.iOS)]
+		public void ReleaseAttribute (Profile profile)
+		{
+			Configuration.IgnoreIfIgnoredPlatform (profile.AsPlatform ());
+			var bgen = BuildFile (profile, "tests/release-attribute.cs");
+			bgen.AssertNoWarnings ();
+
+			var passesOwnsEqualsTrue = new Func<MethodDefinition, bool> ((method) => {
+				foreach (var ins in method.Body.Instructions) {
+					switch (ins.OpCode.Code) {
+					case Code.Call:
+					case Code.Calli:
+					case Code.Callvirt:
+						var mr = (MethodReference) ins.Operand;
+						switch (mr.Name) {
+						case "GetINativeObject":
+						case "GetNSObject":
+						case "FromHandle":
+							var prev = ins.Previous;
+							return prev.OpCode.Code == Code.Ldc_I4_1;
+						}
+						break;
+					}
+				}
+				return false;
+			});
+
+			// The last argument in the call to GetNSObject, GetINativeObject or FromHandle (or any other object-creating methods) must be 'true'.
+			var methods = bgen.ApiAssembly.MainModule.GetType ("NS", "ReleaseAttributeTest").Methods
+								.Where ((v) => !v.IsConstructor)
+								.Where (v => v.Name != "get_ClassHandle");
+			Assert.Multiple (() => {
+				foreach (var method in methods)
+					Assert.True (passesOwnsEqualsTrue (method), method.Name);
+			});
+		}
 	}
 }
diff --git a/tests/generator/tests/release-attribute.cs b/tests/generator/tests/release-attribute.cs
new file mode 100644
index 00000000000..c2133234fbe
--- /dev/null
+++ b/tests/generator/tests/release-attribute.cs
@@ -0,0 +1,22 @@
+using System;
+
+using CoreVideo;
+using Foundation;
+using ObjCRuntime;
+
+namespace NS {
+	[BaseType (typeof (NSObject))]
+	interface ReleaseAttributeTest {
+		[Export ("getNSObject")]
+		[return: Release]
+		NSObject GetNSObject ();
+
+		[Export ("getNativeObject")]
+		[return: Release]
+		CVPixelBuffer GetNativeObject ();
+
+		[Export ("getINativeObject")]
+		[return: Release]
+		Selector GetINativeObject ();
+	}
+}