From 39d5389b1f91d02ab60eefa6fedaac41188ca0cf Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 5 Sep 2017 12:33:40 +0300
Subject: [PATCH] Fixed build issues

---
 src/Avalonia.Controls/DropDown.cs                    |  2 +-
 src/Avalonia.HtmlRenderer/Compat/Api.cs              | 12 ------------
 .../Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj |  1 +
 .../PortableXaml/portable.xaml.github                |  2 +-
 .../PlatformSupport/StandardRuntimePlatform.cs       |  2 +-
 .../Avalonia.Win32/Interop/UnmanagedMethods.cs       |  2 +-
 6 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index 0b1371b10e..5349fb1ca7 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -120,7 +120,7 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
-            if (!IsDropDownOpen && ((IVisual)e.Source).GetVisualRoot() != typeof(PopupRoot))
+            if (!IsDropDownOpen && ((IVisual)e.Source).GetVisualRoot() is PopupRoot)
             {
                 IsDropDownOpen = true;
                 e.Handled = true;
diff --git a/src/Avalonia.HtmlRenderer/Compat/Api.cs b/src/Avalonia.HtmlRenderer/Compat/Api.cs
index 798b697277..d4f4c6abbe 100644
--- a/src/Avalonia.HtmlRenderer/Compat/Api.cs
+++ b/src/Avalonia.HtmlRenderer/Compat/Api.cs
@@ -4,18 +4,6 @@ using System.Text;
 
 namespace System.Net
 {
-    internal class AsyncCompletedEventArgs
-    {
-        public object UserState { get; set; }
-        public Exception Error { get; set; }
-        public bool Cancelled { get; set; }
-
-        public AsyncCompletedEventArgs(Exception error, bool cancelled, object userState)
-        {
-
-        }
-    }
-
     class WebException : Exception
     {
         public object Response { get; set; }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 8f538b38a5..99b62181d7 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -94,6 +94,7 @@
         <Compile Include="Templates\TemplateLoader.cs" />
         <Compile Include="Templates\TreeDataTemplate.cs" />
         <Compile Include="PortableXaml\portable.xaml.github\src\Portable.Xaml\**\*.cs" Exclude="PortableXaml\portable.xaml.github\src\Portable.Xaml\Assembly\**\*.cs" />
+        <Compile Remove="**\UriTypeConverter.cs" />
     </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Animation\Avalonia.Animation.csproj" />
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
index dfc5affa5d..eebf9dbb92 160000
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
@@ -1 +1 @@
-Subproject commit dfc5affa5d8f4ddf5a7707e3202d5593519de640
+Subproject commit eebf9dbb9275ecc48c18ec24f6fbad8cb494857f
diff --git a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
index e7402fb23c..092910a08f 100644
--- a/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
+++ b/src/Shared/PlatformSupport/StandardRuntimePlatform.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Shared.PlatformSupport
     internal partial class StandardRuntimePlatform : IRuntimePlatform
     {
 
-#if NETCOREAPP1_0
+#if NETCOREAPP2_0
         public void PostThreadPoolItem(Action cb) =>  ThreadPool.QueueUserWorkItem(_ => cb(), null);
 #else
         public Assembly[] GetLoadedAssemblies() => AppDomain.CurrentDomain.GetAssemblies();
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index d5a6f1a7a1..1cc06af0d6 100644
--- a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
+++ b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -811,7 +811,7 @@ namespace Avalonia.Win32.Interop
 
             return SetClassLong64(hWnd, nIndex, dwNewLong);
         }
-#if !NETSTANDARD && !NETSTANDARD1_3
+#if !NETSTANDARD && !NETSTANDARD2_0
         [ComImport, ClassInterface(ClassInterfaceType.None), TypeLibType(TypeLibTypeFlags.FCanCreate), Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")]
         internal class FileOpenDialogRCW { }