diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index cf6f6fa0a..61bc53d02 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -52,23 +52,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -94,41 +94,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index 345e2a034..28eb41e75 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -8,12 +8,12 @@ - - - - - - + + + + + + @@ -22,18 +22,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ 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 253efbc51..b3f4463d5 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -54,23 +54,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll @@ -99,41 +99,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll @@ -222,13 +222,13 @@ 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.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 16896d7a1..3c240571f 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -9,12 +9,12 @@ - - - - - - + + + + + + @@ -24,18 +24,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 99edfe8e4..6676db8c6 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -49,23 +49,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -91,41 +91,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index 345e2a034..28eb41e75 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -8,12 +8,12 @@ - - - - - - + + + + + + @@ -22,18 +22,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index b3a1daf11..7e125f8fa 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -67,23 +67,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -100,35 +100,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 39f985275..a8d26588f 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -9,26 +9,26 @@ - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 737ad0911..50853a873 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -64,23 +64,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -103,41 +103,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index c02cc7bf9..cdb98e1d4 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -8,12 +8,12 @@ - - - - - - + + + + + + @@ -21,17 +21,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 2a288993f..23e0de425 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -50,23 +50,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -89,41 +89,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index c02cc7bf9..cdb98e1d4 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -8,12 +8,12 @@ - - - - - - + + + + + + @@ -21,17 +21,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ 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 ca3b6cc94..2c249e508 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -69,23 +69,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -111,41 +111,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\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 64cf7243b..582e78f21 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -9,12 +9,12 @@ - - - - - - + + + + + + @@ -23,18 +23,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index bcbea656f..676a14dfe 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -69,23 +69,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -114,41 +114,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll @@ -293,13 +293,13 @@ copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuratio None false - 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.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index b03f31941..40902e54d 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -9,12 +9,12 @@ - - - - - - + + + + + + @@ -24,19 +24,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 9ee5825b9..8395158d5 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -49,23 +49,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -85,38 +85,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.83\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.95\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index deacd45f1..c036f1390 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -8,28 +8,28 @@ - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + \ 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 7a74095a0..40837500b 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -67,23 +67,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\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 cfac2a9cf..7855d1b0b 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -9,12 +9,12 @@ - - - - - - + + + + + + @@ -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 1ad09395c..1133761f2 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -64,23 +64,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -97,35 +97,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index fef20086a..e17bbbc0f 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -8,26 +8,26 @@ - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + \ 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 8d9afba6f..cd1b362d3 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -51,23 +51,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -84,38 +84,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll @@ -252,13 +252,13 @@ 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/packages.config b/src/Greenshot.Addon.Office/packages.config index d690f6b56..aa0c53d67 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -9,28 +9,28 @@ - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + \ 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 5bdf95613..11ba88d99 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -63,23 +63,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -105,41 +105,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\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 64cf7243b..582e78f21 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -9,12 +9,12 @@ - - - - - - + + + + + + @@ -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 ee793cf03..f8d8abc7f 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -64,23 +64,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -103,41 +103,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index c02cc7bf9..cdb98e1d4 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -8,12 +8,12 @@ - - - - - - + + + + + + @@ -21,17 +21,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ 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 a06128c71..c49833aad 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -63,23 +63,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -102,35 +102,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\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 cfac2a9cf..7855d1b0b 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -9,12 +9,12 @@ - - - - - - + + + + + + @@ -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 f74b37f21..711f5fbcd 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -60,11 +60,11 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -81,35 +81,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index 211da92bf..693d4e42b 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -8,22 +8,22 @@ - - + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 68b6b31f3..e110119e7 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -47,23 +47,23 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -89,44 +89,44 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.83\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.95\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 5ddcc50fa..a90c6dc65 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -8,12 +8,12 @@ - - - - - - + + + + + + @@ -22,19 +22,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 493d4a2d9..3a6b1174c 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -43,11 +43,11 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -64,32 +64,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 1905daf33..1a5b02188 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -8,22 +8,22 @@ - - + + - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.PerformanceTests/App.config b/src/Greenshot.PerformanceTests/App.config index f1aa07e2b..33bfa1269 100644 --- a/src/Greenshot.PerformanceTests/App.config +++ b/src/Greenshot.PerformanceTests/App.config @@ -59,11 +59,11 @@ - + - + @@ -105,6 +105,10 @@ + + + + diff --git a/src/Greenshot.PerformanceTests/GfxPerformance.cs b/src/Greenshot.PerformanceTests/GfxPerformance.cs index 3c86c0090..40b2d2b00 100644 --- a/src/Greenshot.PerformanceTests/GfxPerformance.cs +++ b/src/Greenshot.PerformanceTests/GfxPerformance.cs @@ -1,8 +1,6 @@ using System.Drawing; using System.Drawing.Imaging; using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Attributes.Columns; -using BenchmarkDotNet.Order; using Greenshot.Gfx; using Greenshot.Gfx.Experimental; using Greenshot.Gfx.Quantizer; @@ -14,7 +12,6 @@ namespace Greenshot.PerformanceTests /// This defines the benchmarks which can be done /// [MinColumn, MaxColumn, MemoryDiagnoser] - [OrderProvider(SummaryOrderPolicy.FastestToSlowest)] public class GfxPerformance { [Benchmark] diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 7ed34db6e..76f45e016 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -22,11 +22,8 @@ ..\packages\Autofac.Mef.4.0.0\lib\net45\Autofac.Integration.Mef.dll - - ..\packages\BenchmarkDotNet.0.10.14\lib\net46\BenchmarkDotNet.dll - - - ..\packages\BenchmarkDotNet.Core.0.10.14\lib\net46\BenchmarkDotNet.Core.dll + + ..\packages\BenchmarkDotNet.0.11.0\lib\net46\BenchmarkDotNet.dll ..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.14\lib\net46\BenchmarkDotNet.Toolchains.Roslyn.dll @@ -40,6 +37,9 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll + + ..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll + ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll @@ -49,11 +49,11 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -70,32 +70,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll @@ -167,6 +167,9 @@ ..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll @@ -177,6 +180,11 @@ True + + ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll + True + True + ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll @@ -249,6 +257,9 @@ True True + + ..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll + diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 74290b494..90d3604fd 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -3,30 +3,31 @@ - + + - - + + - - - - - - - - - + + + + + + + + + @@ -45,14 +46,19 @@ + + + + + @@ -60,6 +66,7 @@ + @@ -81,4 +88,5 @@ + \ No newline at end of file diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 459b9b3ed..dfc5901ab 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -48,8 +48,8 @@ ..\packages\Autofac.Mef.4.0.0\lib\net45\Autofac.Integration.Mef.dll - - ..\packages\BenchmarkDotNet.0.10.14\lib\net46\BenchmarkDotNet.dll + + ..\packages\BenchmarkDotNet.0.11.0\lib\net46\BenchmarkDotNet.dll ..\packages\BenchmarkDotNet.Core.0.10.14\lib\net46\BenchmarkDotNet.Core.dll @@ -78,11 +78,11 @@ ..\packages\Dapplo.Addons.Bootstrapper.1.0.70\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -102,32 +102,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll @@ -210,6 +210,11 @@ True + + ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll + True + True + ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll @@ -283,18 +288,21 @@ True True + + ..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll + - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll + ..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll - - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + + ..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll - - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + + ..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll - - ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll + + ..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll ..\packages\Xunit.StaFact.0.2.17\lib\net452\Xunit.StaFact.dll @@ -367,9 +375,9 @@ 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.Tests/app.config b/src/Greenshot.Tests/app.config index 0be6426c5..3bacaa38a 100644 --- a/src/Greenshot.Tests/app.config +++ b/src/Greenshot.Tests/app.config @@ -60,11 +60,11 @@ - + - + @@ -90,6 +90,10 @@ + + + + diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 8485f5697..a75d4a33e 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -3,7 +3,7 @@ - + @@ -12,23 +12,23 @@ - - + + - - - - - - - - - + + + + + + + + + @@ -52,8 +52,10 @@ + + @@ -64,6 +66,7 @@ + @@ -85,13 +88,14 @@ - - + + + - - - - - + + + + + \ No newline at end of file diff --git a/src/Greenshot/Components/GreenshotServer.cs b/src/Greenshot/Components/GreenshotServer.cs index 74c0f2fe4..572e0b7a3 100644 --- a/src/Greenshot/Components/GreenshotServer.cs +++ b/src/Greenshot/Components/GreenshotServer.cs @@ -56,7 +56,7 @@ namespace Greenshot.Components private static readonly LogSource Log = new LogSource(); private readonly ICoreConfiguration _coreConfiguration; private readonly MainForm _mainForm; - private readonly HotkeyHandler _hotkeyHandler; + private readonly HotkeyService _hotkeyService; private readonly DestinationHolder _destinationHolder; private ServiceHost _host; @@ -73,12 +73,12 @@ namespace Greenshot.Components public GreenshotServerAction( ICoreConfiguration coreConfiguration, MainForm mainForm, - HotkeyHandler hotkeyHandler, + HotkeyService hotkeyService, DestinationHolder destinationHolder) { _coreConfiguration = coreConfiguration; _mainForm = mainForm; - _hotkeyHandler = hotkeyHandler; + _hotkeyService = hotkeyService; _destinationHolder = destinationHolder; } @@ -121,11 +121,6 @@ namespace Greenshot.Components { // Even update language when needed, this should be done automatically :) _mainForm.UpdateUi(); - - // Make sure the current hotkeys are disabled - HotkeyControl.UnregisterHotkeys(); - // and registered again (should be automated) - _hotkeyHandler.RegisterHotkeys(true); })); } catch (Exception ex) diff --git a/src/Greenshot/Components/HotkeyHandler.cs b/src/Greenshot/Components/HotkeyHandler.cs index 376ee2a56..9edeb2896 100644 --- a/src/Greenshot/Components/HotkeyHandler.cs +++ b/src/Greenshot/Components/HotkeyHandler.cs @@ -22,271 +22,57 @@ #endregion using System; -using System.IO; using System.Linq; -using System.Text; -using System.Windows.Forms; -using Dapplo.Addons; +using Dapplo.CaliburnMicro.Extensions; using Dapplo.Log; -using Dapplo.Windows.Common; -using Greenshot.Addons; -using Greenshot.Addons.Components; -using Greenshot.Addons.Controls; +using Dapplo.Windows.Input.Keyboard; using Greenshot.Addons.Core; -using Greenshot.Addons.Interfaces.Plugin; -using Greenshot.Forms; -using Greenshot.Helpers; namespace Greenshot.Components { /// - /// This startup action registers the hotkeys + /// This handles the hotkey for the region capture /// - [Service(nameof(HotkeyHandler), nameof(MainFormStartup), TaskSchedulerName = "ui")] - public class HotkeyHandler : IStartup, IShutdown + public class HotKeyHandler : KeyCombinationHandler, IDisposable { + private readonly IDisposable _propertyChangeSubscription; private static readonly LogSource Log = new LogSource(); - private readonly ICoreConfiguration _coreConfiguration; - private readonly IGreenshotLanguage _greenshotLanguage; - private readonly WindowHandle _windowHandle; - private static HotkeyHandler _instance; - - public HotkeyHandler( - ICoreConfiguration coreConfiguration, - IGreenshotLanguage greenshotLanguage, - WindowHandle windowHandle) + public override bool Handle(KeyboardHookEventArgs keyboardHookEventArgs) { - _instance = this; - _coreConfiguration = coreConfiguration; - _greenshotLanguage = greenshotLanguage; - _windowHandle = windowHandle; - } - - public void Startup() - { - Log.Debug().WriteLine("Registering hotkeys"); - // Make sure all hotkeys pass this window! - HotkeyControl.RegisterHotkeyHwnd(_windowHandle.Handle); - - RegisterHotkeys(false); - - Log.Debug().WriteLine("Started hotkeys"); - } - - public void Shutdown() - { - Log.Debug().WriteLine("Stopping hotkeys"); - - // Make sure hotkeys are disabled - try - { - HotkeyControl.UnregisterHotkeys(); - } - catch (Exception e) - { - Log.Error().WriteLine(e, "Error unregistering hotkeys!"); - } - - } - - #region hotkeys - - /// - /// Helper method to cleanly register a hotkey - /// - /// - /// - /// - /// - /// - private static bool RegisterHotkey(StringBuilder failedKeys, string functionName, string hotkeyString, HotKeyHandler handler) - { - var modifierKeyCode = HotkeyControl.HotkeyModifiersFromString(hotkeyString); - var virtualKeyCode = HotkeyControl.HotkeyFromString(hotkeyString); - if (!Keys.None.Equals(virtualKeyCode)) - { - if (HotkeyControl.RegisterHotKey(modifierKeyCode, virtualKeyCode, handler) < 0) - { - Log.Debug().WriteLine("Failed to register {0} to hotkey: {1}", functionName, hotkeyString); - if (failedKeys.Length > 0) - { - failedKeys.Append(", "); - } - failedKeys.Append(hotkeyString); - return false; - } - Log.Debug().WriteLine("Registered {0} to hotkey: {1}", functionName, hotkeyString); - } - else - { - Log.Info().WriteLine("Skipping hotkey registration for {0}, no hotkey set!", functionName); - } - return true; - } - - private bool RegisterWrapper(StringBuilder failedKeys, string functionName, string configurationKey, HotKeyHandler handler, bool ignoreFailedRegistration) - { - var hotkeyValue = _coreConfiguration[configurationKey]; - try - { - var success = RegisterHotkey(failedKeys, functionName, hotkeyValue.Value.ToString(), handler); - if (!success && ignoreFailedRegistration) - { - Log.Debug().WriteLine("Ignoring failed hotkey registration for {0}, with value '{1}', resetting to 'None'.", functionName, hotkeyValue); - _coreConfiguration[configurationKey].Value = Keys.None.ToString(); - } - return success; - } - catch (Exception ex) - { - Log.Warn().WriteLine(ex); - Log.Warn().WriteLine("Restoring default hotkey for {0}, stored under {1} from '{2}' to '{3}'", functionName, configurationKey, hotkeyValue.Value, - hotkeyValue.DefaultValue); - // when getting an exception the key wasn't found: reset the hotkey value - hotkeyValue.ResetToDefault(); - return RegisterHotkey(failedKeys, functionName, hotkeyValue.Value.ToString(), handler); - } + var result = base.Handle(keyboardHookEventArgs); + Log.Debug().WriteLine("{0} - {1} == {2} : {3}- {4}", result, AvailableKeys.Length, AvailableKeys.Count(b => b), string.Join("+", TriggerCombination), keyboardHookEventArgs.ToString()); + return result; } /// - /// Registers all hotkeys as configured, displaying a dialog in case of hotkey conflicts with other tools. + /// Create a RegionHotKeyHandler for the specified VirtualKeyCodes /// - /// - /// Whether the hotkeys could be registered to the users content. This also applies if conflicts arise and the - /// user decides to ignore these (i.e. not to register the conflicting hotkey). - /// - public static bool RegisterHotkeys() + /// ICoreConfiguration + /// string with the property of the ICoreConfiguration to use + public HotKeyHandler(ICoreConfiguration coreConfiguration, string propertyName) { - return _instance.RegisterHotkeys(false); + string RetrieveFunc() => coreConfiguration[propertyName].Value as string; + _propertyChangeSubscription = coreConfiguration + .OnPropertyChanged(propertyName) + .Subscribe(pc => UpdateKeyCombination(RetrieveFunc)); + UpdateKeyCombination(RetrieveFunc); } /// - /// Registers all hotkeys as configured, displaying a dialog in case of hotkey conflicts with other tools. + /// This updates the key combination /// - /// - /// if true, a failed hotkey registration will not be reported to the user - the - /// hotkey will simply not be registered - /// - /// - /// Whether the hotkeys could be registered to the users content. This also applies if conflicts arise and the - /// user decides to ignore these (i.e. not to register the conflicting hotkey). - /// - public bool RegisterHotkeys(bool ignoreFailedRegistration) + /// + private void UpdateKeyCombination(Func retrieveHotkeyFunc) { - var success = true; - var failedKeys = new StringBuilder(); - - if (!RegisterWrapper(failedKeys, "CaptureRegion", "RegionHotkey", - () => - { - CaptureHelper.CaptureRegion(true); - - }, ignoreFailedRegistration)) - { - success = false; - } - if (!RegisterWrapper(failedKeys, "CaptureWindow", "WindowHotkey", () => - { - if (_coreConfiguration.CaptureWindowsInteractive) - { - CaptureHelper.CaptureWindowInteractive(true); - } - else - { - CaptureHelper.CaptureWindow(true); - } - }, ignoreFailedRegistration)) - { - success = false; - } - if (!RegisterWrapper(failedKeys, "CaptureFullScreen", "FullscreenHotkey", - () => CaptureHelper.CaptureFullscreen(true, _coreConfiguration.ScreenCaptureMode), ignoreFailedRegistration)) - { - success = false; - } - if (!RegisterWrapper(failedKeys, "CaptureLastRegion", "LastregionHotkey", () => CaptureHelper.CaptureLastRegion(true), ignoreFailedRegistration)) - { - success = false; - } - if (_coreConfiguration.IECapture) - { - if (!RegisterWrapper(failedKeys, "CaptureIE", "IEHotkey", () => - { - if (_coreConfiguration.IECapture) - { - CaptureHelper.CaptureIe(true, null); - } - }, ignoreFailedRegistration)) - { - success = false; - } - } - - if (!success && !ignoreFailedRegistration) - { - success = HandleFailedHotkeyRegistration(failedKeys.ToString()); - } - - return success || ignoreFailedRegistration; + var keyCombinationString = retrieveHotkeyFunc(); + var combination = KeyHelper.VirtualKeyCodesFromString(keyCombinationString); + Configure(combination); } - /// - /// Check if OneDrive is blocking hotkeys - /// - /// true if onedrive has hotkeys turned on - private static bool IsOneDriveBlockingHotkey() + /// + public void Dispose() { - if (!WindowsVersion.IsWindows10) - { - return false; - } - var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); - var oneDriveSettingsPath = Path.Combine(localAppData, @"Microsoft\OneDrive\settings\Personal"); - if (!Directory.Exists(oneDriveSettingsPath)) - { - return false; - } - var oneDriveSettingsFile = Directory.GetFiles(oneDriveSettingsPath, "*_screenshot.dat").FirstOrDefault(); - if (oneDriveSettingsFile == null || !File.Exists(oneDriveSettingsFile)) - { - return false; - } - var screenshotSetting = File.ReadAllLines(oneDriveSettingsFile).Skip(1).Take(1).First(); - return "2".Equals(screenshotSetting); + _propertyChangeSubscription.Dispose(); } - - /// - /// Displays a dialog for the user to choose how to handle hotkey registration failures: - /// retry (allowing to shut down the conflicting application before), - /// ignore (not registering the conflicting hotkey and resetting the respective config to "None", i.e. not trying to - /// register it again on next startup) - /// abort (do nothing about it) - /// - /// comma separated list of the hotkeys that could not be registered, for display in dialog text - /// - private bool HandleFailedHotkeyRegistration(string failedKeys) - { - var success = false; - var warningTitle = _greenshotLanguage.Warning; - var message = string.Format(_greenshotLanguage.WarningHotkeys, failedKeys, IsOneDriveBlockingHotkey() ? " (OneDrive)" : ""); - var dialogResult = MessageBox.Show(MainForm.Instance, message, warningTitle, MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Exclamation); - switch (dialogResult) - { - case DialogResult.Retry: - Log.Debug().WriteLine("Re-trying to register hotkeys"); - HotkeyControl.UnregisterHotkeys(); - success = RegisterHotkeys(false); - break; - case DialogResult.Ignore: - Log.Debug().WriteLine("Ignoring failed hotkey registration"); - HotkeyControl.UnregisterHotkeys(); - success = RegisterHotkeys(true); - break; - } - return success; - } - - #endregion - } } diff --git a/src/Greenshot/Components/HotkeyService.cs b/src/Greenshot/Components/HotkeyService.cs new file mode 100644 index 000000000..94229e797 --- /dev/null +++ b/src/Greenshot/Components/HotkeyService.cs @@ -0,0 +1,134 @@ +#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.Reactive.Concurrency; +using System.Reactive.Linq; +using System.Threading; +using Autofac.Features.AttributeFilters; +using Dapplo.Addons; +using Dapplo.Log; +using Dapplo.Windows.Input.Keyboard; +using Greenshot.Addons.Core; +using Greenshot.Helpers; + +namespace Greenshot.Components +{ + /// + /// This startup action registers the hotkeys + /// + [Service(nameof(HotkeyService), nameof(MainFormStartup), TaskSchedulerName = "ui")] + public class HotkeyService : IStartup, IShutdown + { + private static readonly LogSource Log = new LogSource(); + private readonly ICoreConfiguration _coreConfiguration; + private readonly SynchronizationContext _synchronizationContext; + private IDisposable _subscriptions; + + public HotkeyService(ICoreConfiguration coreConfiguration, + [KeyFilter("ui")] SynchronizationContext synchronizationContext) + { + _coreConfiguration = coreConfiguration; + _synchronizationContext = synchronizationContext; + } + + public void Startup() + { + Log.Debug().WriteLine("Registering hotkeys"); + + var syncedEvents = KeyboardHook.KeyboardEvents + .Synchronize() + .ObserveOn(_synchronizationContext) + .SubscribeOn(_synchronizationContext); + + var regionHotkeyHandler = new HotKeyHandler(_coreConfiguration, nameof(ICoreConfiguration.RegionHotkey)); + _subscriptions = syncedEvents + .Where(regionHotkeyHandler) + .Subscribe(CaptureRegion, () => regionHotkeyHandler.Dispose()); + + var fullScreenHotkeyHandler = new HotKeyHandler(_coreConfiguration, nameof(ICoreConfiguration.FullscreenHotkey)); + _subscriptions = syncedEvents + .Where(fullScreenHotkeyHandler) + .Subscribe(CaptureFullscreen, () => fullScreenHotkeyHandler.Dispose()); + + var lastRegionHotKeyHandler = new HotKeyHandler(_coreConfiguration, nameof(ICoreConfiguration.LastregionHotkey)); + _subscriptions = syncedEvents + .Where(lastRegionHotKeyHandler) + .Subscribe(CaptureLast, () => lastRegionHotKeyHandler.Dispose()); + + var windowHotKeyHandler = new HotKeyHandler(_coreConfiguration, nameof(ICoreConfiguration.WindowHotkey)); + _subscriptions = syncedEvents + .Where(windowHotKeyHandler) + .Subscribe(CaptureWindow, () => windowHotKeyHandler.Dispose()); + + var ieHotKeyHandler = new HotKeyHandler(_coreConfiguration, nameof(ICoreConfiguration.IEHotkey)); + _subscriptions = syncedEvents + .Where(ieHotKeyHandler) + .Subscribe(CaptureIe, () => ieHotKeyHandler.Dispose()); + + Log.Debug().WriteLine("Started hotkeys"); + } + + public void Shutdown() + { + Log.Debug().WriteLine("Stopping hotkeys"); + + _subscriptions.Dispose(); + } + + private void CaptureRegion(KeyboardHookEventArgs keyboardHookEventArgs) + { + CaptureHelper.CaptureRegion(true); + } + + private void CaptureWindow(KeyboardHookEventArgs keyboardHookEventArgs) + { + if (_coreConfiguration.CaptureWindowsInteractive) + { + CaptureHelper.CaptureWindowInteractive(true); + } + else + { + CaptureHelper.CaptureWindow(true); + } + } + + private void CaptureFullscreen(KeyboardHookEventArgs keyboardHookEventArgs) + { + CaptureHelper.CaptureFullscreen(true, _coreConfiguration.ScreenCaptureMode); + } + + private void CaptureLast(KeyboardHookEventArgs keyboardHookEventArgs) + { + CaptureHelper.CaptureLastRegion(true); + } + + private void CaptureIe(KeyboardHookEventArgs keyboardHookEventArgs) + { + if (_coreConfiguration.IECapture) + { + CaptureHelper.CaptureIe(true, null); + } + } + } +} diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 7f900b958..1b7ffbb36 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -65,26 +65,26 @@ ..\packages\Dapplo.Addons.Config.1.0.70\lib\net461\Dapplo.Addons.Config.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.56\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.58\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.56\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.58\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.56\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.58\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.56\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.58\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Metro.1.0.56\lib\net461\Dapplo.CaliburnMicro.Metro.dll + + ..\packages\Dapplo.CaliburnMicro.Metro.1.0.58\lib\net461\Dapplo.CaliburnMicro.Metro.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.56\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.58\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.56\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.58\lib\net461\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll @@ -116,47 +116,47 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.83\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.95\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.83\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.95\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.83\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.95\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.83\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.95\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.83\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.95\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.83\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.95\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.83\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.95\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.83\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.95\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.83\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.95\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.83\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.95\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.83\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.95\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.83\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.95\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.83\lib\net461\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Multimedia.0.5.95\lib\net461\Dapplo.Windows.Multimedia.dll - - ..\packages\Dapplo.Windows.User32.0.5.83\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.95\lib\net461\Dapplo.Windows.User32.dll ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll @@ -192,8 +192,8 @@ ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - - ..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll + + ..\packages\System.Reflection.TypeExtensions.4.5.0\lib\net461\System.Reflection.TypeExtensions.dll @@ -210,11 +210,12 @@ + - + @@ -536,13 +537,13 @@ - 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/GreenshotAutofacModule.cs b/src/Greenshot/GreenshotAutofacModule.cs index bf68bf87a..5f5c63142 100644 --- a/src/Greenshot/GreenshotAutofacModule.cs +++ b/src/Greenshot/GreenshotAutofacModule.cs @@ -22,6 +22,7 @@ #endregion using Autofac; +using Autofac.Features.AttributeFilters; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Security; @@ -96,6 +97,7 @@ namespace Greenshot .As() .AsSelf() .AsImplementedInterfaces() + .WithAttributeFiltering() .SingleInstance(); builder diff --git a/src/Greenshot/Helpers/ScrollingCapture.cs b/src/Greenshot/Helpers/ScrollingCapture.cs index f0e07c849..f603c4363 100644 --- a/src/Greenshot/Helpers/ScrollingCapture.cs +++ b/src/Greenshot/Helpers/ScrollingCapture.cs @@ -29,8 +29,8 @@ using System.Windows.Forms; using Dapplo.Log; using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Desktop; -using Dapplo.Windows.Input; using Dapplo.Windows.Input.Enums; +using Dapplo.Windows.Input.Keyboard; using Dapplo.Windows.User32; using Dapplo.Windows.User32.Enums; using Greenshot.Addons.Core; @@ -113,7 +113,7 @@ namespace Greenshot.Helpers // Register a keyboard hook to make it possible to ESC the capturing var breakScroll = false; var keyboardHook = KeyboardHook.KeyboardEvents - .Where(args => args.Key == VirtualKeyCodes.ESCAPE) + .Where(args => args.Key == VirtualKeyCode.Escape) .Subscribe(args => { args.Handled = true; diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index a3d456e45..ffefb648b 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -13,13 +13,13 @@ - - - - - - - + + + + + + + @@ -30,21 +30,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -60,9 +60,9 @@ - + - + \ No newline at end of file