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

Updates for replacing the clipboard access

Browse source
This commit is contained in:
Robin 2018-06-06 10:35:09 +02:00
commit 14f10640e4
60 changed files with 978 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Greenshot.Addon.Box/BoxDestination.cs
View file

@ -38,6 +38,7 @@ using Dapplo.HttpExtensions;
using Dapplo.HttpExtensions.OAuth; using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Box.Entities; using Greenshot.Addon.Box.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
@ -150,8 +151,11 @@ namespace Greenshot.Addon.Box
if (url != null && _boxConfiguration.AfterUploadLinkToClipBoard) if (url != null && _boxConfiguration.AfterUploadLinkToClipBoard)
{ {
ClipboardHelper.SetClipboardData(url); using (var clipboardAccessToken = ClipboardNative.Access())
} {
clipboardAccessToken.SetAsUrl(url);
}
}
return url; return url;
} }

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

@ -94,32 +94,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -22,15 +22,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

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

@ -116,32 +116,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -24,15 +24,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

8
src/Greenshot.Addon.Dropbox/DropboxDestination.cs
View file

@ -38,6 +38,7 @@ using Dapplo.HttpExtensions;
using Dapplo.HttpExtensions.OAuth; using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Dropbox.Entities; using Greenshot.Addon.Dropbox.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
@ -131,8 +132,11 @@ namespace Greenshot.Addon.Dropbox
exportInformation.ExportMade = true; exportInformation.ExportMade = true;
if (_dropboxPluginConfiguration.AfterUploadLinkToClipBoard) if (_dropboxPluginConfiguration.AfterUploadLinkToClipBoard)
{ {
ClipboardHelper.SetClipboardData(uploadUrl); using (var clipboardAccessToken = ClipboardNative.Access())
} {
clipboardAccessToken.SetAsUrl(uploadUrl);
}
}
} }
ProcessExport(exportInformation, surface); ProcessExport(exportInformation, surface);
return exportInformation; return exportInformation;

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

@ -106,32 +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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -22,15 +22,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

6
src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs
View file

@ -28,6 +28,7 @@ using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using CliWrap; using CliWrap;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.ExternalCommand.Entities; using Greenshot.Addon.ExternalCommand.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
@ -91,7 +92,10 @@ namespace Greenshot.Addon.ExternalCommand
{ {
exportInformation.Uri = uriMatches[0].Groups[1].Value; exportInformation.Uri = uriMatches[0].Groups[1].Value;
ClipboardHelper.SetClipboardData(output.StandardOutput); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(exportInformation.Uri);
}
} }
} }

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

@ -100,32 +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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -20,14 +20,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

8
src/Greenshot.Addon.Flickr/FlickrDestination.cs
View file

@ -41,6 +41,7 @@ using Dapplo.HttpExtensions.Extensions;
using Dapplo.HttpExtensions.Listener; using Dapplo.HttpExtensions.Listener;
using Dapplo.HttpExtensions.OAuth; using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
@ -178,8 +179,11 @@ namespace Greenshot.Addon.Flickr
} }
if (_flickrConfiguration.AfterUploadLinkToClipBoard) if (_flickrConfiguration.AfterUploadLinkToClipBoard)
{ {
ClipboardHelper.SetClipboardData(uploadUrl); using (var clipboardAccessToken = ClipboardNative.Access())
} {
clipboardAccessToken.SetAsUrl(uploadUrl);
}
}
} }
catch (Exception e) catch (Exception e)

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

@ -103,32 +103,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -21,14 +21,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

8
src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs
View file

