From 585f20f36560bf3ae955ae155009eb663b5ff206 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 20 Jan 2021 16:30:57 +0000
Subject: [PATCH] update avalonia

---
 NuGet.Config                                               | 4 ++--
 XamlControlGallery.iOS/XamlControlGallery.iOS.csproj       | 6 +++---
 XamlControlsGallery.NetCore/Program.cs                     | 1 +
 .../XamlControlsGallery.NetCore.csproj                     | 4 ++--
 XamlControlsGallery/App.xaml                               | 3 +--
 XamlControlsGallery/App.xaml.cs                            | 4 ++--
 XamlControlsGallery/XamlControlsGallery.csproj             | 7 +++----
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 5eb449e..618f26a 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="AvaloniaCI" value="https://nuget.avaloniaui.net/repository/avalonia-all/" />
+    <add key="AvaloniaCI" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" />
   </packageSources>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/XamlControlGallery.iOS/XamlControlGallery.iOS.csproj b/XamlControlGallery.iOS/XamlControlGallery.iOS.csproj
index 593b97a..bf84875 100644
--- a/XamlControlGallery.iOS/XamlControlGallery.iOS.csproj
+++ b/XamlControlGallery.iOS/XamlControlGallery.iOS.csproj
@@ -69,9 +69,9 @@
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
-      <PackageReference Include="Avalonia.iOS" Version="0.10.0-preview5" />
-      <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview5" />
-      <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview5" />
+      <PackageReference Include="Avalonia.iOS" Version="0.10.999-cibuild0012558-beta" />
+      <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012558-beta" />
+      <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0012558-beta" />
       <PackageReference Include="SkiaSharp" Version="2.80.2-preview.33" />
       <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2-preview.33" />
       <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
diff --git a/XamlControlsGallery.NetCore/Program.cs b/XamlControlsGallery.NetCore/Program.cs
index eaa969e..84a07ef 100644
--- a/XamlControlsGallery.NetCore/Program.cs
+++ b/XamlControlsGallery.NetCore/Program.cs
@@ -18,6 +18,7 @@ namespace XamlControlsGallery
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .With(new SkiaOptions{ MaxGpuResourceSizeBytes = 8096000})
+                .With(new Win32PlatformOptions{ AllowEglInitialization = true })
                 .LogToDebug()
                 .UseReactiveUI();
     }
diff --git a/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj b/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj
index a0eaa6c..f95af79 100644
--- a/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj
+++ b/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0012021-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012021-beta" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0012558-beta" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012558-beta" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\XamlControlsGallery\XamlControlsGallery.csproj" />
diff --git a/XamlControlsGallery/App.xaml b/XamlControlsGallery/App.xaml
index bcaa6ad..361db84 100644
--- a/XamlControlsGallery/App.xaml
+++ b/XamlControlsGallery/App.xaml
@@ -7,8 +7,7 @@
     </Application.DataTemplates>
 
     <Application.Styles>        
-      <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"/>
-      <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"/>
+      <FluentTheme Mode="Dark" />
       <StyleInclude Source="/Styles/Styles.xaml" />
       <StyleInclude Source="/Styles/SideBar.xaml" />
     </Application.Styles>
diff --git a/XamlControlsGallery/App.xaml.cs b/XamlControlsGallery/App.xaml.cs
index d47299b..298d949 100644
--- a/XamlControlsGallery/App.xaml.cs
+++ b/XamlControlsGallery/App.xaml.cs
@@ -34,8 +34,8 @@ namespace XamlControlsGallery
             var theme = new Avalonia.Themes.Default.DefaultTheme();
             theme.TryGetResource("Button", out _);
 
-            var theme1 = new Avalonia.Themes.Fluent.FluentTheme();
-            theme1.TryGetResource("Button", out _);
+            //var theme1 = new Avalonia.Themes.Fluent.FluentTheme();
+            //theme1.TryGetResource("Button", out _);
 
             base.OnFrameworkInitializationCompleted();
         }
diff --git a/XamlControlsGallery/XamlControlsGallery.csproj b/XamlControlsGallery/XamlControlsGallery.csproj
index 13a97ab..6bfb038 100644
--- a/XamlControlsGallery/XamlControlsGallery.csproj
+++ b/XamlControlsGallery/XamlControlsGallery.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <Folder Include="Models\" />
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
@@ -20,9 +19,9 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.999-cibuild0012021-beta" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0012021-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012021-beta" />
+    <PackageReference Include="Avalonia" Version="0.10.999-cibuild0012558-beta" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0012558-beta" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.999-cibuild0012558-beta" />
    </ItemGroup>
 
 </Project>