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

Updated dependencies, Dapplo.Addons is now loading differently which slices off another 0,5 seconds of the start.

Browse source
This commit is contained in:
Robin 2018-07-04 12:36:32 +02:00
commit d69e75963f
53 changed files with 486 additions and 575 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,29 +46,29 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />

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

@ -65,29 +65,29 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll</HintPath> <HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net46\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="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.Confluence" version="0.7.19" targetFramework="net46" /> <package id="Dapplo.Confluence" version="0.7.19" targetFramework="net46" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.43" targetFramework="net46" />

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"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />

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

@ -37,7 +37,7 @@ namespace Greenshot.Addon.ExternalCommand
{ {
builder builder
.RegisterType<ExternalCommandDestinationProvider>() .RegisterType<ExternalCommandDestinationProvider>()
.As<IStartup>() .As<IService>()
.As<IDestinationProvider>() .As<IDestinationProvider>()
.SingleInstance(); .SingleInstance();
builder builder

3
src/Greenshot.Addon.ExternalCommand/ExternalCommandDestinationProvider.cs
View file

@ -40,6 +40,7 @@ namespace Greenshot.Addon.ExternalCommand
/// <summary> /// <summary>
/// Generate the external command destinations /// Generate the external command destinations
/// </summary> /// </summary>
[Service(nameof(ExternalCommandDestinationProvider))]
public sealed class ExternalCommandDestinationProvider : IStartup, IDestinationProvider public sealed class ExternalCommandDestinationProvider : IStartup, IDestinationProvider
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
@ -101,7 +102,7 @@ namespace Greenshot.Addon.ExternalCommand
return false; return false;
} }
public void Start() public void Startup()
{ {
// Check configuration & cleanup // Check configuration & cleanup
foreach (var command in _externalCommandConfig.Commands.Where(command => !IsCommandValid(command)).ToList()) foreach (var command in _externalCommandConfig.Commands.Where(command => !IsCommandValid(command)).ToList())

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

@ -61,29 +61,29 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <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> <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CliWrap" version="1.8.5" targetFramework="net46" /> <package id="CliWrap" version="1.8.5" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />

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"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

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"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

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"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />

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

@ -63,29 +63,29 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>

3
src/Greenshot.Addon.Jira/JiraAddonModule.cs
View file

@ -52,8 +52,7 @@ namespace Greenshot.Addon.Jira
.SingleInstance(); .SingleInstance();
builder builder
.RegisterType<JiraMonitor>() .RegisterType<JiraMonitor>()
.As<IUiStartup>() .As<IService>()
.As<IUiShutdown>()
.AsSelf() .AsSelf()
.SingleInstance(); .SingleInstance();

7
src/Greenshot.Addon.Jira/JiraMonitor.cs
View file

@ -30,7 +30,7 @@ using System.Reactive.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dapplo.CaliburnMicro; using Dapplo.Addons;
using Dapplo.Jira; using Dapplo.Jira;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Desktop; using Dapplo.Windows.Desktop;
@ -45,7 +45,8 @@ namespace Greenshot.Addon.Jira
/// It keeps a list of the last "accessed" jiras, and makes it easy to upload to one. /// It keeps a list of the last "accessed" jiras, and makes it easy to upload to one.
/// Make sure this is instanciated on the UI thread! /// Make sure this is instanciated on the UI thread!
/// </summary> /// </summary>
public class JiraMonitor : IUiStartup, IUiShutdown [Service(nameof(JiraMonitor), TaskSchedulerName = "ui")]
public class JiraMonitor : IStartup, IShutdown
{ {
private readonly IJiraConfiguration _jiraConfiguration; private readonly IJiraConfiguration _jiraConfiguration;
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
@ -61,7 +62,7 @@ namespace Greenshot.Addon.Jira
_jiraConfiguration = jiraConfiguration; _jiraConfiguration = jiraConfiguration;
} }
public void Start() public void Startup()
{ {
// Subscribe the windows events which tell us a title was changed // Subscribe the windows events which tell us a title was changed
_winEventObservable = WinEventHook.WindowTileChangeObservable() _winEventObservable = WinEventHook.WindowTileChangeObservable()

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

@ -7,14 +7,14 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />

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

@ -43,29 +43,29 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>

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

@ -6,14 +6,14 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" 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.InterfaceImpl" version="0.2.12" targetFramework="net46" />

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"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

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"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <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> <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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />

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

@ -45,29 +45,29 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <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> <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="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />

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"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />

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"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

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"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

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

@ -41,29 +41,29 @@
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="CustomMarshalers" /> <Reference Include="CustomMarshalers" />
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />

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

@ -37,17 +37,17 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <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> <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="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />

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

@ -43,17 +43,17 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL"> <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> <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="net461" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
<package id="Dapplo.Language" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Language" version="0.5.28" targetFramework="net461" />

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

@ -72,17 +72,17 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -197,8 +197,8 @@
<Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Reflection.Metadata, Version=1.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath> <HintPath>..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath> <HintPath>..\packages\System.Reflection.TypeExtensions.4.5.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Caching" /> <Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@ -297,7 +297,7 @@
<HintPath>..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath> <HintPath>..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xunit.StaFact, Version=0.2.0.0, Culture=neutral, PublicKeyToken=593f35978b459a4b, processorArchitecture=MSIL"> <Reference Include="Xunit.StaFact, Version=0.2.0.0, Culture=neutral, PublicKeyToken=593f35978b459a4b, processorArchitecture=MSIL">
<HintPath>..\packages\Xunit.StaFact.0.2.9\lib\net452\Xunit.StaFact.dll</HintPath> <HintPath>..\packages\Xunit.StaFact.0.2.17\lib\net452\Xunit.StaFact.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -10,10 +10,10 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" /> <package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" /> <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net461" />
@ -46,7 +46,7 @@
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" /> <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net461" /> <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net461" />
<package id="System.Globalization" version="4.3.0" targetFramework="net461" /> <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
<package id="System.IO" version="4.1.0" targetFramework="net461" /> <package id="System.IO" version="4.3.0" targetFramework="net461" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net461" /> <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" /> <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" /> <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
@ -54,9 +54,9 @@
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" /> <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" /> <package id="System.Reactive" version="4.0.0" targetFramework="net461" />
<package id="System.Reflection" version="4.3.0" targetFramework="net461" /> <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" /> <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" /> <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" /> <package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" /> <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime" version="4.3.0" targetFramework="net461" /> <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" /> <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net461" />
@ -93,5 +93,5 @@
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net461" /> <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net461" />
<package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net461" /> <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net461" />
<package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net461" developmentDependency="true" /> <package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net461" developmentDependency="true" />
<package id="Xunit.StaFact" version="0.2.9" targetFramework="net461" /> <package id="Xunit.StaFact" version="0.2.17" targetFramework="net461" />
</packages> </packages>

4
src/Greenshot/Components/FormsStartup.cs
View file

@ -32,12 +32,12 @@ namespace Greenshot.Components
/// <summary> /// <summary>
/// This startup action starts Windows.Forms /// This startup action starts Windows.Forms
/// </summary> /// </summary>
[ServiceOrder(GreenshotStartupOrder.Forms)] [Service(nameof(FormsStartup))]
public class FormsStartup : IStartup public class FormsStartup : IStartup
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
public void Start() public void Startup()
{ {
Log.Debug().WriteLine("Starting Windows.Forms"); Log.Debug().WriteLine("Starting Windows.Forms");

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

@ -50,7 +50,7 @@ namespace Greenshot.Components
/// This startup action starts the Greenshot "server", which allows to open files etc. /// This startup action starts the Greenshot "server", which allows to open files etc.
/// </summary> /// </summary>
[ServiceBehavior(InstanceContextMode = InstanceContextMode.Single)] [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single)]
[ServiceOrder(GreenshotStartupOrder.Server)] [Service(nameof(GreenshotServerAction), nameof(MainFormStartup))]
public class GreenshotServerAction : IGreenshotContract, IStartupAsync, IShutdownAsync public class GreenshotServerAction : IGreenshotContract, IStartupAsync, IShutdownAsync
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
@ -82,15 +82,17 @@ namespace Greenshot.Components
_destinationHolder = destinationHolder; _destinationHolder = destinationHolder;
} }
public async Task StartAsync(CancellationToken cancellationToken = default) /// <inheritdoc />
public Task StartupAsync(CancellationToken cancellationToken = default)
{ {
// TODO: Test performance with Startup without async
Log.Debug().WriteLine("Starting Greenshot server"); Log.Debug().WriteLine("Starting Greenshot server");
await Task.Factory.StartNew(() => { return Task.Run(() => {
_host = new ServiceHost(this, new Uri("net.pipe://localhost/Greenshot")); _host = new ServiceHost(this, new Uri("net.pipe://localhost/Greenshot"));
_host.AddServiceEndpoint(typeof(IGreenshotContract), new NetNamedPipeBinding(), "Greenshot_" + Identity); _host.AddServiceEndpoint(typeof(IGreenshotContract), new NetNamedPipeBinding(), "Greenshot_" + Identity);
_host.Open(); _host.Open();
Log.Debug().WriteLine("Started Greenshot server");
}, cancellationToken); }, cancellationToken);
Log.Debug().WriteLine("Started Greenshot server");
} }
public Task ShutdownAsync(CancellationToken cancellationToken = default) public Task ShutdownAsync(CancellationToken cancellationToken = default)

41
src/Greenshot/Components/GreenshotStartupOrder.cs
View file

@ -1,41 +0,0 @@
#region Greenshot GNU General Public License
// Greenshot - a free and open source screenshot tool
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
//
// For more information see: http://getgreenshot.org/
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 1 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#endregion
using Dapplo.CaliburnMicro;
namespace Greenshot.Components
{
/// <summary>
/// This defines the startup order of the basic components of Greenshot
/// </summary>
public enum GreenshotStartupOrder
{
/// <summary>
/// Start the forms initialization before the shell is initialized!
/// </summary>
Forms = CaliburnStartOrder.Shell-1,
User = CaliburnStartOrder.User,
Server = CaliburnStartOrder.User + 100,
Sound = CaliburnStartOrder.User + 200
}
}

35
src/Greenshot/Components/GreenshotUiStartupOrder.cs
View file

@ -1,35 +0,0 @@
#region Greenshot GNU General Public License
// Greenshot - a free and open source screenshot tool
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
//
// For more information see: http://getgreenshot.org/
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 1 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#endregion
namespace Greenshot.Components
{
/// <summary>
/// This defines the startup order of the basic components of Greenshot
/// </summary>
public enum GreenshotUiStartupOrder
{
TrayIcon = 100,
Addons = 200,
Hotkeys = 300
}
}

6
src/Greenshot/Components/HotkeyHandler.cs
View file

@ -43,8 +43,8 @@ namespace Greenshot.Components
/// <summary> /// <summary>
/// This startup action registers the hotkeys /// This startup action registers the hotkeys
/// </summary> /// </summary>
[ServiceOrder(GreenshotUiStartupOrder.Hotkeys, int.MinValue)] [Service(nameof(HotkeyHandler), nameof(MainFormStartup), TaskSchedulerName = "ui")]
public class HotkeyHandler : IUiStartup, IUiShutdown public class HotkeyHandler : IStartup, IShutdown
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
private readonly ICoreConfiguration _coreConfiguration; private readonly ICoreConfiguration _coreConfiguration;
@ -63,7 +63,7 @@ namespace Greenshot.Components
_windowHandle = windowHandle; _windowHandle = windowHandle;
} }
public void Start() public void Startup()
{ {
Log.Debug().WriteLine("Registering hotkeys"); Log.Debug().WriteLine("Registering hotkeys");
// Make sure all hotkeys pass this window! // Make sure all hotkeys pass this window!

6
src/Greenshot/Components/MainFormStartup.cs
View file

@ -40,8 +40,8 @@ namespace Greenshot.Components
/// <summary> /// <summary>
/// This startup action starts the MainForm /// This startup action starts the MainForm
/// </summary> /// </summary>
[ServiceOrder(GreenshotUiStartupOrder.TrayIcon)] [Service(nameof(MainFormStartup), nameof(FormsStartup), TaskSchedulerName = "ui")]
public class MainFormStartup : IUiStartup, IUiShutdown public class MainFormStartup : IStartup, IShutdown
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
private readonly ICoreConfiguration _coreConfiguration; private readonly ICoreConfiguration _coreConfiguration;
@ -61,7 +61,7 @@ namespace Greenshot.Components
_windowHandle = windowHandle; _windowHandle = windowHandle;
} }
public void Start() public void Startup()
{ {
Log.Debug().WriteLine("Starting MainForm"); Log.Debug().WriteLine("Starting MainForm");

4
src/Greenshot/Components/SoundHelper.cs
View file

@ -41,7 +41,7 @@ namespace Greenshot.Components
/// Create to fix the sometimes wrongly played sample, especially after first start from IDE /// Create to fix the sometimes wrongly played sample, especially after first start from IDE
/// See: http://www.codeproject.com/KB/audio-video/soundplayerbug.aspx?msg=2487569 /// See: http://www.codeproject.com/KB/audio-video/soundplayerbug.aspx?msg=2487569
/// </summary> /// </summary>
[ServiceOrder(GreenshotStartupOrder.Sound)] [Service(nameof(SoundHelper))]
public class SoundHelper : IStartup, IShutdown public class SoundHelper : IStartup, IShutdown
{ {
private readonly ICoreConfiguration _coreConfiguration; private readonly ICoreConfiguration _coreConfiguration;
@ -57,7 +57,7 @@ namespace Greenshot.Components
_instance = this; _instance = this;
} }
public void Start() public void Startup()
{ {
if (_gcHandle != null) if (_gcHandle != null)
{ {

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

@ -47,7 +47,7 @@ namespace Greenshot.Components
/// <summary> /// <summary>
/// This processes the information, if there are updates available. /// This processes the information, if there are updates available.
/// </summary> /// </summary>
[ServiceOrder(GreenshotStartupOrder.User)] [Service(nameof(UpdateService), nameof(MainFormStartup))]
public class UpdateService : IStartup, IShutdown, IVersionProvider public class UpdateService : IStartup, IShutdown, IVersionProvider
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
@ -94,7 +94,7 @@ namespace Greenshot.Components
} }
/// <inheritdoc /> /// <inheritdoc />
public void Start() public void Startup()
{ {
var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token); var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token);
} }
@ -128,7 +128,7 @@ namespace Greenshot.Components
} }
try try
{ {
await Task.WhenAll(Task.Delay(interval, cancellationToken), task(cancellationToken)); await Task.WhenAll(Task.Delay(interval), task(cancellationToken)).ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -139,7 +139,7 @@ namespace Greenshot.Components
break; break;
} }
} }
}, cancellationToken); }, cancellationToken).ConfigureAwait(false);
Log.Info().WriteLine("Finished background task"); Log.Info().WriteLine("Finished background task");
} }

