From 2e9e74789418b569f023dce20e2a602459ac2851 Mon Sep 17 00:00:00 2001
From: memu8 <66331238+memu8@users.noreply.github.com>
Date: Wed, 22 Jul 2020 10:20:29 -0500
Subject: [PATCH] fixes #11471 #11472
---
...Forms.Platform.Android (Forwarders).csproj | 2 +-
...n.Forms.Platform.Tizen (Forwarders).csproj | 2 -
.../Xamarin.Forms.Build.Tasks.csproj | 2 +-
...amarin.Forms.ControlGallery.Android.csproj | 2 +-
.../Xamarin.Forms.ControlGallery.GTK.csproj | 4 +-
.../Xamarin.Forms.ControlGallery.MacOS.csproj | 2 +-
.../Xamarin.Forms.ControlGallery.Tizen.csproj | 2 -
.../Xamarin.Forms.ControlGallery.iOS.csproj | 4 +-
.../Xamarin.Forms.Core.Android.UITests.csproj | 2 +-
.../Xamarin.Forms.Core.Windows.UITests.csproj | 2 +-
.../Xamarin.Forms.Core.iOS.UITests.csproj | 2 +-
.../Xamarin.Forms.Core.macOS.UITests.csproj | 2 +-
.../Xamarin.Forms.Maps.Android.csproj | 5 +-
.../Xamarin.Forms.Maps.GTK.csproj | 2 +-
.../Xamarin.Forms.Maps.Tizen.csproj | 2 -
.../Xamarin.Forms.Maps.UWP.csproj | 3 +
.../Xamarin.Forms.Maps.WPF.csproj | 6 +-
.../Xamarin.Forms.Material.Android.csproj | 2 +-
.../Xamarin.Forms.Material.Tizen.csproj | 2 -
...rin.Forms.Platform.Android.AppLinks.csproj | 6 +-
.../DatePickerRenderer.cs | 63 +++++++++++++-----
.../Xamarin.Forms.Platform.UAP.csproj | 3 +
Xamarin.Forms.sln | 65 +++++++++----------
23 files changed, 106 insertions(+), 81 deletions(-)
diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
index f262bfc349c..c935d3e26d6 100644
--- a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
+++ b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
@@ -10,7 +10,7 @@
true
-
+
false
bin\$(Configuration)\$(TargetFramework)
diff --git a/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
index c9ad03a2c25..f3ac6c0a3cf 100644
--- a/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
+++ b/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
@@ -2,8 +2,6 @@
tizen40
- Tizen
- v4.0
Xamarin.Forms.Platform
TIZEN4_0
Library
diff --git a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
index e959560e2c8..23bf35f9f37 100644
--- a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
+++ b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
@@ -71,7 +71,7 @@
-
+
diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
index 8b5dfc9e76e..06f72e978c8 100644
--- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
+++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
@@ -185,7 +185,7 @@
- {cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}
Xamarin.Forms.Controls
diff --git a/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj b/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj
index 212b639a303..b70af3ebf55 100644
--- a/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj
+++ b/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj
@@ -108,7 +108,7 @@
- {cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}
Xamarin.Forms.Controls
@@ -124,7 +124,7 @@
Xamarin.Forms.Maps
- {1f058504-62f9-4279-ac8f-16738e0f4417}
+ {0D497738-2598-431D-8CAF-8FBF3D9F99EC}
Xamarin.Forms.Platform.GTK
diff --git a/Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj b/Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj
index 78113a431e2..306044da8b1 100644
--- a/Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj
+++ b/Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj
@@ -114,7 +114,7 @@
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}
Xamarin.Forms.Controls
diff --git a/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj b/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
index 20a4532aa38..bff43ed5ac0 100644
--- a/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
+++ b/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
@@ -3,8 +3,6 @@
Exe
tizen40
- Tizen
- v4.0
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index da94635079e..52c66a8cdf6 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -5,7 +5,7 @@
Debug
iPhone
- $(iOSPlatform)
+ iPhoneSimulator
{C7131F14-274F-4B55-ACA9-E81731AD012F}
{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
Exe
@@ -149,7 +149,7 @@
- {cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}
Xamarin.Forms.Controls
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 3e6a62402ad..1382a2498ca 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
@@ -87,7 +87,7 @@
- <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
+ <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
diff --git a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
index 1d2baaf667e..4e5ae4a19bd 100644
--- a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
+++ b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
@@ -93,7 +93,7 @@
- <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
+ <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
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 792d796b52a..2cd13ac62de 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,7 +92,7 @@
- <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
+ <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
diff --git a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
index f250c96171f..72e9dcd975d 100644
--- a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
+++ b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
@@ -85,7 +85,7 @@
- <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
+ <_XamarinUITestFiles Include="$(NuGetPackageRoot)Xamarin.UITest\%(Version)\**" Condition="@(PackageReference -> '%(Identity)') == 'Xamarin.UITest'" InProject="False" />
diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
index 2627ef855b1..231c179f1c4 100644
--- a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
+++ b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
@@ -9,7 +9,7 @@
true
-
+
false
bin\$(Configuration)\$(TargetFramework)
@@ -27,8 +27,7 @@
-
- 1.0.0.1
+
diff --git a/Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj b/Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj
index 3d550c6588f..4fb1814b56c 100644
--- a/Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj
+++ b/Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj
@@ -107,7 +107,7 @@
Xamarin.Forms.Maps
- {1f058504-62f9-4279-ac8f-16738e0f4417}
+ {0D497738-2598-431D-8CAF-8FBF3D9F99EC}
Xamarin.Forms.Platform.GTK
diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
index fc845342122..fb20f50de84 100644
--- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
+++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
@@ -2,8 +2,6 @@
tizen40
- Tizen
- v4.0
diff --git a/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj b/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
index c81162763ea..c30f8273c97 100644
--- a/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
+++ b/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
@@ -29,4 +29,7 @@
+
+
+
diff --git a/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj b/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
index 910fb4c278b..d1b15d15afb 100644
--- a/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
+++ b/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
@@ -10,11 +10,11 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
index d0c0a974cd3..969909e8671 100644
--- a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
+++ b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
@@ -11,7 +11,7 @@
true
-
+
false
bin\$(Configuration)\$(TargetFramework)
diff --git a/Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj b/Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj
index 588e4db5cfc..789bf2721e5 100644
--- a/Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj
+++ b/Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj
@@ -2,8 +2,6 @@
tizen40
- Tizen
- v4.0
false
Xamarin.Forms.Material.Tizen
Xamarin.Forms.Material
diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
index afbe9383cc6..f72f02ae08e 100644
--- a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
+++ b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
@@ -12,7 +12,7 @@
true
-
+
false
bin\$(Configuration)\$(TargetFramework)
@@ -26,14 +26,12 @@
- Xamarin.Forms.Core
-
- 1.0.0.1
+
diff --git a/Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs b/Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs
index bc3a10ec53b..5b196686f91 100644
--- a/Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs
@@ -143,26 +143,25 @@ void UpdateDate(DateTime date)
if (Control != null)
Control.Date = new DateTimeOffset(new DateTime(date.Ticks, DateTimeKind.Unspecified));
+ UpdateDay();
+ UpdateMonth();
+ UpdateYear();
+ }
+
+ void UpdateMonth()
+ {
Control.MonthVisible = true;
- Control.YearVisible = true;
- Control.DayVisible = true;
if (Element.Format.Equals("") || Element.Format.Equals("d"))
{
Control.MonthFormat = "month";
- Control.YearFormat = "year";
- Control.DayFormat = "day";
}
else if (Element.Format.Equals("D"))
{
Control.MonthFormat = "month.full";
- Control.YearFormat = "year.full";
- Control.DayFormat = "dayofweek.full";
}
else
{
var month = Element.Format.Count(x => x == 'M');
- var year = Element.Format.Count(x => x == 'y');
- var day = Element.Format.Count(x => x == 'd');
if (month == 0)
Control.MonthVisible = false;
else if (month <= 2)
@@ -171,16 +170,27 @@ void UpdateDate(DateTime date)
Control.MonthFormat = "month.abbreviated";
else
Control.MonthFormat = "month.full";
- if (year == 0)
- Control.YearVisible = false;
- else if (year <= 2)
- Control.YearFormat = "year.abbreviated";
- else
- Control.YearFormat = "year.full";
+ }
+ }
+
+ void UpdateDay()
+ {
+ Control.DayVisible = true;
+ if (Element.Format.Equals("") || Element.Format.Equals("d"))
+ {
+ Control.DayFormat = "day";
+ }
+ else if (Element.Format.Equals("D"))
+ {
+ Control.DayFormat = "dayofweek.full";
+ }
+ else
+ {
+ var day = Element.Format.Count(x => x == 'd');
if (day == 0)
Control.DayVisible = false;
else if (day == 3)
- Control.DayFormat = "dayofweek.abbreviated";
+ Control.DayFormat = "day dayofweek.abbreviated";
else if (day == 4)
Control.DayFormat = "dayofweek.full";
else
@@ -188,6 +198,29 @@ void UpdateDate(DateTime date)
}
}
+ void UpdateYear()
+ {
+ Control.YearVisible = true;
+ if (Element.Format.Equals("") || Element.Format.Equals("d"))
+ {
+ Control.YearFormat = "year";
+ }
+ else if (Element.Format.Equals("D"))
+ {
+ Control.YearFormat = "year.full";
+ }
+ else
+ {
+ var year = Element.Format.Count(x => x == 'y');
+ if (year == 0)
+ Control.YearVisible = false;
+ else if (year <= 2)
+ Control.YearFormat = "year.abbreviated";
+ else
+ Control.YearFormat = "year.full";
+ }
+ }
+
void UpdateFlowDirection()
{
Control.UpdateFlowDirection(Element);
diff --git a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
index 657e6196e40..c46fc5af450 100644
--- a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
+++ b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
@@ -123,4 +123,7 @@
+
+
+
diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index 7f22184e9db..4b4b1e2e460 100644
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -49,11 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Core", "Xamar
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj", "{9DB2F292-8034-4E06-89AD-98BBDA4306B9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Controls", "Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj", "{CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}"
- ProjectSection(ProjectDependencies) = postProject
- {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7} = {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Build.Tasks", "Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj", "{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms.Maps", "Xamarin.Forms.Maps", "{132FB9A4-613F-44CE-95D5-758D32D231DD}"
@@ -161,6 +156,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.UAP.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.iOS.UnitTests", "Xamarin.Forms.Platform.iOS.UnitTests\Xamarin.Forms.Platform.iOS.UnitTests.csproj", "{52C50E88-7F15-45FE-A63C-8E7C76CA2BAE}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Controls", "Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj", "{EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}"
+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
@@ -402,34 +399,6 @@ Global
{9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|x64.Build.0 = Release|Any CPU
{9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|x86.ActiveCfg = Release|Any CPU
{9DB2F292-8034-4E06-89AD-98BBDA4306B9}.Release|x86.Build.0 = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|ARM.Build.0 = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|ARM64.Build.0 = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhone.Build.0 = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x64.ActiveCfg = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x64.Build.0 = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Debug|x86.Build.0 = Debug|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|Any CPU.Build.0 = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|ARM.ActiveCfg = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|ARM.Build.0 = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|ARM64.ActiveCfg = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|ARM64.Build.0 = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhone.ActiveCfg = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhone.Build.0 = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x64.ActiveCfg = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x64.Build.0 = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x86.ActiveCfg = Release|Any CPU
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1}.Release|x86.Build.0 = Release|Any CPU
{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1551,6 +1520,34 @@ Global
{52C50E88-7F15-45FE-A63C-8E7C76CA2BAE}.Release|x64.Build.0 = Release|Any CPU
{52C50E88-7F15-45FE-A63C-8E7C76CA2BAE}.Release|x86.ActiveCfg = Release|Any CPU
{52C50E88-7F15-45FE-A63C-8E7C76CA2BAE}.Release|x86.Build.0 = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|ARM.Build.0 = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|x64.Build.0 = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Debug|x86.Build.0 = Debug|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|ARM.ActiveCfg = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|ARM.Build.0 = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|ARM64.Build.0 = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|iPhone.Build.0 = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|x64.ActiveCfg = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|x64.Build.0 = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|x86.ActiveCfg = Release|Any CPU
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1563,7 +1560,6 @@ Global
{4B14D295-C09B-4C38-B880-7CC768E50585} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
{57B8B73D-C3B5-4C42-869E-7B2F17D354AC} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
{9DB2F292-8034-4E06-89AD-98BBDA4306B9} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
- {CB9C96CE-125C-4A68-B6A1-C3FF1FBF93E1} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7} = {32F608E2-6406-4DCF-9105-E2A7CB7085CF}
{7D13BAC2-C6A4-416A-B07E-C169B199E52B} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
{ABA078C4-F9BB-4924-8B2B-10FE0D2F5491} = {132FB9A4-613F-44CE-95D5-758D32D231DD}
@@ -1610,6 +1606,7 @@ Global
{A4C57790-71D1-467C-A69E-2BD84CB6666C} = {60B64BCC-378A-4354-9E9F-BBB45169EDBD}
{8F245976-F555-4814-B935-9AD58F4D2871} = {60B64BCC-378A-4354-9E9F-BBB45169EDBD}
{52C50E88-7F15-45FE-A63C-8E7C76CA2BAE} = {60B64BCC-378A-4354-9E9F-BBB45169EDBD}
+ {EC110FB6-FD6F-40F2-89F7-3FB9379CCE2E} = {4F5E2D21-17F6-4A42-B8FB-D03D82E24EC8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {650AE971-2F29-46A8-822C-FB4FCDC6A9A0}