diff --git a/src/Greenshot.Addon.Box/BoxDestination.cs b/src/Greenshot.Addon.Box/BoxDestination.cs index 49abcc670..8b3276320 100644 --- a/src/Greenshot.Addon.Box/BoxDestination.cs +++ b/src/Greenshot.Addon.Box/BoxDestination.cs @@ -38,6 +38,7 @@ using Dapplo.HttpExtensions; using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; using Dapplo.Utils; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.Box.Entities; using Greenshot.Addons; using Greenshot.Addons.Components; @@ -150,8 +151,11 @@ namespace Greenshot.Addon.Box if (url != null && _boxConfiguration.AfterUploadLinkToClipBoard) { - ClipboardHelper.SetClipboardData(url); - } + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(url); + } + } return url; } diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 4d5c3ecd7..4f681e24b 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -94,32 +94,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index adf096c1a..494881640 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -22,15 +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 23916be22..895443ec3 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -116,32 +116,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 5d4508012..fa6af6294 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -24,15 +24,16 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs index 291002b11..59161485f 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs @@ -38,6 +38,7 @@ using Dapplo.HttpExtensions; using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; using Dapplo.Utils; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.Dropbox.Entities; using Greenshot.Addons; using Greenshot.Addons.Components; @@ -131,8 +132,11 @@ namespace Greenshot.Addon.Dropbox exportInformation.ExportMade = true; if (_dropboxPluginConfiguration.AfterUploadLinkToClipBoard) { - ClipboardHelper.SetClipboardData(uploadUrl); - } + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(uploadUrl); + } + } } ProcessExport(exportInformation, surface); return exportInformation; diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 1f835920d..147313444 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -106,32 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index adf096c1a..494881640 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -22,15 +22,16 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs b/src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs index f86405b0e..495d012cd 100644 --- a/src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs +++ b/src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs @@ -28,6 +28,7 @@ using System.IO; using System.Text.RegularExpressions; using System.Threading.Tasks; using CliWrap; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.ExternalCommand.Entities; using Greenshot.Addons; using Greenshot.Addons.Core; @@ -91,7 +92,10 @@ namespace Greenshot.Addon.ExternalCommand { exportInformation.Uri = uriMatches[0].Groups[1].Value; - ClipboardHelper.SetClipboardData(output.StandardOutput); + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(exportInformation.Uri); + } } } diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 43352c0c1..911248d86 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -100,32 +100,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 7ebbe20c8..444b563d7 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -20,14 +20,15 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Flickr/FlickrDestination.cs b/src/Greenshot.Addon.Flickr/FlickrDestination.cs index 44f877b2f..b2a1ac206 100644 --- a/src/Greenshot.Addon.Flickr/FlickrDestination.cs +++ b/src/Greenshot.Addon.Flickr/FlickrDestination.cs @@ -41,6 +41,7 @@ using Dapplo.HttpExtensions.Extensions; using Dapplo.HttpExtensions.Listener; using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Controls; @@ -178,8 +179,11 @@ namespace Greenshot.Addon.Flickr } if (_flickrConfiguration.AfterUploadLinkToClipBoard) { - ClipboardHelper.SetClipboardData(uploadUrl); - } + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(uploadUrl); + } + } } catch (Exception e) diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 597743a73..071ed41a9 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -103,32 +103,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 6f752d248..7dfc4695d 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -21,14 +21,15 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs b/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs index 010af7cb5..64cfe6ac0 100644 --- a/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs +++ b/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs @@ -38,6 +38,7 @@ using Dapplo.HttpExtensions; using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; using Dapplo.Utils; +using Dapplo.Windows.Clipboard; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Controls; @@ -145,8 +146,11 @@ namespace Greenshot.Addon.GooglePhotos if (url != null && _googlePhotosConfiguration.AfterUploadLinkToClipBoard) { - ClipboardHelper.SetClipboardData(url); - } + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(url); + } + } return url; } catch (Exception e) diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index cf361d428..e50865445 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -89,32 +89,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 6f752d248..7dfc4695d 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -21,14 +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 fa84efa42..ac1c590dc 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -111,32 +111,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Imgur/ImgurDestination.cs b/src/Greenshot.Addon.Imgur/ImgurDestination.cs index 9a5ca78a5..59b130f86 100644 --- a/src/Greenshot.Addon.Imgur/ImgurDestination.cs +++ b/src/Greenshot.Addon.Imgur/ImgurDestination.cs @@ -31,6 +31,7 @@ using System.Windows.Forms; using Autofac.Features.OwnedInstances; using Dapplo.Addons; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Dapplo.Windows.Extensions; using Greenshot.Addon.Imgur.Entities; using Greenshot.Addon.Imgur.ViewModels; @@ -38,6 +39,7 @@ using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Controls; using Greenshot.Addons.Core; +using Greenshot.Addons.Extensions; using Greenshot.Addons.Interfaces; using Greenshot.Gfx; @@ -159,8 +161,10 @@ namespace Greenshot.Addon.Imgur try { - ClipboardHelper.SetClipboardData(uploadUrl.AbsoluteUri); - + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(uploadUrl.AbsoluteUri); + } } catch (Exception ex) { diff --git a/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs b/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs index 7f95aa25a..5e89b1297 100644 --- a/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs +++ b/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs @@ -31,9 +31,11 @@ using System.Threading.Tasks; using Caliburn.Micro; using Dapplo.CaliburnMicro.Extensions; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.Imgur.Entities; using Greenshot.Addons; using Greenshot.Addons.Core; +using Greenshot.Addons.Extensions; namespace Greenshot.Addon.Imgur.ViewModels { @@ -143,7 +145,10 @@ namespace Greenshot.Addon.Imgur.ViewModels public void CopyToClipboard() { - ClipboardHelper.SetClipboardData(SelectedImgur.Data.Link?.AbsoluteUri); + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(SelectedImgur.Data.Link?.AbsoluteUri); + } } public void ClearHistory() diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 47aeb23c4..005fe334e 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -23,15 +23,16 @@ - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 6636bac75..dc23a2eb2 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -114,32 +114,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index c2aec5957..08e7fe8de 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -24,15 +24,16 @@ - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index c057a03c3..f98e1840d 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -79,35 +79,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.61\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index e6307ec36..d18d31d2a 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -20,15 +20,15 @@ - - - - - - - - - - + + + + + + + + + + \ 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 540554d8e..b683a265a 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -106,32 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Lutim/LutimDestination.cs b/src/Greenshot.Addon.Lutim/LutimDestination.cs index 51a52257e..3ac98db81 100644 --- a/src/Greenshot.Addon.Lutim/LutimDestination.cs +++ b/src/Greenshot.Addon.Lutim/LutimDestination.cs @@ -27,11 +27,13 @@ using System.Windows.Forms; using Autofac.Features.OwnedInstances; using Dapplo.Addons; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.Lutim.Entities; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Controls; using Greenshot.Addons.Core; +using Greenshot.Addons.Extensions; using Greenshot.Addons.Interfaces; using Greenshot.Gfx; @@ -137,7 +139,10 @@ namespace Greenshot.Addon.Lutim { } try { - ClipboardHelper.SetClipboardData(uploadUrl); + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(uploadUrl); + } } catch (Exception ex) { diff --git a/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs b/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs index bfbc3ca85..ae0b48a04 100644 --- a/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs +++ b/src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs @@ -30,9 +30,11 @@ using System.Threading.Tasks; using Caliburn.Micro; using Dapplo.CaliburnMicro.Extensions; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.Lutim.Entities; using Greenshot.Addons; using Greenshot.Addons.Core; +using Greenshot.Addons.Extensions; namespace Greenshot.Addon.Lutim.ViewModels { @@ -144,7 +146,10 @@ namespace Greenshot.Addon.Lutim.ViewModels public void CopyToClipboard() { // TODO: Build url - ClipboardHelper.SetClipboardData(SelectedLutim.LutimInfo.Short); + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(SelectedLutim.LutimInfo.Short); + } } public void ClearHistory() diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index a6a3b4fff..97d4dc9f0 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -22,15 +22,16 @@ - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index aa6856e71..5a371ef6f 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -97,32 +97,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 383023dd9..9439c4a06 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -19,14 +19,15 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj b/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj index 2e59217c4..123af6798 100644 --- a/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj +++ b/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj @@ -40,12 +40,15 @@ + + + diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index a833e6936..c3308c3e7 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -84,35 +84,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Com.0.5.61\lib\net46\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.65\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index 02b28e4aa..4f789037f 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -20,16 +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 3aac04d6d..c11e7faaf 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -105,32 +105,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs b/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs index d9b5ba4fb..3fc357c59 100644 --- a/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs +++ b/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs @@ -38,6 +38,7 @@ using Dapplo.HttpExtensions.JsonNet; using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; using Dapplo.Utils; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.OneDrive.Entities; using Greenshot.Addons; using Greenshot.Addons.Components; @@ -177,7 +178,10 @@ namespace Greenshot.Addon.OneDrive if (_oneDriveConfiguration.AfterUploadLinkToClipBoard) { - ClipboardHelper.SetClipboardData(response.ToString()); + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(response.AbsoluteUri); + } } return response; diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index d64d9f831..5af6c68dc 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -23,6 +23,10 @@ + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index c11304d1c..85c684941 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -103,32 +103,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 6f752d248..7dfc4695d 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -21,14 +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 9737dc5f8..3c17479d3 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -102,32 +102,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Tfs/TfsDestination.cs b/src/Greenshot.Addon.Tfs/TfsDestination.cs index 35501fd41..f99e53091 100644 --- a/src/Greenshot.Addon.Tfs/TfsDestination.cs +++ b/src/Greenshot.Addon.Tfs/TfsDestination.cs @@ -32,11 +32,13 @@ using System.Windows.Forms; using Autofac.Features.OwnedInstances; using Dapplo.Addons; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Greenshot.Addon.Tfs.Entities; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Controls; using Greenshot.Addons.Core; +using Greenshot.Addons.Extensions; using Greenshot.Addons.Interfaces; using Greenshot.Gfx; @@ -193,7 +195,10 @@ namespace Greenshot.Addon.Tfs if (_tfsConfiguration.AfterUploadLinkToClipBoard) { - ClipboardHelper.SetClipboardData(response.ToString()); + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUrl(response.AbsoluteUri); + } } return response; diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 79912af25..600ccad56 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -22,6 +22,10 @@ + + + + diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 693593c4f..097e66045 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -81,32 +81,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Win10/Win10OcrDestination.cs b/src/Greenshot.Addon.Win10/Win10OcrDestination.cs index 2de393e5e..5a5eab590 100644 --- a/src/Greenshot.Addon.Win10/Win10OcrDestination.cs +++ b/src/Greenshot.Addon.Win10/Win10OcrDestination.cs @@ -26,6 +26,7 @@ using System.Threading.Tasks; using Windows.Graphics.Imaging; using Windows.Media.Ocr; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Core; @@ -94,8 +95,11 @@ namespace Greenshot.Addon.Win10 // Check if we found text if (!string.IsNullOrWhiteSpace(text)) { - // Place the OCR text on the - ClipboardHelper.SetClipboardData(text); + // Place the OCR text on the clipboard + using (var clipboardAccessToken = ClipboardNative.Access()) + { + clipboardAccessToken.SetAsUnicodeString(text); + } } exportInformation.ExportMade = true; } diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index 1da0841df..c66dc0097 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -15,14 +15,15 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addons/Controls/GreenshotTabPage.cs b/src/Greenshot.Addons/Controls/GreenshotTabPage.cs deleted file mode 100644 index c7e78fd7a..000000000 --- a/src/Greenshot.Addons/Controls/GreenshotTabPage.cs +++ /dev/null @@ -1,40 +0,0 @@ -#region Greenshot GNU General Public License - -// Greenshot - a free and open source screenshot tool -// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom -// -// For more information see: http://getgreenshot.org/ -// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 1 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#endregion - -#region Usings - -using System.ComponentModel; -using System.Windows.Forms; - -#endregion - -namespace Greenshot.Addons.Controls -{ - public class GreenshotTabPage : TabPage, IGreenshotLanguageBindable - { - [Category("Greenshot")] - [DefaultValue(null)] - [Description("Specifies key of the language file to use when displaying the text.")] - public string LanguageKey { get; set; } - } -} \ No newline at end of file diff --git a/src/Greenshot.Addons/Core/ClipboardHelper.cs b/src/Greenshot.Addons/Core/ClipboardHelper.cs index de20b3f7c..988aa76f3 100644 --- a/src/Greenshot.Addons/Core/ClipboardHelper.cs +++ b/src/Greenshot.Addons/Core/ClipboardHelper.cs @@ -262,14 +262,16 @@ EndSelection:<<<<<<<4 /// public static bool ContainsText(IDataObject dataObject) { - if (dataObject != null) - { - if (dataObject.GetDataPresent(DataFormats.Text) || dataObject.GetDataPresent(DataFormats.UnicodeText)) - { - return true; - } - } - return false; + if (dataObject == null) + { + return false; + } + + if (dataObject.GetDataPresent(DataFormats.Text) || dataObject.GetDataPresent(DataFormats.UnicodeText)) + { + return true; + } + return false; } /// @@ -289,45 +291,50 @@ EndSelection:<<<<<<<4 /// true if an image is there public static bool ContainsImage(IDataObject dataObject) { - if (dataObject != null) - { - if (dataObject.GetDataPresent(DataFormats.Bitmap) - || dataObject.GetDataPresent(DataFormats.Dib) - || dataObject.GetDataPresent(DataFormats.Tiff) - || dataObject.GetDataPresent(DataFormats.EnhancedMetafile) - || dataObject.GetDataPresent(FORMAT_PNG) - || dataObject.GetDataPresent(FORMAT_17) - || dataObject.GetDataPresent(FORMAT_JPG) - || dataObject.GetDataPresent(FORMAT_GIF)) - { - return true; - } - var imageFiles = GetImageFilenames(dataObject); - if (imageFiles.Any()) - { - return true; - } - if (dataObject.GetDataPresent(FORMAT_FILECONTENTS)) - { - try - { - var imageStream = dataObject.GetData(FORMAT_FILECONTENTS) as MemoryStream; - if (IsValidStream(imageStream)) - { - using (BitmapHelper.FromStream(imageStream)) - { - // If we get here, there is an image - return true; - } - } - } - catch (Exception) - { - // Ignore - } - } - } - return false; + if (dataObject == null) + { + return false; + } + + if (dataObject.GetDataPresent(DataFormats.Bitmap) + || dataObject.GetDataPresent(DataFormats.Dib) + || dataObject.GetDataPresent(DataFormats.Tiff) + || dataObject.GetDataPresent(DataFormats.EnhancedMetafile) + || dataObject.GetDataPresent(FORMAT_PNG) + || dataObject.GetDataPresent(FORMAT_17) + || dataObject.GetDataPresent(FORMAT_JPG) + || dataObject.GetDataPresent(FORMAT_GIF)) + { + return true; + } + var imageFiles = GetImageFilenames(dataObject); + if (imageFiles.Any()) + { + return true; + } + + if (!dataObject.GetDataPresent(FORMAT_FILECONTENTS)) + { + return false; + } + + try + { + var imageStream = dataObject.GetData(FORMAT_FILECONTENTS) as MemoryStream; + if (IsValidStream(imageStream)) + { + using (BitmapHelper.FromStream(imageStream)) + { + // If we get here, there is an image + return true; + } + } + } + catch (Exception) + { + // Ignore + } + return false; } /// diff --git a/src/Greenshot.Addons/Core/ImageOutput.cs b/src/Greenshot.Addons/Core/ImageOutput.cs index 5b19dcf5c..d8573153f 100644 --- a/src/Greenshot.Addons/Core/ImageOutput.cs +++ b/src/Greenshot.Addons/Core/ImageOutput.cs @@ -38,6 +38,7 @@ using System.Windows.Forms; using Dapplo.Ini; using Dapplo.Language; using Dapplo.Log; +using Dapplo.Windows.Clipboard; using Dapplo.Windows.Common; using Greenshot.Addons.Controls; using Greenshot.Addons.Core.Enums; @@ -850,7 +851,11 @@ namespace Greenshot.Addons.Core if (copyPathToClipboard) { - ClipboardHelper.SetClipboardData(fullPath); + using (var clipboardAccessToken = ClipboardNative.Access()) + { + // TODO: File?? + clipboardAccessToken.SetAsUnicodeString(fullPath); + } } } diff --git a/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs b/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs new file mode 100644 index 000000000..127e53f3a --- /dev/null +++ b/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs @@ -0,0 +1,201 @@ +#region Greenshot GNU General Public License + +// Greenshot - a free and open source screenshot tool +// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom +// +// For more information see: http://getgreenshot.org/ +// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 1 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#endregion + +using System; +using System.Drawing; +using System.IO; +using System.Text; +using Dapplo.Windows.Clipboard; +using Dapplo.Windows.Common.Structs; +using Greenshot.Addons.Core; +using Greenshot.Addons.Core.Enums; +using Greenshot.Addons.Interfaces; +using Greenshot.Addons.Interfaces.Plugin; + +namespace Greenshot.Addons.Extensions +{ + public static class ClipboardHtmlExtensions + { + // Defintion of the Html Clipboard format + private static readonly string HtmlFormat = "CF_HTML"; + // Defintion of the Url Clipboard format + private static readonly string UrlFormat = "CFSTR_INETURL"; + + // Store the ID for the Html clipboard format + private static uint? _htmlFormatId; + // Store the ID for the Url clipboard format + private static uint? _urlFormatId; + + // Template for the HTML Text on the clipboard + // see: http://msdn.microsoft.com/en-us/library/ms649015%28v=vs.85%29.aspx + // or: http://msdn.microsoft.com/en-us/library/Aa767917.aspx + private const string HtmlClipboardString = @"Version:0.9 +StartHTML:<<<<<<<1 +EndHTML:<<<<<<<2 +StartFragment:<<<<<<<3 +EndFragment:<<<<<<<4 +StartSelection:<<<<<<<3 +EndSelection:<<<<<<<4 + + + +Greenshot capture + + + + + + +"; + + // Template for the HTML Text on the clipboard + // see: http://msdn.microsoft.com/en-us/library/ms649015%28v=vs.85%29.aspx + // or: http://msdn.microsoft.com/en-us/library/Aa767917.aspx + private const string HtmlClipboardBase64String = @"Version:0.9 +StartHTML:<<<<<<<1 +EndHTML:<<<<<<<2 +StartFragment:<<<<<<<3 +EndFragment:<<<<<<<4 +StartSelection:<<<<<<<3 +EndSelection:<<<<<<<4 + + + +Greenshot capture + + + + + + +"; + /// + /// Generate a HTML string for the clipboard + /// + /// Size + /// string + /// + private static string GenerateHtmlString(NativeSize size, string filename) + { + var utf8EncodedHtmlString = Encoding.GetEncoding(0).GetString(Encoding.UTF8.GetBytes(HtmlClipboardString)); + utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${width}", size.Width.ToString()); + utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${height}", size.Height.ToString()); + utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${file}", filename.Replace("\\", "/")); + var sb = new StringBuilder(); + sb.Append(utf8EncodedHtmlString); + sb.Replace("<<<<<<<1", (utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal) + "".Length).ToString("D8")); + sb.Replace("<<<<<<<2", utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal).ToString("D8")); + sb.Replace("<<<<<<<3", (utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal) + "".Length).ToString("D8")); + sb.Replace("<<<<<<<4", utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal).ToString("D8")); + return sb.ToString(); + } + + /// + /// Generate a HTML snippet + /// + /// NativeSize + /// Stream + /// string with the snippet + private static string GenerateHtmlDataUrlString(NativeSize size, MemoryStream pngStream) + { + var utf8EncodedHtmlString = Encoding.GetEncoding(0).GetString(Encoding.UTF8.GetBytes(HtmlClipboardBase64String)); + utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${width}", size.Width.ToString()); + utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${height}", size.Height.ToString()); + utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${format}", "png"); + utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${data}", Convert.ToBase64String(pngStream.GetBuffer(), 0, (int)pngStream.Length)); + var sb = new StringBuilder(); + sb.Append(utf8EncodedHtmlString); + sb.Replace("<<<<<<<1", (utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal) + "".Length).ToString("D8")); + sb.Replace("<<<<<<<2", utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal).ToString("D8")); + sb.Replace("<<<<<<<3", (utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal) + "".Length).ToString("D8")); + sb.Replace("<<<<<<<4", utf8EncodedHtmlString.IndexOf("", StringComparison.Ordinal).ToString("D8")); + return sb.ToString(); + } + + /// + /// Place the bitmap as HTML on the clipboard + /// + /// IClipboardAccessToken + /// ISurface + public static void SetAsHtml(this IClipboardAccessToken clipboardAccessToken, ISurface surface) + { + var pngOutputSettings = new SurfaceOutputSettings(OutputFormats.png, 100, false); + // This file is automatically deleted when Greenshot exits. + var filename = ImageOutput.SaveNamedTmpFile(surface, surface.CaptureDetails, pngOutputSettings); + // Set the PNG stream + var htmlText = GenerateHtmlString(new NativeSize(surface.Width, surface.Height), filename); + + clipboardAccessToken.SetAsHtml(htmlText); + } + + /// + /// Place the bitmap as embedded HTML on the clipboard + /// + /// IClipboardAccessToken + /// Bitmap + public static void SetAsEmbeddedHtml(this IClipboardAccessToken clipboardAccessToken, Bitmap bitmap) + { + using (var pngStream = new MemoryStream()) + { + var pngOutputSettings = new SurfaceOutputSettings(OutputFormats.png, 100, false); + ImageOutput.SaveToStream(bitmap, null, pngStream, pngOutputSettings); + pngStream.Seek(0, SeekOrigin.Begin); + // Set the PNG stream + var htmlText = GenerateHtmlDataUrlString(bitmap.Size, pngStream); + clipboardAccessToken.SetAsHtml(htmlText); + } + } + + /// + /// Place HTML on the clipboard + /// + /// IClipboardAccessToken + /// string with the html + public static void SetAsHtml(this IClipboardAccessToken clipboardAccessToken, string htmlText) + { + if (!_htmlFormatId.HasValue) + { + _htmlFormatId = ClipboardFormatExtensions.RegisterFormat(HtmlFormat); + } + + // Set the Html stream + clipboardAccessToken.SetAsUnicodeString(htmlText, _htmlFormatId.Value); + } + + /// + /// Place Uri on the clipboard + /// + /// IClipboardAccessToken + /// string with the url + public static void SetAsUrl(this IClipboardAccessToken clipboardAccessToken, string url) + { + if (!_urlFormatId.HasValue) + { + _urlFormatId = ClipboardFormatExtensions.RegisterFormat(UrlFormat); + } + + // Set the Html stream + clipboardAccessToken.SetAsUnicodeString(url, _urlFormatId.Value); + } + } +} diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 8766cf51e..a48294642 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.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.61\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.61\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.65\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll @@ -207,6 +207,7 @@ + @@ -278,9 +279,6 @@ Component - - Component - Component diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 4a24f2931..67527dbe6 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -22,17 +22,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Greenshot.Gfx/BitmapHelper.cs b/src/Greenshot.Gfx/BitmapHelper.cs index 9882f62b2..0b8b9e329 100644 --- a/src/Greenshot.Gfx/BitmapHelper.cs +++ b/src/Greenshot.Gfx/BitmapHelper.cs @@ -134,7 +134,7 @@ namespace Greenshot.Gfx }; } - public static IDictionary> StreamConverters { get; } = new Dictionary>(); + public static IDictionary> StreamConverters { get; } = new Dictionary>(StringComparer.OrdinalIgnoreCase); /// /// Make sure the image is orientated correctly diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index f5f421596..bbfd2e163 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.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 3ff0dea37..37e894702 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 d3f208a14..f3c4b81d3 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.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll @@ -236,8 +236,8 @@ - - + + \ No newline at end of file diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index cf80f2ce7..c4bef8881 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -18,17 +18,17 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 9eba0e71b..05e2ee7e8 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.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll @@ -310,8 +310,8 @@ - - + + diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 5b5ee1ac3..c0f1359c9 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -20,16 +20,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 20770d74e..4d55a1beb 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -118,41 +118,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.61\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.61\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.65\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.61\lib\net46\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Multimedia.0.5.65\lib\net46\Dapplo.Windows.Multimedia.dll - - ..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.65\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 959b7cf67..0aee84103 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -31,18 +31,18 @@ - - - - - - - - - - - - + + + + + + + + + + + +