From 1ad0d7ceb3e6862e571ea85ebcf49def25f9f682 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 4 Oct 2018 00:46:53 +0300
Subject: [PATCH 1/2] Fixed Dispatcher.CheckAccess from always returning true

---
 src/Avalonia.Native/AvaloniaNativePlatform.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index d8cace98d2..ceb8c51f9d 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -63,6 +63,7 @@ namespace Avalonia.Native
             _factory.Initialize();
 
             AvaloniaLocator.CurrentMutable
+                .Bind<IPlatformThreadingInterface>().ToConstant(new PlatformThreadingInterface(_factory.CreatePlatformThreadingInterface()))
                 .Bind<IStandardCursorFactory>().ToTransient<CursorFactoryStub>()
                 .Bind<IPlatformIconLoader>().ToSingleton<IconLoader>()
 
@@ -73,8 +74,8 @@ namespace Avalonia.Native
                 .Bind<IClipboard>().ToConstant(new ClipboardImpl(_factory.CreateClipboard()))
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<IRenderTimer>().ToConstant(new DefaultRenderTimer(60))
-                .Bind<ISystemDialogImpl>().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs()))
-                .Bind<IPlatformThreadingInterface>().ToConstant(new PlatformThreadingInterface(_factory.CreatePlatformThreadingInterface()));
+                .Bind<ISystemDialogImpl>().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs()));
+                
         }
 
         public IWindowImpl CreateWindow()

From 8aae66f12c97bfecee50f341e3b161e2abe2d45e Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 4 Oct 2018 00:47:06 +0300
Subject: [PATCH 2/2] OSX 10.12 compatibility

---
 src/Avalonia.Native.OSX/window.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Native.OSX/window.mm b/src/Avalonia.Native.OSX/window.mm
index 0e745fdf8a..315bb94ee1 100644
--- a/src/Avalonia.Native.OSX/window.mm
+++ b/src/Avalonia.Native.OSX/window.mm
@@ -572,7 +572,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     
 }
 
-- (NSArray<NSAttributedStringKey> *)validAttributesForMarkedText
+- (NSArray<NSString *> *)validAttributesForMarkedText
 {
     return [NSArray new];
 }