diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index c545cadcee6..80b57b40495 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -2726,19 +2726,19 @@ global using nfloat = global::System.Runtime.InteropServices.NFloat%3B
 	</PropertyGroup>
 
 	<Import Project="$(_TargetsDirectory)Xamarin.iOS.$(_ProjectLanguage).targets"                  Condition="'$(_ProjectType)' == 'iOSExecutableProject' Or '$(_ProjectType)' == 'iOSClassLibrary' " />
-	<Import Project="$(_TargetsDirectory)Xamarin.iOS.AppExtension.$(_ProjectLanguage).targets"     Condition="'$(_ProjectType)' == 'iOSAppExtensionProject' " />
+	<Import Project="$(_TargetsDirectory)Xamarin.iOS.$(_ProjectLanguage).targets"                  Condition="'$(_ProjectType)' == 'iOSAppExtensionProject' " />
 	<Import Project="$(_TargetsDirectory)Xamarin.iOS.ObjCBinding.$(_ProjectLanguage).targets"      Condition="'$(_ProjectType)' == 'iOSBindingProject' " />
 
 	<Import Project="$(_TargetsDirectory)Xamarin.TVOS.$(_ProjectLanguage).targets"                 Condition="'$(_ProjectType)' == 'tvOSExecutableProject' Or '$(_ProjectType)' == 'tvOSClassLibrary' " />
-	<Import Project="$(_TargetsDirectory)Xamarin.TVOS.AppExtension.$(_ProjectLanguage).targets"    Condition="'$(_ProjectType)' == 'tvOSAppExtensionProject' " />
+	<Import Project="$(_TargetsDirectory)Xamarin.TVOS.$(_ProjectLanguage).targets"                 Condition="'$(_ProjectType)' == 'tvOSAppExtensionProject' " />
 	<Import Project="$(_TargetsDirectory)Xamarin.TVOS.ObjCBinding.$(_ProjectLanguage).targets"     Condition="'$(_ProjectType)' == 'tvOSBindingProject' " />
 
 	<Import Project="$(_TargetsDirectory)Xamarin.Mac.$(_ProjectLanguage).targets"                  Condition="'$(_ProjectType)' == 'macOSExecutableProject' Or '$(_ProjectType)' == 'macOSClassLibrary' " />
-	<Import Project="$(_TargetsDirectory)Xamarin.Mac.AppExtension.$(_ProjectLanguage).targets"     Condition="'$(_ProjectType)' == 'macOSAppExtensionProject' " />
+	<Import Project="$(_TargetsDirectory)Xamarin.Mac.$(_ProjectLanguage).targets"                  Condition="'$(_ProjectType)' == 'macOSAppExtensionProject' " />
 	<Import Project="$(_TargetsDirectory)Xamarin.Mac.ObjCBinding.$(_ProjectLanguage).targets"      Condition="'$(_ProjectType)' == 'macOSBindingProject' " />
 
 	<Import Project="$(_TargetsDirectory)Xamarin.MacCatalyst.$(_ProjectLanguage).targets"              Condition="'$(_ProjectType)' == 'MacCatalystExecutableProject' Or '$(_ProjectType)' == 'MacCatalystClassLibrary' " />