42
src/Greenshot/Greenshot.csproj
View file

@ -55,35 +55,35 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.52\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.62\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.52\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.62\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Config, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Config, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Config.1.0.52\lib\net45\Dapplo.Addons.Config.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Config.1.0.62\lib\net46\Dapplo.Addons.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.49\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.52\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.49\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.52\lib\net46\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.49\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.52\lib\net46\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.49\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.52\lib\net46\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.49\lib\net46\Dapplo.CaliburnMicro.Metro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.52\lib\net46\Dapplo.CaliburnMicro.Metro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.49\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.52\lib\net46\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.49.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.52.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.49\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.52\lib\net46\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.HttpExtensions, Version=0.8.43.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath> <HintPath>..\packages\Dapplo.HttpExtensions.0.8.43\lib\net46\Dapplo.HttpExtensions.dll</HintPath>
@ -206,9 +206,7 @@
<Compile Include="AssemblyInfo.cs" /> <Compile Include="AssemblyInfo.cs" />
<Compile Include="Components\AuthenticationProvider.cs" /> <Compile Include="Components\AuthenticationProvider.cs" />
<Compile Include="Components\CommandlineParser.cs" /> <Compile Include="Components\CommandlineParser.cs" />
<Compile Include="Components\GreenshotUiStartupOrder.cs" />
<Compile Include="Components\MainFormStartup.cs" /> <Compile Include="Components\MainFormStartup.cs" />
<Compile Include="Components\GreenshotStartupOrder.cs" />
<Compile Include="Components\HotkeyHandler.cs" /> <Compile Include="Components\HotkeyHandler.cs" />
<Compile Include="Components\FormsStartup.cs" /> <Compile Include="Components\FormsStartup.cs" />
<Compile Include="Configuration\CommandlineCaptureOptions.cs" /> <Compile Include="Configuration\CommandlineCaptureOptions.cs" />

16
src/Greenshot/GreenshotAutofacModule.cs
View file

@ -23,7 +23,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Security; using Dapplo.CaliburnMicro.Security;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
@ -66,19 +65,6 @@ namespace Greenshot
.RegisterType<LanguageDialog>() .RegisterType<LanguageDialog>()
.AsSelf(); .AsSelf();
builder
.RegisterType<HotkeyHandler>()
.As<IUiStartup>()
.As<IUiShutdown>()
.AsSelf()
.SingleInstance();
builder
.RegisterType<MainFormStartup>()
.As<IUiStartup>()
.As<IUiShutdown>()
.SingleInstance();
builder builder
.RegisterType<AboutForm>() .RegisterType<AboutForm>()
.AsSelf(); .AsSelf();
@ -95,7 +81,7 @@ namespace Greenshot
.RegisterAssemblyTypes(ThisAssembly) .RegisterAssemblyTypes(ThisAssembly)
.AssignableTo<IService>() .AssignableTo<IService>()
.As<IService>() .As<IService>()
.AsImplementedInterfaces() .AsSelf()
.SingleInstance(); .SingleInstance();
builder builder

20
src/Greenshot/packages.config
View file

@ -10,16 +10,16 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.Addons.Config" version="1.0.52" targetFramework="net46" /> <package id="Dapplo.Addons.Config" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Metro" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.49" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.52" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net46" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" /> <package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net46" />