diff --git a/src/Greenshot.Addon.Box/BoxDestination.cs b/src/Greenshot.Addon.Box/BoxDestination.cs index 54cd3b175..446a7fe94 100644 --- a/src/Greenshot.Addon.Box/BoxDestination.cs +++ b/src/Greenshot.Addon.Box/BoxDestination.cs @@ -154,7 +154,7 @@ namespace Greenshot.Addon.Box catch (Exception ex) { Log.Error().WriteLine(ex, "Error uploading."); - MessageBox.Show(_boxLanguage.UploadFailure + " " + ex.Message); + MessageBox.Show(_boxLanguage.UploadFailure + @" " + ex.Message); return null; } } diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 7047d97f7..583ced292 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -46,29 +46,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index 15f9f4503..1cf55a088 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 6523e8ea9..cdbf9169a 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -65,29 +65,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 9468c0fe8..7b89d10fc 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs index 131583553..8e6c04b3d 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs @@ -96,7 +96,7 @@ namespace Greenshot.Addon.Dropbox RedirectUrl = "http://localhost:47336", Token = dropboxPluginConfiguration }; - var httpBehaviour = OAuth2HttpBehaviourFactory.Create(_oAuth2Settings) as IChangeableHttpBehaviour; + var httpBehaviour = OAuth2HttpBehaviourFactory.Create(_oAuth2Settings); _oAuthHttpBehaviour = httpBehaviour; // Use the default network settings @@ -169,7 +169,7 @@ namespace Greenshot.Addon.Dropbox catch (Exception e) { Log.Error().WriteLine(e); - MessageBox.Show(_dropboxLanguage.UploadFailure + " " + e.Message); + MessageBox.Show(_dropboxLanguage.UploadFailure + @" " + e.Message); } return dropboxUrl; } diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 3c853db1c..94a03febc 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index 15f9f4503..1cf55a088 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index ad37f18f4..6fd219bc7 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.ExternalCommand/SettingsFormDetail.cs b/src/Greenshot.Addon.ExternalCommand/SettingsFormDetail.cs index fbc13bda9..f3f31ef20 100644 --- a/src/Greenshot.Addon.ExternalCommand/SettingsFormDetail.cs +++ b/src/Greenshot.Addon.ExternalCommand/SettingsFormDetail.cs @@ -63,7 +63,7 @@ namespace Greenshot.Addon.ExternalCommand } else { - textBox_arguments.Text = "\"{0}\""; + textBox_arguments.Text = @"""{0}"""; } OkButtonState(); } diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index def4e64e9..7f4e15bf5 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Flickr/FlickrDestination.cs b/src/Greenshot.Addon.Flickr/FlickrDestination.cs index 7d5a5fd02..47f052dde 100644 --- a/src/Greenshot.Addon.Flickr/FlickrDestination.cs +++ b/src/Greenshot.Addon.Flickr/FlickrDestination.cs @@ -178,7 +178,7 @@ namespace Greenshot.Addon.Flickr catch (Exception e) { Log.Error().WriteLine(e, "Error uploading."); - MessageBox.Show(_flickrLanguage.UploadFailure + " " + e.Message); + MessageBox.Show(_flickrLanguage.UploadFailure + @" " + e.Message); } return uploadUrl; } diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 8c9f9ffa0..5ef2f952f 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index eb9cc3625..a634f0890 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 155ae01d2..24d5f7dc3 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -44,29 +44,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index eb9cc3625..a634f0890 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 922b0d859..d724162eb 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -63,29 +63,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index ed5c3df2e..ca3a14e5e 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 6962df373..d84c159d7 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -63,29 +63,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index c861adde2..f7b994640 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index c5fa75214..3f004a05b 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -36,29 +36,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index e68a64c4b..32fc8a97d 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index a83c8a91c..ecacf0f05 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -61,29 +61,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 4c5e8e555..c959ae980 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index abe16aa67..7e15a13b4 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index def4e64e9..7f4e15bf5 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Office/Destinations/OutlookDestination.cs b/src/Greenshot.Addon.Office/Destinations/OutlookDestination.cs index 5866f36f3..727a1a37f 100644 --- a/src/Greenshot.Addon.Office/Destinations/OutlookDestination.cs +++ b/src/Greenshot.Addon.Office/Destinations/OutlookDestination.cs @@ -28,7 +28,6 @@ using System.Drawing; using System.IO; using System.Text.RegularExpressions; using System.Windows.Forms; -using Dapplo.Ini; using Dapplo.Log; using Greenshot.Addon.Office.OfficeExport; using Greenshot.Addon.Office.OfficeInterop; diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 2696edac4..275e2c1c7 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -44,29 +44,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index 5db9ee402..703145783 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index ff1e9319b..6d02607f4 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -57,29 +57,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index ed5c3df2e..ca3a14e5e 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 4e28e1635..f458afe62 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index eb9cc3625..a634f0890 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index ffd4869a7..59cb6a19d 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -57,29 +57,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 4c5e8e555..c959ae980 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Addons/Components/DestinationHolder.cs b/src/Greenshot.Addons/Components/DestinationHolder.cs index 489236aed..6ef4d0ddf 100644 --- a/src/Greenshot.Addons/Components/DestinationHolder.cs +++ b/src/Greenshot.Addons/Components/DestinationHolder.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Greenshot.Addons.Extensions; namespace Greenshot.Addons.Components { diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index c50c8a47d..1586e65ef 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -40,29 +40,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index f319aaa43..e051271e3 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 5a7af00e1..96360d9fb 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -36,17 +36,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index fbdbb1c48..751a3c51a 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 3814c6f4f..2f652e4d2 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -42,17 +42,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 03834cdf7..8a334c0e2 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index f69cc1d08..154ea8eb8 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -71,17 +71,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 3030c4b17..4cf9e0324 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/src/Greenshot/Components/GreenshotServer.cs b/src/Greenshot/Components/GreenshotServer.cs index 6e9dbd4dc..105a5ffda 100644 --- a/src/Greenshot/Components/GreenshotServer.cs +++ b/src/Greenshot/Components/GreenshotServer.cs @@ -24,7 +24,6 @@ #region Usings using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Security.Principal; diff --git a/src/Greenshot/Destinations/PickerDestination.cs b/src/Greenshot/Destinations/PickerDestination.cs index be1f238ae..db9850dc6 100644 --- a/src/Greenshot/Destinations/PickerDestination.cs +++ b/src/Greenshot/Destinations/PickerDestination.cs @@ -23,7 +23,6 @@ #region Usings -using System; using System.Collections.Generic; using System.Linq; using Greenshot.Addons; diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index ed3b7daa4..33991e5cf 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -57,35 +57,35 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Metro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll + + ..\packages\Dapplo.CaliburnMicro.Metro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs index 149d65361..24b22ff9f 100644 --- a/src/Greenshot/Startup.cs +++ b/src/Greenshot/Startup.cs @@ -22,7 +22,6 @@ #endregion using System; -using System.Collections.Generic; using System.Diagnostics; using System.Drawing; using System.Text; @@ -33,7 +32,7 @@ using Autofac.Extras.CommonServiceLocator; using Autofac.Features.OwnedInstances; using Caliburn.Micro; using CommonServiceLocator; -using Dapplo.Addons.Bootstrapper.Resolving; +using Dapplo.Addons.Bootstrapper; using Dapplo.CaliburnMicro.Dapp; using Dapplo.Ini.Converters; using Dapplo.Language; @@ -69,8 +68,13 @@ namespace Greenshot // Initialize a debug logger for Dapplo packages LogSettings.RegisterDefaultLogger(LogLevels.Verbose); #endif + var applicationConfig = ApplicationConfig.Create() + .WithApplicationName("Greenshot") + .WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08") + .WithAssemblyNames("Dapplo.Addons.Config") + .WithAssemblyPatterns("Greenshot.Addon*"); - var application = new Dapplication("Greenshot", "F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08") + var application = new Dapplication(applicationConfig) { ShutdownMode = ShutdownMode.OnExplicitShutdown }; @@ -87,25 +91,7 @@ namespace Greenshot RegisterErrorHandlers(application); - var scanDirectories = new List - { - FileLocations.StartupDirectory, -#if DEBUG - // Test directories? -#else - Others? -#endif - }; - application.Bootstrapper - .AddScanDirectories(scanDirectories) - // Load the assemblies, and run the application - .FindAndLoadAssemblies("Dapplo.Caliburn*") - // Load the assemblies, and run the application - .FindAndLoadAssemblies("Dapplo.Addons.Config") - // Make sure the non-plugin DLLs are also loaded, so exports are available. - .FindAndLoadAssemblies("Greenshot.Addon*", new []{".dll", ".gsp"}) - - .OnContainerCreated += container => + application.Bootstrapper.OnContainerCreated += container => { var autofacServiceLocator = new AutofacServiceLocator(container); ServiceLocator.SetLocatorProvider(() => autofacServiceLocator); diff --git a/src/Greenshot/Ui/Misc/ViewModels/SplashViewModel.cs b/src/Greenshot/Ui/Misc/ViewModels/SplashViewModel.cs index 0b8723ac1..deb221f1a 100644 --- a/src/Greenshot/Ui/Misc/ViewModels/SplashViewModel.cs +++ b/src/Greenshot/Ui/Misc/ViewModels/SplashViewModel.cs @@ -25,7 +25,6 @@ using Caliburn.Micro; using Dapplo.CaliburnMicro; -using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Forms; #endregion diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 66c7ebdf2..6eadd241b 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -11,16 +11,16 @@ - - + + - - - - - - - + + + + + + +