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

Updated dependencies, and reflected some changes to those, to improve some DPI issues, and removed unneeded code.

Browse source
This commit is contained in:
Robin 2018-06-13 08:52:15 +02:00
commit e64f995c50
52 changed files with 678 additions and 970 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />

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

@ -22,16 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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>

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

@ -62,8 +62,8 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath>
@ -116,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />
@ -233,13 +233,13 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Green
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"</PostBuildEvent> copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" /> <Import Project="..\packages\Fody.3.0.4\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.4\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" /> <Error Condition="!Exists('..\packages\Fody.3.0.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets'))" /> <Error Condition="!Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets'))" />
</Target> </Target>
<Import Project="..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" /> <Import Project="..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" />
</Project> </Project>

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

@ -6,7 +6,7 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net46" /> <package id="Costura.Fody" version="3.0.0" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
@ -24,16 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="3.0.4" 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>

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

@ -106,35 +106,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />

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

@ -22,16 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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>

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

@ -55,8 +55,8 @@
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL"> <Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath> <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="CliWrap, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="CliWrap, Version=1.8.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\CliWrap.1.8.4\lib\net45\CliWrap.dll</HintPath> <HintPath>..\packages\CliWrap.1.8.5\lib\net45\CliWrap.dll</HintPath>
</Reference> </Reference>
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
@ -100,35 +100,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />

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

@ -5,7 +5,7 @@
<package id="Autofac.Mef" version="4.0.0" targetFramework="net46" /> <package id="Autofac.Mef" version="4.0.0" targetFramework="net46" />
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CliWrap" version="1.8.4" targetFramework="net46" /> <package id="CliWrap" version="1.8.5" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" />
@ -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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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.Addon.Flickr/Greenshot.Addon.Flickr.csproj
View file

@ -103,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />

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

@ -21,15 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
View file

@ -89,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />

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

@ -21,15 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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.Addon.Imgur/Greenshot.Addon.Imgur.csproj
View file

@ -111,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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>

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

@ -23,16 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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" />

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

@ -60,8 +60,8 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath>
@ -114,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />
@ -287,13 +287,13 @@ copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuratio
<DebugType>None</DebugType> <DebugType>None</DebugType>
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" /> <Import Project="..\packages\Fody.3.0.4\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.4\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" /> <Error Condition="!Exists('..\packages\Fody.3.0.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets'))" /> <Error Condition="!Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets'))" />
</Target> </Target>
<Import Project="..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" /> <Import Project="..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" />
</Project> </Project>

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

@ -6,7 +6,7 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.0.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
@ -24,17 +24,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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="3.0.4" 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" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />

15
src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.cs
View file

@ -39,7 +39,6 @@ using Dapplo.Windows.Common.Extensions;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.Desktop; using Dapplo.Windows.Desktop;
using Dapplo.Windows.Dpi; using Dapplo.Windows.Dpi;
using Dapplo.Windows.Dpi.Enums;
using Dapplo.Windows.Kernel32; using Dapplo.Windows.Kernel32;
using Dapplo.Windows.User32; using Dapplo.Windows.User32;
using Greenshot.Addon.LegacyEditor.Controls; using Greenshot.Addon.LegacyEditor.Controls;
@ -153,27 +152,19 @@ namespace Greenshot.Addon.LegacyEditor.Forms
// Create a BitmapScaleHandler which knows how to locate the icons for the destinations // Create a BitmapScaleHandler which knows how to locate the icons for the destinations
_destinationScaleHandler = BitmapScaleHandler.Create<IDestination>(FormDpiHandler, (destination, dpi) => destination.GetDisplayIcon(dpi), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi)); _destinationScaleHandler = BitmapScaleHandler.Create<IDestination>(FormDpiHandler, (destination, dpi) => destination.GetDisplayIcon(dpi), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi));
FormDpiHandler.OnDpiChangeInfo.Subscribe(info => FormDpiHandler.OnDpiChanged.Subscribe(info =>
{ {
switch (info.DpiChangeEventType)
{
case DpiChangeEventTypes.Before:
// Change the ImageScalingSize before setting the bitmaps // Change the ImageScalingSize before setting the bitmaps
var width = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Width, info.NewDpi); var size = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize, info.NewDpi);
var size = new Size(width, width);
SuspendLayout(); SuspendLayout();
toolsToolStrip.ImageScalingSize = size; toolsToolStrip.ImageScalingSize = size;
menuStrip1.ImageScalingSize = size; menuStrip1.ImageScalingSize = size;
destinationsToolStrip.ImageScalingSize = size; destinationsToolStrip.ImageScalingSize = size;
propertiesToolStrip.ImageScalingSize = size; propertiesToolStrip.ImageScalingSize = size;
propertiesToolStrip.MinimumSize = new Size(150, width + 10); propertiesToolStrip.MinimumSize = new Size(150, size.Width + 10);
break;
case DpiChangeEventTypes.After:
// Redraw the form // Redraw the form
ResumeLayout(true); ResumeLayout(true);
Refresh(); Refresh();
break;
}
}); });
// Use the GreenshotForm ScaleHandler to locate the icons and get them scaled // Use the GreenshotForm ScaleHandler to locate the icons and get them scaled

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

@ -85,35 +85,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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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.Addon.Lutim/Greenshot.Addon.Lutim.csproj
View file

@ -106,35 +106,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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>

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

@ -22,16 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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" />

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

@ -97,35 +97,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />

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

@ -19,15 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

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

@ -42,8 +42,8 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath>
@ -84,38 +84,38 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.73\lib\net46\Dapplo.Windows.Com.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.74\lib\net46\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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">
@ -252,13 +252,13 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Green
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"</PostBuildEvent> copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" /> <Import Project="..\packages\Fody.3.0.4\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.4\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" /> <Error Condition="!Exists('..\packages\Fody.3.0.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets'))" /> <Error Condition="!Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets'))" />
</Target> </Target>
<Import Project="..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" /> <Import Project="..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" />
</Project> </Project>

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

@ -6,7 +6,7 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.0.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
@ -20,17 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Com" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Com" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Fody" version="3.0.4" 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>

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

@ -105,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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>

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

@ -23,16 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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" />

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

@ -103,35 +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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />

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

@ -21,15 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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.Addon.Tfs/Greenshot.Addon.Tfs.csproj
View file

@ -102,35 +102,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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>

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

@ -22,16 +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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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" />

80
src/Greenshot.Addons/Controls/ExtendedWebBrowser.cs
View file

@ -1,80 +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;
using System.Windows.Forms;
using Greenshot.Addons.Interop;
#endregion
namespace Greenshot.Addons.Controls
{
public class ExtendedWebBrowser : WebBrowser
{
protected override WebBrowserSiteBase CreateWebBrowserSiteBase()
{
return new ExtendedWebBrowserSite(this);
}
protected class ExtendedWebBrowserSite : WebBrowserSite, IOleCommandTarget
{
private const int OLECMDID_SHOWSCRIPTERROR = 40;
private const int OLECMDID_SHOWMESSAGE = 41;
private const int S_OK = 0;
private const int OLECMDERR_E_NOTSUPPORTED = -2147221248;
private const int OLECMDERR_E_UNKNOWNGROUP = -2147221244;
private static readonly Guid CGID_DocHostCommandHandler = new Guid("F38BC242-B950-11D1-8918-00C04FC2C836");
public ExtendedWebBrowserSite(WebBrowser wb) : base(wb)
{
}
#region IOleCommandTarget Members
public int QueryStatus(Guid pguidCmdGroup, int cCmds, IntPtr prgCmds, IntPtr pCmdText)
{
return OLECMDERR_E_NOTSUPPORTED;
}
public int Exec(Guid pguidCmdGroup, int nCmdID, int nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut)
{
if (pguidCmdGroup == CGID_DocHostCommandHandler)
{
if (nCmdID == OLECMDID_SHOWSCRIPTERROR)
{
// do not need to alter pvaOut as the docs says, enough to return S_OK here
return S_OK;
}
}
return OLECMDERR_E_NOTSUPPORTED;
}
#endregion
}
}
}

6
src/Greenshot.Addons/Core/AbstractDestination.cs
View file

@ -314,11 +314,9 @@ namespace Greenshot.Addons.Core
(destination, dpi) => destination.GetDisplayIcon(dpi), (destination, dpi) => destination.GetDisplayIcon(dpi),
(bitmap, d) => bitmap.ScaleIconForDisplaying(d)); (bitmap, d) => bitmap.ScaleIconForDisplaying(d));
dpiHandler.OnDpiChanged.Subscribe(dpi => dpiHandler.OnDpiChanged.Subscribe(dpiChangeInfo =>
{ {
var width = DpiHandler.ScaleWithDpi(CoreConfiguration.IconSize.Width, dpi); menu.ImageScalingSize = DpiHandler.ScaleWithDpi(CoreConfiguration.IconSize, dpiChangeInfo.NewDpi);
var size = new Size(width, width);
menu.ImageScalingSize = size;
}); });
// Generate an empty ExportInformation object, for when nothing was selected. // Generate an empty ExportInformation object, for when nothing was selected.

6
src/Greenshot.Addons/Core/WindowCapture.cs
View file

@ -102,8 +102,8 @@ namespace Greenshot.Addons.Core
/// be different in multiscreen setups. This implementation /// be different in multiscreen setups. This implementation
/// can conveniently be used when the cursor location is needed to deal with a fullscreen bitmap. /// can conveniently be used when the cursor location is needed to deal with a fullscreen bitmap.
/// </summary> /// </summary>
/// <param name="locationRelativeToScreenOrigin"></param> /// <param name="locationRelativeToScreenOrigin">NativePoint</param>
/// <returns></returns> /// <returns>NativePoint</returns>
public static NativePoint GetLocationRelativeToScreenBounds(NativePoint locationRelativeToScreenOrigin) public static NativePoint GetLocationRelativeToScreenBounds(NativePoint locationRelativeToScreenOrigin)
{ {
var bounds = GetScreenBounds(); var bounds = GetScreenBounds();
@ -177,7 +177,7 @@ namespace Greenshot.Addons.Core
/// </summary> /// </summary>
/// <param name="method">string with current method</param> /// <param name="method">string with current method</param>
/// <param name="captureBounds">NativeRect of what we want to capture</param> /// <param name="captureBounds">NativeRect of what we want to capture</param>
/// <returns></returns> /// <returns>Exception</returns>
private static Exception CreateCaptureException(string method, NativeRect captureBounds) private static Exception CreateCaptureException(string method, NativeRect captureBounds)
{ {
var exceptionToThrow = User32Api.CreateWin32Exception(method); var exceptionToThrow = User32Api.CreateWin32Exception(method);

51
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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.73\lib\net46\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.74\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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" />
@ -252,14 +252,7 @@
<Compile Include="Interfaces\SurfaceMessageTyp.cs" /> <Compile Include="Interfaces\SurfaceMessageTyp.cs" />
<Compile Include="Interfaces\SurfaceSizeChangeEventHandler.cs" /> <Compile Include="Interfaces\SurfaceSizeChangeEventHandler.cs" />
<Compile Include="Interfaces\VerticalAlignment.cs" /> <Compile Include="Interfaces\VerticalAlignment.cs" />
<Compile Include="Interop\IUnknown.cs" />
<Compile Include="Interop\IDispatch.cs" />
<Compile Include="Interop\IOleWindow.cs" />
<Compile Include="Interop\IOleCommandTarget.cs" />
<Compile Include="Interop\IServiceProvider.cs" /> <Compile Include="Interop\IServiceProvider.cs" />
<Compile Include="Controls\ExtendedWebBrowser.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\FormWithoutActivation.cs"> <Compile Include="Controls\FormWithoutActivation.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>

56
src/Greenshot.Addons/Interop/IDispatch.cs
View file

@ -1,56 +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;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.CustomMarshalers;
using DISPPARAMS = System.Runtime.InteropServices.ComTypes.DISPPARAMS;
using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;
#endregion
namespace Greenshot.Addons.Interop
{
[ComImport]
[Guid("00020400-0000-0000-C000-000000000046")]
[InterfaceType(ComInterfaceType.InterfaceIsDual)]
public interface IDispatch : IUnknown
{
[PreserveSig]
int GetTypeInfoCount(out int count);
[PreserveSig]
int GetTypeInfo([MarshalAs(UnmanagedType.U4)] int iTInfo, [MarshalAs(UnmanagedType.U4)] int lcid,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(TypeToTypeInfoMarshaler))] out Type typeInfo);
[PreserveSig]
int GetIDsOfNames(ref Guid riid, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPWStr)] string[] rgsNames, int cNames, int lcid,
[MarshalAs(UnmanagedType.LPArray)] int[] rgDispId);
[PreserveSig]
int Invoke(int dispIdMember, ref Guid riid, uint lcid, ushort wFlags, ref DISPPARAMS pDispParams,
out object pVarResult, ref EXCEPINFO pExcepInfo, IntPtr[] pArgErr);
}
}

47
src/Greenshot.Addons/Interop/IOleCommandTarget.cs
View file

@ -1,47 +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;
using System.Runtime.InteropServices;
#endregion
namespace Greenshot.Addons.Interop
{
[ComImport]
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
[ComVisible(true)]
[Guid("B722BCCB-4E68-101B-A2BC-00AA00404770")]
public interface IOleCommandTarget
{
[return: MarshalAs(UnmanagedType.I4)]
[PreserveSig]
int QueryStatus([In] [MarshalAs(UnmanagedType.LPStruct)] Guid pguidCmdGroup, int cCmds, IntPtr prgCmds, IntPtr pCmdText);
[return: MarshalAs(UnmanagedType.I4)]
[PreserveSig]
int Exec([In] [MarshalAs(UnmanagedType.LPStruct)] Guid pguidCmdGroup, int nCmdID, int nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut);
}
}

43
src/Greenshot.Addons/Interop/IOleWindow.cs
View file

@ -1,43 +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;
using System.Runtime.InteropServices;
#endregion
namespace Greenshot.Addons.Interop
{
// Needed to get the Window handle from the IDocument2
// See: http://msdn.microsoft.com/en-us/library/ms680102%28v=vs.85%29.aspx
[ComImport]
[Guid("00000114-0000-0000-C000-000000000046")]
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
public interface IOleWindow
{
void GetWindow(out IntPtr phwnd);
void ContextSensitiveHelp([In] [MarshalAs(UnmanagedType.Bool)] bool fEnterMode);
}
}

4
src/Greenshot.Addons/Interop/IServiceProvider.cs
View file

@ -30,7 +30,9 @@ using System.Runtime.InteropServices;
namespace Greenshot.Addons.Interop namespace Greenshot.Addons.Interop
{ {
// This is the COM IServiceProvider interface, not System.IServiceProvider .Net interface! /// <summary>
/// This is the COM IServiceProvider interface, not System.IServiceProvider .Net interface!
/// </summary>
[ComImport] [ComImport]
[ComVisible(true)] [ComVisible(true)]
[Guid("6D5140C1-7436-11CE-8034-00AA006009FA")] [Guid("6D5140C1-7436-11CE-8034-00AA006009FA")]

46
src/Greenshot.Addons/Interop/IUnknown.cs
View file

@ -1,46 +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;
using System.Runtime.InteropServices;
#endregion
namespace Greenshot.Addons.Interop
{
[ComImport]
[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
[Guid("00000000-0000-0000-C000-000000000046")]
public interface IUnknown
{
IntPtr QueryInterface(ref Guid riid);
[PreserveSig]
uint AddRef();
[PreserveSig]
uint Release();
}
}

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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Icons" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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" />

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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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" />

36
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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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>

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

@ -18,15 +18,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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" 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.1" 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" />

36
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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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>

18
src/Greenshot.Tests/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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.74" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" 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" />

6
src/Greenshot/Forms/AboutForm.cs
View file

@ -35,6 +35,7 @@ using Dapplo.CaliburnMicro;
using Greenshot.Helpers; using Greenshot.Helpers;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Common.Structs;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Animation; using Greenshot.Addons.Animation;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
@ -156,10 +157,9 @@ namespace Greenshot.Forms
_bitmap = BitmapFactory.CreateEmpty(90, 90, PixelFormat.Format24bppRgb, BackColor); _bitmap = BitmapFactory.CreateEmpty(90, 90, PixelFormat.Format24bppRgb, BackColor);
pictureBox1.Image = _bitmap; pictureBox1.Image = _bitmap;
_dpiSubscription = FormDpiHandler.OnDpiChangeInfo.Subscribe(info => _dpiSubscription = FormDpiHandler.OnDpiChanged.Subscribe(info =>
{ {
pictureBox1.Width = FormDpiHandler.ScaleWithCurrentDpi(90); pictureBox1.Size = FormDpiHandler.ScaleWithCurrentDpi(new NativeSize(90,90));
pictureBox1.Height = FormDpiHandler.ScaleWithCurrentDpi(90);
}); });
var versionInfo = $@"Greenshot {versionProvider.CurrentVersion} {(coreConfiguration.IsPortable ? " Portable" : "")} ({OsInfo.Bits} bit)"; var versionInfo = $@"Greenshot {versionProvider.CurrentVersion} {(coreConfiguration.IsPortable ? " Portable" : "")} ({OsInfo.Bits} bit)";

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

@ -375,11 +375,8 @@ namespace Greenshot.Forms
{ {
ContextMenuDpiHandler = contextMenu.AttachDpiHandler(); ContextMenuDpiHandler = contextMenu.AttachDpiHandler();
var dpiChangeSubscription = FormDpiHandler.OnDpiChangeInfo.Subscribe(info => var dpiChangeSubscription = FormDpiHandler.OnDpiChanged.Subscribe(info =>
{ {
switch (info.DpiChangeEventType)
{
case DpiChangeEventTypes.Before:
// Change the ImageScalingSize before setting the bitmaps // Change the ImageScalingSize before setting the bitmaps
var width = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Width, info.NewDpi); var width = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Width, info.NewDpi);
var height = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Height, info.NewDpi); var height = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Height, info.NewDpi);
@ -387,14 +384,9 @@ namespace Greenshot.Forms
contextMenu.SuspendLayout(); contextMenu.SuspendLayout();
contextMenu.ImageScalingSize = size; contextMenu.ImageScalingSize = size;
contextmenu_quicksettings.Size = new Size(170, width + 8); contextmenu_quicksettings.Size = new Size(170, width + 8);
break;
case DpiChangeEventTypes.After:
// Redraw the form
contextMenu.ResumeLayout(true); contextMenu.ResumeLayout(true);
contextMenu.Refresh(); contextMenu.Refresh();
notifyIcon.Icon = GreenshotResources.GetGreenshotIcon(); notifyIcon.Icon = GreenshotResources.GetGreenshotIcon();
break;
}
}); });
var contextMenuResourceScaleHandler = BitmapScaleHandler.WithComponentResourceManager(ContextMenuDpiHandler, GetType(), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi)); var contextMenuResourceScaleHandler = BitmapScaleHandler.WithComponentResourceManager(ContextMenuDpiHandler, GetType(), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi));

63
src/Greenshot/Greenshot.csproj
View file

@ -55,8 +55,8 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath>
@ -118,41 +118,44 @@
<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.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Com, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Com.0.5.74\lib\net46\Dapplo.Windows.Com.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.73\lib\net46\Dapplo.Windows.Icons.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Icons, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Icons.0.5.74\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Multimedia, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.73\lib\net46\Dapplo.Windows.Multimedia.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.73.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Multimedia, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.74\lib\net46\Dapplo.Windows.Multimedia.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.74.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.74\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>
@ -532,13 +535,13 @@
<PreBuildEvent> <PreBuildEvent>
</PreBuildEvent> </PreBuildEvent>
</PropertyGroup> </PropertyGroup>
<Import Project="..\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.3\build\Fody.targets')" /> <Import Project="..\packages\Fody.3.0.4\build\Fody.targets" Condition="Exists('..\packages\Fody.3.0.4\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.3\build\Fody.targets'))" /> <Error Condition="!Exists('..\packages\Fody.3.0.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.0.4\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets'))" /> <Error Condition="!Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets'))" />
</Target> </Target>
<Import Project="..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.1\build\Costura.Fody.targets')" /> <Import Project="..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.0.0\build\Costura.Fody.targets')" />
</Project> </Project>

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

@ -34,6 +34,7 @@ using Greenshot.Configuration;
using Greenshot.Helpers.IEInterop; using Greenshot.Helpers.IEInterop;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com;
using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Extensions;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.Messages; using Dapplo.Windows.Messages;
@ -41,7 +42,6 @@ using Dapplo.Windows.User32;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interop;
using Greenshot.Gfx; using Greenshot.Gfx;
using mshtml; using mshtml;

29
src/Greenshot/packages.config
View file

@ -10,7 +10,7 @@
<package id="CommandLineParser" version="2.2.1" targetFramework="net46" /> <package id="CommandLineParser" version="2.2.1" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.0.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Addons.Config" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Config" version="1.0.47" targetFramework="net46" />
@ -31,19 +31,20 @@
<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.73" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Com" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Icons" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.Multimedia" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.74" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.73" targetFramework="net46" /> <package id="Dapplo.Windows.Multimedia" version="0.5.74" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" /> <package id="Dapplo.Windows.User32" version="0.5.74" targetFramework="net46" />
<package id="Fody" version="3.0.4" 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" />
<package id="MahApps.Metro.IconPacks" version="2.2.0" targetFramework="net46" /> <package id="MahApps.Metro.IconPacks" version="2.2.0" targetFramework="net46" />