github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-23 06:36:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the Windows 10 destinations, which were not active due to a wrong expression.

Browse source
This commit is contained in:
Robin 2018-08-26 16:20:16 +02:00
commit 80ebc2f3a9
78 changed files with 1025 additions and 909 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

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

@ -22,18 +22,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />

2
src/Greenshot.Addon.Confluence/ConfluenceUtils.cs
View file

@ -32,7 +32,7 @@ using Dapplo.Confluence;
using Dapplo.Confluence.Entities; using Dapplo.Confluence.Entities;
using Dapplo.Confluence.Query; using Dapplo.Confluence.Query;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons.Core; using Greenshot.Addon.InternetExplorer;
#endregion #endregion

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />
@ -211,6 +211,10 @@
</Page> </Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj">
<Project>{4cca2717-b8a4-44f7-965b-5687107e4921}</Project>
<Name>Greenshot.Addon.InternetExplorer</Name>
</ProjectReference>
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj"> <ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj">
<Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project> <Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project>
<Name>Greenshot.Core</Name> <Name>Greenshot.Core</Name>

1
src/Greenshot.Addon.Confluence/IConfluenceConfiguration.cs
View file

@ -26,7 +26,6 @@
using System.ComponentModel; using System.ComponentModel;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.InterfaceImpl.Extensions; using Dapplo.InterfaceImpl.Extensions;
using Greenshot.Addons.Core.Enums;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
#endregion #endregion

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

@ -24,18 +24,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

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

@ -22,18 +22,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

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

@ -20,16 +20,16 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

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

@ -21,18 +21,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

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

@ -21,18 +21,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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>

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

@ -23,18 +23,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />

2
src/Greenshot.Addons/Core/AccessibleHelper.cs → src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs
View file

@ -31,7 +31,7 @@ using Dapplo.Log;
#endregion #endregion
namespace Greenshot.Addons.Core namespace Greenshot.Addon.InternetExplorer
{ {
/// <summary> /// <summary>
/// See: /// See:

115
src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj Normal file
View file

@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\CommonProject.properties" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<ProjectGuid>{4CCA2717-B8A4-44F7-965B-5687107E4921}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Greenshot.Addon.InternetExplorer</RootNamespace>
<AssemblyName>Greenshot.Addon.InternetExplorer</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<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>
</Reference>
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
</Reference>
<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>
</Reference>
<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>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Reactive, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.1.0\lib\net46\System.Reactive.dll</HintPath>
</Reference>
<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.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>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="AccessibleHelper.cs" />
<Compile Include="IECaptureHelper.cs" />
<Compile Include="IEHelper.cs" />
<Compile Include="IEInterop\IEContainer.cs" />
<Compile Include="IEInterop\IWebBrowser2.cs" />
<Compile Include="InternetExplorerSource.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj">
<Project>{5b924697-4dcd-4f98-85f1-105cb84b7341}</Project>
<Name>Greenshot.Addons</Name>
</ProjectReference>
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj">
<Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project>
<Name>Greenshot.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">
<Project>{f041c685-eb96-4ed1-9ace-0f5bd836610f}</Project>
<Name>Greenshot.Gfx</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

9
src/Greenshot/Helpers/IECaptureHelper.cs → src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs
View file

@ -29,16 +29,15 @@ using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dapplo.Windows.Desktop;
using Greenshot.Configuration;
using Greenshot.Helpers.IEInterop;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com; using Dapplo.Windows.Com;
using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Extensions;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.Desktop;
using Dapplo.Windows.Messages; using Dapplo.Windows.Messages;
using Dapplo.Windows.User32; using Dapplo.Windows.User32;
using Greenshot.Addon.InternetExplorer.IEInterop;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
@ -47,7 +46,7 @@ using mshtml;
#endregion #endregion
namespace Greenshot.Helpers namespace Greenshot.Addon.InternetExplorer
{ {
/// <summary> /// <summary>
/// The code for this helper comes from: http://www.codeproject.com/KB/graphics/IECapture.aspx /// The code for this helper comes from: http://www.codeproject.com/KB/graphics/IECapture.aspx
@ -391,7 +390,7 @@ namespace Greenshot.Helpers
windowToCapture = InteropWindowQuery.GetActiveWindow(); windowToCapture = InteropWindowQuery.GetActiveWindow();
} }
// Show backgroundform after retrieving the active window.. // Show backgroundform after retrieving the active window..
var backgroundForm = new BackgroundForm(Language.GetString(LangKey.contextmenu_captureie), Language.GetString(LangKey.wait_ie_capture)); var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured...");
backgroundForm.Show(); backgroundForm.Show();
//BackgroundForm backgroundForm = BackgroundForm.ShowAndWait(language.GetString(LangKey.contextmenu_captureie), language.GetString(LangKey.wait_ie_capture)); //BackgroundForm backgroundForm = BackgroundForm.ShowAndWait(language.GetString(LangKey.contextmenu_captureie), language.GetString(LangKey.wait_ie_capture));
try try

83
src/Greenshot.Addons/Core/IEHelper.cs → src/Greenshot.Addon.InternetExplorer/IEHelper.cs
View file

@ -21,14 +21,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Desktop; using Dapplo.Windows.Desktop;
using Microsoft.Win32; using Microsoft.Win32;
namespace Greenshot.Addons.Core { namespace Greenshot.Addon.InternetExplorer {
/// <summary> /// <summary>
/// Description of IEHelper. /// Description of IEHelper.
/// </summary> /// </summary>
@ -75,85 +73,6 @@ namespace Greenshot.Addons.Core {
} }
} }
/// <summary>
/// Get the highest possible version for the embedded browser
/// </summary>
/// <param name="ignoreDoctype">true to ignore the doctype when loading a page</param>
/// <returns>IE Feature</returns>
public static int GetEmbVersion(bool ignoreDoctype = true)
{
var ieVersion = IEVersion;
if (ieVersion > 9)
{
return ieVersion * 1000 + (ignoreDoctype ? 1 : 0);
}
if (ieVersion > 7)
{
return ieVersion * 1111;
}
return 7000;
}
/// <summary>
/// Fix browser version to the highest possible
/// </summary>
/// <param name="ignoreDoctype">true to ignore the doctype when loading a page</param>
public static void FixBrowserVersion(bool ignoreDoctype = true)
{
var applicationName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
FixBrowserVersion(applicationName, ignoreDoctype);
}
/// <summary>
/// Fix the browser version for the specified application
/// </summary>
/// <param name="applicationName">Name of the process</param>
/// <param name="ignoreDoctype">true to ignore the doctype when loading a page</param>
public static void FixBrowserVersion(string applicationName, bool ignoreDoctype = true)
{
FixBrowserVersion(applicationName, GetEmbVersion(ignoreDoctype));
}
/// <summary>
/// Fix the browser version for the specified application
/// </summary>
/// <param name="applicationName">Name of the process</param>
/// <param name="ieVersion">
/// Version, see
/// <a href="https://msdn.microsoft.com/en-us/library/ee330730(v=vs.85).aspx#browser_emulation">Browser Emulation</a>
/// </param>
public static void FixBrowserVersion(string applicationName, int ieVersion)
{
ModifyRegistry("HKEY_CURRENT_USER", applicationName + ".exe", ieVersion);
#if DEBUG
ModifyRegistry("HKEY_CURRENT_USER", applicationName + ".vshost.exe", ieVersion);
#endif
}
/// <summary>
/// Make the change to the registry
/// </summary>
/// <param name="root">HKEY_CURRENT_USER or something</param>
/// <param name="applicationName">Name of the executable</param>
/// <param name="ieFeatureVersion">Version to use</param>
private static void ModifyRegistry(string root, string applicationName, int ieFeatureVersion)
{
var regKey = root + @"\Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION";
try
{
Registry.SetValue(regKey, applicationName, ieFeatureVersion);
}
catch (Exception ex)
{
// some config will hit access rights exceptions
// this is why we try with both LOCAL_MACHINE and CURRENT_USER
Log.Error().WriteLine(ex, "couldn't modify the registry key {0}", regKey);
}
}
/// <summary> /// <summary>
/// Find the DirectUI window for MSAA (Accessible) /// Find the DirectUI window for MSAA (Accessible)
/// </summary> /// </summary>

4
src/Greenshot/Helpers/IEInterop/IEContainer.cs → src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs
View file

@ -28,16 +28,16 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Globalization; using System.Globalization;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dapplo.Windows.Desktop;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Extensions;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.Desktop;
using mshtml; using mshtml;
using IServiceProvider = Greenshot.Addons.Interop.IServiceProvider; using IServiceProvider = Greenshot.Addons.Interop.IServiceProvider;
#endregion #endregion
namespace Greenshot.Helpers.IEInterop namespace Greenshot.Addon.InternetExplorer.IEInterop
{ {
public class DocumentContainer public class DocumentContainer
{ {

2
src/Greenshot/Helpers/IEInterop/IWebBrowser2.cs → src/Greenshot.Addon.InternetExplorer/IEInterop/IWebBrowser2.cs
View file

@ -27,7 +27,7 @@ using System.Runtime.InteropServices;
#endregion #endregion
namespace Greenshot.Helpers.IEInterop namespace Greenshot.Addon.InternetExplorer.IEInterop
{ {
// IWebBrowser: EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B // IWebBrowser: EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B
// [ComVisible(true), ComImport(), Guid("D30C1661-CDAF-11D0-8A3E-00C04FC9E26E"), // [ComVisible(true), ComImport(), Guid("D30C1661-CDAF-11D0-8A3E-00C04FC9E26E"),

43
src/Greenshot.Addon.InternetExplorer/InternetExplorerSource.cs Normal file
View file

@ -0,0 +1,43 @@
#region Greenshot GNU General Public License
// Greenshot - a free and open source screenshot tool
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
//
// For more information see: http://getgreenshot.org/
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 1 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Media.Imaging;
using Greenshot.Core.Interfaces;
namespace Greenshot.Addon.InternetExplorer
{
/// <summary>
/// This is an ISource implementation which allows to capture the Internet-Explorer
/// </summary>
public class InternetExplorerSource : ISource<BitmapSource>
{
/// <inheritdoc />
public ValueTask<ICaptureElement<BitmapSource>> Import(CancellationToken cancellationToken = default)
{
throw new NotImplementedException();
}
}
}

35
src/Greenshot.Addon.InternetExplorer/Properties/AssemblyInfo.cs Normal file
View file

@ -0,0 +1,35 @@
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Greenshot.Addon.InternetExplorer")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Greenshot.Addon.InternetExplorer")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("4cca2717-b8a4-44f7-965b-5687107e4921")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

19
src/Greenshot.Addon.InternetExplorer/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>

20
src/Greenshot.Addon.InternetExplorer/packages.config Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" 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.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.109" 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>

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

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

@ -24,18 +24,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />

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

@ -20,17 +20,17 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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>

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

@ -22,16 +22,16 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

1
src/Greenshot.Addon.OCR/OCRDestination.cs
View file

@ -33,7 +33,6 @@ using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

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

@ -19,16 +19,16 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

8
src/Greenshot.Addon.Office/FodyWeavers.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura IncludeDebugSymbols='false'>
<IncludeAssemblies>
Dapplo.Windows.Com
</IncludeAssemblies>
</Costura>
</Weavers>

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

@ -42,9 +42,6 @@
<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>
</Reference> </Reference>
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
@ -84,38 +81,39 @@
<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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Interop.Microsoft.Office.Interop.OneNote, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Interop.Microsoft.Office.Interop.OneNote.1.1.0.0\lib\net40\Interop.Microsoft.Office.Interop.OneNote.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</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">
@ -200,11 +198,6 @@
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="FodyWeavers.xml">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="Views\OfficeConfigView.xaml"> <Page Include="Views\OfficeConfigView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
@ -221,15 +214,6 @@
<Isolated>False</Isolated> <Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference> </COMReference>
<COMReference Include="Microsoft.Office.Interop.OneNote">
<Guid>{0EA692EE-BB50-4E3C-AEF0-356D91732725}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>1</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<PropertyGroup> <PropertyGroup>
@ -239,13 +223,4 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Green
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"</PostBuildEvent> copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages\Fody.3.1.4\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.4\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.3.1.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.1.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets'))" />
</Target>
<Import Project="..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" />
</Project> </Project>

2
src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs
View file

@ -28,8 +28,8 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com;
using Dapplo.Windows.Desktop; using Dapplo.Windows.Desktop;
using Dapplo.Windows.Interop;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Microsoft.Office.Core; using Microsoft.Office.Core;
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;

2
src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs
View file

@ -29,7 +29,7 @@ using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Xml; using System.Xml;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com; using Dapplo.Windows.Interop;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;

3
src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs
View file

@ -30,7 +30,7 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com; using Dapplo.Windows.Interop;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using mshtml; using mshtml;
using Microsoft.Office.Interop.Outlook; using Microsoft.Office.Interop.Outlook;
@ -404,7 +404,6 @@ namespace Greenshot.Addon.Office.OfficeExport
{ {
return; return;
} }
//MailItem newMail = COMWrapper.Cast<MailItem>(newItem);
var newMail = newItem.ComObject; var newMail = newItem.ComObject;
newMail.Subject = subject; newMail.Subject = subject;
if (!string.IsNullOrEmpty(to)) if (!string.IsNullOrEmpty(to))

2
src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs
View file

@ -29,7 +29,7 @@ using System.Drawing;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com; using Dapplo.Windows.Interop;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Microsoft.Office.Core; using Microsoft.Office.Core;
using Microsoft.Office.Interop.PowerPoint; using Microsoft.Office.Interop.PowerPoint;

2
src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs
View file

@ -24,7 +24,7 @@ using System.Collections.Generic;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com; using Dapplo.Windows.Interop;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Microsoft.Office.Core; using Microsoft.Office.Core;
using Microsoft.Office.Interop.Word; using Microsoft.Office.Interop.Word;

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

@ -6,7 +6,6 @@
<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="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
<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.72" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.72" targetFramework="net461" />
@ -20,18 +19,17 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Interop.Microsoft.Office.Interop.OneNote" version="1.1.0.0" targetFramework="net461" />
<package id="Fody" version="3.1.4" targetFramework="net461" developmentDependency="true" />
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net461" /> <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net461" />
<package id="Microsoft.Office.Interop.Outlook" version="15.0.4797.1003" targetFramework="net461" /> <package id="Microsoft.Office.Interop.Outlook" version="15.0.4797.1003" targetFramework="net461" />
<package id="Microsoft.Office.Interop.PowerPoint" version="15.0.4420.1017" targetFramework="net461" /> <package id="Microsoft.Office.Interop.PowerPoint" version="15.0.4420.1017" targetFramework="net461" />

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

@ -109,41 +109,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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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>

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

@ -23,18 +23,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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" />

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

@ -21,18 +21,18 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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>

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

@ -22,16 +22,16 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.0" targetFramework="net461" /> <package id="System.Reactive" version="4.1.0" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />

2
src/Greenshot.Addon.Win10/Win10AddonModule.cs
View file

@ -31,7 +31,7 @@ namespace Greenshot.Addon.Win10
{ {
protected override void Load(ContainerBuilder builder) protected override void Load(ContainerBuilder builder)
{ {
if (!WindowsVersion.IsWindows10OrLater) if (WindowsVersion.IsWindows10OrLater)
{ {
builder builder
.RegisterType<Win10OcrDestination>() .RegisterType<Win10OcrDestination>()

2
src/Greenshot.Addon.Win10/Win10OcrDestination.cs
View file

@ -91,10 +91,10 @@ namespace Greenshot.Addon.Win10
var softwareBitmap = await decoder.GetSoftwareBitmapAsync(); var softwareBitmap = await decoder.GetSoftwareBitmapAsync();
var ocrResult = await ocrEngine.RecognizeAsync(softwareBitmap); var ocrResult = await ocrEngine.RecognizeAsync(softwareBitmap);
// TODO: Get the lines, words, bounding rectangles
text = ocrResult.Text; text = ocrResult.Text;
} }
// Check if we found text // Check if we found text
if (!string.IsNullOrWhiteSpace(text)) if (!string.IsNullOrWhiteSpace(text))
{ {

1
src/Greenshot.Addon.Win10/Win10ShareDestination.cs
View file

@ -154,7 +154,6 @@ namespace Greenshot.Addon.Win10
/// <returns>Task with string, which describes the application which was used to share with</returns> /// <returns>Task with string, which describes the application which was used to share with</returns>
private async Task Share(ShareInfo shareInfo, IntPtr handle, ISurface surface, ICaptureDetails captureDetails) private async Task Share(ShareInfo shareInfo, IntPtr handle, ISurface surface, ICaptureDetails captureDetails)
{ {
using (var imageStream = new MemoryRandomAccessStream()) using (var imageStream = new MemoryRandomAccessStream())
using (var logoStream = new MemoryRandomAccessStream()) using (var logoStream = new MemoryRandomAccessStream())
using (var thumbnailStream = new MemoryRandomAccessStream()) using (var thumbnailStream = new MemoryRandomAccessStream())

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

@ -19,16 +19,16 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

1
src/Greenshot.Addons/Controls/QualityDialog.cs
View file

@ -25,7 +25,6 @@
using System; using System;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

1
src/Greenshot.Addons/Controls/SaveImageFileDialog.cs
View file

@ -29,7 +29,6 @@ using System.Windows.Forms;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

1
src/Greenshot.Addons/Core/FilenameHelper.cs
View file

@ -31,7 +31,6 @@ using System.Text.RegularExpressions;
using System.Windows.Forms; using System.Windows.Forms;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

1
src/Greenshot.Addons/Core/IFileConfiguration.cs
View file

@ -24,7 +24,6 @@
#region Usings #region Usings
using System.ComponentModel; using System.ComponentModel;
using Greenshot.Addons.Core.Enums;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
#endregion #endregion

1
src/Greenshot.Addons/Core/ImageOutput.cs
View file

@ -41,7 +41,6 @@ using Dapplo.Log;
using Dapplo.Windows.Clipboard; using Dapplo.Windows.Clipboard;
using Dapplo.Windows.Common; using Dapplo.Windows.Common;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

1
src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs
View file

@ -27,7 +27,6 @@ using System.Text;
using Dapplo.Windows.Clipboard; using Dapplo.Windows.Clipboard;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

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

@ -18,7 +18,6 @@
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath> <HintPath>..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
</Reference> </Reference>
@ -95,47 +94,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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Shell32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Shell32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Shell32.0.5.108\lib\net461\Dapplo.Windows.Shell32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Shell32.0.5.109\lib\net461\Dapplo.Windows.Shell32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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>
@ -347,7 +346,6 @@
</Compile> </Compile>
<Compile Include="Core\AbstractDestination.cs" /> <Compile Include="Core\AbstractDestination.cs" />
<Compile Include="Core\AbstractProcessor.cs" /> <Compile Include="Core\AbstractProcessor.cs" />
<Compile Include="Core\AccessibleHelper.cs" />
<Compile Include="Animation\AnimationLeg.cs" /> <Compile Include="Animation\AnimationLeg.cs" />
<Compile Include="Core\BinaryStructHelper.cs" /> <Compile Include="Core\BinaryStructHelper.cs" />
<Compile Include="Core\Cache.cs" /> <Compile Include="Core\Cache.cs" />
@ -362,7 +360,6 @@
<Compile Include="Core\EnumExtensions.cs" /> <Compile Include="Core\EnumExtensions.cs" />
<Compile Include="Core\ExtensionAttribute.cs" /> <Compile Include="Core\ExtensionAttribute.cs" />
<Compile Include="Core\GreenshotResources.cs" /> <Compile Include="Core\GreenshotResources.cs" />
<Compile Include="Core\IEHelper.cs" />
<Compile Include="Core\Language.cs" /> <Compile Include="Core\Language.cs" />
<Compile Include="Core\ObjectExtensions.cs" /> <Compile Include="Core\ObjectExtensions.cs" />
<Compile Include="Core\PluginUtils.cs" /> <Compile Include="Core\PluginUtils.cs" />

1
src/Greenshot.Addons/Interfaces/Plugin/SurfaceOutputSettings.cs
View file

@ -26,7 +26,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using Dapplo.Ini; using Dapplo.Ini;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
using Greenshot.Gfx.Effects; using Greenshot.Gfx.Effects;

1
src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs
View file

@ -25,7 +25,6 @@ using System.Collections.Generic;
using System.Windows; using System.Windows;
using Caliburn.Micro; using Caliburn.Micro;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

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

@ -24,20 +24,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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Shell32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Shell32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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" />

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

@ -21,32 +21,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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />

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

@ -1,15 +1,15 @@
<?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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" targetFramework="net461" />
<package id="System.Reactive" version="4.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" /> <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />

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

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />

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

@ -15,15 +15,15 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.1.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.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />

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

@ -67,32 +67,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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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>

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

@ -17,15 +17,15 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.9.0" targetFramework="net461" /> <package id="Microsoft.CodeAnalysis.Common" version="2.9.0" targetFramework="net461" />

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

@ -102,32 +102,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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\lib\net461\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=2.9.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.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath> <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>

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

@ -20,15 +20,15 @@
<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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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.9.0" targetFramework="net461" /> <package id="Microsoft.CodeAnalysis.Common" version="2.9.0" targetFramework="net461" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.9.0" targetFramework="net461" /> <package id="Microsoft.CodeAnalysis.CSharp" version="2.9.0" targetFramework="net461" />

11
src/Greenshot.sln
View file

@ -51,6 +51,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.OcrCommand"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.InternetExplorer", "Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj", "{4CCA2717-B8A4-44F7-965B-5687107E4921}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -153,6 +155,7 @@ Global
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|x86 {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|x86
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|x86 {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|x86
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -238,6 +241,14 @@ Global
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.Build.0 = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.Build.0 = Release|Any CPU
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.ActiveCfg = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.ActiveCfg = Release|Any CPU
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.Build.0 = Release|Any CPU {BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.Build.0 = Release|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.ActiveCfg = Debug|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.Build.0 = Debug|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.Build.0 = Release|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.ActiveCfg = Release|Any CPU
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

1
src/Greenshot/Forms/MainForm.cs
View file

@ -48,6 +48,7 @@ using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.DesktopWindowsManager; using Dapplo.Windows.DesktopWindowsManager;
using Dapplo.Windows.Dpi.Forms; using Dapplo.Windows.Dpi.Forms;
using Dapplo.Windows.Kernel32; using Dapplo.Windows.Kernel32;
using Greenshot.Addon.InternetExplorer;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;

67
src/Greenshot/Greenshot.csproj
View file

@ -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.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.108\lib\net461\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.109\lib\net461\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.108\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.109\lib\net461\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.108\lib\net461\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.109\lib\net461\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.108\lib\net461\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.109\lib\net461\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.108\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.109\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.108\lib\net461\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.109\lib\net461\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.EmbeddedBrowser, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.108\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.EmbeddedBrowser.0.5.109\lib\net461\Dapplo.Windows.EmbeddedBrowser.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.108\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.109\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.108\lib\net461\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.109\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.108\lib\net461\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.109\lib\net461\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.108\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.109\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.108\lib\net461\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.109\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Multimedia, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Multimedia, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.108\lib\net461\Dapplo.Windows.Multimedia.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.109\lib\net461\Dapplo.Windows.Multimedia.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Shell32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Shell32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Shell32.0.5.108\lib\net461\Dapplo.Windows.Shell32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Shell32.0.5.109\lib\net461\Dapplo.Windows.Shell32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.108.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.109.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.108\lib\net461\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.109\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>
@ -306,9 +306,6 @@
<Compile Include="Helpers\CaptureHelper.cs" /> <Compile Include="Helpers\CaptureHelper.cs" />
<Compile Include="Components\GreenshotClient.cs" /> <Compile Include="Components\GreenshotClient.cs" />
<Compile Include="Components\GreenshotServer.cs" /> <Compile Include="Components\GreenshotServer.cs" />
<Compile Include="Helpers\IECaptureHelper.cs" />
<Compile Include="Helpers\IEInterop\IEContainer.cs" />
<Compile Include="Helpers\IEInterop\IWebBrowser2.cs" />
<Compile Include="Helpers\ScrollingCapture.cs" /> <Compile Include="Helpers\ScrollingCapture.cs" />
<Compile Include="Help\HelpFileLoader.cs" /> <Compile Include="Help\HelpFileLoader.cs" />
<Compile Include="Processors\TitleFixProcessor.cs" /> <Compile Include="Processors\TitleFixProcessor.cs" />
@ -462,6 +459,10 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj">
<Project>{4cca2717-b8a4-44f7-965b-5687107e4921}</Project>
<Name>Greenshot.Addon.InternetExplorer</Name>
</ProjectReference>
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj"> <ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj">
<Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project> <Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project>
<Name>Greenshot.Core</Name> <Name>Greenshot.Core</Name>

2
src/Greenshot/Helpers/CaptureHelper.cs
View file

@ -42,9 +42,9 @@ using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.DesktopWindowsManager; using Dapplo.Windows.DesktopWindowsManager;
using Dapplo.Windows.Kernel32; using Dapplo.Windows.Kernel32;
using Dapplo.Windows.User32; using Dapplo.Windows.User32;
using Greenshot.Addon.InternetExplorer;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Components; using Greenshot.Components;

1
src/Greenshot/Helpers/PrintHelper.cs
View file

@ -34,7 +34,6 @@ using Dapplo.Windows.Common.Extensions;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;

30
src/Greenshot/packages.config
View file

@ -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.108" targetFramework="net461" /> <package id="Dapplo.Windows" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Clipboard" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Clipboard" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Com" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Com" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Common" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Common" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Dpi" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Dpi" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.EmbeddedBrowser" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Gdi32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Gdi32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Icons" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Icons" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Input" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Input" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Kernel32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Kernel32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Messages" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Messages" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Multimedia" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Multimedia" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.Shell32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.Shell32" version="0.5.109" targetFramework="net461" />
<package id="Dapplo.Windows.User32" version="0.5.108" targetFramework="net461" /> <package id="Dapplo.Windows.User32" version="0.5.109" 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" />