[Build] Cleanup build yml for handlers (#12219)

* Add handlers yaml pipeline * - dotnet version * - fix project names * - project names * - remove xaml tests * - remove test.sdk * - remove test.sdk * - updates * - updates * - updates * - updates Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
2020-09-29 11:15:20 +01:00 · 2020-09-29 11:15:20 +01:00 · 6f8e59f4d0
--- a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
+++ b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
@ -5,7 +5,7 @@
    </PackageReference>
    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
    <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0" />
    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
  </ItemGroup>
--- a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
+++ b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
@ -1,7 +1,7 @@
 <Project>
  <ItemGroup>
    <PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0.1" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0" />
    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
    <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
--- a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
+++ b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
@ -50,7 +50,7 @@ namespace Xamarin.Forms.ControlGallery.Android
 			Forms.Init(this, bundle);

 			FormsMaps.Init(this, bundle);
-			FormsMaterial.Init(this, bundle);
+			//FormsMaterial.Init(this, bundle);
 			AndroidAppLinks.Init(this);
 			Forms.ViewInitialized += (sender, e) => {
 				//				if (!string.IsNullOrWhiteSpace(e.View.StyleId)) {
--- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
+++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
@ -182,6 +182,10 @@
    <AndroidResource Include="Resources\drawable\cover1.jpg" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj">
+      <Project>{e2403480-7079-4e09-9c21-113b615a2a0a}</Project>
+      <Name>Xamarin.Platform.Handlers</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
      <Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
      <Name>Xamarin.Forms.Controls</Name>
@ -190,6 +194,18 @@
      <Project>{4dcd0420-1168-4b77-86db-6196ee4bd491}</Project>
      <Name>Xamarin.Forms.CustomAttributes</Name>
    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Maps.Android\Xamarin.Forms.Maps.Android.csproj">
+      <Project>{31913345-bc10-49d6-802d-c119e953afcc}</Project>
+      <Name>Xamarin.Forms.Maps.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj">
+      <Project>{7724ac21-0b03-4bb0-b125-d26ccf84b3f9}</Project>
+      <Name>Xamarin.Forms.Maps</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Platform.Android.UnitTests\Xamarin.Forms.Platform.Android.UnitTests.csproj">
+      <Project>{a4c57790-71d1-467c-a69e-2bd84cb6666c}</Project>
+      <Name>Xamarin.Forms.Platform.Android.UnitTests</Name>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup Condition="$(FromSource) == 'true'">
    <ProguardConfiguration Include="..\.nuspec\proguard.cfg">
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@ -147,6 +147,10 @@
    <Compile Include="_11132CustomRenderer.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj">
+      <Project>{e2403480-7079-4e09-9c21-113b615a2a0a}</Project>
+      <Name>Xamarin.Platform.Handlers</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
      <Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
      <Name>Xamarin.Forms.Controls</Name>
--- a/Xamarin.Forms.ControlGallery.sln
+++ b/Xamarin.Forms.ControlGallery.sln
@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms", "Xamarin.Fo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform.Renderers", "Platform.Renderers", "{29AC50BF-B4FB-450B-9386-0C5AD4B84226}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{33A20844-7EF4-441D-83DA-2ACAF5E1CDFA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{33A20844-7EF4-441D-83DA-2ACAF5E1CDFA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Control Gallery", "Control Gallery", "{4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}"
 EndProject
@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Android", "Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj", "{0E16E70A-D6DD-4323-AD5D-363ABFF42D6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.UnitTests", "Xamarin.Forms.Core.UnitTests\Xamarin.Forms.Core.UnitTests.csproj", "{00259593-A283-47A5-ACB7-9C3819B16364}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Core.UnitTests", "Xamarin.Forms.Core.UnitTests\Xamarin.Forms.Core.UnitTests.csproj", "{00259593-A283-47A5-ACB7-9C3819B16364}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.Android", "Xamarin.Forms.ControlGallery.Android\Xamarin.Forms.ControlGallery.Android.csproj", "{1346A7F1-4457-4BB4-A371-2C8E28BBD53E}"
 EndProject
@ -56,14 +56,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Build.Tasks",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.FormsViewGroup", "Xamarin.Forms.Platform.Android.FormsViewGroup\Xamarin.Forms.Platform.Android.FormsViewGroup.csproj", "{3B72465B-ACAE-43AE-9327-10F372FE5F80}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.iOS.UITests", "Xamarin.Forms.Core.iOS.UITests\Xamarin.Forms.Core.iOS.UITests.csproj", "{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.Android.UITests", "Xamarin.Forms.Core.Android.UITests\Xamarin.Forms.Core.Android.UITests.csproj", "{A34EBE01-25BF-4E69-A2DC-2288DC625541}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.CustomAttributes", "Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj", "{4DCD0420-1168-4B77-86DB-6196EE4BD491}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.iOS", "Xamarin.Forms.ControlGallery.iOS\Xamarin.Forms.ControlGallery.iOS.csproj", "{C7131F14-274F-4B55-ACA9-E81731AD012F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forwarders", "Forwarders", "{5A2DADBC-9510-4DD1-BE58-01501F2DF65D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Android (Forwarders)", "Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android (Forwarders).csproj", "{6E53FEB1-1100-46AE-8013-17BBA35CC197}"
@ -102,6 +98,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Maps.Android"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.iOS", "Xamarin.Forms.Maps.iOS\Xamarin.Forms.Maps.iOS.csproj", "{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.UnitTests", "Xamarin.Forms.Platform.Android.UnitTests\Xamarin.Forms.Platform.Android.UnitTests.csproj", "{A4C57790-71D1-467C-A69E-2BD84CB6666C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Platform.Handlers.UnitTests", "src\Platform.Handlers\tests\Xamarin.Platform.Handlers.UnitTests\Xamarin.Platform.Handlers.UnitTests.csproj", "{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0f0db9cc-ea65-429c-9363-38624bf8f49c}*SharedItemsImports = 13
@ -109,8 +109,6 @@ Global
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{a34ebe01-25bf-4e69-a2dc-2288dc625541}*SharedItemsImports = 4
 		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}*SharedItemsImports = 5
 		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{e175485b-3c8c-47d7-8dd5-f7fed627eb25}*SharedItemsImports = 13
-		Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4
-		Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.projitems*{eadd8100-b3ae-4a31-92c4-267a64a1c6eb}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -421,34 +419,6 @@ Global
 		{3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|x64.Build.0 = Release|Any CPU
 		{3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|x86.ActiveCfg = Release|Any CPU
 		{3B72465B-ACAE-43AE-9327-10F372FE5F80}.Release|x86.Build.0 = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|ARM.Build.0 = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x64.Build.0 = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Debug|x86.Build.0 = Debug|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|ARM.ActiveCfg = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|ARM.Build.0 = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|ARM64.Build.0 = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhone.Build.0 = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x64.ActiveCfg = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x64.Build.0 = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x86.ActiveCfg = Release|Any CPU
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB}.Release|x86.Build.0 = Release|Any CPU
 		{A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A34EBE01-25BF-4E69-A2DC-2288DC625541}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -505,33 +475,6 @@ Global
 		{4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x64.Build.0 = Release|Any CPU
 		{4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x86.ActiveCfg = Release|Any CPU
 		{4DCD0420-1168-4B77-86DB-6196EE4BD491}.Release|x86.Build.0 = Release|Any CPU
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|ARM.Build.0 = Debug|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|ARM64.ActiveCfg = Debug|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhone.Build.0 = Debug|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|x64.Build.0 = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Debug|x86.Build.0 = Debug|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|ARM.ActiveCfg = Release|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|ARM.Build.0 = Release|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|ARM64.ActiveCfg = Release|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhone.ActiveCfg = Release|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhone.Build.0 = Release|iPhone
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|x64.ActiveCfg = Release|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|x64.Build.0 = Release|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|x86.ActiveCfg = Release|iPhoneSimulator
-		{C7131F14-274F-4B55-ACA9-E81731AD012F}.Release|x86.Build.0 = Release|iPhoneSimulator
 		{6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6E53FEB1-1100-46AE-8013-17BBA35CC197}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -808,6 +751,62 @@ Global
 		{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|x64.Build.0 = Release|Any CPU
 		{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|x86.ActiveCfg = Release|Any CPU
 		{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491}.Release|x86.Build.0 = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|x64.Build.0 = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Debug|x86.Build.0 = Debug|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|ARM.Build.0 = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|ARM64.Build.0 = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|iPhone.Build.0 = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|x64.ActiveCfg = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|x64.Build.0 = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C}.Release|x86.Build.0 = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|ARM.Build.0 = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|x64.Build.0 = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Debug|x86.Build.0 = Debug|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|ARM.ActiveCfg = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|ARM.Build.0 = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|ARM64.Build.0 = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|iPhone.Build.0 = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|x64.ActiveCfg = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|x64.Build.0 = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|x86.ActiveCfg = Release|Any CPU
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -827,10 +826,8 @@ Global
 		{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1} = {AE49A966-4626-466A-857E-095F6794E27F}
 		{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
 		{3B72465B-ACAE-43AE-9327-10F372FE5F80} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
-		{EADD8100-B3AE-4A31-92C4-267A64A1C6EB} = {92FFBAAC-8613-49E5-A102-5FF50AFAB092}
 		{A34EBE01-25BF-4E69-A2DC-2288DC625541} = {92FFBAAC-8613-49E5-A102-5FF50AFAB092}
 		{4DCD0420-1168-4B77-86DB-6196EE4BD491} = {92FFBAAC-8613-49E5-A102-5FF50AFAB092}
-		{C7131F14-274F-4B55-ACA9-E81731AD012F} = {AE49A966-4626-466A-857E-095F6794E27F}
 		{5A2DADBC-9510-4DD1-BE58-01501F2DF65D} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
 		{6E53FEB1-1100-46AE-8013-17BBA35CC197} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D}
 		{39B3457F-01D8-43D0-8E84-D8C4F73CF48D} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D}
@ -848,6 +845,8 @@ Global
 		{7724AC21-0B03-4BB0-B125-D26CCF84B3F9} = {9C8762AA-506B-433C-BADC-4A26BA55EA83}
 		{31913345-BC10-49D6-802D-C119E953AFCC} = {9C8762AA-506B-433C-BADC-4A26BA55EA83}
 		{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491} = {9C8762AA-506B-433C-BADC-4A26BA55EA83}
+		{A4C57790-71D1-467C-A69E-2BD84CB6666C} = {92FFBAAC-8613-49E5-A102-5FF50AFAB092}
+		{4DB0F543-F2AF-47FF-BD67-7C7F6C036967} = {C3B9A438-50C5-4BE3-AC65-FA453F01571C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {650AE971-2F29-46A8-822C-FB4FCDC6A9A0}
--- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
+++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
@ -114,6 +114,7 @@
  </ItemGroup>

  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj" />
    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj" />
  </ItemGroup>

--- a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
+++ b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
@ -50,7 +50,7 @@
    <PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
    <PackageReference Include="Xamarin.UITest" Version="3.0.7" />
    <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.17.0</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
@ -58,6 +58,10 @@
    <Compile Include="PlatformTests\DisplayAlertUITestsAndroid.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj">
+      <Project>{e2403480-7079-4e09-9c21-113b615a2a0a}</Project>
+      <Name>Xamarin.Platform.Handlers</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
      <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
      <Name>Xamarin.Forms.Core</Name>
@ -66,6 +70,10 @@
      <Project>{4DCD0420-1168-4B77-86DB-6196EE4BD491}</Project>
      <Name>Xamarin.Forms.CustomAttributes</Name>
    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj">
+      <Project>{7724ac21-0b03-4bb0-b125-d26ccf84b3f9}</Project>
+      <Name>Xamarin.Forms.Maps</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj">
      <Project>{D31A6537-ED9C-4EBD-B231-A8D4FE44126A}</Project>
      <Name>Xamarin.Forms.Platform</Name>
--- a/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
+++ b/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
@ -58,6 +58,10 @@
    <Compile Include="VisualDesignTypeConverter.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj">
+      <Project>{e2403480-7079-4e09-9c21-113b615a2a0a}</Project>
+      <Name>Xamarin.Platform.Handlers</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
      <Name>Xamarin.Forms.Core</Name>
--- a/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj
+++ b/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj
@ -1,312 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{00259593-A283-47A5-ACB7-9C3819B16364}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xamarin.Forms.Core.UnitTests</RootNamespace>
-    <AssemblyName>Xamarin.Forms.Core.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net472</TargetFramework>
+    <IsPackable>false</IsPackable>
    <NoWarn>0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014</NoWarn>
  </PropertyGroup>
+
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AcceleratorTypeConverterUnitTests.cs" />
-    <Compile Include="AcceleratorUnitTests.cs" />
-    <Compile Include="AnimatableKeyTests.cs" />
-    <Compile Include="BaseTestFixture.cs" />
-    <Compile Include="AbsoluteLayoutTests.cs" />
-    <Compile Include="BindableLayoutTests.cs" />
-    <Compile Include="BindableObjectExtensionTests.cs" />
-    <Compile Include="BindableObjectUnitTests.cs" />
-    <Compile Include="BindablePropertyUnitTests.cs" />
-    <Compile Include="BindingBaseUnitTests.cs" />
-    <Compile Include="BindingExpressionTests.cs" />
-    <Compile Include="BindingTests.cs" />
-    <Compile Include="BindingTypeConverterTests.cs" />
-    <Compile Include="BindingUnitTests.cs" />
-    <Compile Include="ButtonUnitTest.cs" />
-    <Compile Include="CarouselPageTests.cs" />
-    <Compile Include="CarouselViewTests.cs" />
-    <Compile Include="CellTests.cs" />
-    <Compile Include="ColorUnitTests.cs" />
-    <Compile Include="CommandSourceTests.cs" />
-    <Compile Include="CommandTests.cs" />
-    <Compile Include="DependencyResolutionTests.cs" />
-    <Compile Include="DataPackageTests.cs" />
-    <Compile Include="DropGestureRecognizerTests.cs" />
-    <Compile Include="DragGestureRecognizerTests.cs" />
-    <Compile Include="ItemsLayoutTypeConverterTests.cs" />
-    <Compile Include="MultiBindingTests.cs" />
-    <Compile Include="Markup\DefaultBindablePropertiesTests.cs" />
-    <Compile Include="Markup\BindableObjectExtensionsTests.cs" />
-    <Compile Include="Markup\ElementExtensionsTests.cs" />
-    <Compile Include="Markup\GridRowsColumns.cs" />
-    <Compile Include="Markup\FuncConverter.cs" />
-    <Compile Include="Markup\LabelExtensionsRightToLeftTests.cs" />
-    <Compile Include="Markup\LabelExtensionsLeftToRightTests.cs" />
-    <Compile Include="Markup\LayoutExtensionsTests.cs" />
-    <Compile Include="Markup\StyleTests.cs" />
-    <Compile Include="Markup\ViewExtensionsRightToLeftTests.cs" />
-    <Compile Include="Markup\ViewExtensionsLeftToRightTests.cs" />
-    <Compile Include="Markup\ViewExtensionsTests.cs" />
-    <Compile Include="Markup\LabelExtensionsTests.cs" />
-    <Compile Include="Markup\MarkupBaseTestFixture.cs" />
-    <Compile Include="Markup\ElementGesturesExtensionsTests.cs" />
-    <Compile Include="Markup\ViewInFlexLayoutExtensionsTests.cs" />
-    <Compile Include="Markup\ViewInGridExtensionsTests.cs" />
-    <Compile Include="Markup\VisualElementExtensionsTests.cs" />
-    <Compile Include="MarshalingObservableCollectionTests.cs" />
-    <Compile Include="NumericExtensionsTests.cs" />
-    <Compile Include="RadioButtonTests.cs" />
-    <Compile Include="RefreshViewTests.cs" />
-    <Compile Include="MockDispatcherProvider.cs" />
-    <Compile Include="MockDispatcher.cs" />
-    <Compile Include="DeviceUnitTests.cs" />
-    <Compile Include="EffectiveFlowDirectionExtensions.cs" />
-    <Compile Include="ShellElementCollectionTests.cs" />
-    <Compile Include="ShellFlyoutItemGroupTests.cs" />
-    <Compile Include="ShellFlyoutItemTemplateTests.cs" />
-    <Compile Include="ShellModalTests.cs" />
-    <Compile Include="ShellNavigatingTests.cs" />
-    <Compile Include="ShellTestBase.cs" />
-    <Compile Include="ShellLifeCycleTests.cs" />
-    <Compile Include="ShellUriHandlerTests.cs" />
-    <Compile Include="CheckBoxUnitTests.cs" />
-    <Compile Include="StyleSheets\BaseClassSelectorTests.cs" />
-    <Compile Include="StateTriggerTests.cs" />
-    <Compile Include="VisualTests.cs" />
-    <Compile Include="FlowDirectionTests.cs" />
-    <Compile Include="ImageButtonUnitTest.cs" />
-    <Compile Include="ItemsViewTests.cs" />
-    <Compile Include="LayoutChildIntoBoundingRegionTests.cs" />
-    <Compile Include="MenuUnitTests.cs" />
-    <Compile Include="PreviewerReflectionTests.cs" />
-    <Compile Include="RegionTests.cs" />
-    <Compile Include="RelativeSourceBindingTests.cs" />
-    <Compile Include="ShellTests.cs" />
-    <Compile Include="SpanTests.cs" />
-    <Compile Include="TabIndexTests.cs" />
-    <Compile Include="TitleViewUnitTests.cs" />
-    <Compile Include="TemplatedViewUnitTests.cs" />
-    <Compile Include="TemplatedPageUnitTests.cs" />
-    <Compile Include="ContentFormUnitTests.cs" />
-    <Compile Include="ContraintTypeConverterTests.cs" />
-    <Compile Include="ControlTemplateTests.cs" />
-    <Compile Include="DataTemplateSelectorTests.cs" />
-    <Compile Include="DatePickerUnitTest.cs" />
-    <Compile Include="DependencyServiceTests.cs" />
-    <Compile Include="DistanceTests.cs" />
-    <Compile Include="DynamicBindingContextTests.cs" />
-    <Compile Include="EasingTests.cs" />
-    <Compile Include="EffectTests.cs" />
-    <Compile Include="ElementTests.cs" />
-    <Compile Include="EntryCellTests.cs" />
-    <Compile Include="EntryUnitTests.cs" />
-    <Compile Include="FluentTests.cs" />
-    <Compile Include="FontUnitTests.cs" />
-    <Compile Include="FormattedStringTests.cs" />
-    <Compile Include="FrameUnitTests.cs" />
-    <Compile Include="GeocoderUnitTests.cs" />
-    <Compile Include="GroupViewUnitTests.cs" />
-    <Compile Include="ImageTests.cs" />
-    <Compile Include="KeyboardTests.cs" />
-    <Compile Include="LabelTests.cs" />
-    <Compile Include="ListProxyTests.cs" />
-    <Compile Include="ListViewTests.cs" />
-    <Compile Include="MapSpanTests.cs" />
-    <Compile Include="MapTests.cs" />
-    <Compile Include="MarginTests.cs" />
-    <Compile Include="MasterDetailFormUnitTests.cs" />
-    <Compile Include="MenuItemTests.cs" />
-    <Compile Include="MessagingCenterTests.cs" />
-    <Compile Include="MockViewModel.cs" />
-    <Compile Include="MotionTests.cs" />
-    <Compile Include="MultiPageTests.cs" />
-    <Compile Include="NavigationModelTests.cs" />
-    <Compile Include="NavigationProxyTests.cs" />
-    <Compile Include="NavigationUnitTest.cs" />
-    <Compile Include="NotifyCollectionChangedEventArgsExtensionsTests.cs" />
-    <Compile Include="ObservableWrapperTests.cs" />
-    <Compile Include="OpenGLViewUnitTests.cs" />
-    <Compile Include="PageTests.cs" />
-    <Compile Include="PanGestureRecognizerUnitTests.cs" />
-    <Compile Include="PinTests.cs" />
-    <Compile Include="PlatformSpecificsTests.cs" />
-    <Compile Include="PointTests.cs" />
-    <Compile Include="PositionTests.cs" />
-    <Compile Include="ProgressBarTests.cs" />
-    <Compile Include="RectangleUnitTests.cs" />
-    <Compile Include="RegistrarUnitTests.cs" />
-    <Compile Include="RelativeLayoutTests.cs" />
-    <Compile Include="ScrollViewUnitTests.cs" />
-    <Compile Include="SearchBarUnitTests.cs" />
-    <Compile Include="SizeTests.cs" />
-    <Compile Include="SliderUnitTests.cs" />
-    <Compile Include="StackLayoutUnitTests.cs" />
-    <Compile Include="StepperUnitTests.cs" />
-    <Compile Include="SwitchCellTests.cs" />
-    <Compile Include="SwitchUnitTests.cs" />
-    <Compile Include="TabbedFormUnitTests.cs" />
-    <Compile Include="TableModelTests.cs" />
-    <Compile Include="TableRootUnitTests.cs" />
-    <Compile Include="TableSectionTests.cs" />
-    <Compile Include="TableViewUnitTests.cs" />
-    <Compile Include="TapGestureRecognizerTests.cs" />
-    <Compile Include="TemplatedItemsListTests.cs" />
-    <Compile Include="TextCellTests.cs" />
-    <Compile Include="TextDecorationUnitTests.cs" />
-    <Compile Include="ThicknessTests.cs" />
-    <Compile Include="TimePickerUnitTest.cs" />
-    <Compile Include="ToolbarItemTests.cs" />
-    <Compile Include="ToolbarTrackerTests.cs" />
-    <Compile Include="ToStringValueConverterTests.cs" />
-    <Compile Include="TypeUnitTests.cs" />
-    <Compile Include="ViewCellTests.cs" />
-    <Compile Include="ViewUnitTests.cs" />
-    <Compile Include="VisualStateManagerTests.cs" />
-    <Compile Include="WeakEventManagerTests.cs" />
-    <Compile Include="WebViewUnitTests.cs" />
-    <Compile Include="ImageSourceTests.cs" />
-    <Compile Include="DataTemplateTests.cs" />
-    <Compile Include="LayoutOptionsUnitTests.cs" />
-    <Compile Include="ContentViewUnitTest.cs" />
-    <Compile Include="MockPlatformServices.cs" />
-    <Compile Include="GridTests.cs" />
-    <Compile Include="GridLengthTypeConverterTests.cs" />
-    <Compile Include="BoxViewUnitTests.cs" />
-    <Compile Include="NotifiedPropertiesTests.cs" />
-    <Compile Include="PickerTests.cs" />
-    <Compile Include="EditorTests.cs" />
-    <Compile Include="UriImageSourceTests.cs" />
-    <Compile Include="ResourceDictionaryTests.cs" />
-    <Compile Include="BehaviorTest.cs" />
-    <Compile Include="EventTriggerTest.cs" />
-    <Compile Include="DynamicResourceTests.cs" />
-    <Compile Include="StyleTests.cs" />
-    <Compile Include="DataTriggerTests.cs" />
-    <Compile Include="MultiTriggerTests.cs" />
-    <Compile Include="TriggerTests.cs" />
-    <Compile Include="PinchGestureRecognizerTests.cs" />
-    <Compile Include="AppLinkEntryTests.cs" />
-    <Compile Include="NativeBindingTests.cs" />
-    <Compile Include="TypedBindingUnitTests.cs" />
-    <Compile Include="AnimationTests.cs" />
-    <Compile Include="StyleSheets\MockStylable.cs" />
-    <Compile Include="StyleSheets\SelectorTests.cs" />
-    <Compile Include="StyleSheets\IStylableTest.cs" />
-    <Compile Include="StyleSheets\StyleTests.cs" />
-    <Compile Include="FlexLayoutTests.cs" />
-    <Compile Include="FlexLayoutAlignItemsTests.cs" />
-    <Compile Include="FlexLayoutFlexDirectionTests.cs" />
-    <Compile Include="FlexLayoutMarginTests.cs" />
-    <Compile Include="FlexLayoutAlignContentTests.cs" />
-    <Compile Include="FlexLayoutAlignSelfTests.cs" />
-    <Compile Include="FlexOrderTests.cs" />
-    <Compile Include="FontAttributeConverterUnitTests.cs" />
-    <Compile Include="AppThemeTests.cs" />
-    <Compile Include="DoubleCollectionTests.cs" />
-    <Compile Include="PointCollectionTests.cs" />
-    <Compile Include="PathFigureCollectionTests.cs" />
-    <Compile Include="PolygonTests.cs" />
-    <Compile Include="PolylineTests.cs" />
-    <Compile Include="RectangleTests.cs" />
-    <Compile Include="LineTests.cs" />
-    <Compile Include="GeometryTests.cs" />
-    <Compile Include="RectUnitTests.cs" />
-    <Compile Include="BrushUnitTests.cs" />
-    <Compile Include="LinearGradientBrushTests.cs" />
-    <Compile Include="SolidColorBrushTests.cs" />
-    <Compile Include="RadialGradientBrushTests.cs" />
-    <Compile Include="SwipeViewTests.cs" />
-    <Compile Include="PathSegmentTests.cs" />
-    <Compile Include="GeometryTests.cs" />
-  </ItemGroup>
+
  <ItemGroup>
    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj">
-      <Project>{29913989-0f70-48d8-8ede-b1dd217f21d1}</Project>
-      <Name>Xamarin.Platform.Handlers</Name>
    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
-      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
-      <Name>Xamarin.Forms.Core</Name>
    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj">
-      <Project>{f137fac5-3385-4b19-988b-4a14ed84ccc6}</Project>
-      <Name>Xamarin.Forms.Maps</Name>
    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj">
-      <Project>{D31A6537-ED9C-4EBD-B231-A8D4FE44126A}</Project>
-      <Name>Xamarin.Forms.Platform</Name>
    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj">
-      <Project>{9db2f292-8034-4e06-89ad-98bbda4306b9}</Project>
-      <Name>Xamarin.Forms.Xaml</Name>
    </ProjectReference>
  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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>
-    <EmbeddedResource Include="Images\crimson.jpg">
-      <LogicalName>Images/crimson.jpg</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup />
-  <Target Name="_CopyNUnitTestAdapterFiles" AfterTargets="Build">
-    <ItemGroup>
-      <_NUnitTestAdapterFiles Include="$(NuGetPackageRoot)NUnit3TestAdapter\%(Version)\build\net35\**" Condition="@(PackageReference -> '%(Identity)') == 'NUnit3TestAdapter'" InProject="False" />
-    </ItemGroup>
-    <Copy SourceFiles="@(_NUnitTestAdapterFiles)" DestinationFolder="$(SolutionDir)packages\NUnitTestAdapter.AnyVersion\tools\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
-    <Copy SourceFiles="@(_NUnitTestAdapterFiles)" DestinationFolder="$(SolutionDir)packages\NUnitTestAdapter.AnyVersion\build\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
-  </Target>
-</Project>
+
+</Project>
--- a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
+++ b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
@ -92,4 +92,4 @@
    </ItemGroup>
    <Copy SourceFiles="@(_XamarinUITestFiles)" DestinationFolder="$(SolutionDir)packages\Xamarin.UITest.AnyVersion\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
  </Target>
-</Project>
+</Project>
--- a/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
+++ b/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard1.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
  </PropertyGroup>
  
  <PropertyGroup>
--- a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
+++ b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
@ -54,6 +54,10 @@
    <Reference Include="System.Core" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj">
+      <Project>{e2403480-7079-4e09-9c21-113b615a2a0a}</Project>
+      <Name>Xamarin.Platform.Handlers</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
      <Name>Xamarin.Forms.Core</Name>
--- a/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj
+++ b/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj
@ -79,6 +79,10 @@
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj">
+      <Project>{e2403480-7079-4e09-9c21-113b615a2a0a}</Project>
+      <Name>Xamarin.Platform.Handlers</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
      <Name>Xamarin.Forms.Core</Name>
--- a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj
+++ b/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj
@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard1.0</TargetFrameworks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <TargetFrameworks>netstandard2.0;</TargetFrameworks>
  </PropertyGroup>
 </Project>
--- a/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs
@ -23,6 +23,7 @@ namespace Xamarin.Forms.MSBuild.UnitTests
 			"System",
 			"Xamarin.Forms.Core.dll",
 			"Xamarin.Forms.Xaml.dll",
+			"Xamarin.Platform.dll",
 		};

 		class Xaml
@ -306,7 +307,7 @@ namespace Xamarin.Forms.MSBuild.UnitTests
 			RestoreIfNeeded(projectFile, sdkStyle);

 			string log = Build(projectFile, additionalArgs: "/p:XFXamlCValidateOnly=True", shouldSucceed: false);
-			StringAssert.Contains("MainPage.xaml(7,6): XamlC error XFC0000: Cannot resolve type \"NotARealThing\".", log);
+			StringAssert.Contains("MainPage.xaml(7,6): XamlC error XFC0000: Cannot resolve type \"http://xamarin.com/schemas/2014/forms:NotARealThing\".", log);
 		}

 		/// <summary>
--- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
+++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
@ -5,6 +5,7 @@
    <AssemblyName>Xamarin.Forms.Xaml.UnitTests</AssemblyName>
    <WarningLevel>4</WarningLevel>
    <NoWarn>0672;0219;0414;CS0436</NoWarn>
+    <IsPackable>false</IsPackable>
  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@ -15,6 +16,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <ProjectReference Include="..\src\Platform.Handlers\src\Xamarin.Platform.Handlers\Xamarin.Platform.Handlers.csproj" />
    <ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj" />
    <ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
  </ItemGroup>
@ -22,7 +24,8 @@
    <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
    <PackageReference Include="NUnit" Version="3.12.0" />
    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <!--<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />-->
  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\Xamarin.Forms.Core.UnitTests\MockDispatcherProvider.cs">
--- a/Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs
@ -3,6 +3,7 @@ using NUnit.Framework;
 using Mono.Cecil;
 using Xamarin.Forms.Build.Tasks;
 using System.Collections.Generic;
+using Xamarin.Platform;

 namespace Xamarin.Forms
 {
@ -90,6 +91,7 @@ namespace Xamarin.Forms.XamlcUnitTests
 			resolver.AddAssembly(Uri.UnescapeDataString((new UriBuilder(typeof(object).Assembly.CodeBase)).Path));
 			resolver.AddAssembly(Uri.UnescapeDataString((new UriBuilder(typeof(IList<>).Assembly.CodeBase)).Path));
 			resolver.AddAssembly(Uri.UnescapeDataString((new UriBuilder(typeof(Queue<>).Assembly.CodeBase)).Path));
+			resolver.AddAssembly(Uri.UnescapeDataString((new UriBuilder(typeof(IViewHandler).Assembly.CodeBase)).Path));

 			module = ModuleDefinition.CreateModule("foo", new ModuleParameters {
 				AssemblyResolver = resolver,
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@ -60,8 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Andr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS", "Xamarin.Forms.Platform.iOS\Xamarin.Forms.Platform.iOS.csproj", "{271193C1-6E7C-429C-A36D-3F1BE5267231}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Platform.Handlers.Tests", "src\Platform.Handlers\tests\Xamarin.Platform.Handlers.Tests\Xamarin.Platform.Handlers.Tests.csproj", "{44E3D113-F658-4789-BDCF-CD1E6251025E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5B986A3-7FC9-437E-8030-349AA4698DFD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{75A2CD30-BB85-4CA6-AC95-86A8A538A690}"
@ -74,6 +72,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Maps", "Xamar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Build.Tasks", "Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj", "{C328C538-B69F-43D2-80EE-3C1EB8254CBA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Platform.Handlers.UnitTests", "src\Platform.Handlers\tests\Xamarin.Platform.Handlers.UnitTests\Xamarin.Platform.Handlers.UnitTests.csproj", "{1524004D-5BE8-4834-9F52-DCBE3F7F2333}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -386,34 +386,6 @@ Global
 		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x64.Build.0 = Release|Any CPU
 		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x86.ActiveCfg = Release|Any CPU
 		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x86.Build.0 = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|ARM.Build.0 = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|x64.Build.0 = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Debug|x86.Build.0 = Debug|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|ARM.ActiveCfg = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|ARM.Build.0 = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|ARM64.Build.0 = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|iPhone.Build.0 = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|x64.ActiveCfg = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|x64.Build.0 = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|x86.ActiveCfg = Release|Any CPU
-		{44E3D113-F658-4789-BDCF-CD1E6251025E}.Release|x86.Build.0 = Release|Any CPU
 		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -526,6 +498,34 @@ Global
 		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|x64.Build.0 = Release|Any CPU
 		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|x86.ActiveCfg = Release|Any CPU
 		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|x86.Build.0 = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|x64.Build.0 = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Debug|x86.Build.0 = Debug|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|ARM.Build.0 = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|ARM64.Build.0 = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|iPhone.Build.0 = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|x64.ActiveCfg = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|x64.Build.0 = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|x86.ActiveCfg = Release|Any CPU
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -547,13 +547,13 @@ Global
 		{0E63E501-2348-41D1-8B56-2B66346AA34A} = {F69A2922-9D5F-4046-8354-8DA6CF45502B}
 		{94C3F82C-A507-465C-B49D-FC735ADD2E43} = {5A2DADBC-9510-4DD1-BE58-01501F2DF65D}
 		{271193C1-6E7C-429C-A36D-3F1BE5267231} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
-		{44E3D113-F658-4789-BDCF-CD1E6251025E} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
 		{D5B986A3-7FC9-437E-8030-349AA4698DFD} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
 		{75A2CD30-BB85-4CA6-AC95-86A8A538A690} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
 		{00259593-A283-47A5-ACB7-9C3819B16364} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
 		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
 		{F137FAC5-3385-4B19-988B-4A14ED84CCC6} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
 		{C328C538-B69F-43D2-80EE-3C1EB8254CBA} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
+		{1524004D-5BE8-4834-9F52-DCBE3F7F2333} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {650AE971-2F29-46A8-822C-FB4FCDC6A9A0}
--- a/build.cake
+++ b/build.cake
@ -722,16 +722,14 @@ Task("BuildForNuget")
        };

        msbuildSettings.BinaryLogger = binaryLogger;
-        binaryLogger.FileName = $"{artifactStagingDirectory}/win-{configuration}.binlog";
+        binaryLogger.FileName = $"{artifactStagingDirectory}/Xamarin.Forms-{configuration}.binlog";
        MSBuild("./Xamarin.Forms.sln", msbuildSettings);

        msbuildSettings = GetMSBuildSettings();
        msbuildSettings.BinaryLogger = binaryLogger;
-        binaryLogger.FileName = $"{artifactStagingDirectory}/dualscreen-{configuration}-csproj.binlog";
+        binaryLogger.FileName = $"{artifactStagingDirectory}/Xamarin.Forms.DualScreen-{configuration}-csproj.binlog";
        MSBuild("./Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj",
-                    msbuildSettings
-                        .WithRestore()
-                        .WithTarget("rebuild"));
+                    msbuildSettings.WithRestore());


        // msbuildSettings = GetMSBuildSettings();
@ -743,22 +741,23 @@ Task("BuildForNuget")
        //                 .WithProperty("DisableEmbeddedXbf", "false")
        //                 .WithProperty("EnableTypeInfoReflection", "false"));

-        msbuildSettings = GetMSBuildSettings();
+       /*msbuildSettings = GetMSBuildSettings();
        msbuildSettings.BinaryLogger = binaryLogger;
        binaryLogger.FileName = $"{artifactStagingDirectory}/ios-{configuration}-csproj.binlog";
        MSBuild("./Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj",
                    msbuildSettings
-                        .WithTarget("rebuild"));
-
-                        
-       /* msbuildSettings = GetMSBuildSettings();
-        msbuildSettings.BinaryLogger = binaryLogger;
-        binaryLogger.FileName = $"{artifactStagingDirectory}/xaml-unittests-{configuration}-csproj.binlog";
-        MSBuild("./Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj",
-                    msbuildSettings
-                        .WithRestore()
                        .WithTarget("rebuild"));*/

+
+        // XAML Tests are currently having issues compiling in Release Mode
+        if(configuration == "Debug")
+        {
+            msbuildSettings = GetMSBuildSettings();
+            msbuildSettings.BinaryLogger = binaryLogger;
+            binaryLogger.FileName = $"{artifactStagingDirectory}/Xamarin.Forms.ControlGallery-{configuration}.binlog";
+            MSBuild("./Xamarin.Forms.ControlGallery.sln", msbuildSettings.WithRestore());
+        }
+
        // msbuildSettings = GetMSBuildSettings();
        // msbuildSettings.BinaryLogger = binaryLogger;
        // binaryLogger.FileName = $"{artifactStagingDirectory}/macos-{configuration}-csproj.binlog";
--- a/eng/pipelines/common/build-windows.yml
+++ b/eng/pipelines/common/build-windows.yml
@ -0,0 +1,75 @@
+parameters:
+  slnPath : 'Xamarin.Forms.sln'
+  msbuildExtraArguments : ''
+  artifactsTargetFolder: '$(build.artifactstagingdirectory)'
+  artifactsName: 'win_build'
+  nunitTestFolder: '$(build.sourcesdirectory)'
+  nunitTestAdapterFolder: 'packages/NUnitTestAdapter.AnyVersion/build/'
+
+steps:
+  - checkout: self
+    clean: true
+
+  - task: xamops.azdevex.provisionator-task.provisionator@1
+    displayName: 'Provisionator'
+    condition: eq(variables['provisioning'], 'true')
+    inputs:
+      provisioning_script: ${{ parameters.provisionatorPath }}
+      provisioning_extra_args: ${{ parameters.provisionator.extraArguments }}
+
+  - task: NuGetToolInstaller@1
+    displayName: 'Use NuGet $(NUGET_VERSION)'
+    condition: ne(variables['NUGET_VERSION'], '')
+    inputs:
+      versionSpec: $(NUGET_VERSION)
+
+  - task: CmdLine@2
+    displayName: 'install NUnit3TestAdapter'
+    inputs:
+      script: 'nuget install NUnit3TestAdapter'
+
+  - task: NuGetCommand@2
+    displayName: 'NuGet restore ${{ parameters.slnPath }}'
+    inputs:
+      restoreSolution: ${{ parameters.slnPath }}
+      feedsToUse: config
+      nugetConfigPath: 'DevopsNuget.config'
+
+  - script: build.cmd -Target BuildForNuget -ScriptArgs '-BUILD_CONFIGURATION="$(BuildConfiguration)"','-Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
+    name: winbuild
+    displayName: 'Build Projects For Nuget'
+
+  - task: VSTest@2
+    displayName: 'XAML Unit Tests'
+    inputs:
+      testAssemblyVer2: |
+        **/bin/$(BuildConfiguration)/**/Xamarin.Forms.Xaml.UnitTests.dll
+      searchFolder: ${{ parameters.nunitTestFolder }}
+      codeCoverageEnabled: true
+      testRunTitle: '$(BuildConfiguration)_UnitTests'
+      configuration: '$(BuildConfiguration)'
+      diagnosticsEnabled: true
+      # pathtoCustomTestAdapters: ${{ parameters.nunitTestAdapterFolder }}
+      # overrideTestrunParameters: -platform AnyCPU -framework Framework47
+
+  - task: DotNetCoreCLI@2
+    displayName: 'Unit Tests'
+    inputs:
+      command: test
+      projects:   |
+        **/Xamarin.Forms.Core.UnitTests.csproj
+        **/Xamarin.Platform.Handlers.UnitTests.csproj
+      arguments: '--configuration $(BuildConfiguration)'
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files dlls'
+    inputs:
+      Contents: |
+        **/bin/**/*.dll
+      TargetFolder: ${{ parameters.artifactsTargetFolder }}
+  
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: ${{ parameters.artifactsName }}'
+    condition: always()
+    inputs:
+      ArtifactName: ${{ parameters.artifactsName }}
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@ -0,0 +1,11 @@
+variables:
+- name: SolutionFile
+  value: Xamarin.Forms.sln
+- name: BuildVersion
+  value: $[counter('handler-counter', 1)]
+- name: NUGET_VERSION
+  value: 5.6.0
+- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+  value: true
+- name: DOTNET_VERSION
+  value: 3.1.301
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@ -0,0 +1,80 @@
+trigger:
+  branches:
+    include:
+    - main
+    - main-handlers
+  paths:
+    include:
+    - '*'
+    exclude:
+    - .github/*
+    - docs/*
+    - CODE-OF-CONDUCT.md
+    - CONTRIBUTING.md
+    - LICENSE.TXT
+    - PATENTS.TXT
+    - README.md
+    - SECURITY.md
+    - THIRD-PARTY-NOTICES.TXT
+
+pr:
+  branches:
+    include:
+    - main
+    - main-handlers
+  paths:
+    include:
+    - '*'
+    exclude:
+    - .github/*
+    - docs/*
+    - CODE-OF-CONDUCT.md
+    - CONTRIBUTING.md
+    - LICENSE.TXT
+    - PATENTS.TXT
+    - README.md
+    - SECURITY.md
+    - THIRD-PARTY-NOTICES.TXT
+
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily midnight build
+  branches:
+    include:
+    - main
+
+variables:
+  - template: /eng/pipelines/common/variables.yml
+
+resources:
+  repositories:
+    - repository: xamarin-templates
+      type: github
+      name: xamarin/yaml-templates
+      endpoint: xamarin
+      ref: refs/heads/main # still defaults to master even though main is the main branch
+
+stages:
+  - stage: windows
+    displayName: Build Windows
+    jobs:
+      - job: win_hosted
+        workspace:
+          clean: all
+        displayName: Build Windows Phase
+        timeoutInMinutes: 60
+        pool:
+          name: $(vs2019VmPool)
+          vmImage: $(vs2019VmImage)
+          demands:
+            msbuild
+        strategy:
+          matrix:
+            debug:
+              BuildConfiguration:  'Debug'
+            release:
+              BuildConfiguration:  'Release'
+        steps:
+          - template: common/build-windows.yml
+            parameters:
+              provisionatorPath : '/build/provisioning/provisioning.csx'
--- a/src/Platform.Handlers/src/Xamarin.Platform.Handlers/Properties/AssemblyInfo.cs
+++ b/src/Platform.Handlers/src/Xamarin.Platform.Handlers/Properties/AssemblyInfo.cs
@ -7,4 +7,4 @@ using Xamarin.Forms;
 [assembly: InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Pages.UnitTests")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.DualScreen.UnitTests")]
-[assembly: InternalsVisibleTo("Xamarin.Platform.Handlers.Tests")]
+[assembly: InternalsVisibleTo("Xamarin.Platform.Handlers.UnitTests")]
--- a/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/PropertyMapperTests.cs
+++ b/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/PropertyMapperTests.cs
--- a/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/Xamarin.Platform.Handlers.UnitTests.csproj
+++ b/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/Xamarin.Platform.Handlers.UnitTests.csproj
@ -2,13 +2,15 @@

  <PropertyGroup>
    <TargetFramework>netcoreapp3.1</TargetFramework>
-
    <IsPackable>false</IsPackable>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
    <PackageReference Include="NUnit" Version="3.12.0" />
  </ItemGroup>