-	<Import Project="$(_TargetsDirectory)Xamarin.MacCatalyst.AppExtension.$(_ProjectLanguage).targets" Condition="'$(_ProjectType)' == 'MacCatalystAppExtensionProject' " />
+	<Import Project="$(_TargetsDirectory)Xamarin.MacCatalyst.$(_ProjectLanguage).targets"              Condition="'$(_ProjectType)' == 'MacCatalystAppExtensionProject' " />
 	<Import Project="$(_TargetsDirectory)Xamarin.MacCatalyst.ObjCBinding.$(_ProjectLanguage).targets"  Condition="'$(_ProjectType)' == 'MacCatalystBindingProject' " />
 	
 	<Import Project="dotnet-xcsync.targets" />
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.CSharp.targets
deleted file mode 100644
index a7191083812..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.CSharp.targets
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.Mac.AppExtension.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) 2014 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- Version/fx properties -->
-		<TargetFrameworkVersion Condition="'$(TargetFrameworkIdentifier)' == '' And '$(TargetFrameworkVersion)' ==''">v4.5</TargetFrameworkVersion>
-
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-
-	<Import Project="Xamarin.Mac.AppExtension.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.props b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.props
deleted file mode 100644
index f6d94bf54bb..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.props
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.Mac.AppExtension.Common.props
-
-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 defines default properties for OS X App Extension projects.
-
-Copyright (C) 2013-2014 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
-
-	<PropertyGroup>
-		<IsXPCService Condition="'$(IsXPCService)' == ''">false</IsXPCService>
-	</PropertyGroup>
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
-
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.targets
deleted file mode 100644
index 7e7fb079686..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.targets
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.Mac.AppExtension.Common.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-2014 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<IsAppExtension>True</IsAppExtension>
-	</PropertyGroup>
-
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Mac.AppExtension.Common.props" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets" 
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<Target Name="CreateIpa"/>
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.VisualBasic.targets
deleted file mode 100644
index 4230af13f26..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.VisualBasic.targets
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.Mac.AppExtension.VisualBasic.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) 2014 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- Version/fx properties -->
-		<TargetFrameworkVersion Condition="'$(TargetFrameworkIdentifier)' == '' And '$(TargetFrameworkVersion)' ==''">v4.5</TargetFrameworkVersion>
-
-		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
-		<!-- See Xamarin.iOS.AppExtension.VisualBasic.targets for a detailed explanation of this variable -->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-
-	<Import Project="Xamarin.Mac.AppExtension.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.CSharp.targets
deleted file mode 100644
index 127b5a76ae2..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.CSharp.targets
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.TVOS.AppExtension.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-
-	<Import Project="Xamarin.TVOS.AppExtension.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.props b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.props
deleted file mode 100644
index 70e0390e111..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.iOS.AppExtension.Common.props
-
-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 defines default properties for iOS App Extension projects.
-
-Copyright (C) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
-
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.targets
deleted file mode 100644
index 78ab53ef731..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.targets
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.TVOS.AppExtension.Common.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<IsAppExtension>True</IsAppExtension>
-
-		<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.TVOS.AppExtension.Common.props" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.FSharp.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.FSharp.targets
deleted file mode 100644
index 8da272bf454..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.FSharp.targets
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.TVOS.AppExtension.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- This must be set before importing Microsoft.FSharp.targets -->
-		<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- This should be done in the F# target files, but _DebugFileExt is not an upstream
-		     msbuild feature yet, so F# doesn't have this. Once, upstream F# adds it, we can
-		     remove this -->
-		<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-
-	<Import Project="Xamarin.TVOS.AppExtension.Common.targets" />
-
-	<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element so we can't determine this with a variable -->
-	<Import
-		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')"
-		Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets" />
-	<Import
-		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"
-		Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
-	<Import
-		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"
-		Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.VisualBasic.targets
deleted file mode 100644
index d1b4e8403e0..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.VisualBasic.targets
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.TVOS.AppExtension.VisualBasic.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
-		<!-- See Xamarin.iOS.AppExtension.VisualBasic.targets for a detailed explanation of this variable -->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-
-	<Import Project="Xamarin.TVOS.AppExtension.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.CSharp.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.CSharp.targets
deleted file mode 100644
index cb1583e8be3..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.CSharp.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.iOS.AppExtension.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<!--
-			In Xamarin.iOS.Common.targets, just before the _CompileToNative target, we modify the
-			mtouch references to ensure that we get the lib assemblies for nugets, and not the ref references:
-
-			https://github.com/dotnet/macios/blob/9e31d07ecc08a64372dd562e843c3d8950d24985/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets#L784-L791
-
-			This logic removes nuget references, and then re-adds any copy-local dll references.
-
-			This works fine in executable projects, but not in library projects (aka extensions), because nugets aren't copied for library projects:
-
-			https://github.com/NuGet/NuGet.BuildTasks/blob/cf4b0a12cf1f75e0654f28c2a9020251c41d126a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets#L86
-
-			So we need to set the CopyNuGetImplementations variable to 'true' for our library projects.
-		-->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-	<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.props b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.props
deleted file mode 100644
index 70e0390e111..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.iOS.AppExtension.Common.props
-
-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 defines default properties for iOS App Extension projects.
-
-Copyright (C) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.props')"/>
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.props')"/>
-
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.targets
deleted file mode 100644
index 67cd4bfe460..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.targets
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.iOS.AppExtension.Common.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<IsAppExtension>True</IsAppExtension>
-		<IsWatchExtension>False</IsWatchExtension>
-	</PropertyGroup>
-
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.AppExtension.Common.props" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets" 
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.FSharp.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.FSharp.targets
deleted file mode 100644
index b52db672d06..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.FSharp.targets
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.iOS.AppExtension.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- This must be set before importing Microsoft.FSharp.targets -->
-		<!-- See Xamarin.iOS.AppExtension.CSharp.targets for a detailed explanation of this variable -->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- This should be done in the F# target files, but _DebugFileExt is not an upstream
-		     msbuild feature yet, so F# doesn't have this. Once, upstream F# adds it, we can
-		     remove this -->
-		<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.CSharp.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-
-	<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element so we can't determine this with a variable -->
-	<Import
-		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')"
-		Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets" />
-	<Import
-		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"
-		Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
-	<Import
-		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"
-		Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-
-	<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
-
-</Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.VisualBasic.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.VisualBasic.targets
deleted file mode 100644
index a618fed65d3..00000000000
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.VisualBasic.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.iOS.AppExtension.VisualBasic.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) 2014-2016 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-	<PropertyGroup>
-		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
-		<!--
-			In Xamarin.iOS.Common.targets, just before the _CompileToNative target, we modify the
-			mtouch references to ensure that we get the lib assemblies for nugets, and not the ref references:
-
-			https://github.com/dotnet/macios/blob/9e31d07ecc08a64372dd562e843c3d8950d24985/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets#L784-L791
-
-			This logic removes nuget references, and then re-adds any copy-local dll references.
-
-			This works fine in executable projects, but not in library projects (aka extensions), because nugets aren't copied for library projects:
-
-			https://github.com/NuGet/NuGet.BuildTasks/blob/cf4b0a12cf1f75e0654f28c2a9020251c41d126a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets#L86
-
-			So we need to set the CopyNuGetImplementations variable to 'true' for our library projects.
-		-->
-		<CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)' == ''">true</CopyNuGetImplementations>
-
-		<!-- Enable nuget package conflict resolution -->
-		<!-- This must be set before importing Microsoft.VisualBasic.targets -->
-		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-	</PropertyGroup>
-	<Import Project="Xamarin.iOS.AppExtension.Common.targets" />
-
-	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
-			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
-</Project>