github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 22:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dependency updates

Browse source
This commit is contained in:
Robin 2018-08-20 07:58:05 +02:00
commit 926af54171
67 changed files with 1625 additions and 1181 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
View file

@ -52,23 +52,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -94,41 +94,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -143,12 +143,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Box/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.Box/packages.config
View file

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -22,18 +22,21 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
View file

@ -54,23 +54,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll</HintPath> <HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll</HintPath>
@ -99,41 +99,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -149,12 +149,22 @@
<Reference Include="System.EnterpriseServices" /> <Reference Include="System.EnterpriseServices" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />

8
src/Greenshot.Addon.Confluence/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.Confluence/packages.config
View file

@ -9,12 +9,12 @@
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Confluence" version="0.7.19" targetFramework="net461" /> <package id="Dapplo.Confluence" version="0.7.19" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.43" targetFramework="net461" />
@ -24,18 +24,21 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" /> <package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
View file

@ -49,23 +49,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -91,41 +91,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -140,12 +140,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Dropbox/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.Dropbox/packages.config
View file

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -22,18 +22,21 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

78
src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
View file

@ -67,23 +67,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
@ -100,35 +100,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -138,11 +138,21 @@
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.ExternalCommand/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

37
src/Greenshot.Addon.ExternalCommand/packages.config
View file

@ -9,26 +9,29 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
View file

@ -64,23 +64,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -103,41 +103,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -149,12 +149,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Flickr/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.Flickr/packages.config
View file

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
@ -21,17 +21,20 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
View file

@ -50,23 +50,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -89,41 +89,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -135,12 +135,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.GooglePhotos/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.GooglePhotos/packages.config
View file

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
@ -21,17 +21,20 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
View file

@ -69,23 +69,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -111,41 +111,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath>
@ -163,12 +163,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Imgur/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.Imgur/packages.config
View file

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -23,19 +23,22 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="MahApps.Metro" version="1.6.5" targetFramework="net461" /> <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
View file

@ -69,23 +69,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -114,41 +114,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -167,12 +167,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />

8
src/Greenshot.Addon.Jira/app.config
View file

@ -18,6 +18,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.Jira/packages.config
View file

@ -9,12 +9,12 @@
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -24,20 +24,23 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" /> <package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Svg" version="2.3.0" targetFramework="net461" /> <package id="Svg" version="2.3.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

82
src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
View file

@ -49,23 +49,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -85,38 +85,38 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.105\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.106\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
@ -127,12 +127,22 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.LegacyEditor/app.config
View file

@ -10,6 +10,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

39
src/Greenshot.Addon.LegacyEditor/packages.config
View file

@ -8,28 +8,31 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

78
src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
View file

@ -67,23 +67,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -106,35 +106,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath>
@ -152,12 +152,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Lutim/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

37
src/Greenshot.Addon.Lutim/packages.config
View file

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
@ -22,17 +22,20 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="MahApps.Metro" version="1.6.5" targetFramework="net461" /> <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

78
src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
View file

@ -64,23 +64,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
@ -97,35 +97,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -135,11 +135,21 @@
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.OCR/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

37
src/Greenshot.Addon.OCR/packages.config
View file

@ -8,26 +8,29 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

82
src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
View file

@ -51,23 +51,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
@ -84,38 +84,38 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@ -128,11 +128,21 @@
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Office/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

39
src/Greenshot.Addon.Office/packages.config
View file

@ -9,28 +9,31 @@
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" /> <package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
View file

@ -63,23 +63,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -105,41 +105,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath>
@ -157,12 +157,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.OneDrive/app.config
View file

@ -10,6 +10,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.OneDrive/packages.config
View file

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -23,19 +23,22 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="MahApps.Metro" version="1.6.5" targetFramework="net461" /> <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

86
src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
View file

@ -64,23 +64,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -103,41 +103,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -149,12 +149,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Photobucket/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

41
src/Greenshot.Addon.Photobucket/packages.config
View file

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
@ -21,17 +21,20 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

78
src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
View file

@ -63,23 +63,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -102,35 +102,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll</HintPath>
@ -148,12 +148,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Tfs/app.config
View file

@ -10,6 +10,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

37
src/Greenshot.Addon.Tfs/packages.config
View file

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
@ -22,17 +22,20 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="MahApps.Metro" version="1.6.5" targetFramework="net461" /> <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

78
src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
View file

@ -60,23 +60,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
@ -93,35 +93,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
@ -131,11 +131,21 @@
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addon.Win10/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

37
src/Greenshot.Addon.Win10/packages.config
View file

@ -8,26 +8,29 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

98
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -50,26 +50,26 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.71\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.72\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -95,47 +95,47 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.105\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.106\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Shell32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Shell32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Shell32.0.5.105\lib\net461\Dapplo.Windows.Shell32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Shell32.0.5.106\lib\net461\Dapplo.Windows.Shell32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro.IconPacks, Version=2.3.0.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro.IconPacks, Version=2.3.0.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.IconPacks.2.3.0\lib\net46\MahApps.Metro.IconPacks.dll</HintPath> <HintPath>..\packages\MahApps.Metro.IconPacks.2.3.0\lib\net46\MahApps.Metro.IconPacks.dll</HintPath>
@ -156,12 +156,22 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

8
src/Greenshot.Addons/app.config
View file

@ -14,6 +14,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

47
src/Greenshot.Addons/packages.config
View file

@ -9,13 +9,13 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Toasts" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -24,23 +24,26 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Shell32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Shell32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="MahApps.Metro.IconPacks" version="2.3.0" targetFramework="net461" /> <package id="MahApps.Metro.IconPacks" version="2.3.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Svg" version="2.3.0" targetFramework="net461" /> <package id="Svg" version="2.3.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="ToastNotifications" version="2.3.4" targetFramework="net461" /> <package id="ToastNotifications" version="2.3.4" targetFramework="net461" />
</packages> </packages>

51
src/Greenshot.Core/Greenshot.Core.csproj
View file

@ -15,32 +15,32 @@
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath> <HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.105\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.106\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
@ -48,8 +48,18 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
@ -73,6 +83,7 @@
<Compile Include="Templates\CroppedTemplate.cs" /> <Compile Include="Templates\CroppedTemplate.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

19
src/Greenshot.Core/app.config Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

23
src/Greenshot.Core/packages.config
View file

@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

4
src/Greenshot.Gfx.Experimental/app.config
View file

@ -14,6 +14,10 @@
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" /> <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

58
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -43,11 +43,11 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
@ -64,32 +64,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
@ -102,11 +102,21 @@
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

4
src/Greenshot.Gfx/app.config
View file

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" /> <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" /> <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

27
src/Greenshot.Gfx/packages.config
View file

@ -8,22 +8,25 @@
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Svg" version="2.3.0" targetFramework="net461" /> <package id="Svg" version="2.3.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>

12
src/Greenshot.PerformanceTests/App.config
View file

@ -47,11 +47,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" /> <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" /> <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@ -113,6 +113,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CommandLine" publicKeyToken="de6f01bd326f8c32" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

60
src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
View file

@ -37,8 +37,8 @@
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"> <Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath> <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL"> <Reference Include="CommandLine, Version=2.3.0.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath> <HintPath>..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
</Reference> </Reference>
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
@ -49,11 +49,11 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
@ -70,41 +70,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="JeremyAnsel.ColorQuant, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a5c614433db515df, processorArchitecture=MSIL"> <Reference Include="JeremyAnsel.ColorQuant, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a5c614433db515df, processorArchitecture=MSIL">
<HintPath>..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll</HintPath> <HintPath>..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.CodeAnalysis, Version=2.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath> <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> <Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath> <HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
@ -161,8 +161,8 @@
</Reference> </Reference>
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath> <HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>

30
src/Greenshot.PerformanceTests/packages.config
View file

@ -8,30 +8,30 @@
<package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.14" targetFramework="net461" /> <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.14" targetFramework="net461" />
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" /> <package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="JeremyAnsel.ColorQuant" version="1.0.55" targetFramework="net461" /> <package id="JeremyAnsel.ColorQuant" version="1.0.55" targetFramework="net461" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" targetFramework="net461" developmentDependency="true" /> <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" targetFramework="net461" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net461" /> <package id="Microsoft.CodeAnalysis.Common" version="2.9.0" targetFramework="net461" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net461" /> <package id="Microsoft.CodeAnalysis.CSharp" version="2.9.0" targetFramework="net461" />
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net461" /> <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="net461" /> <package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="net461" />
<package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" /> <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
@ -53,7 +53,7 @@
<package id="System.Linq" version="4.3.0" targetFramework="net461" /> <package id="System.Linq" version="4.3.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" /> <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
<package id="System.Management" version="4.5.0" targetFramework="net461" /> <package id="System.Management" version="4.5.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection" version="4.3.0" targetFramework="net461" /> <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" /> <package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" /> <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />

60
src/Greenshot.Tests/Greenshot.Tests.csproj
View file

@ -66,8 +66,8 @@
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"> <Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath> <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL"> <Reference Include="CommandLine, Version=2.3.0.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath> <HintPath>..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
</Reference> </Reference>
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
@ -78,11 +78,11 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -102,38 +102,38 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.CodeAnalysis, Version=2.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath> <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath> <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> <Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath> <HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
@ -191,8 +191,8 @@
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath> <HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>

12
src/Greenshot.Tests/app.config
View file

@ -20,11 +20,11 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" /> <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" /> <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@ -98,6 +98,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CommandLine" publicKeyToken="de6f01bd326f8c32" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

30
src/Greenshot.Tests/packages.config
View file

@ -8,30 +8,30 @@
<package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.14" targetFramework="net461" /> <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.14" targetFramework="net461" />
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" /> <package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" targetFramework="net461" developmentDependency="true" /> <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" targetFramework="net461" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net461" /> <package id="Microsoft.CodeAnalysis.Common" version="2.9.0" targetFramework="net461" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net461" /> <package id="Microsoft.CodeAnalysis.CSharp" version="2.9.0" targetFramework="net461" />
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net461" /> <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="net461" /> <package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="net461" />
<package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" /> <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
@ -53,7 +53,7 @@
<package id="System.Linq" version="4.3.0" targetFramework="net461" /> <package id="System.Linq" version="4.3.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" /> <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
<package id="System.Management" version="4.5.0" targetFramework="net461" /> <package id="System.Management" version="4.5.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection" version="4.3.0" targetFramework="net461" /> <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" /> <package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" /> <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />

12
src/Greenshot/App.config
View file

@ -10,10 +10,6 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Addons" /> <probing privatePath="Addons" />
<probing privatePath="App\Greenshot" /> <probing privatePath="App\Greenshot" />
<dependentAssembly>
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
</dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" /> <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" /> <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
@ -30,6 +26,14 @@
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" /> <assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" /> <bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

110
src/Greenshot/Greenshot.csproj
View file

@ -44,8 +44,8 @@
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"> <Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath> <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL"> <Reference Include="CommandLine, Version=2.3.0.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath> <HintPath>..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
</Reference> </Reference>
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
@ -65,29 +65,29 @@
<Reference Include="Dapplo.Addons.Config, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Config, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Config.1.0.72\lib\net461\Dapplo.Addons.Config.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Config.1.0.72\lib\net461\Dapplo.Addons.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.72\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.72\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.72\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.72\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.71\lib\net461\Dapplo.CaliburnMicro.Metro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.72\lib\net461\Dapplo.CaliburnMicro.Metro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.72\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.71\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.72\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.72\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -119,50 +119,50 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.106\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.105\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.106\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.105\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.106\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.106\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.106\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.105\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.106\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.105\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.106\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.106\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.105\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.106\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.106\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.106\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.106\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Multimedia, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Multimedia, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.105\lib\net461\Dapplo.Windows.Multimedia.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.106\lib\net461\Dapplo.Windows.Multimedia.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Shell32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Shell32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Shell32.0.5.105\lib\net461\Dapplo.Windows.Shell32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Shell32.0.5.106\lib\net461\Dapplo.Windows.Shell32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.106.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.106\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="GongSolutions.Wpf.DragDrop, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="GongSolutions.Wpf.DragDrop, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll</HintPath> <HintPath>..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll</HintPath>
@ -195,15 +195,25 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> <Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath> <HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath> <HintPath>..\packages\System.Reflection.TypeExtensions.4.5.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" /> <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

53
src/Greenshot/packages.config
View file

@ -6,21 +6,21 @@
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" /> <package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" /> <package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.Addons.Config" version="1.0.72" targetFramework="net461" /> <package id="Dapplo.Addons.Config" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Metro" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Toasts" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.72" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -31,21 +31,21 @@
<package id="Dapplo.Log.LogFile" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log.LogFile" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Log.Loggers" version="1.2.1" targetFramework="net461" /> <package id="Dapplo.Log.Loggers" version="1.2.1" targetFramework="net461" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net461" />
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Multimedia" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Multimedia" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.Shell32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.Shell32" version="0.5.106" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.106" targetFramework="net461" />
<package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" /> <package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" />
<package id="gong-wpf-dragdrop" version="1.1.0" targetFramework="net461" /> <package id="gong-wpf-dragdrop" version="1.1.0" targetFramework="net461" />
<package id="MahApps.Metro" version="1.6.5" targetFramework="net461" /> <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" />
@ -59,13 +59,16 @@
<package id="System.IO" version="4.1.0" targetFramework="net461" /> <package id="System.IO" version="4.1.0" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" /> <package id="System.Linq" version="4.1.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" /> <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection" version="4.1.0" targetFramework="net461" /> <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" /> <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="net461" /> <package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" /> <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" /> <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" /> <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="ToastNotifications" version="2.3.4" targetFramework="net461" /> <package id="ToastNotifications" version="2.3.4" targetFramework="net461" />
<package id="Tools.InnoSetup" version="5.6.1" targetFramework="net461" /> <package id="Tools.InnoSetup" version="5.6.1" targetFramework="net461" />
</packages> </packages>