@ -38,6 +38,7 @@ using Dapplo.HttpExtensions;
using Dapplo.HttpExtensions.OAuth; using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Dapplo.Windows.Clipboard;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
@ -145,8 +146,11 @@ namespace Greenshot.Addon.GooglePhotos
if (url != null && _googlePhotosConfiguration.AfterUploadLinkToClipBoard) if (url != null && _googlePhotosConfiguration.AfterUploadLinkToClipBoard)
{ {
ClipboardHelper.SetClipboardData(url); using (var clipboardAccessToken = ClipboardNative.Access())
} {
clipboardAccessToken.SetAsUrl(url);
}
}
return url; return url;
} }
catch (Exception e) catch (Exception e)

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

@ -89,32 +89,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -21,14 +21,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

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

@ -111,32 +111,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath>

8
src/Greenshot.Addon.Imgur/ImgurDestination.cs
View file

@ -31,6 +31,7 @@ using System.Windows.Forms;
using Autofac.Features.OwnedInstances; using Autofac.Features.OwnedInstances;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Dapplo.Windows.Extensions; using Dapplo.Windows.Extensions;
using Greenshot.Addon.Imgur.Entities; using Greenshot.Addon.Imgur.Entities;
using Greenshot.Addon.Imgur.ViewModels; using Greenshot.Addon.Imgur.ViewModels;
@ -38,6 +39,7 @@ using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Gfx; using Greenshot.Gfx;
@ -159,8 +161,10 @@ namespace Greenshot.Addon.Imgur
try try
{ {
ClipboardHelper.SetClipboardData(uploadUrl.AbsoluteUri); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(uploadUrl.AbsoluteUri);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

7
src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs
View file

@ -31,9 +31,11 @@ using System.Threading.Tasks;
using Caliburn.Micro; using Caliburn.Micro;
using Dapplo.CaliburnMicro.Extensions; using Dapplo.CaliburnMicro.Extensions;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Imgur.Entities; using Greenshot.Addon.Imgur.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions;
namespace Greenshot.Addon.Imgur.ViewModels namespace Greenshot.Addon.Imgur.ViewModels
{ {
@ -143,7 +145,10 @@ namespace Greenshot.Addon.Imgur.ViewModels
public void CopyToClipboard() public void CopyToClipboard()
{ {
ClipboardHelper.SetClipboardData(SelectedImgur.Data.Link?.AbsoluteUri); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(SelectedImgur.Data.Link?.AbsoluteUri);
}
} }
public void ClearHistory() public void ClearHistory()

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

@ -23,15 +23,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" /> <package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -114,32 +114,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -24,15 +24,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="Svg" version="2.3.0" targetFramework="net46" /> <package id="Svg" version="2.3.0" targetFramework="net46" />

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

@ -79,35 +79,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.61\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />

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

@ -20,15 +20,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

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

@ -106,32 +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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath>

7
src/Greenshot.Addon.Lutim/LutimDestination.cs
View file

@ -27,11 +27,13 @@ using System.Windows.Forms;
using Autofac.Features.OwnedInstances; using Autofac.Features.OwnedInstances;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Lutim.Entities; using Greenshot.Addon.Lutim.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Gfx; using Greenshot.Gfx;
@ -137,7 +139,10 @@ namespace Greenshot.Addon.Lutim {
} }
try try
{ {
ClipboardHelper.SetClipboardData(uploadUrl); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(uploadUrl);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

7
src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs
View file

@ -30,9 +30,11 @@ using System.Threading.Tasks;
using Caliburn.Micro; using Caliburn.Micro;
using Dapplo.CaliburnMicro.Extensions; using Dapplo.CaliburnMicro.Extensions;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Lutim.Entities; using Greenshot.Addon.Lutim.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions;
namespace Greenshot.Addon.Lutim.ViewModels namespace Greenshot.Addon.Lutim.ViewModels
{ {
@ -144,7 +146,10 @@ namespace Greenshot.Addon.Lutim.ViewModels
public void CopyToClipboard() public void CopyToClipboard()
{ {
// TODO: Build url // TODO: Build url
ClipboardHelper.SetClipboardData(SelectedLutim.LutimInfo.Short); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(SelectedLutim.LutimInfo.Short);
}
} }
public void ClearHistory() public void ClearHistory()

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

@ -22,15 +22,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" /> <package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -97,32 +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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -19,14 +19,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

3
src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj
View file

@ -40,12 +40,15 @@
<Reference Include="CustomMarshalers" /> <Reference Include="CustomMarshalers" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ComProgIdAttribute.cs" /> <Compile Include="ComProgIdAttribute.cs" />

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

@ -84,35 +84,38 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.61\lib\net46\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.65\lib\net46\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

@ -20,16 +20,17 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Com" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Com" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

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

@ -105,32 +105,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.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath>

6
src/Greenshot.Addon.OneDrive/OneDriveDestination.cs
View file

@ -38,6 +38,7 @@ using Dapplo.HttpExtensions.JsonNet;
using Dapplo.HttpExtensions.OAuth; using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.OneDrive.Entities; using Greenshot.Addon.OneDrive.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
@ -177,7 +178,10 @@ namespace Greenshot.Addon.OneDrive
if (_oneDriveConfiguration.AfterUploadLinkToClipBoard) if (_oneDriveConfiguration.AfterUploadLinkToClipBoard)
{ {
ClipboardHelper.SetClipboardData(response.ToString()); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(response.AbsoluteUri);
}
} }
return response; return response;

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

@ -23,6 +23,10 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" /> <package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -103,32 +103,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />

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

@ -21,14 +21,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

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

@ -102,32 +102,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath>

7
src/Greenshot.Addon.Tfs/TfsDestination.cs
View file

@ -32,11 +32,13 @@ using System.Windows.Forms;
using Autofac.Features.OwnedInstances; using Autofac.Features.OwnedInstances;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addon.Tfs.Entities; using Greenshot.Addon.Tfs.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Gfx; using Greenshot.Gfx;
@ -193,7 +195,10 @@ namespace Greenshot.Addon.Tfs
if (_tfsConfiguration.AfterUploadLinkToClipBoard) if (_tfsConfiguration.AfterUploadLinkToClipBoard)
{ {
ClipboardHelper.SetClipboardData(response.ToString()); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(response.AbsoluteUri);
}
} }
return response; return response;

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

@ -22,6 +22,10 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" /> <package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -81,32 +81,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />

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

@ -26,6 +26,7 @@ using System.Threading.Tasks;
using Windows.Graphics.Imaging; using Windows.Graphics.Imaging;
using Windows.Media.Ocr; using Windows.Media.Ocr;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
@ -94,8 +95,11 @@ namespace Greenshot.Addon.Win10
// Check if we found text // Check if we found text
if (!string.IsNullOrWhiteSpace(text)) if (!string.IsNullOrWhiteSpace(text))
{ {
// Place the OCR text on the // Place the OCR text on the clipboard
ClipboardHelper.SetClipboardData(text); using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUnicodeString(text);
}
} }
exportInformation.ExportMade = true; exportInformation.ExportMade = true;
} }

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

@ -15,14 +15,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

40
src/Greenshot.Addons/Controls/GreenshotTabPage.cs
View file

@ -1,40 +0,0 @@
#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
#region Usings
using System.ComponentModel;
using System.Windows.Forms;
#endregion
namespace Greenshot.Addons.Controls
{
public class GreenshotTabPage : TabPage, IGreenshotLanguageBindable
{
[Category("Greenshot")]
[DefaultValue(null)]
[Description("Specifies key of the language file to use when displaying the text.")]
public string LanguageKey { get; set; }
}
}

101
src/Greenshot.Addons/Core/ClipboardHelper.cs
View file

@ -262,14 +262,16 @@ EndSelection:<<<<<<<4
/// <returns></returns> /// <returns></returns>
public static bool ContainsText(IDataObject dataObject) public static bool ContainsText(IDataObject dataObject)
{ {
if (dataObject != null) if (dataObject == null)
{ {
if (dataObject.GetDataPresent(DataFormats.Text) || dataObject.GetDataPresent(DataFormats.UnicodeText)) return false;
{ }
return true;
} if (dataObject.GetDataPresent(DataFormats.Text) || dataObject.GetDataPresent(DataFormats.UnicodeText))
} {
return false; return true;
}
return false;
} }
/// <summary> /// <summary>
@ -289,45 +291,50 @@ EndSelection:<<<<<<<4
/// <returns>true if an image is there</returns> /// <returns>true if an image is there</returns>
public static bool ContainsImage(IDataObject dataObject) public static bool ContainsImage(IDataObject dataObject)
{ {
if (dataObject != null) if (dataObject == null)
{ {
if (dataObject.GetDataPresent(DataFormats.Bitmap) return false;
|| dataObject.GetDataPresent(DataFormats.Dib) }
|| dataObject.GetDataPresent(DataFormats.Tiff)
|| dataObject.GetDataPresent(DataFormats.EnhancedMetafile) if (dataObject.GetDataPresent(DataFormats.Bitmap)
|| dataObject.GetDataPresent(FORMAT_PNG) || dataObject.GetDataPresent(DataFormats.Dib)
|| dataObject.GetDataPresent(FORMAT_17) || dataObject.GetDataPresent(DataFormats.Tiff)
|| dataObject.GetDataPresent(FORMAT_JPG) || dataObject.GetDataPresent(DataFormats.EnhancedMetafile)
|| dataObject.GetDataPresent(FORMAT_GIF)) || dataObject.GetDataPresent(FORMAT_PNG)
{ || dataObject.GetDataPresent(FORMAT_17)
return true; || dataObject.GetDataPresent(FORMAT_JPG)
} || dataObject.GetDataPresent(FORMAT_GIF))
var imageFiles = GetImageFilenames(dataObject); {
if (imageFiles.Any()) return true;
{ }
return true; var imageFiles = GetImageFilenames(dataObject);
} if (imageFiles.Any())
if (dataObject.GetDataPresent(FORMAT_FILECONTENTS)) {
{ return true;
try }
{
var imageStream = dataObject.GetData(FORMAT_FILECONTENTS) as MemoryStream; if (!dataObject.GetDataPresent(FORMAT_FILECONTENTS))
if (IsValidStream(imageStream)) {
{ return false;
using (BitmapHelper.FromStream(imageStream)) }
{
// If we get here, there is an image try
return true; {
} var imageStream = dataObject.GetData(FORMAT_FILECONTENTS) as MemoryStream;
} if (IsValidStream(imageStream))
} {
catch (Exception) using (BitmapHelper.FromStream(imageStream))
{ {
// Ignore // If we get here, there is an image
} return true;
} }
} }
return false; }
catch (Exception)
{
// Ignore
}
return false;
} }
/// <summary> /// <summary>

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

@ -38,6 +38,7 @@ using System.Windows.Forms;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Dapplo.Log; using Dapplo.Log;
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.Core.Enums;
@ -850,7 +851,11 @@ namespace Greenshot.Addons.Core
if (copyPathToClipboard) if (copyPathToClipboard)
{ {
ClipboardHelper.SetClipboardData(fullPath); using (var clipboardAccessToken = ClipboardNative.Access())
{
// TODO: File??
clipboardAccessToken.SetAsUnicodeString(fullPath);
}
} }
} }

201
src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs Normal file
View file

@ -0,0 +1,201 @@
#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.Drawing;
using System.IO;
using System.Text;
using Dapplo.Windows.Clipboard;
using Dapplo.Windows.Common.Structs;
using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin;
namespace Greenshot.Addons.Extensions
{
public static class ClipboardHtmlExtensions
{
// Defintion of the Html Clipboard format
private static readonly string HtmlFormat = "CF_HTML";
// Defintion of the Url Clipboard format
private static readonly string UrlFormat = "CFSTR_INETURL";
// Store the ID for the Html clipboard format
private static uint? _htmlFormatId;
// Store the ID for the Url clipboard format
private static uint? _urlFormatId;
// Template for the HTML Text on the clipboard
// see: http://msdn.microsoft.com/en-us/library/ms649015%28v=vs.85%29.aspx
// or: http://msdn.microsoft.com/en-us/library/Aa767917.aspx
private const string HtmlClipboardString = @"Version:0.9
StartHTML:<<<<<<<1
EndHTML:<<<<<<<2
StartFragment:<<<<<<<3
EndFragment:<<<<<<<4
StartSelection:<<<<<<<3
EndSelection:<<<<<<<4
<!DOCTYPE>
<HTML>
<HEAD>
<TITLE>Greenshot capture</TITLE>
</HEAD>
<BODY>
<!--StartFragment -->
<img border='0' src='file:///${file}' width='${width}' height='${height}'>
<!--EndFragment -->
</BODY>
</HTML>";
// Template for the HTML Text on the clipboard
// see: http://msdn.microsoft.com/en-us/library/ms649015%28v=vs.85%29.aspx
// or: http://msdn.microsoft.com/en-us/library/Aa767917.aspx
private const string HtmlClipboardBase64String = @"Version:0.9
StartHTML:<<<<<<<1
EndHTML:<<<<<<<2
StartFragment:<<<<<<<3
EndFragment:<<<<<<<4
StartSelection:<<<<<<<3
EndSelection:<<<<<<<4
<!DOCTYPE>
<HTML>
<HEAD>
<TITLE>Greenshot capture</TITLE>
</HEAD>
<BODY>
<!--StartFragment -->
<img border='0' src='data:image/${format};base64,${data}' width='${width}' height='${height}'>
<!--EndFragment -->
</BODY>
</HTML>";
/// <summary>
/// Generate a HTML string for the clipboard
/// </summary>
/// <param name="size">Size</param>
/// <param name="filename">string</param>
/// <returns></returns>
private static string GenerateHtmlString(NativeSize size, string filename)
{
var utf8EncodedHtmlString = Encoding.GetEncoding(0).GetString(Encoding.UTF8.GetBytes(HtmlClipboardString));
utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${width}", size.Width.ToString());
utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${height}", size.Height.ToString());
utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${file}", filename.Replace("\\", "/"));
var sb = new StringBuilder();
sb.Append(utf8EncodedHtmlString);
sb.Replace("<<<<<<<1", (utf8EncodedHtmlString.IndexOf("<HTML>", StringComparison.Ordinal) + "<HTML>".Length).ToString("D8"));
sb.Replace("<<<<<<<2", utf8EncodedHtmlString.IndexOf("</HTML>", StringComparison.Ordinal).ToString("D8"));
sb.Replace("<<<<<<<3", (utf8EncodedHtmlString.IndexOf("<!--StartFragment -->", StringComparison.Ordinal) + "<!--StartFragment -->".Length).ToString("D8"));
sb.Replace("<<<<<<<4", utf8EncodedHtmlString.IndexOf("<!--EndFragment -->", StringComparison.Ordinal).ToString("D8"));
return sb.ToString();
}
/// <summary>
/// Generate a HTML snippet
/// </summary>
/// <param name="size">NativeSize</param>
/// <param name="pngStream">Stream</param>
/// <returns>string with the snippet</returns>
private static string GenerateHtmlDataUrlString(NativeSize size, MemoryStream pngStream)
{
var utf8EncodedHtmlString = Encoding.GetEncoding(0).GetString(Encoding.UTF8.GetBytes(HtmlClipboardBase64String));
utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${width}", size.Width.ToString());
utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${height}", size.Height.ToString());
utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${format}", "png");
utf8EncodedHtmlString = utf8EncodedHtmlString.Replace("${data}", Convert.ToBase64String(pngStream.GetBuffer(), 0, (int)pngStream.Length));
var sb = new StringBuilder();
sb.Append(utf8EncodedHtmlString);
sb.Replace("<<<<<<<1", (utf8EncodedHtmlString.IndexOf("<HTML>", StringComparison.Ordinal) + "<HTML>".Length).ToString("D8"));
sb.Replace("<<<<<<<2", utf8EncodedHtmlString.IndexOf("</HTML>", StringComparison.Ordinal).ToString("D8"));
sb.Replace("<<<<<<<3", (utf8EncodedHtmlString.IndexOf("<!--StartFragment -->", StringComparison.Ordinal) + "<!--StartFragment -->".Length).ToString("D8"));
sb.Replace("<<<<<<<4", utf8EncodedHtmlString.IndexOf("<!--EndFragment -->", StringComparison.Ordinal).ToString("D8"));
return sb.ToString();
}
/// <summary>
/// Place the bitmap as HTML on the clipboard
/// </summary>
/// <param name="clipboardAccessToken">IClipboardAccessToken</param>
/// <param name="surface">ISurface</param>
public static void SetAsHtml(this IClipboardAccessToken clipboardAccessToken, ISurface surface)
{
var pngOutputSettings = new SurfaceOutputSettings(OutputFormats.png, 100, false);
// This file is automatically deleted when Greenshot exits.
var filename = ImageOutput.SaveNamedTmpFile(surface, surface.CaptureDetails, pngOutputSettings);
// Set the PNG stream
var htmlText = GenerateHtmlString(new NativeSize(surface.Width, surface.Height), filename);
clipboardAccessToken.SetAsHtml(htmlText);
}
/// <summary>
/// Place the bitmap as embedded HTML on the clipboard
/// </summary>
/// <param name="clipboardAccessToken">IClipboardAccessToken</param>
/// <param name="bitmap">Bitmap</param>
public static void SetAsEmbeddedHtml(this IClipboardAccessToken clipboardAccessToken, Bitmap bitmap)
{
using (var pngStream = new MemoryStream())
{
var pngOutputSettings = new SurfaceOutputSettings(OutputFormats.png, 100, false);
ImageOutput.SaveToStream(bitmap, null, pngStream, pngOutputSettings);
pngStream.Seek(0, SeekOrigin.Begin);
// Set the PNG stream
var htmlText = GenerateHtmlDataUrlString(bitmap.Size, pngStream);
clipboardAccessToken.SetAsHtml(htmlText);
}
}
/// <summary>
/// Place HTML on the clipboard
/// </summary>
/// <param name="clipboardAccessToken">IClipboardAccessToken</param>
/// <param name="htmlText">string with the html</param>
public static void SetAsHtml(this IClipboardAccessToken clipboardAccessToken, string htmlText)
{
if (!_htmlFormatId.HasValue)
{
_htmlFormatId = ClipboardFormatExtensions.RegisterFormat(HtmlFormat);
}
// Set the Html stream
clipboardAccessToken.SetAsUnicodeString(htmlText, _htmlFormatId.Value);
}
/// <summary>
/// Place Uri on the clipboard
/// </summary>
/// <param name="clipboardAccessToken">IClipboardAccessToken</param>
/// <param name="url">string with the url</param>
public static void SetAsUrl(this IClipboardAccessToken clipboardAccessToken, string url)
{
if (!_urlFormatId.HasValue)
{
_urlFormatId = ClipboardFormatExtensions.RegisterFormat(UrlFormat);
}
// Set the Html stream
clipboardAccessToken.SetAsUnicodeString(url, _urlFormatId.Value);
}
}
}

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

@ -89,38 +89,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.61\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.61\lib\net46\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.65\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
@ -207,6 +207,7 @@
<Compile Include="Core\CaptureHandler.cs" /> <Compile Include="Core\CaptureHandler.cs" />
<Compile Include="Core\EventDelay.cs" /> <Compile Include="Core\EventDelay.cs" />
<Compile Include="Core\WmInputLangChangeRequestFilter.cs" /> <Compile Include="Core\WmInputLangChangeRequestFilter.cs" />
<Compile Include="Extensions\ClipboardHtmlExtensions.cs" />
<Compile Include="Extensions\DestinationExtensions.cs" /> <Compile Include="Extensions\DestinationExtensions.cs" />
<Compile Include="Extensions\LanguageExtensions.cs" /> <Compile Include="Extensions\LanguageExtensions.cs" />
<Compile Include="Extensions\ProcessorExtensions.cs" /> <Compile Include="Extensions\ProcessorExtensions.cs" />
@ -278,9 +279,6 @@
<Compile Include="Controls\GreenshotLabel.cs"> <Compile Include="Controls\GreenshotLabel.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="Controls\GreenshotTabPage.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\GreenshotTextBox.cs"> <Compile Include="Controls\GreenshotTextBox.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>

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

@ -22,17 +22,17 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Icons" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" /> <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="Svg" version="2.3.0" targetFramework="net46" /> <package id="Svg" version="2.3.0" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />

2
src/Greenshot.Gfx/BitmapHelper.cs
View file

@ -134,7 +134,7 @@ namespace Greenshot.Gfx
}; };
} }
public static IDictionary<string, Func<Stream, string, Bitmap>> StreamConverters { get; } = new Dictionary<string, Func<Stream, string, Bitmap>>(); public static IDictionary<string, Func<Stream, string, Bitmap>> StreamConverters { get; } = new Dictionary<string, Func<Stream, string, Bitmap>>(StringComparer.OrdinalIgnoreCase);
/// <summary> /// <summary>
/// Make sure the image is orientated correctly /// Make sure the image is orientated correctly

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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\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="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Svg" version="2.3.0" targetFramework="net46" /> <package id="Svg" version="2.3.0" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net46" /> <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net46" />

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

@ -69,32 +69,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\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>
@ -236,8 +236,8 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" /> <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.1\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" /> <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.1\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

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

@ -18,17 +18,17 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="JeremyAnsel.ColorQuant" version="1.0.55" targetFramework="net46" /> <package id="JeremyAnsel.ColorQuant" version="1.0.55" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" /> <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" targetFramework="net46" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" /> <package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net46" /> <package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net46" />
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" /> <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />

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

@ -101,32 +101,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath> <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
@ -310,8 +310,8 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" /> <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.1\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" /> <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.1\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
<Analyzer Include="..\packages\xunit.analyzers.0.9.0\analyzers\dotnet\cs\xunit.analyzers.dll" /> <Analyzer Include="..\packages\xunit.analyzers.0.9.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -20,16 +20,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" /> <package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" targetFramework="net46" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" /> <package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net46" /> <package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net46" />
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" /> <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />

48
src/Greenshot/Greenshot.csproj
View file

@ -118,41 +118,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.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.61\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.65\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.61\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.65\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.61\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.65\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.61\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.65\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.61\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.65\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.61\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.65\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.61\lib\net46\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.65\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.61\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.65\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.61\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.65\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.61\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.65\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Multimedia, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Multimedia, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.61\lib\net46\Dapplo.Windows.Multimedia.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.65\lib\net46\Dapplo.Windows.Multimedia.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.61.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.61\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.65\lib\net46\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>

24
src/Greenshot/packages.config
View file

@ -31,18 +31,18 @@
<package id="Dapplo.Log.LogFile" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log.LogFile" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Log.Loggers" version="1.2.1" targetFramework="net46" /> <package id="Dapplo.Log.Loggers" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" /> <package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Icons" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.Multimedia" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.Multimedia" version="0.5.65" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.61" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.65" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="gong-wpf-dragdrop" version="1.1.0" targetFramework="net46" /> <package id="gong-wpf-dragdrop" version="1.1.0" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" /> <package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />