diff --git a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets index 4803776e3..b4fca443e 100644 --- a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets +++ b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets @@ -5,7 +5,7 @@ - + diff --git a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets index 2f46f5d3a..90c3dc299 100644 --- a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets +++ b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets @@ -1,7 +1,7 @@ - + diff --git a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs index bf230ccf7..29d959fae 100644 --- 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)) { diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index c829bcd64..602defa88 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -182,6 +182,10 @@ + + {e2403480-7079-4e09-9c21-113b615a2a0a} + Xamarin.Platform.Handlers + {cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1} Xamarin.Forms.Controls @@ -190,6 +194,18 @@ {4dcd0420-1168-4b77-86db-6196ee4bd491} Xamarin.Forms.CustomAttributes + + {31913345-bc10-49d6-802d-c119e953afcc} + Xamarin.Forms.Maps.Android + + + {7724ac21-0b03-4bb0-b125-d26ccf84b3f9} + Xamarin.Forms.Maps + + + {a4c57790-71d1-467c-a69e-2bd84cb6666c} + Xamarin.Forms.Platform.Android.UnitTests + diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj index 11dc1f164..9bf185792 100644 --- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj +++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj @@ -147,6 +147,10 @@ + + {e2403480-7079-4e09-9c21-113b615a2a0a} + Xamarin.Platform.Handlers + {cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1} Xamarin.Forms.Controls diff --git a/Xamarin.Forms.ControlGallery.sln b/Xamarin.Forms.ControlGallery.sln index 81358b0e2..7a64cc107 100644 --- 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} diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj index 7e5585b47..4b206dd73 100644 --- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj +++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj @@ -114,6 +114,7 @@ + diff --git a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj index 5e000e18e..005fe1870 100644 --- 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 @@ - 3.15.1 + 3.17.0 @@ -58,6 +58,10 @@ + + {e2403480-7079-4e09-9c21-113b615a2a0a} + Xamarin.Platform.Handlers + {57B8B73D-C3B5-4C42-869E-7B2F17D354AC} Xamarin.Forms.Core @@ -66,6 +70,10 @@ {4DCD0420-1168-4B77-86DB-6196EE4BD491} Xamarin.Forms.CustomAttributes + + {7724ac21-0b03-4bb0-b125-d26ccf84b3f9} + Xamarin.Forms.Maps + {D31A6537-ED9C-4EBD-B231-A8D4FE44126A} Xamarin.Forms.Platform diff --git a/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj b/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj index ac6ffe48c..e8bda1d71 100644 --- a/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj +++ b/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj @@ -58,6 +58,10 @@ + + {e2403480-7079-4e09-9c21-113b615a2a0a} + Xamarin.Platform.Handlers + {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Xamarin.Forms.Core diff --git a/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj b/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj index 471df2265..8c334bc28 100644 --- a/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj +++ b/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj @@ -1,312 +1,33 @@ - - - + + - Debug - AnyCPU - {00259593-A283-47A5-ACB7-9C3819B16364} - Library - Properties - Xamarin.Forms.Core.UnitTests - Xamarin.Forms.Core.UnitTests - v4.7 - 512 - ..\ - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - 0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net472 + false 0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014 + - - - - - - - - - - - - - 3.15.1 + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - {29913989-0f70-48d8-8ede-b1dd217f21d1} - Xamarin.Platform.Handlers - {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} - Xamarin.Forms.Core - {f137fac5-3385-4b19-988b-4a14ed84ccc6} - Xamarin.Forms.Maps - {D31A6537-ED9C-4EBD-B231-A8D4FE44126A} - Xamarin.Forms.Platform - {9db2f292-8034-4e06-89ad-98bbda4306b9} - Xamarin.Forms.Xaml - - - - - Images/crimson.jpg - - - - - - <_NUnitTestAdapterFiles Include="$(NuGetPackageRoot)NUnit3TestAdapter\%(Version)\build\net35\**" Condition="@(PackageReference -> '%(Identity)') == 'NUnit3TestAdapter'" InProject="False" /> - - - - - + + \ No newline at end of file diff --git a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj index a0f4792da..bad73753d 100644 --- 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 @@ - \ No newline at end of file + diff --git a/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj b/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj index 1f69a67ef..6d58dcaad 100644 --- a/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj +++ b/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard1.0 + netstandard2.0 diff --git a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj index 02be6703b..fbaa9bcaa 100644 --- a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj +++ b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj @@ -54,6 +54,10 @@ + + {e2403480-7079-4e09-9c21-113b615a2a0a} + Xamarin.Platform.Handlers + {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Xamarin.Forms.Core diff --git a/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj b/Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj index 616e51595..1f6da14ac 100644 --- 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 @@ + + {e2403480-7079-4e09-9c21-113b615a2a0a} + Xamarin.Platform.Handlers + {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Xamarin.Forms.Core diff --git a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj b/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj index 1d3be62a4..700788be7 100644 --- a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj +++ b/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj @@ -1,9 +1,5 @@  - netstandard2.0;netstandard1.0 - - - - + netstandard2.0; \ No newline at end of file diff --git a/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs b/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs index 3e7f93693..3a4468f89 100644 --- 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); } /// diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj index 6e2bea9d9..b217d4094 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -5,6 +5,7 @@ Xamarin.Forms.Xaml.UnitTests 4 0672;0219;0414;CS0436 + false @@ -15,6 +16,7 @@ + @@ -22,7 +24,8 @@ - + + diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs b/Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs index aa7e7949c..47c9cba1d 100644 --- 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, diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln index 96a456e0a..f6726e372 100644 --- 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} diff --git a/build.cake b/build.cake index 571e9f9a9..e3936f99f 100644 --- 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"; diff --git a/eng/pipelines/common/build-windows.yml b/eng/pipelines/common/build-windows.yml new file mode 100644 index 000000000..ebd175da9 --- /dev/null +++ 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 }} diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml new file mode 100644 index 000000000..0222b78af --- /dev/null +++ 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 \ No newline at end of file diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml new file mode 100644 index 000000000..56e488298 --- /dev/null +++ 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' \ No newline at end of file diff --git a/src/Platform.Handlers/src/Xamarin.Platform.Handlers/Properties/AssemblyInfo.cs b/src/Platform.Handlers/src/Xamarin.Platform.Handlers/Properties/AssemblyInfo.cs index 8f20a7fd8..026ac0309 100644 --- 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")] \ No newline at end of file +[assembly: InternalsVisibleTo("Xamarin.Platform.Handlers.UnitTests")] \ No newline at end of file diff --git a/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Tests/PropertyMapperTests.cs b/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/PropertyMapperTests.cs similarity index 100% rename from src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Tests/PropertyMapperTests.cs rename to src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/PropertyMapperTests.cs diff --git a/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Tests/Xamarin.Platform.Handlers.Tests.csproj b/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/Xamarin.Platform.Handlers.UnitTests.csproj similarity index 71% rename from src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Tests/Xamarin.Platform.Handlers.Tests.csproj rename to src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/Xamarin.Platform.Handlers.UnitTests.csproj index 981118071..d5c4ea7e6 100644 --- a/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Tests/Xamarin.Platform.Handlers.Tests.csproj +++ b/src/Platform.Handlers/tests/Xamarin.Platform.Handlers.UnitTests/Xamarin.Platform.Handlers.UnitTests.csproj @@ -2,13 +2,15 @@ netcoreapp3.1 - false - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +