Update Avalonia

egramtel · May 1, 2019 · 8092465 · 8092465
1 parent d3e71ed
commit 8092465
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 36 deletions.
diff --git a/src/Tel.Egram.Application/Tel.Egram.Application.csproj b/src/Tel.Egram.Application/Tel.Egram.Application.csproj
@@ -4,9 +4,9 @@
     <RootNamespace>Tel.Egram.Application</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.7.1-build1258-beta" />
+    <PackageReference Include="Avalonia" Version="0.8.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.8.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.8.0" />
     <PackageReference Include="DynamicData" Version="6.6.1.2507" />
     <PackageReference Include="ReactiveUI" Version="9.0.1" />
     <PackageReference Include="System.Reactive" Version="4.0.0" />

diff --git a/src/Tel.Egram.Model/Tel.Egram.Model.csproj b/src/Tel.Egram.Model/Tel.Egram.Model.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.7.1-build1258-beta" />
+    <PackageReference Include="Avalonia" Version="0.8.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.8.0" />
     <PackageReference Include="DynamicData" Version="6.6.1.2507" />
     <PackageReference Include="ReactiveUI" Version="9.0.1" />
     <PackageReference Include="System.Reactive" Version="4.0.0" />

diff --git a/src/Tel.Egram.Services/Tel.Egram.Services.csproj b/src/Tel.Egram.Services/Tel.Egram.Services.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.7.1-build1258-beta" />
+    <PackageReference Include="Avalonia" Version="0.8.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="ReactiveUI" Version="9.0.1" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />

diff --git a/src/Tel.Egram.Views/Tel.Egram.Views.csproj b/src/Tel.Egram.Views/Tel.Egram.Views.csproj
@@ -4,9 +4,9 @@
     <RootNamespace>Tel.Egram.Views</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.7.1-build1258-beta" />
+    <PackageReference Include="Avalonia" Version="0.8.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.8.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.8.0" />
     <PackageReference Include="DynamicData" Version="6.6.1.2507" />
     <PackageReference Include="ReactiveUI" Version="9.0.1" />
     <PackageReference Include="System.Reactive" Version="4.0.0" />

diff --git a/src/Tel.Egram/Program.cs b/src/Tel.Egram/Program.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia;
-using Avalonia.Gtk3;
 using Avalonia.Platform;
 using Splat;
 using Tel.Egram.Application;
@@ -38,31 +37,38 @@ private static void Run(
         {
             var app = resolver.GetService<MainApplication>();
             var builder = AppBuilder.Configure(app);
-            var os = builder.RuntimePlatform.GetRuntimeInfo().OperatingSystem;
+            var runtime = builder.RuntimePlatform.GetRuntimeInfo();
             var model = new MainWindowModel();
 
-            if (os == OperatingSystemType.OSX)
+            switch (runtime.OperatingSystem)
             {
-                builder.UseAvaloniaNative(null, opt =>
-                {
-                    opt.MacOptions.ShowInDock = true;
-                    opt.UseDeferredRendering = true;
-                    opt.UseGpu = true;
-                }).UseSkia();
-            }
-            else if (os == OperatingSystemType.Linux)
-            {
-                builder.UseGtk3(new Gtk3PlatformOptions
-                {
-                    UseDeferredRendering = true,
-                    UseGpuAcceleration = true
-                }).UseSkia();
-            }
-            else
-            {
-                builder.UseWin32(
-                    deferredRendering: true
-                ).UseSkia();
+                case OperatingSystemType.OSX:
+                    builder.UseAvaloniaNative()
+                        .With(new AvaloniaNativePlatformOptions
+                        {
+                            UseGpu = true,
+                            UseDeferredRendering = true
+                        })
+                        .UseSkia();
+                    break;
+
+                case OperatingSystemType.Linux:
+                    builder.UseX11()
+                        .With(new X11PlatformOptions
+                        {
+                            UseGpu = true
+                        })
+                        .UseSkia();
+                    break;
+
+                default:
+                    builder.UseWin32()
+                        .With(new Win32PlatformOptions
+                        {
+                            UseDeferredRendering = true
+                        })
+                        .UseSkia();
+                    break;
             }
 
             builder.UseReactiveUI();

diff --git a/src/Tel.Egram/Tel.Egram.csproj b/src/Tel.Egram/Tel.Egram.csproj
@@ -25,10 +25,10 @@
 
   <ItemGroup>
     <PackageReference Update="Microsoft.NETCore.App" Version="2.1.5" />
-    <PackageReference Include="Avalonia" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.Native" Version="0.7.1-build1258-beta" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.7.1-build1258-beta" />
+    <PackageReference Include="Avalonia" Version="0.8.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.8.0" />
+    <PackageReference Include="Avalonia.Native" Version="0.8.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.8.0" />
     <PackageReference Include="NSubsys" Version="0.7.0-build20180604-0047">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>