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

Made the mutex work again, the error was in Dapplo.Addons

Browse source
This commit is contained in:
Robin 2018-06-20 00:28:40 +02:00
commit 94f4211cc8
46 changed files with 175 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,11 +46,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -65,11 +65,11 @@
<Reference Include="Costura, Version=3.0.0.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.3.0.0\lib\net46\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.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -7,8 +7,8 @@
<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="3.0.0" 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.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -58,11 +58,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -61,11 +61,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -7,8 +7,8 @@
<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.5" 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.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -58,11 +58,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -44,11 +44,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -63,11 +63,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

2
src/Greenshot.Addon.Imgur/IImgurLanguage.cs
View file

@ -62,5 +62,7 @@ namespace Greenshot.Addon.Imgur
string UsePageLink { get; } string UsePageLink { get; }
string AnonymousAccess { get; } string AnonymousAccess { get; }
string ResetCredentialsButton { get; }
} }
} }

9
src/Greenshot.Addon.Imgur/ViewModels/ImgurConfigViewModel.cs
View file

@ -27,6 +27,7 @@ using Autofac.Features.OwnedInstances;
using Caliburn.Micro; using Caliburn.Micro;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Extensions; using Dapplo.CaliburnMicro.Extensions;
using Dapplo.HttpExtensions.OAuth;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.ViewModels; using Greenshot.Addons.ViewModels;
@ -102,5 +103,13 @@ namespace Greenshot.Addon.Imgur.ViewModels
WindowManager.ShowDialog(imgurHistoryViewModel.Value); WindowManager.ShowDialog(imgurHistoryViewModel.Value);
} }
} }
public bool CanResetCredentials => ImgurConfiguration.HasToken();
public void ResetCredentials()
{
ImgurConfiguration.ResetToken();
NotifyOfPropertyChange(nameof(CanResetCredentials));
}
} }
} }

1
src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml
View file

@ -15,6 +15,7 @@
<CheckBox IsChecked="{Binding ImgurConfiguration.AnonymousAccess}" Content="{Binding ImgurLanguage.AnonymousAccess}"/> <CheckBox IsChecked="{Binding ImgurConfiguration.AnonymousAccess}" Content="{Binding ImgurLanguage.AnonymousAccess}"/>
<CheckBox IsChecked="{Binding ImgurConfiguration.UsePageLink}" Content="{Binding ImgurLanguage.UsePageLink}"/> <CheckBox IsChecked="{Binding ImgurConfiguration.UsePageLink}" Content="{Binding ImgurLanguage.UsePageLink}"/>
<Button x:Name="ShowHistory" Content="{Binding ImgurLanguage.History}"/> <Button x:Name="ShowHistory" Content="{Binding ImgurLanguage.History}"/>
<Button Content="{Binding ImgurLanguage.ResetCredentialsButton}" x:Name="ResetCredentials" />
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
</StackPanel> </StackPanel>

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

@ -7,8 +7,8 @@
<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="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -63,11 +63,11 @@
<Reference Include="Costura, Version=3.0.0.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.3.0.0\lib\net46\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.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -7,8 +7,8 @@
<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="3.0.0" 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.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -43,11 +43,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -61,11 +61,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -7,8 +7,8 @@
<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="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -58,11 +58,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -45,11 +45,11 @@
<Reference Include="Costura, Version=3.0.0.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.3.0.0\lib\net46\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.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -7,8 +7,8 @@
<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="3.0.0" 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.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -57,11 +57,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -7,8 +7,8 @@
<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="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -58,11 +58,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -57,11 +57,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -7,8 +7,8 @@
<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="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -54,11 +54,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
@ -81,35 +81,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath> <HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Clipboard, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Common, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Dpi, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Gdi32, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Input, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Kernel32, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.Messages, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.79.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Windows.User32, Version=0.5.80.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll</HintPath> <HintPath>..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
@ -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.79" targetFramework="net46" /> <package id="Dapplo.Windows" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.Clipboard" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.Common" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.Dpi" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.Gdi32" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.Input" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.Kernel32" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.Messages" version="0.5.80" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.79" targetFramework="net46" /> <package id="Dapplo.Windows.User32" version="0.5.80" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" /> <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages> </packages>

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

@ -41,11 +41,11 @@
<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="CustomMarshalers" /> <Reference Include="CustomMarshalers" />
<Reference Include="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />

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

@ -37,11 +37,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -6,8 +6,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

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

@ -42,11 +42,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -9,8 +9,8 @@
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

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

@ -71,11 +71,11 @@
<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="Dapplo.Addons, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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

@ -10,8 +10,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<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="Dapplo.Addons" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.HttpExtensions" version="0.8.41" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.41" targetFramework="net46" />

12
src/Greenshot/Greenshot.csproj
View file

@ -58,14 +58,14 @@
<Reference Include="Costura, Version=3.0.0.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.3.0.0\lib\net46\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.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Config, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Config, Version=1.0.50.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Config.1.0.47\lib\net45\Dapplo.Addons.Config.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Config.1.0.50\lib\net45\Dapplo.Addons.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.47.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

7
src/Greenshot/Startup.cs
View file

@ -38,6 +38,7 @@ using Dapplo.Ini.Converters;
using Dapplo.Language; using Dapplo.Language;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Log.Loggers; using Dapplo.Log.Loggers;
using Dapplo.Windows.Dpi.Forms;
using Dapplo.Windows.Kernel32; using Dapplo.Windows.Kernel32;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
@ -70,7 +71,7 @@ namespace Greenshot
#endif #endif
var applicationConfig = ApplicationConfig.Create() var applicationConfig = ApplicationConfig.Create()
.WithApplicationName("Greenshot") .WithApplicationName("Greenshot")
.WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08") .WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08", false)
.WithAssemblyNames("Dapplo.Addons.Config") .WithAssemblyNames("Dapplo.Addons.Config")
.WithAssemblyPatterns("Greenshot.Addon*"); .WithAssemblyPatterns("Greenshot.Addon*");
@ -159,7 +160,7 @@ namespace Greenshot
IGreenshotLanguage language = null; IGreenshotLanguage language = null;
// A dirty fix to make sure the messagebox is visible as a Greenshot window on the taskbar // A dirty fix to make sure the messagebox is visible as a Greenshot window on the taskbar
using (var multiInstanceForm = new Form using (var multiInstanceForm = new DpiAwareForm
{ {
Icon = GreenshotResources.GetGreenshotIcon(), Icon = GreenshotResources.GetGreenshotIcon(),
ShowInTaskbar = true, ShowInTaskbar = true,
@ -207,7 +208,7 @@ namespace Greenshot
{ {
Text = language.TranslationOrDefault(l => l.BugreportCancel), Text = language.TranslationOrDefault(l => l.BugreportCancel),
Dock = DockStyle.Bottom, Dock = DockStyle.Bottom,
Height = 20 Height = 25
}; };
flowLayoutPanel.Controls.Add(cancelButton); flowLayoutPanel.Controls.Add(cancelButton);
multiInstanceForm.Controls.Add(flowLayoutPanel); multiInstanceForm.Controls.Add(flowLayoutPanel);

6
src/Greenshot/packages.config
View file

@ -11,9 +11,9 @@
<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="3.0.0" 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.50" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.Addons.Config" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.Addons.Config" version="1.0.50" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.47" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.47" targetFramework="net46" />