From 93f26159a3d89bb323e699655483ad54703c604d Mon Sep 17 00:00:00 2001
From: "Dr.Rx" <david.rey@nventive.com>
Date: Fri, 24 May 2019 18:28:40 -0400
Subject: [PATCH 1/2] Restore the Date calculator

---
 src/Calculator.Shared/Common/LocalizationSettings.cs | 2 +-
 src/Calculator.Shared/Views/DateCalculator.xaml      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Calculator.Shared/Common/LocalizationSettings.cs b/src/Calculator.Shared/Common/LocalizationSettings.cs
index 67824d31..d734332d 100644
--- a/src/Calculator.Shared/Common/LocalizationSettings.cs
+++ b/src/Calculator.Shared/Common/LocalizationSettings.cs
@@ -137,7 +137,7 @@ namespace CalculatorApp
                 m_currencyTrailingDigits = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits;
                 m_currencySymbolPrecedence = ~(NumberFormatInfo.CurrentInfo.CurrencyPositivePattern) & 1;
 				m_resolvedName = CultureInfo.CurrentCulture.Name;
-				m_calendarIdentifier = ""; // new Windows.Globalization.Calendar().GetCalendarSystem();
+				m_calendarIdentifier = new Windows.Globalization.Calendar().GetCalendarSystem();
                 m_firstDayOfWeek = (Windows.Globalization.DayOfWeek)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
 #endif
             }
diff --git a/src/Calculator.Shared/Views/DateCalculator.xaml b/src/Calculator.Shared/Views/DateCalculator.xaml
index 4f513fde..76187233 100644
--- a/src/Calculator.Shared/Views/DateCalculator.xaml
+++ b/src/Calculator.Shared/Views/DateCalculator.xaml
@@ -581,19 +581,19 @@
 								 Margin="0,0,0,0"
 								 Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" />
 
+			<!--TOOD UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
 			<TextBlock x:Name="DateDiffAllUnitsResultLabel"
 								 Grid.Row="8"
 								 Style="{ThemeResource SubtitleTextBlockStyle}"
 								 FontWeight="SemiBold"
 								 AutomationProperties.LiveSetting="Polite"
 								 AutomationProperties.Name="{Binding StrDateDiffResultAutomationName}"
-								 ContextFlyout="{StaticResource ResultsContextMenu}"
 								 Text="{Binding StrDateDiffResult}" />
 
+			<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
 			<TextBlock Grid.Row="10"
 								 Style="{ThemeResource BaseTextBlockStyle}"
 								 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-								 ContextFlyout="{StaticResource ResultsContextMenu}"
 								 Text="{Binding StrDateDiffResultInDays, Mode=OneWay}"
 								 Visibility="{Binding IsDiffInDays, Converter={StaticResource BooleanToVisibilityNegationConverter}}" />
 		</Grid>
@@ -741,13 +741,13 @@
 								 Grid.Row="8"
 								 Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" />
 
+			<!--TODO UNO ContextFlyout="{StaticResource ResultsContextMenu}"-->
 			<TextBlock x:Name="DateResultLabel"
 								 Grid.Row="9"
 								 Style="{ThemeResource SubtitleTextBlockStyle}"
 								 FontWeight="SemiBold"
 								 AutomationProperties.LiveSetting="Polite"
 								 AutomationProperties.Name="{Binding StrDateResultAutomationName}"
-								 ContextFlyout="{StaticResource ResultsContextMenu}"
 								 Text="{Binding StrDateResult}" />
 		</Grid>
 	</Grid>

From 3583272064f356fb453e827fab567e0ce338fcfe Mon Sep 17 00:00:00 2001
From: "Dr.Rx" <david.rey@nventive.com>
Date: Fri, 24 May 2019 21:11:22 -0400
Subject: [PATCH 2/2] Update Uno (Fix Calendar and WASM overlay burger menu)

---
 src/Calculator.Droid/Calculator.Droid.csproj | 2 +-
 src/Calculator.UWP/Calculator.UWP.csproj     | 2 +-
 src/Calculator.Wasm/Calculator.Wasm.csproj   | 2 +-
 src/Calculator.iOS/Calculator.iOS.csproj     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Calculator.Droid/Calculator.Droid.csproj b/src/Calculator.Droid/Calculator.Droid.csproj
index 77f93a73..386a7ce2 100644
--- a/src/Calculator.Droid/Calculator.Droid.csproj
+++ b/src/Calculator.Droid/Calculator.Droid.csproj
@@ -63,7 +63,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1550" />
+    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
  		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
diff --git a/src/Calculator.UWP/Calculator.UWP.csproj b/src/Calculator.UWP/Calculator.UWP.csproj
index 822b562b..2351fc9d 100644
--- a/src/Calculator.UWP/Calculator.UWP.csproj
+++ b/src/Calculator.UWP/Calculator.UWP.csproj
@@ -9,7 +9,7 @@
       <Version>4.3.1</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>1.45.0-dev.1550</Version>
+      <Version>1.45.0-dev.1560</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
diff --git a/src/Calculator.Wasm/Calculator.Wasm.csproj b/src/Calculator.Wasm/Calculator.Wasm.csproj
index 9a295d9f..74b4199f 100644
--- a/src/Calculator.Wasm/Calculator.Wasm.csproj
+++ b/src/Calculator.Wasm/Calculator.Wasm.csproj
@@ -43,7 +43,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
-		<PackageReference Include="Uno.UI" Version="1.45.0-dev.1550" />
+		<PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.281" />
 		<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0-dev.276" />
 	</ItemGroup>
diff --git a/src/Calculator.iOS/Calculator.iOS.csproj b/src/Calculator.iOS/Calculator.iOS.csproj
index 9cbedb92..52fd24ba 100644
--- a/src/Calculator.iOS/Calculator.iOS.csproj
+++ b/src/Calculator.iOS/Calculator.iOS.csproj
@@ -190,7 +190,7 @@
     <BundleResource Include="Resources\Fonts\winjs-symbols.ttf" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1550" />
+    <PackageReference Include="Uno.UI" Version="1.45.0-dev.1560" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
 	</ItemGroup>