Merge pull request #335 from unoplatform/dev/jela/uno-update7

fix(skia): Specify the default culture
unoplatform · Nov 17, 2020 · 00adc32 · 00adc32
2 parents 0bf7a0b + 17e806b
commit 00adc32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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>

diff --git 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" />