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

Made things work [skip ci]

Browse source
This commit is contained in:
Robin 2018-05-14 09:09:30 +02:00
commit e73301bade
49 changed files with 499 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,29 +46,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />

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

@ -65,29 +65,29 @@
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll</HintPath>

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.Confluence" version="0.7.19" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.35" targetFramework="net452" />

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

@ -58,29 +58,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />

4
src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs
View file

@ -11,10 +11,6 @@ namespace Greenshot.Addon.ExternalCommand
{
protected override void Load(ContainerBuilder builder)
{
builder
.RegisterType<ExternalCommandDestination>()
.As<IDestination>()
.SingleInstance();
builder
.RegisterType<ExternalCommandStartup>()
.As<IStartup>()

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

@ -58,29 +58,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

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

@ -58,29 +58,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

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

@ -44,29 +44,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

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

@ -63,29 +63,29 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

4
src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs
View file

@ -18,6 +18,10 @@ namespace Greenshot.Addon.Imgur
.RegisterType<ImgurConfigViewModel>()
.As<IConfigScreen>()
.SingleInstance();
builder
.RegisterType<ImgurHistoryViewModel>()
.AsSelf()
.SingleInstance();
builder
.RegisterType<ImgurApi>()
.AsSelf()

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />

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

@ -63,29 +63,29 @@
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

9
src/Greenshot.Addon.Jira/JiraDestination.cs
View file

@ -26,6 +26,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO.Compression;
using System.Windows.Forms;
using Caliburn.Micro;
using Dapplo.Addons;
@ -137,8 +138,12 @@ namespace Greenshot.Addon.Jira
{
using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType(), "jira.svgz"))
{
displayIcon = BitmapHelper.FromStream(bitmapStream);
}
using (var gzStream = new GZipStream(bitmapStream, CompressionMode.Decompress))
{
displayIcon = SvgBitmap.FromStream(gzStream).Bitmap;
}
//displayIcon = BitmapHelper.FromStream(bitmapStream);
}
}
return displayIcon;
}

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />

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

@ -36,29 +36,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

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

@ -61,29 +61,29 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

4
src/Greenshot.Addon.Lutim/LutimAutofacModule.cs
View file

@ -18,6 +18,10 @@ namespace Greenshot.Addon.Lutim
.RegisterType<LutimConfigViewModel>()
.As<IConfigScreen>()
.SingleInstance();
builder
.RegisterType<LutimApi>()
.AsSelf()
.SingleInstance();
}
}
}

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

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

@ -58,29 +58,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

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

@ -44,29 +44,29 @@
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

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

@ -57,29 +57,29 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />

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

@ -58,29 +58,29 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

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

@ -57,29 +57,29 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

4
src/Greenshot.Addon.Tfs/TfsAutofacModule.cs
View file

@ -18,6 +18,10 @@ namespace Greenshot.Addon.Tfs
.RegisterType<TfsConfigViewModel>()
.As<IConfigScreen>()
.SingleInstance();
builder
.RegisterType<TfsClient>()
.AsSelf()
.SingleInstance();
}
}
}

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

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

@ -40,29 +40,29 @@
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="CustomMarshalers" />
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />

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

@ -36,17 +36,17 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

18
src/Greenshot.Gfx/SvgBitmap.cs
View file

@ -48,8 +48,22 @@ namespace Greenshot.Gfx
public SvgBitmap(Stream stream)
{
_svgDocument = SvgDocument.Open<SvgDocument>(stream);
Height = (int) _svgDocument.ViewBox.Height;
Width = (int) _svgDocument.ViewBox.Width;
if ((int) _svgDocument.ViewBox.Height == 0)
{
Height = (int)_svgDocument.Height;
}
else
{
Height = (int)_svgDocument.ViewBox.Height;
}
if ((int)_svgDocument.ViewBox.Width == 0)
{
Width = (int)_svgDocument.Width;
}
else
{
Width = (int)_svgDocument.ViewBox.Width;
}
}
/// <summary>

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

@ -6,10 +6,10 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

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

@ -42,17 +42,17 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -9,10 +9,10 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.8-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />

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

@ -71,17 +71,17 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -10,10 +10,10 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommandLineParser" version="2.2.1" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />

39
src/Greenshot/Greenshot.csproj
View file

@ -27,6 +27,9 @@
<Reference Include="Autofac.Extras.AttributeMetadata, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.Extras.AttributeMetadata.4.0.1\lib\net45\Autofac.Extras.AttributeMetadata.dll</HintPath>
</Reference>
<Reference Include="Autofac.Extras.CommonServiceLocator, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.Extras.CommonServiceLocator.5.0.0\lib\net45\Autofac.Extras.CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Autofac.Integration.Mef, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.Mef.4.0.0\lib\net45\Autofac.Integration.Mef.dll</HintPath>
</Reference>
@ -54,32 +57,32 @@
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>

6
src/Greenshot/GreenshotAutofacModule.cs
View file

@ -53,14 +53,14 @@ namespace Greenshot
// Configuration
builder
.RegisterAssemblyTypes()
.RegisterAssemblyTypes(ThisAssembly)
.AssignableTo<IConfigScreen>()
.As<IConfigScreen>()
.SingleInstance();
// Startup and Shutdown
builder
.RegisterAssemblyTypes()
.RegisterAssemblyTypes(ThisAssembly)
.AssignableTo<IStartupMarker>()
.As<IStartupMarker>()
.SingleInstance();
@ -77,7 +77,7 @@ namespace Greenshot
// Destinations
builder
.RegisterAssemblyTypes()
.RegisterAssemblyTypes(ThisAssembly)
.AssignableTo<IDestination>()
.As<IDestination>()
.SingleInstance();

15
src/Greenshot/Startup.cs
View file

@ -21,17 +21,17 @@
#endregion
#region Usings
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms;
using Autofac;
using Autofac.Extras.CommonServiceLocator;
using Caliburn.Micro;
using CommonServiceLocator;
using Dapplo.Addons.Bootstrapper.Resolving;
using Dapplo.CaliburnMicro.Dapp;
using Dapplo.Ini.Converters;
@ -43,7 +43,7 @@ using Greenshot.Addons;
using Greenshot.Addons.Core;
using Greenshot.Ui.Misc.ViewModels;
using Point = System.Drawing.Point;
#endregion
namespace Greenshot
{
@ -99,9 +99,12 @@ namespace Greenshot
// Make sure the non-plugin DLLs are also loaded, so exports are available.
application.Bootstrapper.LoadAssemblies(FileLocations.Scan(scanDirectories, "Greenshot*.dll"));
application.Bootstrapper.LoadAssemblies(FileLocations.Scan(scanDirectories, "Greenshot*.gsp"));
/*
await application.Bootstrapper.StartupAsync();
*/
application.Bootstrapper.OnContainerCreated += container =>
{
var autofacServiceLocator = new AutofacServiceLocator(container);
ServiceLocator.SetLocatorProvider(() => autofacServiceLocator);
};
application.Run();
return 0;
}

19
src/Greenshot/packages.config
View file

@ -2,6 +2,7 @@
<packages>
<package id="Autofac" version="4.8.1" targetFramework="net452" />
<package id="Autofac.Extras.AttributeMetadata" version="4.0.1" targetFramework="net452" />
<package id="Autofac.Extras.CommonServiceLocator" version="5.0.0" targetFramework="net452" />
<package id="Autofac.Mef" version="4.0.0" targetFramework="net452" />
<package id="Ben.Demystifier" version="0.1.1" targetFramework="net452" />
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
@ -10,15 +11,15 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" />
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />

2
src/NuGet.Config
View file

@ -3,6 +3,6 @@
<packageSources>
<add key="Dapplo.Windows" value="https://ci.appveyor.com/nuget/dapplo-windows-pjnkjqjp7t6a" />
<add key="Dapplo.Addons" value="https://ci.appveyor.com/nuget/dapplo-addons-8psw2ibvh832" />
<add key="Dapplo.CaliburnMicro" value="https://ci.appveyor.com/nuget/dapplo-caliburnmicro-46kaa8k8ft4i" />
<add key="Dapplo.CaliburnMicro" value="https://ci.appveyor.com/nuget/dapplo-caliburnmicro-46kaa8k8ft4i" />
</packageSources>
</configuration>