diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 9d94c9f58..1840b9461 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -70,23 +70,23 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index c04c6c83a..c9b0106bf 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -14,12 +14,12 @@ - - - - + + + + - + diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 51d85351c..945d518ca 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -75,23 +75,23 @@ ..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonSimple.dll + + ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonSimple.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 19efc851c..b9953ee9d 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -16,12 +16,12 @@ - - - - + + + + - + diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 50a61ee97..5853410a1 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -67,23 +67,23 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index c04c6c83a..c9b0106bf 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -14,12 +14,12 @@ - - - - + + + + - + diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 516315277..8a53a62ce 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -85,14 +85,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 4e6f2b194..5a7d38c4d 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -15,9 +15,9 @@ - + - + diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index d5e8047dc..cc794c826 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -82,20 +82,20 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 2cee761cc..22132c767 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -14,11 +14,11 @@ - - - + + + - + diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 407c85634..1c44e81cb 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -68,20 +68,20 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 2cee761cc..22132c767 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -14,11 +14,11 @@ - - - + + + - + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index dc709ec01..3b8309e93 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -87,23 +87,23 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 0d59e03c0..5cbe6add6 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -15,12 +15,12 @@ - - - - + + + + - + diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index 785de7b04..1d55aa232 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -14,8 +14,8 @@ - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll diff --git a/src/Greenshot.Addon.InternetExplorer/packages.config b/src/Greenshot.Addon.InternetExplorer/packages.config index d2618e6f5..e81c467f4 100644 --- a/src/Greenshot.Addon.InternetExplorer/packages.config +++ b/src/Greenshot.Addon.InternetExplorer/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 69c7a2738..c96fec62e 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -87,17 +87,17 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll @@ -105,8 +105,8 @@ ..\packages\Dapplo.Jira.0.7.15\lib\net46\Dapplo.Jira.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index 138c33e68..e13ff7a72 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -15,13 +15,13 @@ - - - - + + + + - + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index ca8c18935..9859c372c 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -67,17 +67,17 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index fe55f1ecb..925e4962f 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -14,10 +14,10 @@ - - + + - + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index b9ef7ef3e..8153b5ab1 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -85,20 +85,20 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index f46db1b4a..0b8163d60 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -15,11 +15,11 @@ - - - + + + - + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index d364a8063..c3a46c93f 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -82,14 +82,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index f21bfb09a..765095269 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -14,9 +14,9 @@ - + - + diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index ca2a62287..f205e6899 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -66,14 +66,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index f6e63df4f..f9b18d551 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -14,9 +14,9 @@ - + - + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 036554ce9..9199a9790 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -85,23 +85,23 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index 0d59e03c0..5cbe6add6 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -15,12 +15,12 @@ - - - - + + + + - + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 4b95e73f9..d39addffc 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -82,20 +82,20 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs b/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs index f64bea526..a9aa15a51 100644 --- a/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs +++ b/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs @@ -186,13 +186,12 @@ namespace Greenshot.Addon.Photobucket IList albums = null; try { - albums = RetrievePhotobucketAlbums().Result; + albums = Task.Run(RetrievePhotobucketAlbums).Result; _albumsCache = albums; - } - catch + catch (Exception ex) { - // ignored + Log.Error().WriteLine(ex, "Couldn't retrieve the photobucket albums."); } if (albums == null || albums.Count == 0) diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 2cee761cc..22132c767 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -14,11 +14,11 @@ - - - + + + - + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index bd80d751b..bbc68915a 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -85,20 +85,20 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index f46db1b4a..0b8163d60 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -15,11 +15,11 @@ - - - + + + - + diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 86d989ef5..b6f8ffcf1 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -78,14 +78,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index f21bfb09a..765095269 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -14,9 +14,9 @@ - + - + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 384b48517..012f4176a 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -70,23 +70,23 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 49ef47b9a..e7af37e24 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -16,12 +16,12 @@ - - - - + + + + - + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 060ddbe5b..212d8aaec 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -49,14 +49,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 733ebc1e2..8d56f0cd6 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -10,9 +10,9 @@ - + - + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 7ca3d5b75..c20fd199b 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -52,20 +52,20 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index af3f95301..dab4316c3 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -12,11 +12,11 @@ - - - + + + - + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index fc04ec8cb..766a63c3f 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -84,20 +84,20 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll @@ -302,7 +302,8 @@ - ..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll + ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll + True ..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index ad7fe1067..605454d8e 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -14,11 +14,11 @@ - - - + + + - + @@ -93,7 +93,7 @@ - + diff --git a/src/Greenshot/Components/MainFormStartup.cs b/src/Greenshot/Components/MainFormStartup.cs index 5ebd47b71..895407e59 100644 --- a/src/Greenshot/Components/MainFormStartup.cs +++ b/src/Greenshot/Components/MainFormStartup.cs @@ -64,7 +64,7 @@ namespace Greenshot.Components /// public void Startup() { - Log.Debug().WriteLine("Starting MainForm"); + Log.Debug().WriteLine($"Starting MainForm, current language {_coreConfiguration.Language}"); // if language is not set, show language dialog if (string.IsNullOrEmpty(_coreConfiguration.Language)) diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 0ecae40e6..46b422b4a 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -89,23 +89,23 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.74\lib\net461\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.46\lib\net46\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.43\lib\net46\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.46\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.43\lib\net46\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.46\lib\net46\Dapplo.HttpExtensions.OAuth.dll - - ..\packages\Dapplo.Ini.0.5.29\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.31\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.29\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.31\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs index 7fa24a79c..021b5b18b 100644 --- a/src/Greenshot/Startup.cs +++ b/src/Greenshot/Startup.cs @@ -36,6 +36,7 @@ using Dapplo.Ini.Converters; using Dapplo.Language; using Dapplo.Log; using Dapplo.Log.Loggers; +using Dapplo.Utils; using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Dpi.Forms; using Dapplo.Windows.Kernel32; @@ -64,7 +65,7 @@ namespace Greenshot //LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified(); #if DEBUG // Initialize a debug logger for Dapplo packages - LogSettings.RegisterDefaultLogger(LogLevels.Debug); + LogSettings.RegisterDefaultLogger(LogLevels.Verbose); #endif var applicationConfig = ApplicationConfigBuilder .Create() @@ -113,7 +114,7 @@ namespace Greenshot /// /// Dapplication /// Exception - private static void DisplayErrorViewModel(Dapplication application, Exception exception) + private static async void DisplayErrorViewModel(Dapplication application, Exception exception) { var windowManager = application.Bootstrapper.Container?.Resolve(); if (windowManager == null) @@ -128,9 +129,15 @@ namespace Greenshot return; } errorViewModel.Value.SetExceptionToDisplay(exception); - windowManager.ShowDialog(errorViewModel.Value); + if (!UiContext.HasUiAccess) + { + await UiContext.RunOn(() => windowManager.ShowDialog(errorViewModel.Value)); + } + else + { + windowManager.ShowDialog(errorViewModel.Value); + } } - } /// diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index fb286cbff..f57e0b43f 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -21,12 +21,12 @@ - - - - + + + + - + diff --git a/src/NuGet.Config b/src/NuGet.Config index 5fb080158..2b5005fdb 100644 --- a/src/NuGet.Config +++ b/src/NuGet.Config @@ -4,6 +4,6 @@ - + \ No newline at end of file