Merge branch 'master' into fixes/fix-skia-formatted-text-impl

src/Skia/Avalonia.Skia/StreamGeometryImpl.cs

@@ -72,6 +72,8 @@ namespace Avalonia.Skia
         public IStreamGeometryContextImpl Open()
         {
             _path = new SKPath();
+            _path.FillType = SKPathFillType.EvenOdd;
+
             return new StreamContext(this);
         }
 

src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj

@@ -37,16 +37,16 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SharpDX, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SharpDX.3.0.2\lib\net45\SharpDX.dll</HintPath>
+    <Reference Include="SharpDX, Version=3.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.3.1.0\lib\net45\SharpDX.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpDX.Direct2D1, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SharpDX.Direct2D1.3.0.2\lib\net45\SharpDX.Direct2D1.dll</HintPath>
+    <Reference Include="SharpDX.Direct2D1, Version=3.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.Direct2D1.3.1.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpDX.DXGI, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll</HintPath>
+    <Reference Include="SharpDX.DXGI, Version=3.1.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpDX.DXGI.3.1.0\lib\net45\SharpDX.DXGI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/Windows/Avalonia.Direct2D1/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpDX" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.Direct2D1" version="3.0.2" targetFramework="net45" />
-  <package id="SharpDX.DXGI" version="3.0.2" targetFramework="net45" />
+  <package id="SharpDX" version="3.1.0" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="3.1.0" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="3.1.0" targetFramework="net45" />
 </packages>