From bc2cc9928c71d7be9fa8e143002a3c5ea164eff0 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 6 Jul 2019 21:34:58 +0300 Subject: [PATCH] Compilation --- samples/ControlCatalog.NetCore/Program.cs | 4 ---- src/Avalonia.Native/Avalonia.Native.csproj | 2 -- src/Avalonia.OpenGL/EglInterface.cs | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs index a364d191db..c58d071ac8 100644 --- a/samples/ControlCatalog.NetCore/Program.cs +++ b/samples/ControlCatalog.NetCore/Program.cs @@ -3,8 +3,6 @@ using System.Diagnostics; using System.Linq; using System.Threading; using Avalonia; -using Avalonia.Skia; -using Avalonia.ReactiveUI; namespace ControlCatalog.NetCore { @@ -46,10 +44,8 @@ namespace ControlCatalog.NetCore public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure() .UsePlatformDetect() - .With(new X11PlatformOptions {EnableMultiTouch = true}) .With(new Win32PlatformOptions { - EnableMultitouch = true, AllowEglInitialization = true }) .UseSkia() diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index c8ee73ad5d..9d6a82a2fb 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -7,8 +7,6 @@ /usr/bin/castxml /usr/local/bin/castxml true - - $(MSBuildThisFileDirectory)/Generated diff --git a/src/Avalonia.OpenGL/EglInterface.cs b/src/Avalonia.OpenGL/EglInterface.cs index 0e4b012dbe..fd1374f3fe 100644 --- a/src/Avalonia.OpenGL/EglInterface.cs +++ b/src/Avalonia.OpenGL/EglInterface.cs @@ -1,4 +1,5 @@ using System; +using System.Runtime.InteropServices; using Avalonia.Platform; using Avalonia.Platform.Interop;