From 40d9ec906010d71b752751eab01a81dd7e484587 Mon Sep 17 00:00:00 2001 From: Robin Date: Sat, 16 Jun 2018 02:35:58 +0200 Subject: [PATCH] Updated dependencies, fixed some namespace issues. --- .../Greenshot.Addon.Box.csproj | 40 +++++++------- src/Greenshot.Addon.Box/packages.config | 20 +++---- .../Greenshot.Addon.Confluence.csproj | 40 +++++++------- .../packages.config | 20 +++---- .../Greenshot.Addon.Dropbox.csproj | 40 +++++++------- src/Greenshot.Addon.Dropbox/packages.config | 20 +++---- .../Greenshot.Addon.ExternalCommand.csproj | 40 +++++++------- .../packages.config | 20 +++---- .../Greenshot.Addon.Flickr.csproj | 40 +++++++------- src/Greenshot.Addon.Flickr/packages.config | 20 +++---- .../Greenshot.Addon.GooglePhotos.csproj | 40 +++++++------- .../packages.config | 20 +++---- .../Greenshot.Addon.Imgur.csproj | 40 +++++++------- src/Greenshot.Addon.Imgur/packages.config | 20 +++---- .../Greenshot.Addon.Jira.csproj | 40 +++++++------- src/Greenshot.Addon.Jira/packages.config | 20 +++---- .../Controls/Pipette.cs | 7 +-- .../Greenshot.Addon.LegacyEditor.csproj | 43 ++++++++------- .../packages.config | 21 ++++---- .../Greenshot.Addon.Lutim.csproj | 40 +++++++------- src/Greenshot.Addon.Lutim/packages.config | 20 +++---- .../Greenshot.Addon.OCR.csproj | 40 +++++++------- src/Greenshot.Addon.OCR/packages.config | 20 +++---- .../Greenshot.Addon.Office.csproj | 44 ++++++++-------- src/Greenshot.Addon.Office/packages.config | 22 ++++---- .../Greenshot.Addon.OneDrive.csproj | 40 +++++++------- src/Greenshot.Addon.OneDrive/packages.config | 20 +++---- .../Greenshot.Addon.Photobucket.csproj | 40 +++++++------- .../packages.config | 20 +++---- .../Greenshot.Addon.Tfs.csproj | 40 +++++++------- src/Greenshot.Addon.Tfs/packages.config | 20 +++---- .../Greenshot.Addon.Win10.csproj | 40 +++++++------- src/Greenshot.Addon.Win10/packages.config | 20 +++---- src/Greenshot.Addons/Core/WindowCapture.cs | 41 +++++++-------- src/Greenshot.Addons/Greenshot.Addons.csproj | 44 ++++++++-------- src/Greenshot.Addons/packages.config | 22 ++++---- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 36 ++++++------- src/Greenshot.Gfx/packages.config | 18 +++---- .../Greenshot.PerformanceTests.csproj | 36 ++++++------- .../packages.config | 18 +++---- src/Greenshot.Tests/Greenshot.Tests.csproj | 36 ++++++------- src/Greenshot.Tests/packages.config | 18 +++---- src/Greenshot/Greenshot.csproj | 52 +++++++++---------- src/Greenshot/packages.config | 26 +++++----- 44 files changed, 664 insertions(+), 660 deletions(-) diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 8e02eb240..3b74523b9 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -94,35 +94,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index bd63c5b64..ce04ec652 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index eedc8ca06..5d32e90cf 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -116,35 +116,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 332aa66c5..640499b1e 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -24,16 +24,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 7884c0c07..d14deb442 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index bd63c5b64..ce04ec652 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 90a1c3736..8695e6ad5 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -100,35 +100,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 618a48952..09ea8f42e 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -20,15 +20,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 8b7be14ef..f2929081c 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -103,35 +103,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 925748726..4d592724d 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -21,15 +21,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 4405083e1..cdd8e5078 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -89,35 +89,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 925748726..4d592724d 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -21,15 +21,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index bbadf0623..cfd6a7ea4 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -111,35 +111,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 152e4b899..52b55ffc8 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -23,16 +23,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 3000a9fdb..7b9442fa8 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -114,35 +114,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index 7b8c56986..3ffb49472 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -24,16 +24,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Controls/Pipette.cs b/src/Greenshot.Addon.LegacyEditor/Controls/Pipette.cs index fbe3481db..dce9590ae 100644 --- a/src/Greenshot.Addon.LegacyEditor/Controls/Pipette.cs +++ b/src/Greenshot.Addon.LegacyEditor/Controls/Pipette.cs @@ -28,9 +28,10 @@ using System.ComponentModel; using System.Drawing; using System.Windows.Forms; using Dapplo.Windows.Common.Structs; +using Dapplo.Windows.Icons; +using Dapplo.Windows.Icons.SafeHandles; using Dapplo.Windows.Messages; using Dapplo.Windows.User32; -using Dapplo.Windows.User32.SafeHandles; using Greenshot.Addons.Controls; #endregion @@ -100,10 +101,10 @@ namespace Greenshot.Addon.LegacyEditor.Controls { using (var iconHandle = new SafeIconHandle(bitmap.GetHicon())) { - User32Api.GetIconInfo(iconHandle, out var iconInfo); + NativeIconMethods.GetIconInfo(iconHandle, out var iconInfo); iconInfo.Hotspot = new NativePoint(hotspotX, hotspotY); iconInfo.IsIcon = false; - var icon = User32Api.CreateIconIndirect(ref iconInfo); + var icon = NativeIconMethods.CreateIconIndirect(ref iconInfo); return new Cursor(icon); } } diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 8899a6e5b..8d86f6739 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -85,35 +85,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Icons.0.5.79\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index 874cfb18e..4e20071c1 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -20,15 +20,16 @@ - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index da2a22af1..0cfec59e3 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 3319ca6f2..6b417cb4a 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 194b49ef4..dc7f13adb 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -97,35 +97,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index dce640f60..97e2bc34d 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -19,15 +19,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 46ce40e7e..84436a593 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -84,38 +84,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.77\lib\net46\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.79\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index cb079d31a..0e50eec29 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -20,17 +20,17 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 61242d9d8..e6628b04b 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -105,35 +105,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index 152e4b899..52b55ffc8 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -23,16 +23,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 03dc137fb..841facb4a 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -103,35 +103,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 925748726..4d592724d 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -21,15 +21,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 2767d826e..7f2115dc6 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -102,35 +102,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 3319ca6f2..6b417cb4a 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 4903889dc..d5aab8504 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -81,35 +81,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index 921cfcdf1..732c1eeb9 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -15,15 +15,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addons/Core/WindowCapture.cs b/src/Greenshot.Addons/Core/WindowCapture.cs index bed21113e..d1b2248a7 100644 --- a/src/Greenshot.Addons/Core/WindowCapture.cs +++ b/src/Greenshot.Addons/Core/WindowCapture.cs @@ -39,8 +39,10 @@ using Dapplo.Windows.Gdi32; using Dapplo.Windows.Gdi32.Enums; using Dapplo.Windows.Gdi32.SafeHandles; using Dapplo.Windows.Gdi32.Structs; +using Dapplo.Windows.Icons; using Dapplo.Windows.User32; using Dapplo.Windows.User32.Enums; +using Dapplo.Windows.User32.Structs; using Greenshot.Addons.Interfaces; using Greenshot.Gfx; @@ -121,7 +123,9 @@ namespace Greenshot.Addons.Core { capture = new Capture(); } - if (!User32Api.GetCursorInfo(out var cursorInfo)) + + var cursorInfo = CursorInfo.Create(); + if (!NativeCursorMethods.GetCursorInfo(ref cursorInfo)) { return capture; } @@ -129,31 +133,26 @@ namespace Greenshot.Addons.Core { return capture; } - using (var safeIcon = User32Api.CopyIcon(cursorInfo.CursorHandle)) + using (var safeIcon = NativeIconMethods.CopyIcon(cursorInfo.CursorHandle)) { - if (!User32Api.GetIconInfo(safeIcon, out var iconInfo)) + if (!NativeIconMethods.GetIconInfo(safeIcon, out var iconInfo)) { return capture; } - var cursorLocation = User32Api.GetCursorLocation(); - // Allign cursor location to Bitmap coordinates (instead of Screen coordinates) - var x = cursorLocation.X - iconInfo.Hotspot.X - capture.ScreenBounds.X; - var y = cursorLocation.Y - iconInfo.Hotspot.Y - capture.ScreenBounds.Y; - // Set the location - capture.CursorLocation = new NativePoint(x, y); + using (iconInfo.BitmaskBitmapHandle) + using (iconInfo.ColorBitmapHandle) + { + var cursorLocation = User32Api.GetCursorLocation(); + // Allign cursor location to Bitmap coordinates (instead of Screen coordinates) + var x = cursorLocation.X - iconInfo.Hotspot.X - capture.ScreenBounds.X; + var y = cursorLocation.Y - iconInfo.Hotspot.Y - capture.ScreenBounds.Y; + // Set the location + capture.CursorLocation = new NativePoint(x, y); - using (var icon = Icon.FromHandle(safeIcon.DangerousGetHandle())) - { - capture.Cursor = icon; - } - - if (iconInfo.BitmaskBitmapHandle != IntPtr.Zero) - { - DeleteObject(iconInfo.BitmaskBitmapHandle); - } - if (iconInfo.ColorBitmapHandle != IntPtr.Zero) - { - DeleteObject(iconInfo.ColorBitmapHandle); + using (var icon = Icon.FromHandle(safeIcon.DangerousGetHandle())) + { + capture.Cursor = icon; + } } } return capture; diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 16334c674..8d071c0a1 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -89,38 +89,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.77\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.79\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 78eb8b253..a53a20fd3 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -22,17 +22,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index d2d17e56e..33341d9fe 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -64,32 +64,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 0045b1558..5cf21be6f 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -15,15 +15,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 2cc3c7715..bb042faf4 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -69,32 +69,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index de2929043..99f895bd9 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -18,15 +18,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index cfd23e85c..7fd1aa9fa 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -101,32 +101,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 45911a2cd..61563a7ec 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -20,15 +20,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index c7441ef00..c64386ed9 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -118,44 +118,44 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.77\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.77\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.77\lib\net46\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.79\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.77\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.77\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.77\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.77\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.77\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.79\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.77\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.77\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.77\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.77\lib\net46\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Multimedia.0.5.79\lib\net46\Dapplo.Windows.Multimedia.dll - - ..\packages\Dapplo.Windows.User32.0.5.77\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 26ab83556..03e9969c7 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -31,19 +31,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +