diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index ad665e8fb..074a2e365 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -94,41 +94,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index e48f9c843..9bd3fe835 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -22,18 +22,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Confluence/ConfluenceUtils.cs b/src/Greenshot.Addon.Confluence/ConfluenceUtils.cs index 69e0759e7..d391b64f6 100644 --- a/src/Greenshot.Addon.Confluence/ConfluenceUtils.cs +++ b/src/Greenshot.Addon.Confluence/ConfluenceUtils.cs @@ -32,7 +32,7 @@ using Dapplo.Confluence; using Dapplo.Confluence.Entities; using Dapplo.Confluence.Query; using Dapplo.Log; -using Greenshot.Addons.Core; +using Greenshot.Addon.InternetExplorer; #endregion diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 00c075ec4..46c1257b5 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -99,41 +99,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll @@ -211,6 +211,10 @@ + + {4cca2717-b8a4-44f7-965b-5687107e4921} + Greenshot.Addon.InternetExplorer + {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} Greenshot.Core diff --git a/src/Greenshot.Addon.Confluence/IConfluenceConfiguration.cs b/src/Greenshot.Addon.Confluence/IConfluenceConfiguration.cs index 162cfbc09..b2888bb83 100644 --- a/src/Greenshot.Addon.Confluence/IConfluenceConfiguration.cs +++ b/src/Greenshot.Addon.Confluence/IConfluenceConfiguration.cs @@ -26,7 +26,6 @@ using System.ComponentModel; using Dapplo.Ini; using Dapplo.InterfaceImpl.Extensions; -using Greenshot.Addons.Core.Enums; using Greenshot.Core.Enums; #endregion diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 039b3a9c1..ec4ca46f1 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -24,18 +24,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 67c875829..766395a67 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -91,41 +91,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index e48f9c843..9bd3fe835 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -22,18 +22,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 8f9f42c9c..0fe7c3633 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.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 821cf8513..260264bea 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -20,16 +20,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 1512b84be..643c80ae8 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -103,41 +103,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 948106759..3742f78a2 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -21,18 +21,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 1a5e97e7f..f83196679 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -89,41 +89,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 948106759..3742f78a2 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -21,18 +21,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 855327a17..715679eb1 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -111,41 +111,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 902fa1d78..f6485d478 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -23,18 +23,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addons/Core/AccessibleHelper.cs b/src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs similarity index 95% rename from src/Greenshot.Addons/Core/AccessibleHelper.cs rename to src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs index 4b61059bb..d116901ab 100644 --- a/src/Greenshot.Addons/Core/AccessibleHelper.cs +++ b/src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs @@ -31,7 +31,7 @@ using Dapplo.Log; #endregion -namespace Greenshot.Addons.Core +namespace Greenshot.Addon.InternetExplorer { /// /// See: diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj new file mode 100644 index 000000000..b15a674e7 --- /dev/null +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -0,0 +1,115 @@ + + + + + + {4CCA2717-B8A4-44F7-965B-5687107E4921} + Library + Properties + Greenshot.Addon.InternetExplorer + Greenshot.Addon.InternetExplorer + v4.6.1 + 512 + true + + + + + ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll + + + ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + + ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + + ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll + + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + + True + + + + + + + + + + + + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll + + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + + + + + + + + + + + + + + + + + {5b924697-4dcd-4f98-85f1-105cb84b7341} + Greenshot.Addons + + + {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} + Greenshot.Core + + + {f041c685-eb96-4ed1-9ace-0f5bd836610f} + Greenshot.Gfx + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot/Helpers/IECaptureHelper.cs b/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs similarity index 96% rename from src/Greenshot/Helpers/IECaptureHelper.cs rename to src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs index 5d6ded387..d7583933e 100644 --- a/src/Greenshot/Helpers/IECaptureHelper.cs +++ b/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs @@ -29,16 +29,15 @@ using System.Drawing; using System.Drawing.Imaging; using System.Linq; using System.Runtime.InteropServices; -using Dapplo.Windows.Desktop; -using Greenshot.Configuration; -using Greenshot.Helpers.IEInterop; using Dapplo.Ini; using Dapplo.Log; using Dapplo.Windows.Com; using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Structs; +using Dapplo.Windows.Desktop; using Dapplo.Windows.Messages; using Dapplo.Windows.User32; +using Greenshot.Addon.InternetExplorer.IEInterop; using Greenshot.Addons.Controls; using Greenshot.Addons.Core; using Greenshot.Addons.Interfaces; @@ -47,7 +46,7 @@ using mshtml; #endregion -namespace Greenshot.Helpers +namespace Greenshot.Addon.InternetExplorer { /// /// The code for this helper comes from: http://www.codeproject.com/KB/graphics/IECapture.aspx @@ -63,7 +62,7 @@ namespace Greenshot.Helpers // Helper method to activate a certain IE Tab public static void ActivateIeTab(IInteropWindow nativeIeWindow, int tabIndex) { - var directUiInteropWindow = IEHelper.GetDirectUi(nativeIeWindow); + var directUiInteropWindow = IEHelper.GetDirectUi(nativeIeWindow); if (directUiInteropWindow != null) { // Bring window to the front @@ -391,7 +390,7 @@ namespace Greenshot.Helpers windowToCapture = InteropWindowQuery.GetActiveWindow(); } // Show backgroundform after retrieving the active window.. - var backgroundForm = new BackgroundForm(Language.GetString(LangKey.contextmenu_captureie), Language.GetString(LangKey.wait_ie_capture)); + var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured..."); backgroundForm.Show(); //BackgroundForm backgroundForm = BackgroundForm.ShowAndWait(language.GetString(LangKey.contextmenu_captureie), language.GetString(LangKey.wait_ie_capture)); try diff --git a/src/Greenshot.Addons/Core/IEHelper.cs b/src/Greenshot.Addon.InternetExplorer/IEHelper.cs similarity index 54% rename from src/Greenshot.Addons/Core/IEHelper.cs rename to src/Greenshot.Addon.InternetExplorer/IEHelper.cs index 856ebc191..abebb5d79 100644 --- a/src/Greenshot.Addons/Core/IEHelper.cs +++ b/src/Greenshot.Addon.InternetExplorer/IEHelper.cs @@ -21,14 +21,12 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Reflection; using Dapplo.Log; using Dapplo.Windows.Desktop; using Microsoft.Win32; -namespace Greenshot.Addons.Core { +namespace Greenshot.Addon.InternetExplorer { /// /// Description of IEHelper. /// @@ -75,85 +73,6 @@ namespace Greenshot.Addons.Core { } } - /// - /// Get the highest possible version for the embedded browser - /// - /// true to ignore the doctype when loading a page - /// IE Feature - public static int GetEmbVersion(bool ignoreDoctype = true) - { - var ieVersion = IEVersion; - - if (ieVersion > 9) - { - return ieVersion * 1000 + (ignoreDoctype ? 1 : 0); - } - - if (ieVersion > 7) - { - return ieVersion * 1111; - } - - return 7000; - } - - /// - /// Fix browser version to the highest possible - /// - /// true to ignore the doctype when loading a page - public static void FixBrowserVersion(bool ignoreDoctype = true) - { - var applicationName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); - FixBrowserVersion(applicationName, ignoreDoctype); - } - - /// - /// Fix the browser version for the specified application - /// - /// Name of the process - /// true to ignore the doctype when loading a page - public static void FixBrowserVersion(string applicationName, bool ignoreDoctype = true) - { - FixBrowserVersion(applicationName, GetEmbVersion(ignoreDoctype)); - } - - /// - /// Fix the browser version for the specified application - /// - /// Name of the process - /// - /// Version, see - /// Browser Emulation - /// - public static void FixBrowserVersion(string applicationName, int ieVersion) - { - ModifyRegistry("HKEY_CURRENT_USER", applicationName + ".exe", ieVersion); -#if DEBUG - ModifyRegistry("HKEY_CURRENT_USER", applicationName + ".vshost.exe", ieVersion); -#endif - } - - /// - /// Make the change to the registry - /// - /// HKEY_CURRENT_USER or something - /// Name of the executable - /// Version to use - private static void ModifyRegistry(string root, string applicationName, int ieFeatureVersion) - { - var regKey = root + @"\Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION"; - try - { - Registry.SetValue(regKey, applicationName, ieFeatureVersion); - } - catch (Exception ex) - { - // some config will hit access rights exceptions - // this is why we try with both LOCAL_MACHINE and CURRENT_USER - Log.Error().WriteLine(ex, "couldn't modify the registry key {0}", regKey); - } - } - /// /// Find the DirectUI window for MSAA (Accessible) /// diff --git a/src/Greenshot/Helpers/IEInterop/IEContainer.cs b/src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs similarity index 96% rename from src/Greenshot/Helpers/IEInterop/IEContainer.cs rename to src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs index 1be99111e..d2163c344 100644 --- a/src/Greenshot/Helpers/IEInterop/IEContainer.cs +++ b/src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs @@ -28,16 +28,16 @@ using System.Collections.Generic; using System.Drawing; using System.Globalization; using System.Runtime.InteropServices; -using Dapplo.Windows.Desktop; using Dapplo.Log; using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Structs; +using Dapplo.Windows.Desktop; using mshtml; using IServiceProvider = Greenshot.Addons.Interop.IServiceProvider; #endregion -namespace Greenshot.Helpers.IEInterop +namespace Greenshot.Addon.InternetExplorer.IEInterop { public class DocumentContainer { diff --git a/src/Greenshot/Helpers/IEInterop/IWebBrowser2.cs b/src/Greenshot.Addon.InternetExplorer/IEInterop/IWebBrowser2.cs similarity index 94% rename from src/Greenshot/Helpers/IEInterop/IWebBrowser2.cs rename to src/Greenshot.Addon.InternetExplorer/IEInterop/IWebBrowser2.cs index 5b474e072..1f3e8f65d 100644 --- a/src/Greenshot/Helpers/IEInterop/IWebBrowser2.cs +++ b/src/Greenshot.Addon.InternetExplorer/IEInterop/IWebBrowser2.cs @@ -27,7 +27,7 @@ using System.Runtime.InteropServices; #endregion -namespace Greenshot.Helpers.IEInterop +namespace Greenshot.Addon.InternetExplorer.IEInterop { // IWebBrowser: EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B // [ComVisible(true), ComImport(), Guid("D30C1661-CDAF-11D0-8A3E-00C04FC9E26E"), diff --git a/src/Greenshot.Addon.InternetExplorer/InternetExplorerSource.cs b/src/Greenshot.Addon.InternetExplorer/InternetExplorerSource.cs new file mode 100644 index 000000000..8cc2f294a --- /dev/null +++ b/src/Greenshot.Addon.InternetExplorer/InternetExplorerSource.cs @@ -0,0 +1,43 @@ +#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.Threading; +using System.Threading.Tasks; +using System.Windows.Media.Imaging; +using Greenshot.Core.Interfaces; + +namespace Greenshot.Addon.InternetExplorer +{ + /// + /// This is an ISource implementation which allows to capture the Internet-Explorer + /// + public class InternetExplorerSource : ISource + { + /// + public ValueTask> Import(CancellationToken cancellationToken = default) + { + throw new NotImplementedException(); + } + } +} diff --git a/src/Greenshot.Addon.InternetExplorer/Properties/AssemblyInfo.cs b/src/Greenshot.Addon.InternetExplorer/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..6e9ffac32 --- /dev/null +++ b/src/Greenshot.Addon.InternetExplorer/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Greenshot.Addon.InternetExplorer")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Greenshot.Addon.InternetExplorer")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4cca2717-b8a4-44f7-965b-5687107e4921")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Greenshot.Addon.InternetExplorer/app.config b/src/Greenshot.Addon.InternetExplorer/app.config new file mode 100644 index 000000000..4ce296638 --- /dev/null +++ b/src/Greenshot.Addon.InternetExplorer/app.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.InternetExplorer/packages.config b/src/Greenshot.Addon.InternetExplorer/packages.config new file mode 100644 index 000000000..f0edf0870 --- /dev/null +++ b/src/Greenshot.Addon.InternetExplorer/packages.config @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index c93e184fd..91c503f04 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -114,41 +114,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index cf631ae8d..9bf39cae2 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -24,18 +24,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 599f1c663..2271e0f4c 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -85,38 +85,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index f19bb6f2c..42cba6292 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -20,17 +20,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 9ca751530..8f3fe79ab 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.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 8e0a41d6e..cdf77ad88 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 93983b675..5a83a0711 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.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.OCR/OCRDestination.cs b/src/Greenshot.Addon.OCR/OCRDestination.cs index 0fdcd7e89..e6e02e5ff 100644 --- a/src/Greenshot.Addon.OCR/OCRDestination.cs +++ b/src/Greenshot.Addon.OCR/OCRDestination.cs @@ -33,7 +33,6 @@ using Dapplo.Log; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Core; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Core.Enums; diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 723fc1700..d2ddab45b 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -19,16 +19,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Office/FodyWeavers.xml b/src/Greenshot.Addon.Office/FodyWeavers.xml deleted file mode 100644 index 9e97c64dd..000000000 --- a/src/Greenshot.Addon.Office/FodyWeavers.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Dapplo.Windows.Com - - - \ 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 a2b50400f..8ba4f605c 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -42,9 +42,6 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll - ..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll @@ -84,38 +81,39 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Interop.Microsoft.Office.Interop.OneNote.1.1.0.0\lib\net40\Interop.Microsoft.Office.Interop.OneNote.dll + True @@ -200,11 +198,6 @@ - - - Designer - - MSBuild:Compile @@ -221,15 +214,6 @@ False True - - {0EA692EE-BB50-4E3C-AEF0-356D91732725} - 1 - 1 - 0 - tlbimp - False - True - @@ -239,13 +223,4 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Green mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs index 61b0445b4..0e6f439d4 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs @@ -28,8 +28,8 @@ using System.Collections.Generic; using System.Drawing; using System.Runtime.InteropServices; using Dapplo.Log; -using Dapplo.Windows.Com; using Dapplo.Windows.Desktop; +using Dapplo.Windows.Interop; using Greenshot.Addon.Office.OfficeInterop; using Microsoft.Office.Core; using Microsoft.Office.Interop.Excel; diff --git a/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs index 4be159bc6..645246ff0 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs @@ -29,7 +29,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Xml; using Dapplo.Log; -using Dapplo.Windows.Com; +using Dapplo.Windows.Interop; using Greenshot.Addons.Core; using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces.Plugin; diff --git a/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs index 742a9ef7f..231fdf797 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs @@ -30,7 +30,7 @@ using System.Runtime.InteropServices; using System.Text; using Dapplo.Ini; using Dapplo.Log; -using Dapplo.Windows.Com; +using Dapplo.Windows.Interop; using Greenshot.Addon.Office.OfficeInterop; using mshtml; using Microsoft.Office.Interop.Outlook; @@ -404,7 +404,6 @@ namespace Greenshot.Addon.Office.OfficeExport { return; } - //MailItem newMail = COMWrapper.Cast(newItem); var newMail = newItem.ComObject; newMail.Subject = subject; if (!string.IsNullOrEmpty(to)) diff --git a/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs index 1bdc0c93b..15fa32215 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs @@ -29,7 +29,7 @@ using System.Drawing; using System.Runtime.InteropServices; using Dapplo.Ini; using Dapplo.Log; -using Dapplo.Windows.Com; +using Dapplo.Windows.Interop; using Greenshot.Addon.Office.OfficeInterop; using Microsoft.Office.Core; using Microsoft.Office.Interop.PowerPoint; diff --git a/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs index 10e9e1761..c4152aae5 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs @@ -24,7 +24,7 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using Dapplo.Ini; using Dapplo.Log; -using Dapplo.Windows.Com; +using Dapplo.Windows.Interop; using Greenshot.Addon.Office.OfficeInterop; using Microsoft.Office.Core; using Microsoft.Office.Interop.Word; diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index e15f855e6..a65df759c 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -6,7 +6,6 @@ - @@ -20,18 +19,17 @@ - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 9c72f0691..f8b95a235 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -109,41 +109,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index 902fa1d78..f6485d478 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -23,18 +23,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 9d793412b..e86801113 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -103,41 +103,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 948106759..3742f78a2 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -21,18 +21,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 623229568..7734e05d0 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 8e0a41d6e..cdf77ad88 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 a3cc12185..f8e0ece92 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -93,35 +93,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Win10/Win10AddonModule.cs b/src/Greenshot.Addon.Win10/Win10AddonModule.cs index 758221b45..99294bc58 100644 --- a/src/Greenshot.Addon.Win10/Win10AddonModule.cs +++ b/src/Greenshot.Addon.Win10/Win10AddonModule.cs @@ -31,7 +31,7 @@ namespace Greenshot.Addon.Win10 { protected override void Load(ContainerBuilder builder) { - if (!WindowsVersion.IsWindows10OrLater) + if (WindowsVersion.IsWindows10OrLater) { builder .RegisterType() diff --git a/src/Greenshot.Addon.Win10/Win10OcrDestination.cs b/src/Greenshot.Addon.Win10/Win10OcrDestination.cs index 9831b0714..e9a57147d 100644 --- a/src/Greenshot.Addon.Win10/Win10OcrDestination.cs +++ b/src/Greenshot.Addon.Win10/Win10OcrDestination.cs @@ -68,16 +68,16 @@ namespace Greenshot.Addon.Win10 } } - /// - /// Run the Windows 10 OCR engine to process the text on the captured image - /// - /// - /// - /// - /// ExportInformation - public override async Task ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) + /// + /// Run the Windows 10 OCR engine to process the text on the captured image + /// + /// + /// + /// + /// ExportInformation + public override async Task ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) { - var exportInformation = new ExportInformation(Designation, Description); + var exportInformation = new ExportInformation(Designation, Description); try { string text; @@ -91,10 +91,10 @@ namespace Greenshot.Addon.Win10 var softwareBitmap = await decoder.GetSoftwareBitmapAsync(); var ocrResult = await ocrEngine.RecognizeAsync(softwareBitmap); + // TODO: Get the lines, words, bounding rectangles text = ocrResult.Text; } - // Check if we found text if (!string.IsNullOrWhiteSpace(text)) { diff --git a/src/Greenshot.Addon.Win10/Win10ShareDestination.cs b/src/Greenshot.Addon.Win10/Win10ShareDestination.cs index 70833e41c..b912265b7 100644 --- a/src/Greenshot.Addon.Win10/Win10ShareDestination.cs +++ b/src/Greenshot.Addon.Win10/Win10ShareDestination.cs @@ -82,16 +82,16 @@ namespace Greenshot.Addon.Win10 public bool IsDataRequested { get; set; } } - /// - /// Share the screenshot with a windows app - /// - /// - /// - /// - /// ExportInformation + /// + /// Share the screenshot with a windows app + /// + /// + /// + /// + /// ExportInformation protected override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) - { - var exportInformation = new ExportInformation(Designation, Description); + { + var exportInformation = new ExportInformation(Designation, Description); try { var triggerWindow = new Window @@ -154,7 +154,6 @@ namespace Greenshot.Addon.Win10 /// Task with string, which describes the application which was used to share with private async Task Share(ShareInfo shareInfo, IntPtr handle, ISurface surface, ICaptureDetails captureDetails) { - using (var imageStream = new MemoryRandomAccessStream()) using (var logoStream = new MemoryRandomAccessStream()) using (var thumbnailStream = new MemoryRandomAccessStream()) diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index 723fc1700..d2ddab45b 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -19,16 +19,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addons/Controls/QualityDialog.cs b/src/Greenshot.Addons/Controls/QualityDialog.cs index 05e093d92..e5365ec77 100644 --- a/src/Greenshot.Addons/Controls/QualityDialog.cs +++ b/src/Greenshot.Addons/Controls/QualityDialog.cs @@ -25,7 +25,6 @@ using System; using Greenshot.Addons.Core; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Core.Enums; diff --git a/src/Greenshot.Addons/Controls/SaveImageFileDialog.cs b/src/Greenshot.Addons/Controls/SaveImageFileDialog.cs index 5beb4b81d..8671b2468 100644 --- a/src/Greenshot.Addons/Controls/SaveImageFileDialog.cs +++ b/src/Greenshot.Addons/Controls/SaveImageFileDialog.cs @@ -29,7 +29,6 @@ using System.Windows.Forms; using Dapplo.Ini; using Dapplo.Log; using Greenshot.Addons.Core; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Interfaces; using Greenshot.Core.Enums; diff --git a/src/Greenshot.Addons/Core/FilenameHelper.cs b/src/Greenshot.Addons/Core/FilenameHelper.cs index e7433384c..1ec7ac53b 100644 --- a/src/Greenshot.Addons/Core/FilenameHelper.cs +++ b/src/Greenshot.Addons/Core/FilenameHelper.cs @@ -31,7 +31,6 @@ using System.Text.RegularExpressions; using System.Windows.Forms; using Dapplo.Ini; using Dapplo.Log; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Interfaces; using Greenshot.Core.Enums; diff --git a/src/Greenshot.Addons/Core/IFileConfiguration.cs b/src/Greenshot.Addons/Core/IFileConfiguration.cs index 6356a26b8..6b8d0ecb8 100644 --- a/src/Greenshot.Addons/Core/IFileConfiguration.cs +++ b/src/Greenshot.Addons/Core/IFileConfiguration.cs @@ -24,7 +24,6 @@ #region Usings using System.ComponentModel; -using Greenshot.Addons.Core.Enums; using Greenshot.Core.Enums; #endregion diff --git a/src/Greenshot.Addons/Core/ImageOutput.cs b/src/Greenshot.Addons/Core/ImageOutput.cs index 888572507..3fdecedc2 100644 --- a/src/Greenshot.Addons/Core/ImageOutput.cs +++ b/src/Greenshot.Addons/Core/ImageOutput.cs @@ -41,7 +41,6 @@ using Dapplo.Log; using Dapplo.Windows.Clipboard; using Dapplo.Windows.Common; using Greenshot.Addons.Controls; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Core.Enums; diff --git a/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs b/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs index c7074fa3d..418086cee 100644 --- a/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs +++ b/src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs @@ -27,7 +27,6 @@ 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; using Greenshot.Core.Enums; diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 7dc4dd601..25f9886b3 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -18,7 +18,6 @@ - ..\packages\Autofac.4.8.1\lib\net45\Autofac.dll @@ -95,47 +94,47 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Shell32.0.5.108\lib\net461\Dapplo.Windows.Shell32.dll + + ..\packages\Dapplo.Windows.Shell32.0.5.109\lib\net461\Dapplo.Windows.Shell32.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.IconPacks.2.3.0\lib\net46\MahApps.Metro.IconPacks.dll @@ -347,7 +346,6 @@ - @@ -362,7 +360,6 @@ - diff --git a/src/Greenshot.Addons/Interfaces/Plugin/SurfaceOutputSettings.cs b/src/Greenshot.Addons/Interfaces/Plugin/SurfaceOutputSettings.cs index 40bd2abca..99f947ea5 100644 --- a/src/Greenshot.Addons/Interfaces/Plugin/SurfaceOutputSettings.cs +++ b/src/Greenshot.Addons/Interfaces/Plugin/SurfaceOutputSettings.cs @@ -26,7 +26,6 @@ using System.Collections.Generic; using Dapplo.Ini; using Greenshot.Addons.Core; -using Greenshot.Addons.Core.Enums; using Greenshot.Core.Enums; using Greenshot.Gfx.Effects; diff --git a/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs b/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs index b8dc7fd46..26de11e8b 100644 --- a/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs +++ b/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs @@ -25,7 +25,6 @@ using System.Collections.Generic; using System.Windows; using Caliburn.Micro; using Greenshot.Addons.Core; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Extensions; using Greenshot.Core.Enums; diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 72202afde..88b13c531 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -24,20 +24,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index 4d9097f21..dea6a2888 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -21,32 +21,32 @@ ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Core/packages.config b/src/Greenshot.Core/packages.config index 272a29425..3fb8454d9 100644 --- a/src/Greenshot.Core/packages.config +++ b/src/Greenshot.Core/packages.config @@ -1,15 +1,15 @@  - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index d13555282..0ba9eb1ca 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.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index d162266e7..abf913a65 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 12284393f..1169d4715 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -67,32 +67,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\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 ea00ad35b..7e227fe57 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -17,15 +17,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index ab077d0f4..b4f4b41ff 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -102,32 +102,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 78f044201..996a8882c 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -20,15 +20,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot.sln b/src/Greenshot.sln index 55b9e7f70..9d3555ec8 100644 --- a/src/Greenshot.sln +++ b/src/Greenshot.sln @@ -51,6 +51,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.OcrCommand" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.InternetExplorer", "Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj", "{4CCA2717-B8A4-44F7-965B-5687107E4921}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -153,6 +155,7 @@ Global {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|x86 {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|x86 {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.Build.0 = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -238,6 +241,14 @@ Global {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.Build.0 = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.ActiveCfg = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.Build.0 = Release|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.ActiveCfg = Debug|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.Build.0 = Debug|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.Build.0 = Release|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.ActiveCfg = Release|Any CPU + {4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Greenshot/Forms/MainForm.cs b/src/Greenshot/Forms/MainForm.cs index 7b951f1d0..06f525d34 100644 --- a/src/Greenshot/Forms/MainForm.cs +++ b/src/Greenshot/Forms/MainForm.cs @@ -48,6 +48,7 @@ using Dapplo.Windows.Common.Structs; using Dapplo.Windows.DesktopWindowsManager; using Dapplo.Windows.Dpi.Forms; using Dapplo.Windows.Kernel32; +using Greenshot.Addon.InternetExplorer; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Controls; diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 727e5f9fa..b703c3ca8 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -119,50 +119,50 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.108\lib\net461\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Multimedia.0.5.109\lib\net461\Dapplo.Windows.Multimedia.dll - - ..\packages\Dapplo.Windows.Shell32.0.5.108\lib\net461\Dapplo.Windows.Shell32.dll + + ..\packages\Dapplo.Windows.Shell32.0.5.109\lib\net461\Dapplo.Windows.Shell32.dll - - ..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll @@ -306,9 +306,6 @@ - - - @@ -462,6 +459,10 @@ + + {4cca2717-b8a4-44f7-965b-5687107e4921} + Greenshot.Addon.InternetExplorer + {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} Greenshot.Core diff --git a/src/Greenshot/Helpers/CaptureHelper.cs b/src/Greenshot/Helpers/CaptureHelper.cs index c42a5a421..ec9287759 100644 --- a/src/Greenshot/Helpers/CaptureHelper.cs +++ b/src/Greenshot/Helpers/CaptureHelper.cs @@ -42,9 +42,9 @@ using Dapplo.Windows.Common.Structs; using Dapplo.Windows.DesktopWindowsManager; using Dapplo.Windows.Kernel32; using Dapplo.Windows.User32; +using Greenshot.Addon.InternetExplorer; using Greenshot.Addons.Components; using Greenshot.Addons.Core; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Extensions; using Greenshot.Addons.Interfaces; using Greenshot.Components; diff --git a/src/Greenshot/Helpers/PrintHelper.cs b/src/Greenshot/Helpers/PrintHelper.cs index b3972bee6..5441528a9 100644 --- a/src/Greenshot/Helpers/PrintHelper.cs +++ b/src/Greenshot/Helpers/PrintHelper.cs @@ -34,7 +34,6 @@ using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Structs; using Greenshot.Addons; using Greenshot.Addons.Core; -using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Core.Enums; diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 9d22e19d5..6f14c68a2 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -31,21 +31,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +