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 again, we are now at 3,5 seconds instead of 5,5

Browse source
This commit is contained in:
Robin 2018-07-04 13:28:53 +02:00
commit 918bc78d4e
47 changed files with 133 additions and 132 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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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

@ -80,7 +80,7 @@ namespace Greenshot.Addon.Confluence
} }
if (!pageDouble) if (!pageDouble)
{ {
var page = await confluenceConnector.Content.GetAsync(pageId); var page = await confluenceConnector.Content.GetAsync(pageId).ConfigureAwait(false);
Log.Debug().WriteLine("Adding page {0}", page.Title); Log.Debug().WriteLine("Adding page {0}", page.Title);
pages.Add(page); pages.Add(page);
} }

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

@ -65,11 +65,11 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.1.0" targetFramework="net46" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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

@ -83,7 +83,7 @@ namespace Greenshot.Addon.ExternalCommand
{ {
var arguments = string.Format(_externalCommandDefinition.Arguments, fullPath); var arguments = string.Format(_externalCommandDefinition.Arguments, fullPath);
// Execute // Execute
var output = await cli.ExecuteAsync(arguments); var output = await cli.ExecuteAsync(arguments).ConfigureAwait(true);
if (_externalCommandDefinition.CommandBehavior.HasFlag(CommandBehaviors.ParseOutputForUris)) if (_externalCommandDefinition.CommandBehavior.HasFlag(CommandBehaviors.ParseOutputForUris))
{ {

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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

@ -63,11 +63,11 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

6
src/Greenshot.Addon.Jira/JiraConnector.cs
View file

@ -119,13 +119,13 @@ namespace Greenshot.Addon.Jira
_issueTypeBitmapCache = new IssueTypeBitmapCache(_jiraClient); _issueTypeBitmapCache = new IssueTypeBitmapCache(_jiraClient);
try try
{ {
await _jiraClient.Session.StartAsync(user, password, cancellationToken); await _jiraClient.Session.StartAsync(user, password, cancellationToken).ConfigureAwait(true);
await _jiraMonitor.AddJiraInstanceAsync(_jiraClient, cancellationToken); await _jiraMonitor.AddJiraInstanceAsync(_jiraClient, cancellationToken).ConfigureAwait(true);
var favIconUri = _jiraClient.JiraBaseUri.AppendSegments("favicon.ico"); var favIconUri = _jiraClient.JiraBaseUri.AppendSegments("favicon.ico");
try try
{ {
FavIcon = await _jiraClient.Server.GetUriContentAsync<Bitmap>(favIconUri, cancellationToken); FavIcon = await _jiraClient.Server.GetUriContentAsync<Bitmap>(favIconUri, cancellationToken).ConfigureAwait(true);
} }
catch (Exception ex) catch (Exception ex)
{ {

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.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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

@ -75,7 +75,8 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\" <PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons"
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\"
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName).config" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\"</PostBuildEvent> copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName).config" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -45,11 +45,11 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

2
src/Greenshot.Addons/Controls/GreenshotForm.cs
View file

@ -105,7 +105,7 @@ namespace Greenshot.Addons.Controls
base.OnShown(e); base.OnShown(e);
if (ToFront) if (ToFront)
{ {
await InteropWindowFactory.CreateFor(Handle).ToForegroundAsync(); await InteropWindowFactory.CreateFor(Handle).ToForegroundAsync().ConfigureAwait(false);
} }
} }

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

@ -376,7 +376,7 @@ namespace Greenshot.Addons.Core
} }
menu.Tag = clickedDestination.Designation; menu.Tag = clickedDestination.Designation;
// Export // Export
exportInformation = await clickedDestination.ExportCaptureAsync(true, surface, captureDetails); exportInformation = await clickedDestination.ExportCaptureAsync(true, surface, captureDetails).ConfigureAwait(true);
if (exportInformation != null && exportInformation.ExportMade) if (exportInformation != null && exportInformation.ExportMade)
{ {
Log.Info().WriteLine("Export to {0} success, closing menu", exportInformation.DestinationDescription); Log.Info().WriteLine("Export to {0} success, closing menu", exportInformation.DestinationDescription);

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />

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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<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

@ -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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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="net461" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

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

@ -72,11 +72,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.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\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="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" /> <package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />

2
src/Greenshot/Components/UpdateService.cs
View file

@ -168,7 +168,7 @@ namespace Greenshot.Components
MainForm.Instance.NotifyIcon.BalloonTipClicked += HandleBalloonTipClick; MainForm.Instance.NotifyIcon.BalloonTipClicked += HandleBalloonTipClick;
MainForm.Instance.NotifyIcon.BalloonTipClosed += CleanupBalloonTipClick; MainForm.Instance.NotifyIcon.BalloonTipClosed += CleanupBalloonTipClick;
MainForm.Instance.NotifyIcon.ShowBalloonTip(10000, "Greenshot", string.Format(_greenshotLanguage.UpdateFound, LatestVersion), ToolTipIcon.Info); MainForm.Instance.NotifyIcon.ShowBalloonTip(10000, "Greenshot", string.Format(_greenshotLanguage.UpdateFound, LatestVersion), ToolTipIcon.Info);
}, cancellationToken); }, cancellationToken).ConfigureAwait(false);
} }
} }

12
src/Greenshot/Greenshot.csproj
View file

@ -55,14 +55,14 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.63\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.63\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Config, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Config, Version=1.0.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Config.1.0.62\lib\net46\Dapplo.Addons.Config.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Config.1.0.63\lib\net46\Dapplo.Addons.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

6
src/Greenshot/packages.config
View file

@ -10,9 +10,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.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.Addons.Config" version="1.0.62" targetFramework="net461" /> <package id="Dapplo.Addons.Config" version="1.0.63" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />