From 7734fcb6607700a54e728359c4ac85a890fda1fe Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 30 Jul 2017 00:17:54 -0700
Subject: [PATCH] Update to SharpDX 4.0.1 to keep strong naming and fix some
 broken project files

---
 build/SharpDX.props                                 | 13 ++++++++-----
 .../Direct3DInteropSample.csproj                    |  4 ++--
 .../Avalonia.Direct2D1/Avalonia.Direct2D1.csproj    |  1 +
 .../Avalonia.Win32/Interop/UnmanagedMethods.cs      |  4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/SharpDX.props b/build/SharpDX.props
index b9864bdd42..99c6032987 100644
--- a/build/SharpDX.props
+++ b/build/SharpDX.props
@@ -1,9 +1,12 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SharpDXVersion>4.0.1</SharpDXVersion>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SharpDX" Version="4.0.0" />
-    <PackageReference Include="SharpDX.Direct2D1" Version="4.0.0" />
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.0" />
-    <PackageReference Include="SharpDX.DXGI" Version="4.0.0" />
-    <PackageReference Include="SharpDX.Direct3D9" Version="4.0.0" Condition="'$(UseDirect3D9)' == 'true'" />
+    <PackageReference Include="SharpDX" Version="$(SharpDXVersion)" />
+    <PackageReference Include="SharpDX.Direct2D1" Version="$(SharpDXVersion)" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="$(SharpDXVersion)" />
+    <PackageReference Include="SharpDX.DXGI" Version="$(SharpDXVersion)" />
+    <PackageReference Include="SharpDX.Direct3D9" Version="$(SharpDXVersion)" Condition="'$(UseDirect3D9)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
index 27c7ee29db..da230d34c6 100644
--- a/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
+++ b/samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net461</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="SharpDX.Mathematics" Version="4.0.0" />
-        <PackageReference Include="SharpDX.D3DCompiler" Version="4.0.0" />
+        <PackageReference Include="SharpDX.Mathematics" Version="4.0.1" />
+        <PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" />
         <Compile Update="**\*.paml.cs">
             <DependentUpon>%(Filename)</DependentUpon>
         </Compile>
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index 87e9f360a0..4d656680b1 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
index ccfce45605..d5a6f1a7a1 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
+#if !NETSTANDARD && !NETSTANDARD1_3
         [ComImport, ClassInterface(ClassInterfaceType.None), TypeLibType(TypeLibTypeFlags.FCanCreate), Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")]
         internal class FileOpenDialogRCW { }
 
@@ -1155,7 +1155,7 @@ namespace Avalonia.Win32.Interop
             public int flagsEx;
         }        
     }
-#if !NETSTANDARD
+#if !NETSTANDARD && !NETSTANDARD1_3
     [ComImport(), Guid("42F85136-DB7E-439C-85F1-E4075D135FC8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
     internal interface IFileDialog
     {