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

Updated dependencies, mainly using the Dapplo.Addons ApplicationConfig to bootstrap, which should speedup the application start.

Browse source
This commit is contained in:
Robin 2018-05-23 14:51:30 +02:00
commit dfd713e17a
50 changed files with 460 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,7 @@ namespace Greenshot.Addon.Box
catch (Exception ex)
{
Log.Error().WriteLine(ex, "Error uploading.");
MessageBox.Show(_boxLanguage.UploadFailure + " " + ex.Message);
MessageBox.Show(_boxLanguage.UploadFailure + @" " + ex.Message);
return null;
}
}

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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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" />

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

@ -96,7 +96,7 @@ namespace Greenshot.Addon.Dropbox
RedirectUrl = "http://localhost:47336",
Token = dropboxPluginConfiguration
};
var httpBehaviour = OAuth2HttpBehaviourFactory.Create(_oAuth2Settings) as IChangeableHttpBehaviour;
var httpBehaviour = OAuth2HttpBehaviourFactory.Create(_oAuth2Settings);
_oAuthHttpBehaviour = httpBehaviour;
// Use the default network settings
@ -169,7 +169,7 @@ namespace Greenshot.Addon.Dropbox
catch (Exception e)
{
Log.Error().WriteLine(e);
MessageBox.Show(_dropboxLanguage.UploadFailure + " " + e.Message);
MessageBox.Show(_dropboxLanguage.UploadFailure + @" " + e.Message);
}
return dropboxUrl;
}

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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -63,7 +63,7 @@ namespace Greenshot.Addon.ExternalCommand
}
else
{
textBox_arguments.Text = "\"{0}\"";
textBox_arguments.Text = @"""{0}""";
}
OkButtonState();
}

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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />

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

@ -178,7 +178,7 @@ namespace Greenshot.Addon.Flickr
catch (Exception e)
{
Log.Error().WriteLine(e, "Error uploading.");
MessageBox.Show(_flickrLanguage.UploadFailure + " " + e.Message);
MessageBox.Show(_flickrLanguage.UploadFailure + @" " + e.Message);
}
return uploadUrl;
}

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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />

1
src/Greenshot.Addon.Office/Destinations/OutlookDestination.cs
View file

@ -28,7 +28,6 @@ using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using Dapplo.Ini;
using Dapplo.Log;
using Greenshot.Addon.Office.OfficeExport;
using Greenshot.Addon.Office.OfficeInterop;

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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.28" targetFramework="net452" />

1
src/Greenshot.Addons/Components/DestinationHolder.cs
View file

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Greenshot.Addons.Extensions;
namespace Greenshot.Addons.Components
{

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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\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.38-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.28" 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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\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.38-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />

1
src/Greenshot/Components/GreenshotServer.cs
View file

@ -24,7 +24,6 @@
#region Usings
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security.Principal;

1
src/Greenshot/Destinations/PickerDestination.cs
View file

@ -23,7 +23,6 @@
#region Usings
using System;
using System.Collections.Generic;
using System.Linq;
using Greenshot.Addons;

36
src/Greenshot/Greenshot.csproj
View file

@ -57,35 +57,35 @@
<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.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Config, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-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>

30
src/Greenshot/Startup.cs
View file

@ -22,7 +22,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Text;
@ -33,7 +32,7 @@ using Autofac.Extras.CommonServiceLocator;
using Autofac.Features.OwnedInstances;
using Caliburn.Micro;
using CommonServiceLocator;
using Dapplo.Addons.Bootstrapper.Resolving;
using Dapplo.Addons.Bootstrapper;
using Dapplo.CaliburnMicro.Dapp;
using Dapplo.Ini.Converters;
using Dapplo.Language;
@ -69,8 +68,13 @@ namespace Greenshot
// Initialize a debug logger for Dapplo packages
LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Verbose);
#endif
var applicationConfig = ApplicationConfig.Create()
.WithApplicationName("Greenshot")
.WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08")
.WithAssemblyNames("Dapplo.Addons.Config")
.WithAssemblyPatterns("Greenshot.Addon*");
var application = new Dapplication("Greenshot", "F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08")
var application = new Dapplication(applicationConfig)
{
ShutdownMode = ShutdownMode.OnExplicitShutdown
};
@ -87,25 +91,7 @@ namespace Greenshot
RegisterErrorHandlers(application);
var scanDirectories = new List<string>
{
FileLocations.StartupDirectory,
#if DEBUG
// Test directories?
#else
Others?
#endif
};
application.Bootstrapper
.AddScanDirectories(scanDirectories)
// Load the assemblies, and run the application
.FindAndLoadAssemblies("Dapplo.Caliburn*")
// Load the assemblies, and run the application
.FindAndLoadAssemblies("Dapplo.Addons.Config")
// Make sure the non-plugin DLLs are also loaded, so exports are available.
.FindAndLoadAssemblies("Greenshot.Addon*", new []{".dll", ".gsp"})
.OnContainerCreated += container =>
application.Bootstrapper.OnContainerCreated += container =>
{
var autofacServiceLocator = new AutofacServiceLocator(container);
ServiceLocator.SetLocatorProvider(() => autofacServiceLocator);

1
src/Greenshot/Ui/Misc/ViewModels/SplashViewModel.cs
View file

@ -25,7 +25,6 @@
using Caliburn.Micro;
using Dapplo.CaliburnMicro;
using Greenshot.Addons.Interfaces.Plugin;
using Greenshot.Forms;
#endregion

18
src/Greenshot/packages.config
View file

@ -11,16 +11,16 @@
<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.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Config" version="1.0.38-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-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" />