diff --git a/build-tools/scripts/MonoAndroidFramework.props b/build-tools/scripts/MonoAndroidFramework.props
deleted file mode 100644
index 0b5eecca0a3..00000000000
--- a/build-tools/scripts/MonoAndroidFramework.props
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    Import this file at the top, when you need to build a MonoAndroid
-    assembly in the local build tree.
--->
-<Project>
-  <!-- Common properties -->
-  <PropertyGroup>
-    <NoStdLib>true</NoStdLib>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\product.snk</AssemblyOriginatorKeyFile>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <AndroidApplication>false</AndroidApplication>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
-  <Import Project="..\..\Configuration.props" />
-
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <TargetFrameworkRootPath>$(XAInstallPrefix)xbuild-frameworks</TargetFrameworkRootPath>
-    <FrameworkPathOverride>$(TargetFrameworkRootPath)\MonoAndroid\v1.0</FrameworkPathOverride>
-    <TargetFramework>monoandroid$(AndroidLatestStableFrameworkVersion.TrimStart('v'))</TargetFramework>
-    <TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>$(AndroidLatestStableFrameworkVersion)</TargetFrameworkVersion>
-    <OutputPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\</OutputPath>
-  </PropertyGroup>
-
-</Project>
diff --git a/build-tools/scripts/MonoAndroidFramework.targets b/build-tools/scripts/MonoAndroidFramework.targets
deleted file mode 100644
index c31d5bb67f5..00000000000
--- a/build-tools/scripts/MonoAndroidFramework.targets
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-    Import this file at the bottom, when you need to build a
-    MonoAndroid assembly in the local build tree.
--->
-<Project>
-  <PropertyGroup>
-    <LanguageTargets Condition="Exists('$(MicrosoftAndroidSdkOutDir)Xamarin.Android.CSharp.targets')">$(MicrosoftAndroidSdkOutDir)Xamarin.Android.CSharp.targets</LanguageTargets>
-  </PropertyGroup>
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-
-  <!-- References -->
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>$(OutputPath)..\v1.0\mscorlib.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>$(OutputPath)..\v1.0\System.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="System.Core">
-      <HintPath>$(OutputPath)..\v1.0\System.Core.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="System.Xml">
-      <HintPath>$(OutputPath)..\v1.0\System.Xml.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Java.Interop">
-      <HintPath>$(OutputPath)..\v1.0\Java.Interop.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <ProjectReference Include="..\Mono.Android\Mono.Android.csproj">
-      <Private>false</Private>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- 
-    NOTE: This prevents transitive project references or other projects in the .sln from copying files to $(OutputPath).
-    Without this Xamarin.Android.Build.Tasks.csproj was copying files to xbuild-frameworks\MonoAndroid\v11.0\
-  -->
-  <Target Name="_DoNotCopyProjectReferences"
-      AfterTargets="AssignProjectConfiguration">
-    <ItemGroup>
-      <ProjectReferenceWithConfiguration Update="@(ProjectReferenceWithConfiguration)" Private="false" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/samples/HelloWorld/HelloLibrary/HelloLibrary.csproj b/samples/HelloWorld/HelloLibrary/HelloLibrary.csproj
deleted file mode 100644
index b613bde6304..00000000000
--- a/samples/HelloWorld/HelloLibrary/HelloLibrary.csproj
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HelloLibrary</RootNamespace>
-    <AssemblyName>HelloLibrary</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <AndroidApplication>false</AndroidApplication>
-    <DebugType>portable</DebugType>
-    <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-  </PropertyGroup>
-  <Import
-      Condition="Exists('..\..\..\Configuration.props')"
-      Project="..\..\..\Configuration.props"
-  />
-  <PropertyGroup Condition="Exists('..\..\..\Configuration.props')">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Bundle|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Bundle\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="LibraryActivity.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Resources\drawable\" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\Case_Check.png" />
-    <AndroidResource Include="Resources\values\Attr.xml" />
-  </ItemGroup>
-</Project>
diff --git a/samples/HelloWorld/HelloWorld/HelloWorld.csproj b/samples/HelloWorld/HelloWorld/HelloWorld.csproj
deleted file mode 100644
index 40279ae12e5..00000000000
--- a/samples/HelloWorld/HelloWorld/HelloWorld.csproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2305B00D-DE81-4744-B0DA-357835CAFE5A}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>HelloWorld</RootNamespace>
-    <AssemblyName>HelloWorld</AssemblyName>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <Import
-      Condition="Exists('..\..\..\Configuration.props')"
-      Project="..\..\..\Configuration.props"
-  />
-  <PropertyGroup Condition="Exists('..\..\..\Configuration.props')">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HelloLibrary\HelloLibrary.csproj">
-      <Project>{6BE66B30-9346-4DA6-B09A-0CDC1DFE33C2}</Project>
-      <Name>HelloLibrary</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Assets\AboutAssets.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-    <AndroidResource Include="Resources\values\Strings.xml" />
-    <AndroidResource Include="Resources\values\Attr.xml" />
-    <AndroidResource Include="Resources\drawable\MyImage.webp" />
-    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\drawable\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/samples/VSAndroidApp/Assets/AboutAssets.txt b/samples/VSAndroidApp/Assets/AboutAssets.txt
deleted file mode 100644
index dcb04096ff4..00000000000
--- a/samples/VSAndroidApp/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with your package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
-    protected override void OnCreate (Bundle bundle)
-    {
-        base.OnCreate (bundle);
-
-        InputStream input = Assets.Open ("my_asset.txt");
-    }
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file
diff --git a/samples/VSAndroidApp/MainActivity.cs b/samples/VSAndroidApp/MainActivity.cs
deleted file mode 100644
index feedda46d52..00000000000
--- a/samples/VSAndroidApp/MainActivity.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using Android.App;
-using Android.OS;
-using Android.Runtime;
-using Android.Support.Design.Widget;
-using Android.Support.V7.App;
-using Android.Views;
-using Android.Widget;
-
-namespace VSAndroidApp
-{
-    [Activity(Label = "@string/app_name", Theme = "@style/AppTheme.NoActionBar", MainLauncher = true)]
-    public class MainActivity : AppCompatActivity
-    {
-
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            base.OnCreate(savedInstanceState);
-            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
-            SetContentView(Resource.Layout.activity_main);
-
-            Android.Support.V7.Widget.Toolbar toolbar = FindViewById<Android.Support.V7.Widget.Toolbar>(Resource.Id.toolbar);
-            SetSupportActionBar(toolbar);
-
-            FloatingActionButton fab = FindViewById<FloatingActionButton>(Resource.Id.fab);
-            fab.Click += FabOnClick;
-        }
-
-        public override bool OnCreateOptionsMenu(IMenu menu)
-        {
-            MenuInflater.Inflate(Resource.Menu.menu_main, menu);
-            return true;
-        }
-
-        public override bool OnOptionsItemSelected(IMenuItem item)
-        {
-            int id = item.ItemId;
-            if (id == Resource.Id.action_settings)
-            {
-                return true;
-            }
-
-            return base.OnOptionsItemSelected(item);
-        }
-
-        private void FabOnClick(object sender, EventArgs eventArgs)
-        {
-            View view = (View) sender;
-            Snackbar.Make(view, "Replace with your own action", Snackbar.LengthLong)
-                .SetAction("Action", (Android.Views.View.IOnClickListener)null).Show();
-        }
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
-        {
-            Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-
-            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-        }
-	}
-}
-
diff --git a/samples/VSAndroidApp/Properties/AndroidManifest.xml b/samples/VSAndroidApp/Properties/AndroidManifest.xml
deleted file mode 100644
index c48b180aa79..00000000000
--- a/samples/VSAndroidApp/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="1"
-          android:versionName="1.0"
-          package="com.companyname.vsandroidapp">
-  <uses-sdk android:minSdkVersion="21" />
-  <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme">
-  </application>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
diff --git a/samples/VSAndroidApp/Properties/AssemblyInfo.cs b/samples/VSAndroidApp/Properties/AssemblyInfo.cs
deleted file mode 100644
index f7814c69528..00000000000
--- a/samples/VSAndroidApp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("VSAndroidApp")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VSAndroidApp")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/VSAndroidApp/Resources/AboutResources.txt b/samples/VSAndroidApp/Resources/AboutResources.txt
deleted file mode 100644
index 096447a90d1..00000000000
--- a/samples/VSAndroidApp/Resources/AboutResources.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.xml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable/
-        icon.png
-
-    layout/
-        main.xml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called "R" 
-(this is an Android convention) that contains the tokens for each one of the resources 
-included. For example, for the above Resources layout, this is what the R class would expose:
-
-public class R {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
-to reference the layout/main.xml file, or R.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/samples/VSAndroidApp/Resources/layout/activity_main.xml b/samples/VSAndroidApp/Resources/layout/activity_main.xml
deleted file mode 100644
index 12d6ee3773a..00000000000
--- a/samples/VSAndroidApp/Resources/layout/activity_main.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_main" />
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/samples/VSAndroidApp/Resources/layout/content_main.xml b/samples/VSAndroidApp/Resources/layout/content_main.xml
deleted file mode 100644
index 5662d6daa5c..00000000000
--- a/samples/VSAndroidApp/Resources/layout/content_main.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/activity_main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="Hello World!" />
-
-</RelativeLayout>
diff --git a/samples/VSAndroidApp/Resources/menu/menu_main.xml b/samples/VSAndroidApp/Resources/menu/menu_main.xml
deleted file mode 100644
index ace8c659206..00000000000
--- a/samples/VSAndroidApp/Resources/menu/menu_main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
-</menu>
diff --git a/samples/VSAndroidApp/Resources/mipmap-anydpi-v26/ic_launcher.xml b/samples/VSAndroidApp/Resources/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 036d09bc5fd..00000000000
--- a/samples/VSAndroidApp/Resources/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/samples/VSAndroidApp/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/samples/VSAndroidApp/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 036d09bc5fd..00000000000
--- a/samples/VSAndroidApp/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher.png b/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 2531cb31efc..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher_foreground.png b/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 7a859c25556..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher_round.png b/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index b8d35b3a1cf..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher.png b/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 795ea7c0058..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher_foreground.png b/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index a12b157f00e..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher_round.png b/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 8f56909cddf..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher.png b/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 761cc91d90f..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e7d70a5e2d1..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher_round.png b/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 9737d79c049..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher.png b/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 9133e31b432..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 73ccaa6a2b1..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher_round.png b/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index c3ae5f5ccde..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher.png b/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index d4fd714eeda..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index f6584afd4d1..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index ef89bd5215f..00000000000
Binary files a/samples/VSAndroidApp/Resources/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/samples/VSAndroidApp/Resources/values/colors.xml b/samples/VSAndroidApp/Resources/values/colors.xml
deleted file mode 100644
index 17bb9a9dd16..00000000000
--- a/samples/VSAndroidApp/Resources/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#2c3e50</color>
-    <color name="colorPrimaryDark">#1B3147</color>
-    <color name="colorAccent">#3498db</color>
-</resources>
diff --git a/samples/VSAndroidApp/Resources/values/dimens.xml b/samples/VSAndroidApp/Resources/values/dimens.xml
deleted file mode 100644
index 59a0b0c4f55..00000000000
--- a/samples/VSAndroidApp/Resources/values/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
diff --git a/samples/VSAndroidApp/Resources/values/ic_launcher_background.xml b/samples/VSAndroidApp/Resources/values/ic_launcher_background.xml
deleted file mode 100644
index 6ec24e6413c..00000000000
--- a/samples/VSAndroidApp/Resources/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#2C3E50</color>
-</resources>
\ No newline at end of file
diff --git a/samples/VSAndroidApp/Resources/values/strings.xml b/samples/VSAndroidApp/Resources/values/strings.xml
deleted file mode 100644
index 67eb31a8aaa..00000000000
--- a/samples/VSAndroidApp/Resources/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="app_name">VSAndroidApp</string>
-    <string name="action_settings">Settings</string>
-</resources>
diff --git a/samples/VSAndroidApp/Resources/values/styles.xml b/samples/VSAndroidApp/Resources/values/styles.xml
deleted file mode 100644
index 545b9c6d2c4..00000000000
--- a/samples/VSAndroidApp/Resources/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-</resources>
diff --git a/samples/VSAndroidApp/VSAndroidApp.csproj b/samples/VSAndroidApp/VSAndroidApp.csproj
deleted file mode 100644
index 521e021ce8e..00000000000
--- a/samples/VSAndroidApp/VSAndroidApp.csproj
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2BB44145-CAF8-4DD0-9E0E-BC8A0BE543D5}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TemplateGuid>{84dd83c5-0fe3-4294-9419-09e7c8ba324f}</TemplateGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>VSAndroidApp</RootNamespace>
-    <AssemblyName>VSAndroidApp</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>True</Deterministic>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
-    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Assets\AboutAssets.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\activity_main.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-    <AndroidResource Include="Resources\layout\content_main.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-    <AndroidResource Include="Resources\values\colors.xml" />
-    <AndroidResource Include="Resources\values\dimens.xml" />
-    <AndroidResource Include="Resources\values\ic_launcher_background.xml" />
-    <AndroidResource Include="Resources\values\strings.xml" />
-    <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\menu\menu_main.xml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
-    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_round.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\drawable\" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-    Other similar extension points exist, see Microsoft.Common.targets.
-    <Target Name="BeforeBuild">
-    </Target>
-    <Target Name="AfterBuild">
-    </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/samples/VSAndroidAppProxy.csproj b/samples/VSAndroidAppProxy.csproj
deleted file mode 100644
index e1fb1c2a616..00000000000
--- a/samples/VSAndroidAppProxy.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <OutputPath>$(MSBuildThisFileDirectory)..\bin\Test$(Configuration)</OutputPath>
-  </PropertyGroup>
-  <Import
-      Condition="Exists('$(MSBuildThisFileDirectory)..\Configuration.props')"
-      Project="$(MSBuildThisFileDirectory)..\Configuration.props"
-  />
-  <PropertyGroup Condition="Exists('$(MSBuildThisFileDirectory)..\Configuration.props')">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <AndroidSupportedAbis Condition=" '$(Enable64BitBuild)' == '' ">armeabi-v7a;x86</AndroidSupportedAbis>
-    <AndroidSupportedAbis  Condition=" '$(Enable64BitBuild)' != '' ">arm64-v8a;x86</AndroidSupportedAbis>
-  </PropertyGroup>
-  <Import Project="VSAndroidAppProxy.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <PropertyGroup>
-    <_OverrideProps>TargetFrameworkVersion=$(TargetFrameworkVersion);OutputPath=$(OutputPath);AndroidSupportedAbis=$(AndroidSupportedAbis)</_OverrideProps>
-    <_OriginalProject>VSAndroidApp/VSAndroidApp.csproj</_OriginalProject>
-  </PropertyGroup>
-  <Target Name="Build">
-    <MSBuild Projects="$(_OriginalProject)" Targets="Build" Properties="$(_OverrideProps)" />
-  </Target>
-  <Target Name="Restore">
-    <MSBuild Projects="$(_OriginalProject)" Targets="Restore" Properties="$(_OverrideProps)" />
-  </Target>
-  <Target Name="Clean">
-    <MSBuild Projects="$(_OriginalProject)" Targets="Clean" Properties="$(_OverrideProps)" />
-  </Target>
-  <Target Name="SignAndroidPackage">
-    <MSBuild Projects="$(_OriginalProject)" Targets="SignAndroidPackage" Properties="$(_OverrideProps)" />
-  </Target>
-  <Target Name="Install">
-    <MSBuild Projects="$(_OriginalProject)" Targets="Install" Properties="$(_OverrideProps)" />
-  </Target>
-</Project>
diff --git a/samples/VSAndroidAppProxy.projitems b/samples/VSAndroidAppProxy.projitems
deleted file mode 100644
index 6e52f9b29b1..00000000000
--- a/samples/VSAndroidAppProxy.projitems
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_Package>com.companyname.vsandroidapp</_Package>
-  </PropertyGroup>
-  <ItemGroup>
-    <TestApk Include="$(OutputPath)\$(_Package)-Signed.apk">
-      <Package>$(_Package)</Package>
-      <Activity>$(_Package)/crc642ec1a13c712a06e8.MainActivity</Activity>
-      <ResultsPath></ResultsPath>
-    </TestApk>
-  </ItemGroup>
-</Project>
diff --git a/samples/VSAndroidAppProxy.targets b/samples/VSAndroidAppProxy.targets
deleted file mode 100644
index 6d8b3bd16ff..00000000000
--- a/samples/VSAndroidAppProxy.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="VSAndroidAppProxy.projitems" />
-  <Import Project="$(XamarinAndroidSourcePath)build-tools\scripts\TestApks.targets" />
-</Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidBindingProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidBindingProject.cs
index 1b6d0c5edaf..96bd05772ed 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidBindingProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidBindingProject.cs
@@ -47,7 +47,6 @@ public string AndroidClassParser {
 		public override ProjectRootElement Construct ()
 		{
 			var root = base.Construct ();
-			root.AddImport (XamarinAndroidLanguage.BindingProjectImport);
 			foreach (var import in Imports) {
 				var projectName = import.Project ();
 				if (projectName != "Directory.Build.props" && projectName != "Directory.Build.targets")
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidCommonProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidCommonProject.cs
index c3405e9f3e8..3c28afdbdfa 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidCommonProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidCommonProject.cs
@@ -63,7 +63,6 @@ public override string ProjectTypeGuid {
 		public override ProjectRootElement Construct ()
 		{
 			var root = base.Construct ();
-			root.AddImport (XamarinAndroidLanguage.NormalProjectImport);
 			foreach (var import in Imports) {
 				var projectName = import.Project ();
 				if (projectName != "Directory.Build.props" && projectName != "Directory.Build.targets")
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidProjectLanguage.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidProjectLanguage.cs
index 755713d99d0..e8df62e3281 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidProjectLanguage.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidProjectLanguage.cs
@@ -9,9 +9,6 @@ namespace Xamarin.ProjectTools
 {
 	public abstract class XamarinAndroidProjectLanguage : ProjectLanguage
 	{
-		public abstract string NormalProjectImport { get; }
-		public abstract string BindingProjectImport { get; }
-
 		public static XamarinAndroidProjectLanguage CSharp = new CSharpLanguage ();
 		public static XamarinAndroidProjectLanguage FSharp = new FSharpLanguage ();
 
@@ -39,12 +36,6 @@ public override string DefaultDesignerExtension {
 			public override string DefaultProjectExtension {
 				get { return ".fsproj"; }
 			}
-			public override string NormalProjectImport {
-				get { return "$(MSBuildExtensionsPath)\\Xamarin\\Android\\Xamarin.Android.FSharp.targets"; }
-			}
-			public override string BindingProjectImport {
-				get { throw new NotSupportedException (); }
-			}
 			public override string DefaultAssemblyInfo {
 				get { return default_assembly_info_fs; }
 			}
@@ -68,12 +59,6 @@ public override string DefaultDesignerExtension {
 			public override string DefaultProjectExtension {
 				get { return ".csproj"; }
 			}
-			public override string NormalProjectImport {
-				get { return "$(MSBuildExtensionsPath)\\Xamarin\\Android\\Xamarin.Android.CSharp.targets"; }
-			}
-			public override string BindingProjectImport {
-				get { return "$(MSBuildExtensionsPath)\\Xamarin\\Android\\Xamarin.Android.Bindings.targets"; }
-			}
 			public override string DefaultAssemblyInfo {
 				get { return default_assembly_info_cs; }
 			}
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
index bf203748680..f002c237b6c 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
@@ -133,9 +133,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
-    <None Include="Xamarin.Android.CSharp.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Xamarin.Android.D8.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.CSharp.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.CSharp.targets
deleted file mode 100644
index ebc10dd9a93..00000000000
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.CSharp.targets
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
-***********************************************************************************************
-Xamarin.Android.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) 2010-2011 Novell. All rights reserved.
-Copyright (C) 2011-2012 Xamarin. All rights reserved.
-***********************************************************************************************
--->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <!--
-    *******************************************
-      Extensibility hook that allows VS to
-      provide extra behavior without modifying 
-      the core targets.
-    *******************************************
-    -->
-    <Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets" 
-            Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-
-    <PropertyGroup>
-        <TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier>
-        <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v5.0</TargetFrameworkVersion>
-        <LangVersion Condition=" '$(LangVersion)' == '' ">8.0</LangVersion>
-        <AndroidLinkMode Condition="'$(AndroidLinkMode)' == ''">SdkOnly</AndroidLinkMode>
-        <!-- The .NET SGEN tool cannot process Xamarin.Android assemblies because
-             our mscorlib.dll isn't properly signed, as far as its concerned.
-             Disable generation to avoid "bizarre" build errors. -->
-        <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-        <_AndroidResourceDesigner>Resource.designer.cs</_AndroidResourceDesigner>
-        <IsXBuild Condition="'$(MSBuildRuntimeVersion)' == ''">true</IsXBuild>
-        <EnableDefaultOutputPaths Condition=" '$(EnableDefaultOutputPaths)' == '' And '$(OS)' != 'Windows_NT' ">false</EnableDefaultOutputPaths>
-        <EnableDefaultOutputPaths Condition=" '$(EnableDefaultOutputPaths)' == '' ">true</EnableDefaultOutputPaths>
-        <!-- Enable nuget package conflict resolution -->
-        <ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-    </PropertyGroup>
-    <!-- Force Xbuild to behave like msbuild -->
-    <PropertyGroup>
-        <DebugSymbols Condition=" '$(DebugType)' == 'None' ">true</DebugSymbols>
-        <DebugType Condition=" '$(DebugType)' == 'None' Or '$(DebugType)' == '' ">portable</DebugType>
-    </PropertyGroup>
-    <Import Project="Xamarin.Android.DefaultOutputPaths.targets" Condition="'$(IsXBuild)' != 'true' and '$(EnableDefaultOutputPaths)' == 'true'" />
-    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-    <Import Project="Xamarin.Android.Common.targets" />
-    <!--
-    *******************************************
-      Extensibility hook that allows VS to
-      provide extra behavior without modifying 
-      the core targets.
-    *******************************************
-    -->
-    <Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets" 
-            Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>    
-</Project>
diff --git a/tests/CodeBehind/BuildTests/CodeBehindBuildTests.csproj b/tests/CodeBehind/BuildTests/CodeBehindBuildTests.csproj
deleted file mode 100644
index f67f3ab651d..00000000000
--- a/tests/CodeBehind/BuildTests/CodeBehindBuildTests.csproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{95012FA9-ED51-4004-8F36-91DB361C892B}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.Tests.CodeBehindBuildTests</RootNamespace>
-    <AssemblyName>CodeBehindBuildTests</AssemblyName>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidGenerateLayoutBindings>True</AndroidGenerateLayoutBindings>
-    <DebugType>portable</DebugType>
-    <_ApkDebugKeyStore>debug.keystore</_ApkDebugKeyStore>
-    <AppendTargetFrameworkToIntermediateOutputPath>false</AppendTargetFrameworkToIntermediateOutputPath>
-  </PropertyGroup>
-  <Import
-      Condition="Exists('..\..\..\Configuration.props')"
-      Project="..\..\..\Configuration.props"
-  />
-  <PropertyGroup Condition="Exists('..\..\..\Configuration.props')">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(AndroidFrameworkVersion)' == '' ">
-    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants Condition=" '$(ExtraConstants)' != '' ">$(DefineConstants);$(ExtraConstants)</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="MainMergeActivity.cs" />
-    <Compile Include="MainActivityNotPartial.cs" />
-    <Compile Include="AnotherMainActivity.cs" />
-    <Compile Include="OnboardingActivity.cs" />
-    <Compile Include="OnboardingActivityPartial.cs" />
-    <Compile Include="SettingsActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Assets\AboutAssets.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-    <AndroidResource Include="Resources\layout\MainMerge.axml" />
-    <AndroidResource Include="Resources\layout-land\Main.axml" />
-    <AndroidResource Include="Resources\layout\settings.xml" />
-    <AndroidResource Include="Resources\layout\loading.xml" />
-    <AndroidResource Include="Resources\layout\item_separator.xml" />
-    <AndroidResource Include="Resources\layout\onboarding_intro.xml" />
-    <AndroidResource Include="Resources\layout\onboarding_info.xml" />
-    <AndroidResource Include="Resources\layout-land\onboarding_intro.xml" />
-    <AndroidResource Include="Resources\values\Strings.xml" />
-    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(ForceParallelBuild)' == 'true' ">
-    <AndroidResource Include="Resources\layout\help_fragment.xml" />
-    <AndroidResource Include="Resources\layout\list_item.xml" />
-    <AndroidResource Include="Resources\layout\list_loading.xml" />
-    <AndroidResource Include="Resources\layout\player_list_item.xml" />
-    <AndroidResource Include="Resources\layout-v16\list_item2.xml" />
-    <AndroidResource Include="Resources\layout-v16\player_list_item2.xml" />
-    <AndroidResource Include="Resources\layout\help_fragment_many.xml" />
-    <AndroidResource Include="Resources\layout\list_item_many.xml" />
-    <AndroidResource Include="Resources\layout\list_loading_many.xml" />
-    <AndroidResource Include="Resources\layout\loading_many.xml" />
-    <AndroidResource Include="Resources\layout\onboarding_info_many.xml" />
-    <AndroidResource Include="Resources\layout\settings_many.xml" />
-    <AndroidResource Include="Resources\layout-land\onboarding_intro_many2.xml" />
-    <AndroidResource Include="Resources\layout-v16\list_item_many2.xml" />
-    <AndroidResource Include="Resources\layout-v16\player_list_item_many2.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\drawable\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\CommonSampleLibrary\CommonSampleLibrary.csproj">
-      <Project>{7A5FB23C-6B26-461A-8BBD-02392DCE3C11}</Project>
-      <Name>CommonSampleLibrary</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(ReferenceAndroidX)' == 'True' ">
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.1.1" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
diff --git a/tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.csproj b/tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.csproj
deleted file mode 100644
index 34e7a43b765..00000000000
--- a/tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.csproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7A5FB23C-6B26-461A-8BBD-02392DCE3C11}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>CommonSampleLibrary</RootNamespace>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AssemblyName>CommonSampleLibrary</AssemblyName>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <Import
-      Condition="Exists('..\..\..\Configuration.props')"
-      Project="..\..\..\Configuration.props"
-  />
-  <PropertyGroup Condition="Exists('..\..\..\Configuration.props')">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;__MOBILE__;__ANDROID__;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <DefineConstants>__MOBILE__;__ANDROID__;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Activities\SampleActivityBase.cs" />
-    <Compile Include="Logger\ILogNode.cs" />
-    <Compile Include="Logger\Log.cs" />
-    <Compile Include="Logger\LogFragment.cs" />
-    <Compile Include="Logger\LogView.cs" />
-    <Compile Include="Logger\LogWrapper.cs" />
-    <Compile Include="Logger\MessageOnlyLogFilter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\Strings.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
diff --git a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.csproj
deleted file mode 100644
index 80c5cb93874..00000000000
--- a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6CB00820-A66B-43E5-8785-ED456C6E9F39}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TemplateGuid>{9ef11e43-1701-4396-8835-8392d57abb70}</TemplateGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Java.Interop_Tests</RootNamespace>
-    <AssemblyName>Java.Interop-Tests</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidLatestStableFrameworkVersion)</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NO_MARSHAL_MEMBER_BUILDER_SUPPORT</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <DebugType></DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NO_MARSHAL_MEMBER_BUILDER_SUPPORT</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Java.Interop" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
-    <PackageReference Include="Mono.Linq.Expressions" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Java.InteropTests\JavaInterop_Tests_Reference.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\**\*.cs" />
-    <Compile Remove="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\obj\*.cs" />
-    <Compile Remove="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\Java.Interop\JavaVMFixture.cs" />
-    <Compile Remove="$(MSBuildThisFileDirectory)..\..\..\external\Java.Interop\tests\Java.Interop-Tests\Java.Interop\JniReferenceSafeHandleTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\external\Java.Interop\src\Java.Interop.GenericMarshaler\Java.Interop.GenericMarshaler.csproj">
-      <Project>{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}</Project>
-      <Name>Java.Interop.GenericMarshaler</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="Java.Interop-Tests.targets" />
-  <PropertyGroup>
-    <BuildDependsOn>
-      BuildTestJarFile;
-      _CopyTestJarFiles;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <CleanDependsOn>
-      CleanTestJarFile;
-      $(CleanDependsOn);
-      CleanLocal;
-    </CleanDependsOn>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests.csproj
deleted file mode 100644
index 1d4a287f573..00000000000
--- a/tests/Mono.Android-Tests/Mono.Android-Tests.csproj
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{40EAD437-216B-4DF4-8258-3F47E1672C3A}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.RuntimeTests</RootNamespace>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AssemblyName>Mono.Android-Tests</AssemblyName>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
-    <AndroidSupportedAbis Condition=" '$(TestAvdAbi)' == 'x86_64' ">$(AndroidSupportedAbis);x86_64</AndroidSupportedAbis>
-    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
-    <MandroidI18n>All</MandroidI18n>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
-    <_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
-    <AndroidIncludeWrapSh Condition=" '$(UseASAN)' != '' Or '$(UseUBSAN)' != '' ">true</AndroidIncludeWrapSh>
-    <_AndroidCheckedBuild Condition=" '$(UseASAN)' != '' ">asan</_AndroidCheckedBuild>
-    <_AndroidCheckedBuild Condition=" '$(UseUBSAN)' != '' ">ubsan</_AndroidCheckedBuild>
-    <_ASANScript>..\..\build-tools\wrap.sh\asan.sh</_ASANScript>
-    <_UBSANScript>..\..\build-tools\wrap.sh\ubsan.sh</_UBSANScript>
-    <_MonoAndroidTestPackage>Mono.Android_Tests</_MonoAndroidTestPackage>
-  </PropertyGroup>
-  <Import Project="Mono.Android-Test.Shared.projitems" Label="Shared" Condition="Exists('Mono.Android-Test.Shared.projitems')" />
-  <Import Project="..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidLatestStableFrameworkVersion)</TargetFrameworkVersion>
-    <AndroidNdkDirectory></AndroidNdkDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\TestDebug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\TestRelease</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Mono.Android.Export" />
-    <Reference Include="Mono.Data.Sqlite" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <ItemGroup>
-    <EmbeddedResource Include="AppResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AppResources.it-IT.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>AppResources.it-IT.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Localization\LocalizationTests.cs" />
-    <Compile Include="AppResources.Designer.cs">
-      <DependentUpon>AppResources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="AppResources.it-IT.Designer.cs">
-      <DependentUpon>AppResources.it-IT.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Localization\" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\arm64-v8a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\armeabi-v7a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\x86\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\x86_64\wrap.sh</Link>
-    </AndroidNativeLibrary>
-
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\arm64-v8a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\armeabi-v7a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\x86\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\x86_64\wrap.sh</Link>
-    </AndroidNativeLibrary>
-  </ItemGroup>
-
-  <ItemGroup>
-    <TestApk Include="$(OutputPath)$(_MonoAndroidTestPackage)-Signed.apk">
-      <Package>$(_MonoAndroidTestPackage)</Package>
-      <InstrumentationType>xamarin.android.runtimetests.NUnitInstrumentation</InstrumentationType>
-      <ResultsPath>$(OutputPath)TestResult-$(_MonoAndroidTestPackage).xml</ResultsPath>
-      <TimingDefinitionsFilename>$(MSBuildThisFileDirectory)..\..\build-tools\scripts\TimingDefinitions.txt</TimingDefinitionsFilename>
-      <TimingResultsFilename>$(MSBuildThisFileDirectory)..\..\TestResult-$(_MonoAndroidTestPackage)-times.csv</TimingResultsFilename>
-      <ApkSizesInputFilename>apk-sizes-$(_MonoAndroidTestPackage)-$(Configuration)$(TestsFlavor).txt</ApkSizesInputFilename>
-      <ApkSizesDefinitionFilename>$(MSBuildThisFileDirectory)..\..\build-tools\scripts\ApkSizesDefinitions.txt</ApkSizesDefinitionFilename>
-      <ApkSizesResultsFilename>$(MSBuildThisFileDirectory)..\..\TestResult-$(_MonoAndroidTestPackage)-values-$(Configuration).csv</ApkSizesResultsFilename>
-    </TestApk>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build-tools\scripts\TestApks.targets" />
-
-</Project>
diff --git a/tests/Mono.Android-Tests/Runtime-AppBundle/Mono.Android-TestsAppBundle.csproj b/tests/Mono.Android-Tests/Runtime-AppBundle/Mono.Android-TestsAppBundle.csproj
deleted file mode 100644
index 809f888dc9e..00000000000
--- a/tests/Mono.Android-Tests/Runtime-AppBundle/Mono.Android-TestsAppBundle.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6E2AB0B9-FA5A-4F3A-923B-4B37F82830F1}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.RuntimeTests</RootNamespace>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AssemblyName>Mono.Android-TestsAppBundle</AssemblyName>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
-    <AndroidPackageFormat>aab</AndroidPackageFormat>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>
-    <_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
-    <_MonoAndroidTestPackage>Mono.Android_TestsAppBundle</_MonoAndroidTestPackage>
-    <PlotDataLabelSuffix>-AppBundle</PlotDataLabelSuffix>
-  </PropertyGroup>
-  <Import Project="..\Mono.Android-Test.Shared.projitems" Label="Shared" Condition="Exists('..\Mono.Android-Test.Shared.projitems')" />
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <AndroidNdkDirectory></AndroidNdkDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\TestDebug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\TestRelease</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Mono.Android.Export" />
-    <Reference Include="Mono.Data.Sqlite" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-    <Compile Remove="..\Resources\Resource.designer.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <ItemGroup>
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <TestAab Include="$(OutputPath)$(_MonoAndroidTestPackage)-Signed.aab">
-      <Package>$(_MonoAndroidTestPackage)</Package>
-      <InstrumentationType>xamarin.android.runtimetests.NUnitInstrumentation</InstrumentationType>
-      <ResultsPath>$(MSBuildThisFileDirectory)..\..\..\TestResult-$(_MonoAndroidTestPackage).xml</ResultsPath>
-      <TimingDefinitionsFilename>$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TimingDefinitions.txt</TimingDefinitionsFilename>
-      <!-- Use default package name to write all Mono.Android-Tests* timing data to the same .csv -->
-      <TimingResultsFilename>$(XamarinAndroidSourcePath)TestResult-Mono.Android_Tests-times.csv</TimingResultsFilename>
-    </TestAab>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TestApks.targets" />
-
-</Project>
diff --git a/tests/Mono.Android-Tests/Runtime-AppBundle/Properties/AndroidManifest.xml b/tests/Mono.Android-Tests/Runtime-AppBundle/Properties/AndroidManifest.xml
deleted file mode 100644
index e9ff9c6650e..00000000000
--- a/tests/Mono.Android-Tests/Runtime-AppBundle/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Mono.Android_TestsAppBundle">
-	<uses-sdk android:minSdkVersion="19" />
-	<application android:label="Xamarin.Android.RuntimeTestsAppBundle" android:name="android.apptests.App" android:usesCleartextTraffic="true">
-		<activity android:name="android.apptests.RenamedActivity" android:configChanges="keyboardHidden" />
-	</application>
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.SET_TIME_ZONE" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-</manifest>
\ No newline at end of file
diff --git a/tests/Mono.Android-Tests/Runtime-MultiDex/Mono.Android-TestsMultiDex.csproj b/tests/Mono.Android-Tests/Runtime-MultiDex/Mono.Android-TestsMultiDex.csproj
deleted file mode 100644
index 1798c788d75..00000000000
--- a/tests/Mono.Android-Tests/Runtime-MultiDex/Mono.Android-TestsMultiDex.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9ECBEA14-B79F-4F92-9266-495C03A32571}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.RuntimeTests</RootNamespace>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AssemblyName>Mono.Android-TestsMultiDex</AssemblyName>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
-    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>
-    <_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
-    <_MonoAndroidTestPackage>Mono.Android_TestsMultiDex</_MonoAndroidTestPackage>
-    <PlotDataLabelSuffix>-MultiDex</PlotDataLabelSuffix>
-    <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
-  </PropertyGroup>
-  <Import Project="..\Mono.Android-Test.Shared.projitems" Label="Shared" Condition="Exists('..\Mono.Android-Test.Shared.projitems')" />
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <AndroidNdkDirectory></AndroidNdkDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\TestDebug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\TestRelease</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Mono.Android.Export" />
-    <Reference Include="Mono.Data.Sqlite" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-    <Compile Remove="..\Resources\Resource.designer.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <ItemGroup>
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <TestApk Include="$(OutputPath)$(_MonoAndroidTestPackage)-Signed.apk">
-      <Package>$(_MonoAndroidTestPackage)</Package>
-      <InstrumentationType>xamarin.android.runtimetests.NUnitInstrumentation</InstrumentationType>
-      <ResultsPath>$(MSBuildThisFileDirectory)..\..\..\TestResult-$(_MonoAndroidTestPackage).xml</ResultsPath>
-      <TimingDefinitionsFilename>$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TimingDefinitions.txt</TimingDefinitionsFilename>
-      <!-- Use default package name to write all Mono.Android-Tests* timing data to the same .csv -->
-      <TimingResultsFilename>$(XamarinAndroidSourcePath)TestResult-Mono.Android_Tests-times.csv</TimingResultsFilename>
-      <ApkSizesInputFilename>apk-sizes-$(_MonoAndroidTestPackage)-$(Configuration)$(TestsFlavor).txt</ApkSizesInputFilename>
-      <ApkSizesDefinitionFilename>$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\ApkSizesDefinitions.txt</ApkSizesDefinitionFilename>
-      <ApkSizesResultsFilename>$(MSBuildThisFileDirectory)..\..\..\TestResult-$(_MonoAndroidTestPackage)-values-$(Configuration).csv</ApkSizesResultsFilename>
-    </TestApk>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TestApks.targets" />
-
-</Project>
diff --git a/tests/Mono.Android-Tests/Runtime-MultiDex/Properties/AndroidManifest.xml b/tests/Mono.Android-Tests/Runtime-MultiDex/Properties/AndroidManifest.xml
deleted file mode 100644
index cb56511ab2d..00000000000
--- a/tests/Mono.Android-Tests/Runtime-MultiDex/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Mono.Android_TestsMultiDex">
-	<uses-sdk android:minSdkVersion="16" />
-	<application android:label="Xamarin.Android.RuntimeTestsMultiDex" android:name="android.apptests.App" android:usesCleartextTraffic="true">
-		<activity android:name="android.apptests.RenamedActivity" android:configChanges="keyboardHidden" />
-	</application>
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.SET_TIME_ZONE" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-</manifest>
\ No newline at end of file
diff --git a/tests/TestRunner.Core/TestRunner.Core.csproj b/tests/TestRunner.Core/TestRunner.Core.csproj
deleted file mode 100644
index 5e05a4e9ea3..00000000000
--- a/tests/TestRunner.Core/TestRunner.Core.csproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{3CC4E384-4985-4D93-A34C-73F69A379FA7}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.UnitTests</RootNamespace>
-    <AssemblyName>TestRunner.Core</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-  </PropertyGroup>
-  <Import Project="..\..\Configuration.props" />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.IO.Compression" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestInstrumentation.cs" />
-    <Compile Include="TestRunner.cs" />
-    <Compile Include="TestExecutionState.cs" />
-    <Compile Include="TestCompletionStatus.cs" />
-    <Compile Include="Extensions.Bool.cs" />
-    <Compile Include="MinimumLogLevel.cs" />
-    <Compile Include="TestFailureInfo.cs" />
-    <Compile Include="LogWriter.cs" />
-    <Compile Include="TestAssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\Strings.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
diff --git a/tests/TestRunner.NUnit/TestRunner.NUnit.csproj b/tests/TestRunner.NUnit/TestRunner.NUnit.csproj
deleted file mode 100644
index 8aa023135b5..00000000000
--- a/tests/TestRunner.NUnit/TestRunner.NUnit.csproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CB2335CB-0050-4020-8A05-E9614EDAA05E}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Android.UnitTests.NUnit</RootNamespace>
-    <AssemblyName>TestRunner.NUnit</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-  </PropertyGroup>
-  <Import Project="..\..\Configuration.props" />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="NUnitTestRunner.cs" />
-    <Compile Include="NUnitTestInstrumentation.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values\Strings.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TestRunner.Core\TestRunner.Core.csproj">
-      <Project>{3CC4E384-4985-4D93-A34C-73F69A379FA7}</Project>
-      <Name>TestRunner.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj b/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj
deleted file mode 100644
index 8353ceb3eec..00000000000
--- a/tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{576312CC-83FF-48B1-A473-488CDC7121AD}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Forms.Performance.Integration.Droid</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Performance.Integration.Droid</AssemblyName>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <AndroidSupportedAbis Condition=" '$(Enable64BitBuild)' == '' ">armeabi-v7a;x86</AndroidSupportedAbis>
-    <AndroidSupportedAbis  Condition=" '$(Enable64BitBuild)' != '' ">arm64-v8a;x86</AndroidSupportedAbis>
-    <AndroidEnablePreloadAssemblies Condition=" '$(AndroidEnablePreloadAssemblies)' == '' ">True</AndroidEnablePreloadAssemblies>
-    <AndroidUseAssemblyStore>False</AndroidUseAssemblyStore>
-    <AndroidIncludeWrapSh Condition=" '$(UseASAN)' != '' Or '$(UseUBSAN)' != '' ">true</AndroidIncludeWrapSh>
-    <_AndroidCheckedBuild Condition=" '$(UseASAN)' != '' ">asan</_AndroidCheckedBuild>
-    <_AndroidCheckedBuild Condition=" '$(UseUBSAN)' != '' ">ubsan</_AndroidCheckedBuild>
-    <_ASANScript>..\..\..\build-tools\wrap.sh\asan.sh</_ASANScript>
-    <_UBSANScript>..\..\..\build-tools\wrap.sh\ubsan.sh</_UBSANScript>
-  </PropertyGroup>
-  <Import Project="..\..\..\Configuration.props" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
-    <AndroidNdkDirectory></AndroidNdkDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\TestDebug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\TestRelease</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="System.Net.Http" />
-    <ProjectReference Include="..\Xamarin.Forms.Performance.Integration.csproj">
-      <Name>Xamarin.Forms.Performance.Integration</Name>
-      <Project>{195BE9C2-1F91-40DC-BD6D-DE860BF083FB}</Project>
-    </ProjectReference>
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
-    <PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="Resources\AboutResources.txt" />
-    <ProguardConfiguration Include="proguard.cfg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="MainActivity.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\icon.png" />
-    <AndroidResource Include="Resources\drawable\xamarin_logo.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
-    <AndroidResource Include="Resources\values\styles.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\arm64-v8a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\armeabi-v7a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\x86\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_ASANScript)" Condition=" '$(UseASAN)' != '' ">
-      <Link>lib\x86_64\wrap.sh</Link>
-    </AndroidNativeLibrary>
-
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\arm64-v8a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\armeabi-v7a\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\x86\wrap.sh</Link>
-    </AndroidNativeLibrary>
-    <AndroidNativeLibrary Include="$(_UBSANScript)" Condition=" '$(UseUBSAN)' != '' ">
-      <Link>lib\x86_64\wrap.sh</Link>
-    </AndroidNativeLibrary>
-  </ItemGroup>
-  <Import Project="Xamarin.Forms.Performance.Integration.Droid.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>