From f7d3da2afd017fccda5b72be5aa0ef8e7734bf7f Mon Sep 17 00:00:00 2001
From: code-beans <marvin.neurath@code-beans.com>
Date: Wed, 17 Oct 2018 18:50:23 +0200
Subject: [PATCH 1/2] updates packages to latest stable

---
 Samples/SampleControl/SampleControl.csproj | 20 +++++++----------
 Samples/SampleControl/packages.config      |  8 +++----
 WpfSharpDxControl/WpfSharpDxControl.csproj | 25 +++++++++-------------
 WpfSharpDxControl/packages.config          | 10 ++++-----
 4 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/Samples/SampleControl/SampleControl.csproj b/Samples/SampleControl/SampleControl.csproj
index b867316..b89fc47 100644
--- a/Samples/SampleControl/SampleControl.csproj
+++ b/Samples/SampleControl/SampleControl.csproj
@@ -36,21 +36,17 @@
     <WarningLevel>4</WarningLevel>
   </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>
-      <Private>True</Private>
+    <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\WpfSharpDxControl\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
     </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>
-      <Private>True</Private>
+    <Reference Include="SharpDX.Direct2D1, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\WpfSharpDxControl\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
     </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>
-      <Private>True</Private>
+    <Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\WpfSharpDxControl\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Mathematics, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Mathematics.3.0.2\lib\net45\SharpDX.Mathematics.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\..\WpfSharpDxControl\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/Samples/SampleControl/packages.config b/Samples/SampleControl/packages.config
index a3c3d1c..2361da6 100644
--- a/Samples/SampleControl/packages.config
+++ b/Samples/SampleControl/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpDX" version="3.0.2" targetFramework="net452" />
-  <package id="SharpDX.Direct2D1" version="3.0.2" targetFramework="net452" />
-  <package id="SharpDX.DXGI" version="3.0.2" targetFramework="net452" />
-  <package id="SharpDX.Mathematics" version="3.0.2" targetFramework="net452" />
+  <package id="SharpDX" version="4.2.0" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.2.0" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.2.0" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/WpfSharpDxControl/WpfSharpDxControl.csproj b/WpfSharpDxControl/WpfSharpDxControl.csproj
index 017af25..806312e 100644
--- a/WpfSharpDxControl/WpfSharpDxControl.csproj
+++ b/WpfSharpDxControl/WpfSharpDxControl.csproj
@@ -33,25 +33,20 @@
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <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>
-      <Private>True</Private>
+    <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
     </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>
-      <Private>True</Private>
+    <Reference Include="SharpDX.Direct2D1, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Direct3D11, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>packages\SharpDX.Direct3D11.3.0.2\lib\net45\SharpDX.Direct3D11.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll</HintPath>
     </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>
-      <Private>True</Private>
+    <Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Mathematics, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>packages\SharpDX.Mathematics.3.0.2\lib\net45\SharpDX.Mathematics.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SharpDX.Mathematics, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/WpfSharpDxControl/packages.config b/WpfSharpDxControl/packages.config
index c757b51..1770d0c 100644
--- a/WpfSharpDxControl/packages.config
+++ b/WpfSharpDxControl/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpDX" version="3.0.2" targetFramework="net452" />
-  <package id="SharpDX.Direct2D1" version="3.0.2" targetFramework="net452" />
-  <package id="SharpDX.Direct3D11" version="3.0.2" targetFramework="net452" />
-  <package id="SharpDX.DXGI" version="3.0.2" targetFramework="net452" />
-  <package id="SharpDX.Mathematics" version="3.0.2" targetFramework="net452" />
+  <package id="SharpDX" version="4.2.0" targetFramework="net45" />
+  <package id="SharpDX.Direct2D1" version="4.2.0" targetFramework="net45" />
+  <package id="SharpDX.Direct3D11" version="4.2.0" targetFramework="net45" />
+  <package id="SharpDX.DXGI" version="4.2.0" targetFramework="net45" />
+  <package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 6a6b32eb94c7b6a8235745ff56410a2cb867e543 Mon Sep 17 00:00:00 2001
From: code-beans <marvin.neurath@code-beans.com>
Date: Wed, 17 Oct 2018 18:51:59 +0200
Subject: [PATCH 2/2] removed dispose in unloaded event and unsubscribing from
 events

---
 WpfSharpDxControl/Win32HwndControl.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/WpfSharpDxControl/Win32HwndControl.cs b/WpfSharpDxControl/Win32HwndControl.cs
index 1b81261..2d2421c 100644
--- a/WpfSharpDxControl/Win32HwndControl.cs
+++ b/WpfSharpDxControl/Win32HwndControl.cs
@@ -32,19 +32,13 @@ protected Win32HwndControl()
         private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
         {
             Initialize();
-            HwndInitialized = true;
-
-            Loaded -= OnLoaded;
+            HwndInitialized = true;         
         }
 
         private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs)
         {
             Uninitialize();
             HwndInitialized = false;
-
-            Unloaded -= OnUnloaded;
-
-            Dispose();
         }
 
         protected abstract void Initialize();