From 27905cabdadcb35621e615d723ac8ab650412560 Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Mon, 3 Jun 2019 09:12:48 +0200
Subject: [PATCH] Updating dependencies and removed a lot of them where there
 are no needed.

---
 azure-pipelines.yml                           |  2 +-
 .../Greenshot.Addon.Box.csproj                |  4 --
 .../Greenshot.Addon.Confluence.csproj         |  5 +-
 .../Greenshot.Addon.Dropbox.csproj            |  4 --
 .../Greenshot.Addon.ExternalCommand.csproj    |  3 +-
 .../Greenshot.Addon.Flickr.csproj             |  2 -
 .../Greenshot.Addon.GooglePhotos.csproj       |  2 -
 .../Greenshot.Addon.Imgur.csproj              |  3 --
 .../Greenshot.Addon.InternetExplorer.csproj   |  5 +-
 .../Greenshot.Addon.Jira.csproj               |  6 +--
 .../Greenshot.Addon.LegacyEditor.csproj       |  3 --
 .../Greenshot.Addon.Lutim.csproj              |  3 --
 .../Greenshot.Addon.Office.csproj             |  1 -
 .../Greenshot.Addon.OneDrive.csproj           |  4 --
 .../Greenshot.Addon.Photobucket.csproj        |  2 -
 .../Greenshot.Addon.Tfs.csproj                |  3 --
 .../Greenshot.Addon.Win10.csproj              |  3 +-
 src/Greenshot.Addons/Greenshot.Addons.csproj  | 50 +++++--------------
 src/Greenshot.Core/Greenshot.Core.csproj      |  6 +--
 src/Greenshot.Gfx/GfxModule.cs                |  1 -
 src/Greenshot.Gfx/Greenshot.Gfx.csproj        | 17 +++----
 .../GfxPerformance.cs                         | 16 ------
 .../Greenshot.PerformanceTests.csproj         | 13 -----
 src/Greenshot.Tests/Greenshot.Tests.csproj    | 21 +-------
 src/Greenshot/Greenshot.csproj                | 35 ++-----------
 25 files changed, 34 insertions(+), 180 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7e98ada48..83bcb1dbb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,7 +15,7 @@ steps:
 - task: DotNetCoreInstaller@0
   displayName: 'Install .NET Core SDK 3.0'
   inputs:
-    version: '3.0.100-preview6-012096'
+    version: '3.0.100-preview6-012162'
 
 - task: NuGetToolInstaller@0
   displayName: 'Use NuGet 5.0.0'
diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
index 860361e4d..be154051a 100644
--- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
+++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
@@ -25,10 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
index 8bd0aa2e0..7164de525 100644
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@@ -26,10 +26,7 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
-    <PackageReference Include="Dapplo.Confluence" Version="0.8.16" />
+    <PackageReference Include="Dapplo.Confluence" Version="0.8.19" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
index 233841e74..eb080c97c 100644
--- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
+++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
@@ -25,10 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
index c0445c4ff..4e4d05642 100644
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@@ -21,8 +21,7 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
-	<PackageReference Include="CliWrap" Version="2.2.2" />
+	<PackageReference Include="CliWrap" Version="2.3.0" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
index 3c5e1250f..ebddcca36 100644
--- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
+++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
@@ -25,8 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
index c4a60bc96..9d2df7288 100644
--- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
+++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
@@ -25,8 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
index e87bbd971..742a869c5 100644
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@@ -25,9 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
index a0bb36d5b..a72c3ab9a 100644
--- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
+++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
@@ -7,11 +7,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dapplo.Windows">
-      <Version>0.8.28</Version>
-    </PackageReference>
     <PackageReference Include="Dapplo.Windows.Com">
-      <Version>0.8.28</Version>
+      <Version>0.8.33</Version>
     </PackageReference>
     <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
   </ItemGroup>
diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
index 7d5709fa4..5c9c404d0 100644
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@@ -22,11 +22,7 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Utils" Version="1.1.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
-	<PackageReference Include="Dapplo.Jira" Version="0.8.9" />
+	<PackageReference Include="Dapplo.Jira" Version="0.8.15" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
index 02a92547e..aaa2e0fb9 100644
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@@ -112,9 +112,6 @@
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
-    <PackageReference Include="Dapplo.Windows.Icons" Version="0.8.28" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
index 25a9de0b0..983707944 100644
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@@ -25,9 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
 	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0316" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
index b61bc0e30..d7092b363 100644
--- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
+++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
@@ -20,7 +20,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
     <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />
     <PackageReference Include="Microsoft.Office.Interop.Outlook" Version="15.0.4797.1003" />
diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
index a2794c951..d683b7135 100644
--- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
+++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
@@ -25,10 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
-	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0316" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
index 169829970..c6b8c8a9b 100644
--- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
+++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
@@ -25,8 +25,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
index 0418c7765..c4e1dc5ee 100644
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@@ -24,9 +24,6 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
 	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0316" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
index 2c1292792..3668214cd 100644
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@@ -19,9 +19,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" />
-	<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview4.19212.13" />
+    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview4.19212.13" />
     <PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview4.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj
index 8a6d424f4..fe923acc9 100644
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@@ -5,10 +5,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
-	<PackageReference Include="System.ComponentModel.Composition" Version="4.5.0" />
-  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\Checkerboard.Image.png" />
@@ -22,43 +18,23 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
-      <Version>1.2.28</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
-      <Version>1.2.28</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.2.28</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.HttpExtensions">
-      <Version>0.9.18</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet">
-      <Version>0.9.18</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth">
-      <Version>0.9.18</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.Windows.Clipboard">
-      <Version>0.8.28</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.Windows.Dpi">
-      <Version>0.8.28</Version>
-    </PackageReference>
-    <PackageReference Include="Dapplo.Windows.Icons">
-      <Version>0.8.28</Version>
-    </PackageReference>
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.31" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.31" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.31" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.31" />
+    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.21" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.21" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.21" />
+    <PackageReference Include="Dapplo.Windows" Version="0.8.33" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.33" />
+    <PackageReference Include="Dapplo.Windows.Dpi" Version="0.8.33" />
+    <PackageReference Include="Dapplo.Windows.Icons" Version="0.8.33" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MahApps.Metro.IconPacks">
-      <Version>3.0.0-alpha0146</Version>
-    </PackageReference>
-    <PackageReference Include="Svg">
-      <Version>2.4.3</Version>
-    </PackageReference>
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0146" />
+    <PackageReference Include="Svg" Version="2.4.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj
index c570d48c9..902922bd1 100644
--- a/src/Greenshot.Core/Greenshot.Core.csproj
+++ b/src/Greenshot.Core/Greenshot.Core.csproj
@@ -5,11 +5,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="Dapplo.Windows.Icons">
-      <Version>0.8.28</Version>
-    </PackageReference>
+    <PackageReference Include="Dapplo.Windows.Icons" Version="0.8.33" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Greenshot.Gfx/GfxModule.cs b/src/Greenshot.Gfx/GfxModule.cs
index cc330999f..8c2154555 100644
--- a/src/Greenshot.Gfx/GfxModule.cs
+++ b/src/Greenshot.Gfx/GfxModule.cs
@@ -19,7 +19,6 @@
 
 using Autofac;
 using Dapplo.Addons;
-using Greenshot.Gfx;
 using Greenshot.Gfx.Formats;
 
 namespace Greenshot.Gfx
diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
index 9b88f94a9..97a50a411 100644
--- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj
+++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
@@ -1,21 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework><!-- net472;netcoreapp3.0 -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>8</LangVersion>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.2.28</Version>
-    </PackageReference>
-    <PackageReference Include="Svg">
-      <Version>2.4.3</Version>
-    </PackageReference>
-    <PackageReference Include="System.Memory">
-      <Version>4.5.3</Version>
-    </PackageReference>
+    <PackageReference Include="Dapplo.Addons" Version="1.2.14" />
+    <PackageReference Include="Dapplo.Log" Version="1.3.20" />
+    <PackageReference Include="Dapplo.Windows" Version="0.8.33" />
+    <PackageReference Include="Dapplo.Windows.Dpi" Version="0.8.33" />
+    <PackageReference Include="Svg" Version="2.4.3" />
+    <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 </Project>
diff --git a/src/Greenshot.PerformanceTests/GfxPerformance.cs b/src/Greenshot.PerformanceTests/GfxPerformance.cs
index 9cbf4bc25..17853e889 100644
--- a/src/Greenshot.PerformanceTests/GfxPerformance.cs
+++ b/src/Greenshot.PerformanceTests/GfxPerformance.cs
@@ -108,22 +108,6 @@ namespace Greenshot.PerformanceTests
             }
         }
 
-        [Benchmark]
-        public void Blur_UnmanagedBitmapReference()
-        {
-            using (var unmanagedBitmap = new UnmanagedBitmap<Bgr32>(400, 400))
-            {
-                unmanagedBitmap.Span.Fill(new Bgr32 { B = 255, G = 255, R = 255 });
-                using (var graphics = Graphics.FromImage(unmanagedBitmap.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
-                {
-                    graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
-                }
-
-                unmanagedBitmap.ApplyBoxBlurReference(10);
-            }
-        }
-
         [Benchmark]
         public void Blur_Old()
         {
diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
index e399dd198..89f01be5e 100644
--- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
+++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
@@ -9,18 +9,6 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="System.Console" Version="4.3.1" />
-    <PackageReference Include="System.IO" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
-    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
-    <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
     <ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
@@ -35,6 +23,5 @@
     <PackageReference Include="SharpAvi" Version="2.1.1" />
     <PackageReference Include="System.Memory" Version="4.5.3" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj
index a57c547f3..d314f2f34 100644
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@@ -6,18 +6,6 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
-    <PackageReference Include="System.Console" Version="4.3.1" />
-    <PackageReference Include="System.IO" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
-    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
-    <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
-  </ItemGroup>
-
   <ItemGroup>
 	<None Include="TestFiles\scroll0.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -43,13 +31,8 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
     <PackageReference Include="CommandLineParser" Version="2.5.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.28" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
-    <PackageReference Include="Dapplo.Windows" Version="0.8.28" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0006" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
+    <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.20" />
+    <PackageReference Include="Dapplo.Windows" Version="0.8.33" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
     <PackageReference Include="xunit.analyzers" Version="0.10.0" />
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index da760690d..ebe50da3b 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -19,24 +19,6 @@
     </None>
   </ItemGroup>
   
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
-    <PackageReference Include="System.Collections" Version="4.3.0" />
-    <PackageReference Include="System.Console" Version="4.3.1" />
-    <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
-    <PackageReference Include="System.Globalization" Version="4.3.0" />
-    <PackageReference Include="System.IO" Version="4.3.0" />
-    <PackageReference Include="System.Linq" Version="4.3.0" />
-    <PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
-    <PackageReference Include="System.Management" Version="4.5.0" />
-    <PackageReference Include="System.Reflection" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
-    <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.ServiceModel.Syndication" Version="4.5.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Resources\camera.wav" />
     <EmbeddedResource Include="Resources\contextmenu_capturearea.Image.png" />
@@ -58,24 +40,15 @@
     <PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
     <PackageReference Include="CommandLineParser" Version="2.5.0" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.28" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.28" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.28" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.28" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.28" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
-    <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
-    <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
-    <PackageReference Include="Dapplo.Windows.Icons" Version="0.8.28" />
-    <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.8.28" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.31" />
+    <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.20" />
+    <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.20" />
+    <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.8.33" />
     <PackageReference Include="Fody" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="gong-wpf-dragdrop" Version="2.0.1" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0146" />
     <PackageReference Include="Svg" Version="2.4.3" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />