diff --git a/src/CommonProject.properties b/src/CommonProject.properties index 89ccbad53..1cfd12951 100644 --- a/src/CommonProject.properties +++ b/src/CommonProject.properties @@ -2,7 +2,8 @@ false - 7.2 + latest + OnBuildSuccess 1685 @@ -11,7 +12,7 @@ DEBUG;TRACE true 4096 - Full + pdbonly x86 Off @@ -22,7 +23,7 @@ DEBUG;TRACE true 4096 - Full + pdbonly AnyCPU Off diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index b2ab30850..2cdb027f4 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -46,11 +46,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index 94ef4ead9..078dddd4c 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs b/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs index 08ef151a8..3df62fa52 100644 --- a/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs +++ b/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Confluence.ViewModels; diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 6b8657553..037bc63b2 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -2,7 +2,6 @@ - 1685 {C3052651-598A-44E2-AAB3-2E41311D50F9} {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library @@ -14,9 +13,7 @@ False 4 false - OnBuildSuccess - - + @@ -25,20 +22,6 @@ - - false - latest - - - false - - - false - latest - - - false - @@ -65,11 +48,11 @@ ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 39f3e3b60..1c252705d 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs b/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs index 5e1bb6727..f2dd1d482 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Dropbox.ViewModels; diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 0b771a367..fa2c85d13 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -13,7 +13,6 @@ False 4 false - Always @@ -21,20 +20,6 @@ 3.5 - - false - latest - - - false - - - false - latest - - - false - @@ -58,11 +43,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index 94ef4ead9..078dddd4c 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 4c44d566f..f895d7a43 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -61,11 +61,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index ca357a4ba..161ce04ae 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addon.Flickr/FlickrAddonModule.cs b/src/Greenshot.Addon.Flickr/FlickrAddonModule.cs index 91cf8d428..6de005a52 100644 --- a/src/Greenshot.Addon.Flickr/FlickrAddonModule.cs +++ b/src/Greenshot.Addon.Flickr/FlickrAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Flickr.ViewModels; diff --git a/src/Greenshot.Addon.Flickr/FlickrDestination.cs b/src/Greenshot.Addon.Flickr/FlickrDestination.cs index af51a5c8e..10fbed821 100644 --- a/src/Greenshot.Addon.Flickr/FlickrDestination.cs +++ b/src/Greenshot.Addon.Flickr/FlickrDestination.cs @@ -38,7 +38,6 @@ using Autofac.Features.OwnedInstances; using Dapplo.Addons; using Dapplo.HttpExtensions; using Dapplo.HttpExtensions.Extensions; -using Dapplo.HttpExtensions.Listener; using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; using Dapplo.Windows.Clipboard; @@ -112,8 +111,9 @@ namespace Greenshot.Addon.Flickr {OAuth1Parameters.Token.EnumValueOf(), "{RequestToken}"}, {OAuth1Parameters.Callback.EnumValueOf(), "{RedirectUrl}"} }), + // TODO: Remove this, use Greenshot redirect like with Imgur, doesn't work anyway // Create a localhost redirect uri, prefer port 47336, but use the first free found - RedirectUrl = new[] { 47336, 0 }.CreateLocalHostUri().AbsoluteUri, + RedirectUrl = "http://localhost:47336",//new[] { 47336 }.CreateLocalHostUri().AbsoluteUri, CheckVerifier = true }; diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 1a2639572..fbc93441d 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -58,11 +58,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 20d55797e..d05eff3ad 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs b/src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs index c56ba9fb6..b4484e816 100644 --- a/src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs +++ b/src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.GooglePhotos.ViewModels; diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 5b8dedd3b..7b4427dbc 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -44,11 +44,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 20d55797e..d05eff3ad 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 67570ca2d..79222689e 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -63,11 +63,11 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Imgur/ImgurAddonModule.cs b/src/Greenshot.Addon.Imgur/ImgurAddonModule.cs index a132eb7d1..716000f94 100644 --- a/src/Greenshot.Addon.Imgur/ImgurAddonModule.cs +++ b/src/Greenshot.Addon.Imgur/ImgurAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Imgur.ViewModels; diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index ccb2aaa88..89644ff34 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 0c1624a04..3d851998b 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -63,11 +63,11 @@ ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Jira/JiraAddonModule.cs b/src/Greenshot.Addon.Jira/JiraAddonModule.cs index 513f897e5..885f82411 100644 --- a/src/Greenshot.Addon.Jira/JiraAddonModule.cs +++ b/src/Greenshot.Addon.Jira/JiraAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Jira.ViewModels; diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index aa68babd6..d94b48130 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs b/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs index 91a8fb0da..ad5b1fe35 100644 --- a/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs +++ b/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.LegacyEditor.Controls; diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 0b0d1e6a7..e64d75b16 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -43,11 +43,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index 1905210d7..43c20a5ff 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 72aa4fffc..33ad6c9aa 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -61,11 +61,11 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Lutim/LutimAddonModule.cs b/src/Greenshot.Addon.Lutim/LutimAddonModule.cs index 8484eeb3d..eb7fa3f57 100644 --- a/src/Greenshot.Addon.Lutim/LutimAddonModule.cs +++ b/src/Greenshot.Addon.Lutim/LutimAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Lutim.ViewModels; diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 72e01cd43..d8ad09f9f 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 87c62aa6f..656be8b9f 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -58,11 +58,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.OCR/OcrAddonModule.cs b/src/Greenshot.Addon.OCR/OcrAddonModule.cs index 737a7ef64..af7bbda80 100644 --- a/src/Greenshot.Addon.OCR/OcrAddonModule.cs +++ b/src/Greenshot.Addon.OCR/OcrAddonModule.cs @@ -26,7 +26,6 @@ using System.IO; using Autofac; using Dapplo.Addons; using Dapplo.Addons.Bootstrapper.Resolving; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addons.Components; diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 563ed728b..78ce6249d 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index cfad4c5c7..1ae3e61da 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -45,11 +45,11 @@ ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Office/OfficeAddonModule.cs b/src/Greenshot.Addon.Office/OfficeAddonModule.cs index ac6b545b0..b54f44be0 100644 --- a/src/Greenshot.Addon.Office/OfficeAddonModule.cs +++ b/src/Greenshot.Addon.Office/OfficeAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Office.Destinations; diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index fedcc8281..ef773344e 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index f565d7251..d35d08925 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -57,11 +57,11 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs b/src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs index 1d4293a49..6f3ef98ed 100644 --- a/src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs +++ b/src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.OneDrive.ViewModels; diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index ccb2aaa88..89644ff34 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index adf98b1b8..3f07218e8 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -58,11 +58,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs b/src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs index 86d8a27ba..c7c78fa33 100644 --- a/src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs +++ b/src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Photobucket.ViewModels; diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 20d55797e..d05eff3ad 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index c53a6b8a7..72236dc98 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -57,11 +57,11 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addon.Tfs/TfsAddonModule.cs b/src/Greenshot.Addon.Tfs/TfsAddonModule.cs index 7ee198950..4db22afbf 100644 --- a/src/Greenshot.Addon.Tfs/TfsAddonModule.cs +++ b/src/Greenshot.Addon.Tfs/TfsAddonModule.cs @@ -24,7 +24,6 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.CaliburnMicro.Translations; using Dapplo.Ini; using Dapplo.Language; using Greenshot.Addon.Tfs.ViewModels; diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 72e01cd43..d8ad09f9f 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -7,8 +7,8 @@ - - + + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index c9fe08067..2dbb60e68 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -41,11 +41,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 82a6d2042..34e119f85 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index a47d3aa4d..259c1e3ed 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -37,11 +37,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index a537963fc..393933f2a 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index ee7acd935..51bc73447 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -43,11 +43,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index ee8f8501c..995a76a34 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -9,8 +9,8 @@ - - + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 36f4310f6..6ef65e2b5 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -72,11 +72,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index e32c074d4..65c3fe46e 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -10,8 +10,8 @@ - - + + diff --git a/src/Greenshot/App.config b/src/Greenshot/App.config index 48da126be..659715f6c 100644 --- a/src/Greenshot/App.config +++ b/src/Greenshot/App.config @@ -1,12 +1,13 @@  - + - + + diff --git a/src/Greenshot/Components/HotkeyHandler.cs b/src/Greenshot/Components/HotkeyHandler.cs index 58aede1ac..376ee2a56 100644 --- a/src/Greenshot/Components/HotkeyHandler.cs +++ b/src/Greenshot/Components/HotkeyHandler.cs @@ -27,7 +27,6 @@ using System.Linq; using System.Text; using System.Windows.Forms; using Dapplo.Addons; -using Dapplo.CaliburnMicro; using Dapplo.Log; using Dapplo.Windows.Common; using Greenshot.Addons; diff --git a/src/Greenshot/Components/MainFormStartup.cs b/src/Greenshot/Components/MainFormStartup.cs index 689804be0..8c6d4bc12 100644 --- a/src/Greenshot/Components/MainFormStartup.cs +++ b/src/Greenshot/Components/MainFormStartup.cs @@ -27,7 +27,6 @@ using System.Linq; using System.Windows.Forms; using Autofac.Features.OwnedInstances; using Dapplo.Addons; -using Dapplo.CaliburnMicro; using Dapplo.Log; using Greenshot.Addons.Components; using Greenshot.Addons.Core; diff --git a/src/Greenshot/Forms/MainForm.cs b/src/Greenshot/Forms/MainForm.cs index 4ecaac08a..b75555efc 100644 --- a/src/Greenshot/Forms/MainForm.cs +++ b/src/Greenshot/Forms/MainForm.cs @@ -46,7 +46,6 @@ using Dapplo.Windows.App; using Dapplo.Windows.Clipboard; using Dapplo.Windows.Common.Structs; using Dapplo.Windows.DesktopWindowsManager; -using Dapplo.Windows.Dpi.Enums; using Dapplo.Windows.Dpi.Forms; using Dapplo.Windows.Kernel32; using Greenshot.Addons; diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 853c77f44..5ac5e0d03 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -9,6 +9,7 @@ Greenshot OnBuildSuccess icons\applicationIcon\icon.ico + Properties True False 4 @@ -55,14 +56,14 @@ ..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll - - ..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.Addons.Config.1.0.66\lib\net46\Dapplo.Addons.Config.dll + + ..\packages\Dapplo.Addons.Config.1.0.68\lib\net46\Dapplo.Addons.Config.dll ..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll @@ -203,7 +204,7 @@ - + @@ -473,7 +474,9 @@ - + + Designer + diff --git a/src/Greenshot/AssemblyInfo.cs b/src/Greenshot/Properties/AssemblyInfo.cs similarity index 100% rename from src/Greenshot/AssemblyInfo.cs rename to src/Greenshot/Properties/AssemblyInfo.cs diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs index 004a342aa..271f2b1e4 100644 --- a/src/Greenshot/Startup.cs +++ b/src/Greenshot/Startup.cs @@ -66,7 +66,7 @@ namespace Greenshot //LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified(); #if DEBUG // Initialize a debug logger for Dapplo packages - LogSettings.RegisterDefaultLogger(LogLevels.Verbose); + LogSettings.RegisterDefaultLogger(LogLevels.Debug); #endif var applicationConfig = ApplicationConfigBuilder .Create() @@ -74,6 +74,7 @@ namespace Greenshot .WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08") .WithConfigSupport() .WithCaliburnMicro() + .WithoutCopyOfEmbeddedAssemblies() .WithAssemblyPatterns("Greenshot.Addon*") .BuildApplicationConfig(); diff --git a/src/Greenshot/greenshot.manifest b/src/Greenshot/greenshot.manifest index 37f2f2177..5a9949195 100644 --- a/src/Greenshot/greenshot.manifest +++ b/src/Greenshot/greenshot.manifest @@ -3,11 +3,11 @@ - - True/PM - - + + True/PM + PerMonitorV2,permonitor true + true @@ -20,8 +20,6 @@ - - diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 1360a90a6..434a5817b 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -10,9 +10,9 @@ - - - + + +