From cb9f62d3e5c53f92c111e76f98533175a874554e Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 19 Jun 2018 16:03:00 +0200 Subject: [PATCH] Updates for the OAuth process, this is WIP --- .../Greenshot.Addon.Box.csproj | 58 +++++++++------- src/Greenshot.Addon.Box/packages.config | 28 ++++---- .../Greenshot.Addon.Confluence.csproj | 58 +++++++++------- .../packages.config | 28 ++++---- .../Greenshot.Addon.Dropbox.csproj | 58 +++++++++------- src/Greenshot.Addon.Dropbox/packages.config | 28 ++++---- .../Greenshot.Addon.ExternalCommand.csproj | 40 +++++------ .../packages.config | 20 +++--- .../Greenshot.Addon.Flickr.csproj | 54 ++++++++------- src/Greenshot.Addon.Flickr/packages.config | 26 +++---- .../Greenshot.Addon.GooglePhotos.csproj | 54 ++++++++------- .../packages.config | 26 +++---- .../Greenshot.Addon.Imgur.csproj | 58 +++++++++------- src/Greenshot.Addon.Imgur/ImgurApi.cs | 5 +- src/Greenshot.Addon.Imgur/packages.config | 28 ++++---- .../Greenshot.Addon.Jira.csproj | 58 +++++++++------- src/Greenshot.Addon.Jira/packages.config | 28 ++++---- .../Greenshot.Addon.LegacyEditor.csproj | 48 ++++++------- .../packages.config | 24 +++---- .../Greenshot.Addon.Lutim.csproj | 48 ++++++------- src/Greenshot.Addon.Lutim/packages.config | 24 +++---- .../Greenshot.Addon.OCR.csproj | 40 +++++------ src/Greenshot.Addon.OCR/packages.config | 20 +++--- .../Greenshot.Addon.Office.csproj | 44 ++++++------ src/Greenshot.Addon.Office/packages.config | 22 +++--- .../Greenshot.Addon.OneDrive.csproj | 58 +++++++++------- src/Greenshot.Addon.OneDrive/packages.config | 28 ++++---- .../Greenshot.Addon.Photobucket.csproj | 54 ++++++++------- .../packages.config | 26 +++---- .../Greenshot.Addon.Tfs.csproj | 48 ++++++------- src/Greenshot.Addon.Tfs/packages.config | 24 +++---- src/Greenshot.Addons/Greenshot.Addons.csproj | 62 +++++++++-------- src/Greenshot.Addons/packages.config | 30 +++++---- .../Greenshot.Gfx.Experimental.csproj | 4 +- .../packages.config | 4 +- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 38 +++++------ src/Greenshot.Gfx/packages.config | 20 +++--- .../Greenshot.PerformanceTests.csproj | 40 +++++------ .../packages.config | 22 +++--- src/Greenshot.Tests/Greenshot.Tests.csproj | 44 ++++++------ src/Greenshot.Tests/packages.config | 24 +++---- src/Greenshot/Components/UpdateService.cs | 18 ++++- src/Greenshot/Greenshot.csproj | 67 ++++++++++--------- src/Greenshot/packages.config | 33 ++++----- src/NuGet.Config | 1 + 45 files changed, 835 insertions(+), 735 deletions(-) diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index b427a4264..ba0a88ef3 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -70,14 +70,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -94,35 +94,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index ad7c57c50..6a42152df 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -14,24 +14,26 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 716d81f2e..df427633f 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -92,14 +92,14 @@ ..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonSimple.dll + + ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonSimple.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -116,35 +116,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 57ab051ae..b47c5ef6c 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -16,24 +16,26 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 4e5751a8c..b7dc4cd71 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -82,14 +82,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -106,35 +106,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index ad7c57c50..6a42152df 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -14,24 +14,26 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 8695e6ad5..436bcd069 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -100,35 +100,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 09ea8f42e..b78aadc21 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -20,15 +20,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index ea4183497..22dddefb0 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -82,11 +82,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -103,35 +103,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 618e0376c..f85304ab4 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -14,22 +14,24 @@ - - + + - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 25ef5faac..0ae1e6de0 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -68,11 +68,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -89,35 +89,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 618e0376c..f85304ab4 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -14,22 +14,24 @@ - - + + - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index a40e777a3..70bf28666 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -87,14 +87,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -111,35 +111,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Imgur/ImgurApi.cs b/src/Greenshot.Addon.Imgur/ImgurApi.cs index 84527c6c4..af33ff476 100644 --- a/src/Greenshot.Addon.Imgur/ImgurApi.cs +++ b/src/Greenshot.Addon.Imgur/ImgurApi.cs @@ -74,14 +74,15 @@ namespace Greenshot.Addon.Imgur {"response_type", "code"}, {"client_id", "{ClientId}"}, {"redirect_uri", "{RedirectUrl}"}, + // TODO: Add version? {"state", "{State}"} }), TokenUrl = new Uri("https://api.imgur.com/oauth2/token"), CloudServiceName = "Imgur", ClientId = imgurConfiguration.ClientId, ClientSecret = imgurConfiguration.ClientSecret, - RedirectUrl = "http://getgreenshot.org", - AuthorizeMode = AuthorizeModes.EmbeddedBrowser, + RedirectUrl = "https://getgreenshot.org/oauth/imgur", + AuthorizeMode = AuthorizeModes.OutOfBound, Token = imgurConfiguration }; diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 2641539ba..891934ddb 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -15,24 +15,26 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index b8793545a..37370495c 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -87,14 +87,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -114,35 +114,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index 4c650bc4d..d6aec4719 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -15,25 +15,27 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 48840906b..3296c9b11 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -67,8 +67,8 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -85,38 +85,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.79\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.80\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index 9508c2315..a4b96dc89 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -14,22 +14,22 @@ - + - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 8a1c8586c..db4209b7c 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -85,11 +85,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index e3137167f..29e381555 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -15,23 +15,23 @@ - - + + - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index dc7f13adb..ce0486578 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -97,35 +97,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 97e2bc34d..f06a2e23f 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -19,15 +19,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 84436a593..dd3d9ef98 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -84,38 +84,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.79\lib\net46\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index 0e50eec29..6c116c60f 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -20,17 +20,17 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 4c8450e77..92b4b975c 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -81,14 +81,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -105,35 +105,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index 2641539ba..891934ddb 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -15,24 +15,26 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 5fd10744b..e18effac0 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -82,11 +82,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -103,35 +103,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 618e0376c..f85304ab4 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -14,22 +14,24 @@ - - + + - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 90e76a159..1da984e8d 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -81,11 +81,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -102,35 +102,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index e3137167f..29e381555 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -15,23 +15,23 @@ - - + + - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 4994c4c1c..12c345e7b 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -65,14 +65,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -89,38 +89,44 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Icons.0.5.79\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Icons.0.5.80\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll + + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index d92b5dd3f..af0d70df4 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -14,25 +14,27 @@ - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj index 4eafbbd1f..16c2161be 100644 --- a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj +++ b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj @@ -42,10 +42,10 @@ - ..\packages\System.Memory.4.5.0\lib\netstandard1.1\System.Memory.dll + ..\packages\System.Memory.4.5.1\lib\netstandard1.1\System.Memory.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll diff --git a/src/Greenshot.Gfx.Experimental/packages.config b/src/Greenshot.Gfx.Experimental/packages.config index 6e758c782..9116a7aac 100644 --- a/src/Greenshot.Gfx.Experimental/packages.config +++ b/src/Greenshot.Gfx.Experimental/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 33341d9fe..900544401 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -64,32 +64,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll @@ -107,7 +107,7 @@ - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 5cf21be6f..5dcfd3462 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -15,16 +15,16 @@ - - - - - - - - - + + + + + + + + + - + \ No newline at end of file diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index bb042faf4..f54596d42 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -69,32 +69,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll @@ -156,7 +156,7 @@ - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -178,7 +178,7 @@ ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net46\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 99f895bd9..d005bc06b 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -18,15 +18,15 @@ - - - - - - - - - + + + + + + + + + @@ -55,7 +55,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 8cae9af3e..2995b6d23 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -83,8 +83,8 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -101,32 +101,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll @@ -186,7 +186,7 @@ - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -209,7 +209,7 @@ ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net46\System.Text.Encoding.CodePages.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 35ca543ff..fabd8d64f 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -14,21 +14,21 @@ - + - - - - - - - - - + + + + + + + + + @@ -56,7 +56,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/src/Greenshot/Components/UpdateService.cs b/src/Greenshot/Components/UpdateService.cs index ed071e7ee..a7a46e6f1 100644 --- a/src/Greenshot/Components/UpdateService.cs +++ b/src/Greenshot/Components/UpdateService.cs @@ -91,7 +91,6 @@ namespace Greenshot.Components _greenshotLanguage = greenshotLanguage; LatestVersion = CurrentVersion = GetType().Assembly.GetName().Version; _coreConfiguration.LastSaveWithVersion = CurrentVersion.ToString(); - } /// @@ -144,6 +143,11 @@ namespace Greenshot.Components Log.Info().WriteLine("Finished background task"); } + /// + /// Do the actual update check + /// + /// CancellationToken + /// Task private async Task UpdateCheck(CancellationToken cancellationToken = default) { Log.Info().WriteLine("Checking for updates"); @@ -160,7 +164,7 @@ namespace Greenshot.Components { await UiContext.RunOn(() => { - // TODO: Show update + // TODO: Show update more nicely... MainForm.Instance.NotifyIcon.BalloonTipClicked += HandleBalloonTipClick; MainForm.Instance.NotifyIcon.BalloonTipClosed += CleanupBalloonTipClick; MainForm.Instance.NotifyIcon.ShowBalloonTip(10000, "Greenshot", string.Format(_greenshotLanguage.UpdateFound, LatestVersion), ToolTipIcon.Info); @@ -205,12 +209,22 @@ namespace Greenshot.Components } } + /// + /// Remove the event handlers + /// + /// object + /// EventArgs private void CleanupBalloonTipClick(object sender, EventArgs e) { MainForm.Instance.NotifyIcon.BalloonTipClicked -= HandleBalloonTipClick; MainForm.Instance.NotifyIcon.BalloonTipClosed -= CleanupBalloonTipClick; } + /// + /// Handle the click on a balloon + /// + /// object + /// EventArgs private void HandleBalloonTipClick(object sender, EventArgs e) { try diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 0e296e762..825e4a6d1 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -88,14 +88,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.47\lib\net46\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.38\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.41\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.38\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.41\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.38\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.41\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -118,44 +118,47 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.79\lib\net46\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.80\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.80\lib\net46\Dapplo.Windows.EmbeddedBrowser.dll - - ..\packages\Dapplo.Windows.Icons.0.5.79\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Icons.0.5.80\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.79\lib\net46\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Multimedia.0.5.80\lib\net46\Dapplo.Windows.Multimedia.dll + + + ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index e337f309c..0b1daded8 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -21,9 +21,9 @@ - - - + + + @@ -31,19 +31,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/NuGet.Config b/src/NuGet.Config index 739aab3f5..5fb080158 100644 --- a/src/NuGet.Config +++ b/src/NuGet.Config @@ -4,5 +4,6 @@ + \ No newline at end of file