projects / platform / core / csapi / xsf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e41144 210371f)
Merge with master branch
authorJavier Suárez Ruiz <javiersuarezruiz@hotmail.com>
Thu, 19 Oct 2017 10:50:05 +0000 (12:50 +0200)
committerJavier Suárez Ruiz <javiersuarezruiz@hotmail.com>
Thu, 19 Oct 2017 10:50:05 +0000 (12:50 +0200)
1  2 
Xamarin.Forms.Core/Device.cs patch | diff1 | diff2 | blob | history
Xamarin.Forms.Core/Xamarin.Forms.Core.csproj patch | diff1 | diff2 | blob | history
Xamarin.Forms.sln patch | diff1 | diff2 | blob | history

diff --cc Xamarin.Forms.Core/Device.cs
Simple merge
diff --cc Xamarin.Forms.sln
index 87f2f44,18f0ff2..6e25bae
--- 1/Xamarin.Forms.sln
--- 2/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@@ -154,10 -162,10 +162,12 @@@ Project("{FAE04EC0-301F-11D3-BF4B-00C04
  EndProject
  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core.macOS.UITests", "Xamarin.Forms.Core.macOS.UITests\Xamarin.Forms.Core.macOS.UITests.csproj", "{9DB0CABB-24CC-4538-88EC-6E0A0FE40248}"
  EndProject
- Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Forms.Core.UITests.Shared", "Xamarin.Forms.Core.UITests.Shared\Xamarin.Forms.Core.UITests.Shared.shproj", "{E175485B-3C8C-47D7-8DD5-F7FED627EB25}"
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Embedding.iOS", "EmbeddingTestBeds\Embedding.iOS\Embedding.iOS.csproj", "{29DDE791-5608-4072-8E1C-D37D72992A83}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Embedding.UWP", "EmbeddingTestBeds\Embedding.UWP\Embedding.UWP.csproj", "{73A22D45-2350-457D-A191-F888148E4280}"
  EndProject
 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.GTK", "Xamarin.Forms.Platform.GTK\Xamarin.Forms.Platform.GTK.csproj", "{0D497738-2598-431D-8CAF-8FBF3D9F99EC}"
 +EndProject
  Global
        GlobalSection(SharedMSBuildProjectFiles) = preSolution
                Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4
@@@ -1592,34 -3288,112 +3290,140 @@@
                {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x64.Build.0 = Release|Any CPU
                {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.ActiveCfg = Release|Any CPU
                {9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.Build.0 = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|ARM.ActiveCfg = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|ARM.Build.0 = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|iPhone.Build.0 = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|Templates.ActiveCfg = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|Templates.Build.0 = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|x64.ActiveCfg = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|x64.Build.0 = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|x86.ActiveCfg = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Debug|x86.Build.0 = Debug|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|Any CPU.Build.0 = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|ARM.ActiveCfg = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|ARM.Build.0 = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|iPhone.ActiveCfg = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|iPhone.Build.0 = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|Templates.ActiveCfg = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|Templates.Build.0 = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|x64.ActiveCfg = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|x64.Build.0 = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|x86.ActiveCfg = Release|Any CPU
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC}.Release|x86.Build.0 = Release|Any CPU
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|Templates.ActiveCfg = Ad-Hoc|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|iPhone.Build.0 = AppStore|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|Templates.ActiveCfg = AppStore|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|x64.ActiveCfg = AppStore|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.AppStore|x86.ActiveCfg = AppStore|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|Any CPU.ActiveCfg = Debug|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|ARM.ActiveCfg = Debug|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhone.ActiveCfg = Debug|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhone.Build.0 = Debug|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|Templates.ActiveCfg = Debug|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x64.ActiveCfg = Debug|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x86.ActiveCfg = Debug|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|Any CPU.ActiveCfg = Release|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|ARM.ActiveCfg = Release|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|iPhone.ActiveCfg = Release|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|iPhone.Build.0 = Release|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|Templates.ActiveCfg = Release|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x64.ActiveCfg = Release|iPhone
+               {29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x86.ActiveCfg = Release|iPhone
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|Any CPU.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|ARM.Build.0 = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|iPhone.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|Templates.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|Templates.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|Templates.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|x64.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|x64.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|x64.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|x86.ActiveCfg = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|x86.Build.0 = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Ad-Hoc|x86.Deploy.0 = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|Any CPU.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|Any CPU.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|Any CPU.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|ARM.ActiveCfg = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|ARM.Build.0 = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|ARM.Deploy.0 = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|iPhone.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|iPhone.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|iPhone.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|iPhoneSimulator.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|Templates.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|Templates.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|Templates.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|x64.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|x64.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|x64.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|x86.ActiveCfg = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|x86.Build.0 = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.AppStore|x86.Deploy.0 = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.Build.0 = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.Deploy.0 = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.ActiveCfg = Debug|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Build.0 = Debug|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Deploy.0 = Debug|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhone.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|Templates.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.ActiveCfg = Debug|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Build.0 = Debug|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Deploy.0 = Debug|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.ActiveCfg = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Build.0 = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Deploy.0 = Debug|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.ActiveCfg = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|ARM.ActiveCfg = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|ARM.Build.0 = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|ARM.Deploy.0 = Release|ARM
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|iPhone.ActiveCfg = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|Templates.ActiveCfg = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|x64.ActiveCfg = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|x64.Build.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|x64.Deploy.0 = Release|x64
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|x86.ActiveCfg = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|x86.Build.0 = Release|x86
+               {73A22D45-2350-457D-A191-F888148E4280}.Release|x86.Deploy.0 = Release|x86
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -1681,7 -3458,7 +3488,9 @@@
                {8D3DFCB7-DB10-40E5-ACFE-411AAA85520D} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
                {C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
                {9DB0CABB-24CC-4538-88EC-6E0A0FE40248} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9}
 +              {E175485B-3C8C-47D7-8DD5-F7FED627EB25} = {D4D57221-71D6-4031-A6F4-EC66AF0929D9}
 +              {0D497738-2598-431D-8CAF-8FBF3D9F99EC} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
+               {29DDE791-5608-4072-8E1C-D37D72992A83} = {406DE4B0-F541-4092-B0EE-F0A20E9A89F5}
+               {73A22D45-2350-457D-A191-F888148E4280} = {406DE4B0-F541-4092-B0EE-F0A20E9A89F5}
        EndGlobalSection
  EndGlobal
Domain: Dotnet / UI;