diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 8e0f824ac..a115738ae 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -46,89 +46,90 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -140,7 +141,10 @@ + + + diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index 056ca4629..9875717c0 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -6,34 +6,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 9f55faa00..a72a00310 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -45,95 +45,96 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll + + ..\packages\Costura.Fody.3.1.2\lib\net46\Costura.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll + + ..\packages\Dapplo.Confluence.0.8.10\lib\net461\Dapplo.Confluence.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonSimple.dll + + ..\packages\Dapplo.HttpExtensions.JsonSimple.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonSimple.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -145,8 +146,11 @@ 3.5 + + + @@ -239,13 +243,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 9ab7b4f4d..a63214b21 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -6,37 +6,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 1a7825e90..05fc50bf6 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -43,89 +43,90 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -137,7 +138,10 @@ + + + diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index 056ca4629..9875717c0 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -6,34 +6,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 6f8e23d56..a14d2e03c 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -61,74 +61,74 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -138,6 +138,7 @@ + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll @@ -159,6 +160,7 @@ + diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 8d64d41fb..ea0f2d4b5 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -7,29 +7,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 5ffdef800..55a59edb4 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -58,86 +58,87 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -146,7 +147,10 @@ + + + diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 4f4d2c4e1..7661605bc 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -6,33 +6,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 30596bf38..618966255 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -44,86 +44,87 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -132,7 +133,10 @@ + + + diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 4f4d2c4e1..7661605bc 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -6,33 +6,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 5b74189b3..135639cd2 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -63,89 +63,90 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll @@ -160,7 +161,10 @@ + + + diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 65c48eebc..6972de601 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -7,34 +7,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index 1d55aa232..0690b77c5 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -14,44 +14,45 @@ - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll True @@ -64,6 +65,7 @@ + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll diff --git a/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs b/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs index d7583933e..2ebca2386 100644 --- a/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs +++ b/src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs @@ -387,7 +387,7 @@ namespace Greenshot.Addon.InternetExplorer { if (windowToCapture == null) { - windowToCapture = InteropWindowQuery.GetActiveWindow(); + windowToCapture = InteropWindowQuery.GetForegroundWindow(); } // Show backgroundform after retrieving the active window.. var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured..."); diff --git a/src/Greenshot.Addon.InternetExplorer/packages.config b/src/Greenshot.Addon.InternetExplorer/packages.config index e81c467f4..adaf206ef 100644 --- a/src/Greenshot.Addon.InternetExplorer/packages.config +++ b/src/Greenshot.Addon.InternetExplorer/packages.config @@ -1,18 +1,18 @@  - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 5251d55f2..67f6ce77e 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -60,95 +60,96 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll + + ..\packages\Costura.Fody.3.1.2\lib\net46\Costura.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Jira.0.7.15\lib\net46\Dapplo.Jira.dll + + ..\packages\Dapplo.Jira.0.8.5\lib\net461\Dapplo.Jira.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -164,7 +165,9 @@ + + @@ -306,13 +309,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 2bf3a3d07..da102a177 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -6,37 +6,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 33efbc600..cb8d62507 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -43,80 +43,80 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.6.6\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -126,6 +126,7 @@ + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index aed919d50..f8c2463eb 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -6,31 +6,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index ea7b988c0..f6f3af376 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -61,80 +61,80 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll @@ -150,6 +150,7 @@ + diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 4dac2319d..e66648085 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -7,31 +7,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 8cb9b537d..21aa6e557 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -58,74 +58,74 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -135,6 +135,7 @@ + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll @@ -155,6 +156,8 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll + + diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 2219eeae9..7f136796e 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -6,29 +6,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 54467a948..91ec447de 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -42,74 +42,74 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\Interop.Microsoft.Office.Interop.OneNote.1.1.0.0\lib\net40\Interop.Microsoft.Office.Interop.OneNote.dll @@ -146,6 +146,7 @@ + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll @@ -167,6 +168,7 @@ + diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index 9074a1870..c2c0c8e39 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -6,29 +6,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 542e9ee7e..7c79c9f62 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -61,89 +61,90 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll @@ -158,7 +159,10 @@ + + + diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index 65c48eebc..6972de601 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -7,34 +7,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index cbe225d88..ad2adabeb 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -58,86 +58,87 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -146,7 +147,10 @@ + + + diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 4f4d2c4e1..7661605bc 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -6,33 +6,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 2f6afa236..12d5758a6 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -61,80 +61,80 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll @@ -150,6 +150,7 @@ + diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 4dac2319d..e66648085 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -7,31 +7,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 2fad3504f..785800cc8 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -54,74 +54,74 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -131,6 +131,7 @@ + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index 2219eeae9..7f136796e 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -6,29 +6,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index cf272b4d1..801e3dc5f 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -43,98 +43,98 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Toasts.1.0.75\lib\net461\Dapplo.CaliburnMicro.Toasts.dll + + ..\packages\Dapplo.CaliburnMicro.Toasts.1.0.83\lib\net461\Dapplo.CaliburnMicro.Toasts.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.6.6\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Shell32.0.5.109\lib\net461\Dapplo.Windows.Shell32.dll + + ..\packages\Dapplo.Windows.Shell32.0.6.6\lib\net461\Dapplo.Windows.Shell32.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.IconPacks.2.3.0\lib\net46\MahApps.Metro.IconPacks.dll @@ -152,7 +152,10 @@ + + + diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 349060502..c7ba1afc1 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -7,37 +7,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index dea6a2888..691f9af5e 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -18,35 +18,35 @@ true - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.6.6\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -69,6 +69,8 @@ + + diff --git a/src/Greenshot.Core/Sources/DwmWindowSource.cs b/src/Greenshot.Core/Sources/DwmWindowSource.cs index 21d5ae708..afd7baf61 100644 --- a/src/Greenshot.Core/Sources/DwmWindowSource.cs +++ b/src/Greenshot.Core/Sources/DwmWindowSource.cs @@ -43,7 +43,7 @@ namespace Greenshot.Core.Sources public DwmWindowSource(ICaptureConfiguration captureConfiguration, Func retrieveWindowFunc = null) { _captureConfiguration = captureConfiguration; - _retrieveWindowFunc = retrieveWindowFunc ?? InteropWindowQuery.GetActiveWindow; + _retrieveWindowFunc = retrieveWindowFunc ?? InteropWindowQuery.GetForegroundWindow; } public ValueTask> Import(CancellationToken cancellationToken = default) diff --git a/src/Greenshot.Core/packages.config b/src/Greenshot.Core/packages.config index 3fb8454d9..c6ec8fc79 100644 --- a/src/Greenshot.Core/packages.config +++ b/src/Greenshot.Core/packages.config @@ -1,15 +1,15 @@  - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index ce72ed38f..400b6d5e0 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -37,59 +37,59 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll @@ -102,6 +102,7 @@ + ..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 0838eca01..b37dc4a8d 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -6,24 +6,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 627bf0e50..218326dbe 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -40,71 +40,72 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 182b12837..b9fe689c6 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -8,28 +8,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 355c220d7..53d368dcc 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -72,71 +72,72 @@ ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 447ff05a6..cbefbb40a 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -10,28 +10,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 81e7174e5..50f0955b5 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -53,116 +53,117 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll + + ..\packages\Costura.Fody.3.1.2\lib\net46\Costura.dll - - ..\packages\Dapplo.Addons.1.0.79\lib\net461\Dapplo.Addons.dll + + + ..\packages\Dapplo.Addons.1.1.3\lib\net461\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.79\lib\net461\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.1.3\lib\net461\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.Addons.Config.1.0.79\lib\net461\Dapplo.Addons.Config.dll + + ..\packages\Dapplo.Addons.Config.1.1.3\lib\net461\Dapplo.Addons.Config.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.75\lib\net461\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.83\lib\net461\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.75\lib\net461\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.83\lib\net461\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.75\lib\net461\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.83\lib\net461\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.75\lib\net461\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.83\lib\net461\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Metro.1.0.75\lib\net461\Dapplo.CaliburnMicro.Metro.dll + + ..\packages\Dapplo.CaliburnMicro.Metro.1.0.83\lib\net461\Dapplo.CaliburnMicro.Metro.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.75\lib\net461\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.83\lib\net461\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Toasts.1.0.75\lib\net461\Dapplo.CaliburnMicro.Toasts.dll + + ..\packages\Dapplo.CaliburnMicro.Toasts.1.0.83\lib\net461\Dapplo.CaliburnMicro.Toasts.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.75\lib\net461\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.83\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.9.4\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.9.4\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.9.4\lib\net461\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.6.2\lib\net461\Dapplo.Ini.dll - - ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll + + ..\packages\Dapplo.InterfaceImpl.0.3.2\lib\net461\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.6.2\lib\net461\Dapplo.Language.dll - - ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll + + ..\packages\Dapplo.Log.1.3.11\lib\net45\Dapplo.Log.dll - - ..\packages\Dapplo.Log.LogFile.1.2.1\lib\net45\Dapplo.Log.LogFile.dll + + ..\packages\Dapplo.Log.LogFile.1.3.11\lib\net45\Dapplo.Log.LogFile.dll - - ..\packages\Dapplo.Log.Loggers.1.2.1\lib\net45\Dapplo.Log.Loggers.dll + + ..\packages\Dapplo.Log.Loggers.1.3.11\lib\net45\Dapplo.Log.Loggers.dll - - ..\packages\Dapplo.Utils.1.0.161\lib\net45\Dapplo.Utils.dll + + ..\packages\Dapplo.Utils.1.1.3\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.6.6\lib\net461\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.6.6\lib\net461\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.6.6\lib\net461\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.6.6\lib\net461\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.6.6\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.6.6\lib\net461\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.6.6\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.6.6\lib\net461\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.6.6\lib\net461\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.6.6\lib\net461\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.6.6\lib\net461\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.6.6\lib\net461\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.109\lib\net461\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Multimedia.0.6.6\lib\net461\Dapplo.Windows.Multimedia.dll - - ..\packages\Dapplo.Windows.Shell32.0.5.109\lib\net461\Dapplo.Windows.Shell32.dll + + ..\packages\Dapplo.Windows.Shell32.0.6.6\lib\net461\Dapplo.Windows.Shell32.dll - - ..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.6.6\lib\net461\Dapplo.Windows.User32.dll ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll @@ -192,7 +193,10 @@ ..\packages\System.Console.4.0.0\lib\net46\System.Console.dll + + + @@ -565,13 +569,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/Helpers/CaptureHelper.cs b/src/Greenshot/Helpers/CaptureHelper.cs index ec9287759..a43cc11b7 100644 --- a/src/Greenshot/Helpers/CaptureHelper.cs +++ b/src/Greenshot/Helpers/CaptureHelper.cs @@ -678,7 +678,7 @@ namespace Greenshot.Helpers } else { - SelectedCaptureWindow = InteropWindowQuery.GetActiveWindow(); + SelectedCaptureWindow = InteropWindowQuery.GetForegroundWindow(); if (SelectedCaptureWindow != null) { if (Log.IsDebugEnabled()) @@ -997,7 +997,7 @@ namespace Greenshot.Helpers private void SetDpi() { // Workaround for proble with DPI retrieval, the FromHwnd activates the window... - var previouslyActiveWindow = InteropWindowQuery.GetActiveWindow(); + var previouslyActiveWindow = InteropWindowQuery.GetForegroundWindow(); // Workaround for changed DPI settings in Windows 7 using (var graphics = Graphics.FromHwnd(MainForm.Instance.Handle)) { diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index bb052a7a9..e065209ae 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -9,44 +9,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +