From ba57f777bbfdab31c3e742133d1e5e97f4640184 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Mon, 16 Nov 2020 22:48:35 -0500
Subject: [PATCH 1/2] fix(skia): Specify the default culture

---
 src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj b/src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj
index 021ef1143..b65f97526 100644
--- a/src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj
+++ b/src/Calculator.Skia.Gtk/Calculator.Skia.Gtk.csproj
@@ -6,8 +6,8 @@
 		<TargetFramework>net5.0</TargetFramework>
 		<DefineConstants>$(DefineConstants);UNO_REFERENCE_API</DefineConstants>
 		<NoWarn>$(NoWarn);Uno0001</NoWarn>
-		<UnoSourceGeneratorUseGenerationHost>true</UnoSourceGeneratorUseGenerationHost>
-		<UnoSourceGeneratorUseGenerationController>false</UnoSourceGeneratorUseGenerationController>
+		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+		<DefaultLanguage>en-US</DefaultLanguage>
 	</PropertyGroup>
 	
 	<ItemGroup>
@@ -21,7 +21,7 @@
 	
   <ItemGroup>
     <PackageReference Include="Uno.SourceGenerationTasks" Version="3.0.0-dev.18" />
-    <PackageReference Include="Uno.UI.Skia.Gtk" Version="3.3.0-dev.99" />
+		<PackageReference Include="Uno.UI.Skia.Gtk" Version="3.3.0-dev.99" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />

From 17e806bf6eaa3154495a54ba16bbc04138c4ef88 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Mon, 16 Nov 2020 23:35:23 -0500
Subject: [PATCH 2/2] fix: Adjust AboutFlyout for x:Load

---
 src/Calculator.Shared/Views/MainPage.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Calculator.Shared/Views/MainPage.xaml b/src/Calculator.Shared/Views/MainPage.xaml
index da2ceaec0..2413380d4 100644
--- a/src/Calculator.Shared/Views/MainPage.xaml
+++ b/src/Calculator.Shared/Views/MainPage.xaml
@@ -181,8 +181,9 @@
 											FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}"
 											Opened="OnAboutFlyoutOpened">
 
+										<!-- UNO TODO x:Load="False"-->
 										<local:AboutFlyout x:Name="AboutPage"
-														   x:Load="False" />
+														    />
 									</Flyout>
 								</FlyoutBase.AttachedFlyout>
 							</NavigationViewItem>