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

Updates of Dapplo.CaliburnMicro to fix an issue with the notifications. Also fixed a project which I cannot update on Windows 7.

Browse source
This commit is contained in:
Robin 2018-08-07 22:14:05 +02:00
commit e976c7129f
65 changed files with 462 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,23 +52,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />

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

@ -54,23 +54,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net46\Dapplo.Confluence.dll</HintPath>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.Confluence" version="0.7.19" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.43" targetFramework="net461" />

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

@ -49,23 +49,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />

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

@ -67,23 +67,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.Language" version="0.5.28" targetFramework="net461" />

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

@ -64,23 +64,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

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

@ -50,23 +50,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

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

@ -69,23 +69,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />

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

@ -69,23 +69,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -14,6 +14,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />

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

@ -49,23 +49,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -6,6 +6,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.InterfaceImpl" version="0.2.12" targetFramework="net461" />

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

@ -67,23 +67,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

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

@ -64,23 +64,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.Language" version="0.5.28" targetFramework="net461" />

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

@ -51,23 +51,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="Costura.Fody" version="3.1.0" targetFramework="net461" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.Language" version="0.5.28" targetFramework="net461" />

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

@ -63,23 +63,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -6,6 +6,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />

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

@ -64,23 +64,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,12 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

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

@ -63,23 +63,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -6,6 +6,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,12 +9,12 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

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

@ -60,11 +60,23 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.62\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.62.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.62\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

7
src/Greenshot.Addon.Win10/Win10OcrDestination.cs
View file

@ -41,6 +41,7 @@ namespace Greenshot.Addon.Win10
[Destination("WIN10OCR")]
public class Win10OcrDestination : AbstractDestination
{
private readonly ExportNotification _exportNotification;
private static readonly LogSource Log = new LogSource();
public override string Description { get; } = "Windows 10 OCR";
@ -55,9 +56,11 @@ namespace Greenshot.Addon.Win10
/// </summary>
public Win10OcrDestination(
ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage
IGreenshotLanguage greenshotLanguage,
ExportNotification exportNotification
) : base(coreConfiguration, greenshotLanguage)
{
_exportNotification = exportNotification;
var languages = OcrEngine.AvailableRecognizerLanguages;
foreach (var language in languages)
{
@ -110,7 +113,7 @@ namespace Greenshot.Addon.Win10
exportInformation.ErrorMessage = ex.Message;
}
ProcessExport(exportInformation, surface);
_exportNotification.NotifyOfExport(this, exportInformation, surface);
return exportInformation;
}

8
src/Greenshot.Addon.Win10/Win10ShareDestination.cs
View file

@ -50,12 +50,15 @@ namespace Greenshot.Addon.Win10
[Destination("WIN10Share")]
public class Win10ShareDestination : AbstractDestination
{
private readonly ExportNotification _exportNotification;
private static readonly LogSource Log = new LogSource();
public Win10ShareDestination(
ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage) : base(coreConfiguration, greenshotLanguage)
IGreenshotLanguage greenshotLanguage,
ExportNotification exportNotification) : base(coreConfiguration, greenshotLanguage)
{
_exportNotification = exportNotification;
}
public override string Description { get; } = "Windows 10 share";
@ -78,6 +81,7 @@ namespace Greenshot.Addon.Win10
public TaskCompletionSource<bool> ShareTask { get; } = new TaskCompletionSource<bool>();
public bool IsDataRequested { get; set; }
}
/// <summary>
/// Share the screenshot with a windows app
/// </summary>
@ -135,7 +139,7 @@ namespace Greenshot.Addon.Win10
exportInformation.ErrorMessage = ex.Message;
}
ProcessExport(exportInformation, surface);
_exportNotification.NotifyOfExport(this, exportInformation, surface);
return exportInformation;
}

4
src/Greenshot.Addon.Win10/app.config
View file

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -8,8 +8,12 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.62" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.Language" version="0.5.28" targetFramework="net461" />

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

@ -50,26 +50,26 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.64\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.65\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>
@ -170,8 +170,8 @@
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="ToastNotifications, Version=2.3.3.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
<HintPath>..\packages\ToastNotifications.2.3.3\lib\net40\ToastNotifications.dll</HintPath>
<Reference Include="ToastNotifications, Version=2.3.4.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
<HintPath>..\packages\ToastNotifications.2.3.4\lib\net40\ToastNotifications.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>

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

@ -10,6 +10,10 @@
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -9,13 +9,13 @@
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -42,5 +42,5 @@
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Svg" version="2.3.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" />
<package id="ToastNotifications" version="2.3.3" targetFramework="net461" />
<package id="ToastNotifications" version="2.3.4" targetFramework="net461" />
</packages>

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

@ -43,11 +43,11 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -8,8 +8,8 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.Language" version="0.5.28" targetFramework="net461" />

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

@ -109,6 +109,10 @@
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

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

@ -49,11 +49,11 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

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

@ -12,8 +12,8 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.Language" version="0.5.28" targetFramework="net461" />

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

@ -78,11 +78,11 @@
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.71\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>

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

@ -94,6 +94,10 @@
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

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

@ -12,8 +12,8 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" 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.InterfaceImpl" version="0.2.12" targetFramework="net461" />

4
src/Greenshot/App.config
View file

@ -26,6 +26,10 @@
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

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

@ -130,6 +130,7 @@ namespace Greenshot.Components
interval = TimeSpan.FromMinutes(10);
task = c => Task.FromResult(true);
}
try
{
await task(cancellationToken).ConfigureAwait(false);
@ -138,10 +139,15 @@ namespace Greenshot.Components
{
Log.Error().WriteLine(ex, "Error occured when trying to check for updates.");
}
try
{
await Task.Delay(interval, cancellationToken).ConfigureAwait(false);
}
catch (TaskCanceledException)
{
// Ignore, this always happens
}
catch (Exception ex)
{
Log.Error().WriteLine(ex, "Error occured await for the next update check.");

36
src/Greenshot/Greenshot.csproj
View file

@ -65,29 +65,29 @@
<Reference Include="Dapplo.Addons.Config, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Config.1.0.71\lib\net461\Dapplo.Addons.Config.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.64\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.65\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.64\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.65\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.64\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.65\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.64\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.65\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.64\lib\net461\Dapplo.CaliburnMicro.Metro.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.65\lib\net461\Dapplo.CaliburnMicro.Metro.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.64\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.65\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.64\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.65\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
</Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.64.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.64\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.65.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.65\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference>
<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>
@ -212,8 +212,8 @@
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="ToastNotifications, Version=2.3.3.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
<HintPath>..\packages\ToastNotifications.2.3.3\lib\net40\ToastNotifications.dll</HintPath>
<Reference Include="ToastNotifications, Version=2.3.4.0, Culture=neutral, PublicKeyToken=e89d9d7314a7c797, processorArchitecture=MSIL">
<HintPath>..\packages\ToastNotifications.2.3.4\lib\net40\ToastNotifications.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="WindowsFormsIntegration" />

18
src/Greenshot/packages.config
View file

@ -13,14 +13,14 @@
<package id="Dapplo.Addons" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.Addons.Config" version="1.0.71" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.64" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.65" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.43" targetFramework="net461" />
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.43" targetFramework="net461" />
@ -66,6 +66,6 @@
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
<package id="ToastNotifications" version="2.3.3" targetFramework="net461" />
<package id="ToastNotifications" version="2.3.4" targetFramework="net461" />
<package id="Tools.InnoSetup" version="5.6.1" targetFramework="net461" />
</packages>