diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 57a3dcfa0..714affbdd 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Box Greenshot.Addon.Box - v4.5.2 + v4.6 Properties False False @@ -46,38 +46,38 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -94,32 +94,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -134,21 +134,13 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll @@ -173,6 +165,7 @@ + @@ -193,7 +186,6 @@ - diff --git a/src/Greenshot.Addon.Box/app.config b/src/Greenshot.Addon.Box/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Box/app.config +++ b/src/Greenshot.Addon.Box/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index 52052b2a6..dbe16b5d2 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -1,38 +1,36 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index cfabe9bcf..922f5506e 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -8,7 +8,7 @@ Library Greenshot.Addon.Confluence Greenshot.Addon.Confluence - v4.5.2 + v4.6 Properties False False @@ -65,41 +65,41 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll + ..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonSimple.dll + ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonSimple.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -116,32 +116,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -157,22 +157,14 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll @@ -198,6 +190,7 @@ + @@ -209,7 +202,6 @@ Never - @@ -238,6 +230,7 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Green mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -245,6 +238,5 @@ copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuratio - \ No newline at end of file diff --git a/src/Greenshot.Addon.Confluence/app.config b/src/Greenshot.Addon.Confluence/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Confluence/app.config +++ b/src/Greenshot.Addon.Confluence/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index ff0b49ca3..810bb9fae 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -1,40 +1,38 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 2b229e251..5deb1186c 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Dropbox Greenshot.Addon.Dropbox - v4.5.2 + v4.6 Properties False False @@ -58,38 +58,38 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -106,32 +106,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -146,21 +146,13 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.Dropbox/app.config b/src/Greenshot.Addon.Dropbox/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Dropbox/app.config +++ b/src/Greenshot.Addon.Dropbox/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index 52052b2a6..dbe16b5d2 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -1,38 +1,36 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index c0312191c..015f114b4 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.ExternalCommand Greenshot.Addon.ExternalCommand - v4.5.2 + v4.6 Properties False False @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -97,32 +97,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -132,20 +132,12 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.ExternalCommand/app.config b/src/Greenshot.Addon.ExternalCommand/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.ExternalCommand/app.config +++ b/src/Greenshot.Addon.ExternalCommand/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index adcd693f3..4e599921a 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -1,34 +1,32 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 0d1714638..44f708995 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Flickr Greenshot.Addon.Flickr - v4.5.2 + v4.6 Properties False False @@ -58,35 +58,35 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -103,32 +103,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -140,21 +140,13 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.Flickr/app.config b/src/Greenshot.Addon.Flickr/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Flickr/app.config +++ b/src/Greenshot.Addon.Flickr/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 4a314dcfd..18cb1bc00 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -1,36 +1,34 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 2b7e10f05..dc37a1f64 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.GooglePhotos Greenshot.Addon.GooglePhotos - v4.5.2 + v4.6 Properties False False @@ -44,35 +44,35 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -89,32 +89,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -126,21 +126,13 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll @@ -174,8 +166,8 @@ - + diff --git a/src/Greenshot.Addon.GooglePhotos/app.config b/src/Greenshot.Addon.GooglePhotos/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.GooglePhotos/app.config +++ b/src/Greenshot.Addon.GooglePhotos/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 4a314dcfd..18cb1bc00 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -1,36 +1,34 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 4eab84b37..c3de95d57 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Imgur Greenshot.Addon.Imgur - v4.5.2 + v4.6 Properties False False @@ -63,38 +63,38 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -111,35 +111,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll - ..\packages\MahApps.Metro.1.6.4\lib\net45\MahApps.Metro.dll + ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll @@ -154,21 +154,13 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.Imgur/app.config b/src/Greenshot.Addon.Imgur/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Imgur/app.config +++ b/src/Greenshot.Addon.Imgur/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index bfd889dc7..37840cdef 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -1,40 +1,38 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index c8470eb5f..43a5525d5 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Jira Greenshot.Addon.Jira - v4.5.2 + v4.6 Properties False False @@ -63,38 +63,38 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -103,7 +103,7 @@ ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - ..\packages\Dapplo.Jira.0.7.10\lib\net45\Dapplo.Jira.dll + ..\packages\Dapplo.Jira.0.7.10\lib\net46\Dapplo.Jira.dll ..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll @@ -114,32 +114,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -150,7 +150,6 @@ ..\packages\Svg.2.3.0\lib\net35\Svg.dll - False @@ -159,22 +158,14 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - False - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - False - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - False + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll @@ -299,6 +290,7 @@ copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuratio None false + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -306,6 +298,5 @@ copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuratio - \ No newline at end of file diff --git a/src/Greenshot.Addon.Jira/app.config b/src/Greenshot.Addon.Jira/app.config index 4e121d920..76f62fbe9 100644 --- a/src/Greenshot.Addon.Jira/app.config +++ b/src/Greenshot.Addon.Jira/app.config @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index e68d85567..a8c29a60e 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -1,42 +1,40 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 1001ed1cc..5b7c10c60 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -10,9 +10,10 @@ Properties Greenshot.Addon.LegacyEditor Greenshot.Addon.LegacyEditor - v4.5.2 + v4.6 512 true + @@ -36,29 +37,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -75,35 +76,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.56\lib\net45\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.58\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -113,17 +114,12 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.LegacyEditor/app.config b/src/Greenshot.Addon.LegacyEditor/app.config index 5ad3f61fd..17fc57827 100644 --- a/src/Greenshot.Addon.LegacyEditor/app.config +++ b/src/Greenshot.Addon.LegacyEditor/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index b2cc34855..b01dfa9f0 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -1,35 +1,33 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index d45440a16..ec2667a4e 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Lutim Greenshot.Addon.Lutim - v4.5.2 + v4.6 Properties False False @@ -61,35 +61,35 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll - ..\packages\MahApps.Metro.1.6.4\lib\net45\MahApps.Metro.dll + ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll @@ -149,21 +149,13 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.Lutim/app.config b/src/Greenshot.Addon.Lutim/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Lutim/app.config +++ b/src/Greenshot.Addon.Lutim/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 536926bf5..91b36a2a6 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -1,39 +1,37 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 2bbfe8b71..b6dd175c0 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.OCR Greenshot.Addon.OCR - v4.5.2 + v4.6 Properties False False @@ -58,29 +58,29 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -97,32 +97,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -132,20 +132,12 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.OCR/app.config b/src/Greenshot.Addon.OCR/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.OCR/app.config +++ b/src/Greenshot.Addon.OCR/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index adcd693f3..4e599921a 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -1,34 +1,32 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 2382a4191..766e959a8 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -9,7 +9,7 @@ Library Greenshot.Addon.Office Greenshot.Addon.Office - v4.5.2 + v4.6 Properties OnBuildSuccess False @@ -18,6 +18,7 @@ false + @@ -44,29 +45,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -83,35 +84,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Com.0.5.56\lib\net45\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.58\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -124,20 +125,12 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll @@ -257,6 +250,7 @@ copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greens mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -264,6 +258,5 @@ copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuratio - \ No newline at end of file diff --git a/src/Greenshot.Addon.Office/app.config b/src/Greenshot.Addon.Office/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Office/app.config +++ b/src/Greenshot.Addon.Office/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index 27870aa6d..b9e5ca6bc 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -1,37 +1,35 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index a24cad2e5..34bf17403 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.OneDrive Greenshot.Addon.OneDrive - v4.5.2 + v4.6 Properties False False @@ -57,38 +57,38 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -105,53 +105,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll - ..\packages\MahApps.Metro.1.6.4\lib\net45\MahApps.Metro.dll - - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + @@ -160,9 +148,13 @@ + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + + ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll @@ -184,9 +176,9 @@ - + diff --git a/src/Greenshot.Addon.OneDrive/app.config b/src/Greenshot.Addon.OneDrive/app.config index 5ad3f61fd..17fc57827 100644 --- a/src/Greenshot.Addon.OneDrive/app.config +++ b/src/Greenshot.Addon.OneDrive/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index bfd889dc7..37840cdef 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -1,40 +1,38 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 6d80e800c..05b2b284f 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Photobucket Greenshot.Addon.Photobucket - v4.5.2 + v4.6 Properties False False @@ -58,35 +58,35 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -103,32 +103,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -140,21 +140,13 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll @@ -186,6 +178,7 @@ Never + @@ -198,7 +191,6 @@ - diff --git a/src/Greenshot.Addon.Photobucket/app.config b/src/Greenshot.Addon.Photobucket/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Photobucket/app.config +++ b/src/Greenshot.Addon.Photobucket/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 4a314dcfd..18cb1bc00 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -1,36 +1,34 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 0ce8d107d..9b9686caf 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -7,7 +7,7 @@ Library Greenshot.Addon.Tfs Greenshot.Addon.Tfs - v4.5.2 + v4.6 Properties False False @@ -57,35 +57,35 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -102,53 +102,41 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll - ..\packages\MahApps.Metro.1.6.4\lib\net45\MahApps.Metro.dll - - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + @@ -157,9 +145,13 @@ + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + + ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll @@ -186,9 +178,9 @@ - + diff --git a/src/Greenshot.Addon.Tfs/app.config b/src/Greenshot.Addon.Tfs/app.config index 5ad3f61fd..17fc57827 100644 --- a/src/Greenshot.Addon.Tfs/app.config +++ b/src/Greenshot.Addon.Tfs/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 536926bf5..91b36a2a6 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -1,39 +1,37 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index ad1395812..d175c4bd7 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -10,7 +10,7 @@ Properties Greenshot.Addon.Win10 Greenshot.Addon.Win10 - v4.5.2 + v4.6 512 8.1 @@ -54,17 +54,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -81,32 +81,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -116,20 +116,12 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addon.Win10/app.config b/src/Greenshot.Addon.Win10/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addon.Win10/app.config +++ b/src/Greenshot.Addon.Win10/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index eb0650aeb..8f5b2bf5c 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -1,30 +1,28 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 284aeb809..082cdaa71 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -7,13 +7,14 @@ Library Greenshot.Addons Greenshot.Addons - v4.5.2 + v4.6 Properties OnBuildSuccess True False 4 false + @@ -40,38 +41,38 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -88,38 +89,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.56\lib\net45\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.58\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.56\lib\net45\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.58\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -130,7 +131,6 @@ ..\packages\Svg.2.3.0\lib\net35\Svg.dll - True @@ -138,24 +138,16 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll + - ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Addons/app.config b/src/Greenshot.Addons/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Addons/app.config +++ b/src/Greenshot.Addons/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 3d26a9c1b..224d9fbdd 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -1,41 +1,39 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj index 299d388c8..4eafbbd1f 100644 --- a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj +++ b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj @@ -9,8 +9,9 @@ Properties Greenshot.Gfx.Experimental Greenshot.Gfx.Experimental - v4.5.2 + v4.6 512 + true @@ -35,13 +36,16 @@ + + ..\packages\System.Buffers.4.5.0\lib\netstandard1.1\System.Buffers.dll + - ..\packages\System.Memory.4.5.0-preview1-26216-02\lib\netstandard1.1\System.Memory.dll + ..\packages\System.Memory.4.5.0\lib\netstandard1.1\System.Memory.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0-preview1-26216-02\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll diff --git a/src/Greenshot.Gfx.Experimental/app.config b/src/Greenshot.Gfx.Experimental/app.config index 5ad3f61fd..8d6df4cbe 100644 --- a/src/Greenshot.Gfx.Experimental/app.config +++ b/src/Greenshot.Gfx.Experimental/app.config @@ -6,6 +6,10 @@ + + + + - \ No newline at end of file + diff --git a/src/Greenshot.Gfx.Experimental/packages.config b/src/Greenshot.Gfx.Experimental/packages.config index e692efefc..6e758c782 100644 --- a/src/Greenshot.Gfx.Experimental/packages.config +++ b/src/Greenshot.Gfx.Experimental/packages.config @@ -1,5 +1,6 @@  - - + + + \ No newline at end of file diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index c983db796..db6f2cfda 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -10,9 +10,10 @@ Properties Greenshot.Gfx Greenshot.Gfx - v4.5.2 + v4.6 512 true + @@ -36,17 +37,17 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -63,32 +64,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll @@ -101,20 +102,15 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0-preview1-26216-02\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.Gfx/app.config b/src/Greenshot.Gfx/app.config index 43fad85c0..2a87a83e1 100644 --- a/src/Greenshot.Gfx/app.config +++ b/src/Greenshot.Gfx/app.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 09c8ee0ae..0d429283e 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -1,32 +1,30 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.PerformanceTests/App.config b/src/Greenshot.PerformanceTests/App.config index 219c43ebe..418f60d26 100644 --- a/src/Greenshot.PerformanceTests/App.config +++ b/src/Greenshot.PerformanceTests/App.config @@ -7,7 +7,7 @@ - + @@ -35,15 +35,15 @@ - + - + - + @@ -55,7 +55,7 @@ - + @@ -81,6 +81,14 @@ + + + + + + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index d2d4fdeea..15f81549b 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.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -69,32 +69,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll @@ -108,12 +108,12 @@ ..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll - - ..\packages\Microsoft.DotNet.PlatformAbstractions.2.0.4\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll + + ..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - ..\packages\Microsoft.Win32.Registry.4.4.0\lib\net46\Microsoft.Win32.Registry.dll + ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net46\Microsoft.Win32.Registry.dll @@ -121,8 +121,8 @@ ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - ..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll @@ -139,7 +139,6 @@ ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll @@ -149,26 +148,22 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll - - - ..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0-preview1-26216-02\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll - True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll @@ -178,20 +173,21 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll - True - ..\packages\System.Text.Encoding.CodePages.4.4.0\lib\net46\System.Text.Encoding.CodePages.dll + ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net46\System.Text.Encoding.CodePages.dll - - ..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + + ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 47a7226c3..f814a1dce 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -9,35 +9,35 @@ - - - - + + + + - - - - - - - - - + + + + + + + + + - - + + - + @@ -50,30 +50,29 @@ - - - + - + - + + - + - + - + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index b6573da54..1bf980274 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.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -98,32 +98,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll @@ -134,12 +134,12 @@ ..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll - - ..\packages\Microsoft.DotNet.PlatformAbstractions.2.0.4\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll + + ..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - ..\packages\Microsoft.Win32.Registry.4.4.0\lib\net46\Microsoft.Win32.Registry.dll + ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net46\Microsoft.Win32.Registry.dll @@ -147,8 +147,8 @@ ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - ..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll @@ -165,7 +165,6 @@ ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll @@ -175,26 +174,22 @@ - - ..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll - - - ..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0-preview1-26216-02\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net46\System.Security.Cryptography.Algorithms.dll - True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll @@ -204,20 +199,21 @@ ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net46\System.Security.Cryptography.X509Certificates.dll - True - ..\packages\System.Text.Encoding.CodePages.4.4.0\lib\net46\System.Text.Encoding.CodePages.dll + ..\packages\System.Text.Encoding.CodePages.4.5.0\lib\net46\System.Text.Encoding.CodePages.dll - - ..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + + ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + + ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll @@ -269,7 +265,6 @@ - @@ -289,6 +284,7 @@ + PreserveNewest diff --git a/src/Greenshot.Tests/app.config b/src/Greenshot.Tests/app.config index 129b46a54..4a3bb809c 100644 --- a/src/Greenshot.Tests/app.config +++ b/src/Greenshot.Tests/app.config @@ -4,7 +4,7 @@ - + @@ -32,15 +32,15 @@ - + - + - + @@ -60,7 +60,7 @@ - + @@ -78,6 +78,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index ed3ce59cf..67c7225c8 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -10,34 +10,34 @@ - - - - + + + + - - - - - - - - - + + + + + + + + + - - + + - + @@ -50,30 +50,29 @@ - - - + - + - + + - + - + - + diff --git a/src/Greenshot/App.config b/src/Greenshot/App.config index 74e76b7d0..9a443e3d8 100644 --- a/src/Greenshot/App.config +++ b/src/Greenshot/App.config @@ -2,7 +2,7 @@ - + @@ -17,6 +17,14 @@ + + + + + + + + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 25576fad8..c6f2c356a 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -13,12 +13,13 @@ False 4 false - v4.5.2 + v4.6 greenshot.manifest 3.5 latest + @@ -57,44 +58,44 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll - - ..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll - - ..\packages\Dapplo.Addons.Config.1.0.44\lib\net45\Dapplo.Addons.Config.dll + + ..\packages\Dapplo.Addons.Config.1.0.47\lib\net45\Dapplo.Addons.Config.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.46\lib\net46\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.46\lib\net46\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.46\lib\net46\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.46\lib\net46\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Metro.1.0.42\lib\net45\Dapplo.CaliburnMicro.Metro.dll + + ..\packages\Dapplo.CaliburnMicro.Metro.1.0.46\lib\net46\Dapplo.CaliburnMicro.Metro.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.46\lib\net46\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.46\lib\net46\Dapplo.CaliburnMicro.Translations.dll - ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net46\Dapplo.HttpExtensions.JsonNet.dll - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net46\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll @@ -117,50 +118,50 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.56\lib\net45\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.56\lib\net45\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.58\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.56\lib\net45\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.56\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.56\lib\net45\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.56\lib\net45\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.56\lib\net45\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.58\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.56\lib\net45\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.56\lib\net45\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.56\lib\net45\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.56\lib\net45\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Multimedia.0.5.58\lib\net46\Dapplo.Windows.Multimedia.dll - - ..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll - ..\packages\gong-wpf-dragdrop.1.1.0\lib\net45\GongSolutions.Wpf.DragDrop.dll + ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll - ..\packages\MahApps.Metro.1.6.4\lib\net45\MahApps.Metro.dll + ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll - ..\packages\MahApps.Metro.IconPacks.2.2.0\lib\net45\MahApps.Metro.IconPacks.dll + ..\packages\MahApps.Metro.IconPacks.2.2.0\lib\net46\MahApps.Metro.IconPacks.dll @@ -176,32 +177,24 @@ ..\packages\Svg.2.3.0\lib\net35\Svg.dll - - ..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll - - ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll - True + + ..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll - True - - - ..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll + ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll @@ -545,6 +538,7 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -552,6 +546,5 @@ - \ No newline at end of file diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index df62fa510..4651fd96d 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -1,57 +1,56 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj b/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj index fc419ccad..194e16430 100644 --- a/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj +++ b/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj @@ -10,7 +10,7 @@ Properties GreenshotOCRCommand GreenshotOCRCommand - v4.5.2 + v4.6 512 OnBuildSuccess False