mirror of
https://github.com/greenshot/greenshot
synced 2025-08-22 22:34:27 -07:00
Working on clean capture logic.
This commit is contained in:
Robin
parent
ed90f2eb43
commit
f9ba457a99
73 changed files with 1717 additions and 558 deletions
|
|
@ -43,32 +43,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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,35 +42,35 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -40,32 +40,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ namespace Greenshot.Addon.ExternalCommand
|
|||
return false;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void Startup()
|
||||
{
|
||||
// Check configuration & cleanup
|
||||
|
|
|
|||
|
|
@ -58,32 +58,32 @@
|
|||
<Reference Include="CliWrap, Version=1.8.5.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CliWrap.1.8.5\lib\net45\CliWrap.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CliWrap" version="1.8.5" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -55,32 +55,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -41,32 +41,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -57,35 +57,35 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -57,35 +57,35 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ namespace Greenshot.Addon.Jira
|
|||
_jiraConfiguration = jiraConfiguration;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void Startup()
|
||||
{
|
||||
// Subscribe the windows events which tell us a title was changed
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -40,32 +40,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -55,35 +55,35 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -55,32 +55,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -39,35 +39,35 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -51,35 +51,35 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -55,32 +55,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -51,35 +51,35 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -51,32 +51,32 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.69.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.69\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.69.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.69\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.69.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.69\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.69.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.69\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.69.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.69\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.69.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.69\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.69" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.69" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.69" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.69" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.69" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.69" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Import Project="..\CommonProject.properties" />
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{5B924697-4DCD-4F98-85F1-105CB84B7341}</ProjectGuid>
|
||||
|
|
@ -16,7 +17,6 @@
|
|||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
|
||||
<ItemGroup>
|
||||
<Reference Include="Accessibility" />
|
||||
<Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
|
||||
|
|
@ -37,39 +37,39 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CustomMarshalers" />
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.70\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.71\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
@ -404,4 +404,5 @@
|
|||
<PreBuildEvent>
|
||||
</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -5,17 +5,17 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
51
src/Greenshot.Core/Capture.cs
Normal file
51
src/Greenshot.Core/Capture.cs
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Dapplo.Windows.Common.Extensions;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
using Greenshot.Core.Interfaces;
|
||||
|
||||
namespace Greenshot.Core
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public class Capture : ICapture
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public DateTimeOffset Taken { get; } = DateTimeOffset.Now;
|
||||
|
||||
/// <inheritdoc />
|
||||
public IList<ICaptureElement> CaptureElements { get; } = new List<ICaptureElement>();
|
||||
|
||||
/// <inheritdoc />
|
||||
public NativeRect Bounds => CaptureElements.Select(element => element.Bounds).Aggregate((b1, b2) => b1.Union(b2));
|
||||
|
||||
/// <inheritdoc />
|
||||
public NativeRect CropRect { get; set; }
|
||||
|
||||
/// <inheritdoc />
|
||||
public IDictionary<string, string> MetaData { get; } = new Dictionary<string, string>();
|
||||
}
|
||||
}
|
||||
55
src/Greenshot.Core/CaptureElement.cs
Normal file
55
src/Greenshot.Core/CaptureElement.cs
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Windows.Media;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
using Greenshot.Core.Enums;
|
||||
using Greenshot.Core.Interfaces;
|
||||
|
||||
namespace Greenshot.Core
|
||||
{
|
||||
/// <summary>
|
||||
/// The CaptureElement contains the information of an element in a capture, e.g the window and mouse
|
||||
/// </summary>
|
||||
public class CaptureElement : ICaptureElement
|
||||
{
|
||||
public CaptureElement(NativePoint location, ImageSource content)
|
||||
{
|
||||
Bounds = new NativeRect(location, new NativeSize((int)content.Width, (int)content.Height));
|
||||
Content = content;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public NativeRect Bounds { get; set; }
|
||||
|
||||
/// <inheritdoc />
|
||||
public ImageSource Content { get; set; }
|
||||
|
||||
/// <inheritdoc />
|
||||
public CaptureElementType ElementType { get; set; } = CaptureElementType.Unknown;
|
||||
|
||||
/// <inheritdoc />
|
||||
public IDictionary<string, string> MetaData { get; } = new Dictionary<string, string>();
|
||||
}
|
||||
}
|
||||
96
src/Greenshot.Core/CaptureFlow.cs
Normal file
96
src/Greenshot.Core/CaptureFlow.cs
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Greenshot.Core.Interfaces;
|
||||
|
||||
namespace Greenshot.Core
|
||||
{
|
||||
/// <summary>
|
||||
/// This describes a capture flow, from source via processor to destination
|
||||
/// </summary>
|
||||
public class CaptureFlow
|
||||
{
|
||||
/// <summary>
|
||||
/// The ISource this capture flow contains
|
||||
/// </summary>
|
||||
public IList<ISource> Sources
|
||||
{
|
||||
get;
|
||||
} = new List<ISource>();
|
||||
|
||||
/// <summary>
|
||||
/// The IProcessor this capture flow contains
|
||||
/// </summary>
|
||||
public IList<IProcessor> Processors
|
||||
{
|
||||
get;
|
||||
} = new List<IProcessor>();
|
||||
|
||||
/// <summary>
|
||||
/// The IDestination this capture flow contains
|
||||
/// </summary>
|
||||
public IList<IDestination> Destinations
|
||||
{
|
||||
get;
|
||||
} = new List<IDestination>();
|
||||
|
||||
/// <summary>
|
||||
/// Execute this capture flow, to create a capture
|
||||
/// </summary>
|
||||
/// <param name="cancellationToken">CancellationToken</param>
|
||||
/// <returns>ICapture</returns>
|
||||
public async Task<ICapture> Execute(CancellationToken cancellationToken = default)
|
||||
{
|
||||
var capture = new Capture();
|
||||
|
||||
// Import the capture from the sources
|
||||
foreach (var source in Sources)
|
||||
{
|
||||
var captureElement = await source.Import(cancellationToken);
|
||||
if (captureElement == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
capture.CaptureElements.Add(captureElement);
|
||||
}
|
||||
|
||||
// Process by processors
|
||||
foreach (var processor in Processors)
|
||||
{
|
||||
await processor.Process(capture, cancellationToken);
|
||||
}
|
||||
|
||||
// Export to destination
|
||||
foreach (var destination in Destinations)
|
||||
{
|
||||
await destination.Export(capture, cancellationToken);
|
||||
}
|
||||
|
||||
return capture;
|
||||
}
|
||||
}
|
||||
}
|
||||
40
src/Greenshot.Core/Enums/CaptureElementType.cs
Normal file
40
src/Greenshot.Core/Enums/CaptureElementType.cs
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
namespace Greenshot.Core.Enums
|
||||
{
|
||||
/// <summary>
|
||||
/// This is used to specified what type of capture
|
||||
/// </summary>
|
||||
public enum CaptureElementType
|
||||
{
|
||||
Unknown,
|
||||
Screen,
|
||||
Mouse,
|
||||
Cursor,
|
||||
Icon,
|
||||
Popup,
|
||||
Window,
|
||||
File
|
||||
}
|
||||
}
|
||||
85
src/Greenshot.Core/Greenshot.Core.csproj
Normal file
85
src/Greenshot.Core/Greenshot.Core.csproj
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Import Project="..\CommonProject.properties" />
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Greenshot.Core</RootNamespace>
|
||||
<AssemblyName>Greenshot.Core</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.0.5.105\lib\net461\Dapplo.Windows.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.Common, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.Common.0.5.105\lib\net461\Dapplo.Windows.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.105\lib\net461\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.105\lib\net461\Dapplo.Windows.Gdi32.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.Icons, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.105\lib\net461\Dapplo.Windows.Icons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.Input, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.Input.0.5.105\lib\net461\Dapplo.Windows.Input.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.105\lib\net461\Dapplo.Windows.Kernel32.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.Messages, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.105\lib\net461\Dapplo.Windows.Messages.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Windows.User32, Version=0.5.105.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Windows.User32.0.5.105\lib\net461\Dapplo.Windows.User32.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Windows" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xaml" />
|
||||
<Reference Include="WindowsBase" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Capture.cs" />
|
||||
<Compile Include="CaptureElement.cs" />
|
||||
<Compile Include="CaptureFlow.cs" />
|
||||
<Compile Include="Enums\CaptureElementType.cs" />
|
||||
<Compile Include="Interfaces\ICapture.cs" />
|
||||
<Compile Include="Interfaces\ICaptureElement.cs" />
|
||||
<Compile Include="Interfaces\IDestination.cs" />
|
||||
<Compile Include="Interfaces\IProcessor.cs" />
|
||||
<Compile Include="Interfaces\ISource.cs" />
|
||||
<Compile Include="Interfaces\ITemplate.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Sources\MouseSource.cs" />
|
||||
<Compile Include="Sources\ScreenSource.cs" />
|
||||
<Compile Include="Templates\CroppedTemplate.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">
|
||||
<Project>{f041c685-eb96-4ed1-9ace-0f5bd836610f}</Project>
|
||||
<Name>Greenshot.Gfx</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
60
src/Greenshot.Core/Interfaces/ICapture.cs
Normal file
60
src/Greenshot.Core/Interfaces/ICapture.cs
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
|
||||
namespace Greenshot.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// This contains all the capture information
|
||||
/// </summary>
|
||||
public interface ICapture
|
||||
{
|
||||
/// <summary>
|
||||
/// The calculated bounds for this capture
|
||||
/// </summary>
|
||||
NativeRect Bounds { get; }
|
||||
|
||||
/// <summary>
|
||||
/// The crop rectangle for this capture
|
||||
/// </summary>
|
||||
NativeRect CropRect { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Meta-data for this capture
|
||||
/// </summary>
|
||||
IDictionary<string, string> MetaData { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Time the capture was made
|
||||
/// </summary>
|
||||
DateTimeOffset Taken { get; }
|
||||
|
||||
/// <summary>
|
||||
/// the actual capture elements, making up the capture
|
||||
/// </summary>
|
||||
IList<ICaptureElement> CaptureElements { get; }
|
||||
}
|
||||
}
|
||||
64
src/Greenshot.Core/Interfaces/ICaptureElement.cs
Normal file
64
src/Greenshot.Core/Interfaces/ICaptureElement.cs
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Windows.Media;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
using Greenshot.Core.Enums;
|
||||
|
||||
namespace Greenshot.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// This specifies a single element of a capture, making it possible to have a capture contain mouse, window, popup etc information
|
||||
/// </summary>
|
||||
public interface ICaptureElement
|
||||
{
|
||||
/// <summary>
|
||||
/// The location or bounds of the content
|
||||
/// </summary>
|
||||
NativeRect Bounds
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The actual content
|
||||
/// </summary>
|
||||
ImageSource Content
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Used to specify what type of capture element this is
|
||||
/// </summary>
|
||||
CaptureElementType ElementType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Meta-data for this capture element, e.g. the text of a window
|
||||
/// </summary>
|
||||
IDictionary<string, string> MetaData { get; }
|
||||
}
|
||||
}
|
||||
42
src/Greenshot.Core/Interfaces/IDestination.cs
Normal file
42
src/Greenshot.Core/Interfaces/IDestination.cs
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Greenshot.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// This IDestination describes things which can export a capture
|
||||
/// </summary>
|
||||
public interface IDestination
|
||||
{
|
||||
/// <summary>
|
||||
/// This is called when the a capture needs to be exported
|
||||
/// </summary>
|
||||
/// <param name="capture">ICapture</param>
|
||||
/// <param name="cancellationToken">CancellationToken</param>
|
||||
/// <returns>Task of bool</returns>
|
||||
Task<bool> Export(ICapture capture, CancellationToken cancellationToken = default);
|
||||
}
|
||||
}
|
||||
43
src/Greenshot.Core/Interfaces/IProcessor.cs
Normal file
43
src/Greenshot.Core/Interfaces/IProcessor.cs
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Greenshot.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// This IProcessor describes things which can process a capture
|
||||
/// An example would be to add a watermark to the capture
|
||||
/// </summary>
|
||||
public interface IProcessor
|
||||
{
|
||||
/// <summary>
|
||||
/// Process the capture
|
||||
/// </summary>
|
||||
/// <param name="capture">ICapture</param>
|
||||
/// <param name="cancellationToken">CancellationToken</param>
|
||||
/// <returns>Task of bool</returns>
|
||||
Task<bool> Process(ICapture capture, CancellationToken cancellationToken = default);
|
||||
}
|
||||
}
|
||||
42
src/Greenshot.Core/Interfaces/ISource.cs
Normal file
42
src/Greenshot.Core/Interfaces/ISource.cs
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Greenshot.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// This interface defines sources, which can be used to get information from.
|
||||
/// For instance the screen, IE, a file etc.
|
||||
/// </summary>
|
||||
public interface ISource
|
||||
{
|
||||
/// <summary>
|
||||
/// Import an ICaptureElement from the source
|
||||
/// </summary>
|
||||
/// <param name="cancellationToken">CancellationToken</param>
|
||||
/// <returns>Task with ICaptureElement</returns>
|
||||
Task<ICaptureElement> Import(CancellationToken cancellationToken = default);
|
||||
}
|
||||
}
|
||||
40
src/Greenshot.Core/Interfaces/ITemplate.cs
Normal file
40
src/Greenshot.Core/Interfaces/ITemplate.cs
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Windows;
|
||||
|
||||
namespace Greenshot.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// This defines a template which is applied to a capture, so we can output it to the screen or to disk.
|
||||
/// </summary>
|
||||
public interface ITemplate
|
||||
{
|
||||
/// <summary>
|
||||
/// This applies a template, to generate a framework element
|
||||
/// </summary>
|
||||
/// <param name="capture">ICapture</param>
|
||||
/// <returns>FrameworkElement</returns>
|
||||
FrameworkElement Apply(ICapture capture);
|
||||
}
|
||||
}
|
||||
35
src/Greenshot.Core/Properties/AssemblyInfo.cs
Normal file
35
src/Greenshot.Core/Properties/AssemblyInfo.cs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("Greenshot.Core")]
|
||||
[assembly: AssemblyDescription("Core capture functionality for Greenshot")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("Greenshot")]
|
||||
[assembly: AssemblyProduct("Greenshot.Core")]
|
||||
[assembly: AssemblyCopyright("Copyright © Greenshot 2018")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("bf35190d-b2a7-4cfa-b397-51cb384cf0d7")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
53
src/Greenshot.Core/Sources/MouseSource.cs
Normal file
53
src/Greenshot.Core/Sources/MouseSource.cs
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Dapplo.Windows.Icons;
|
||||
using Greenshot.Core.Enums;
|
||||
using Greenshot.Core.Interfaces;
|
||||
|
||||
namespace Greenshot.Core.Sources
|
||||
{
|
||||
/// <summary>
|
||||
/// A source to capture the mouse cursor
|
||||
/// </summary>
|
||||
public class MouseSource : ISource
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public Task<ICaptureElement> Import(CancellationToken cancellationToken = default)
|
||||
{
|
||||
if (!CursorHelper.TryGetCurrentCursor(out var bitmapSource, out var location))
|
||||
{
|
||||
return Task.FromResult<ICaptureElement>(null);
|
||||
}
|
||||
|
||||
ICaptureElement result = new CaptureElement(location, bitmapSource)
|
||||
{
|
||||
ElementType = CaptureElementType.Mouse
|
||||
};
|
||||
return Task.FromResult(result);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
220
src/Greenshot.Core/Sources/ScreenSource.cs
Normal file
220
src/Greenshot.Core/Sources/ScreenSource.cs
Normal file
|
|
@ -0,0 +1,220 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Interop;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using Dapplo.Log;
|
||||
using Dapplo.Windows.Common;
|
||||
using Dapplo.Windows.Common.Extensions;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
using Dapplo.Windows.Gdi32;
|
||||
using Dapplo.Windows.Gdi32.Enums;
|
||||
using Dapplo.Windows.Gdi32.SafeHandles;
|
||||
using Dapplo.Windows.Gdi32.Structs;
|
||||
using Dapplo.Windows.User32;
|
||||
using Dapplo.Windows.User32.Structs;
|
||||
using Greenshot.Core.Enums;
|
||||
using Greenshot.Core.Interfaces;
|
||||
using Greenshot.Gfx.Extensions;
|
||||
|
||||
namespace Greenshot.Core.Sources
|
||||
{
|
||||
/// <summary>
|
||||
/// This does the screen capture
|
||||
/// </summary>
|
||||
public class ScreenSource : ISource
|
||||
{
|
||||
private static readonly LogSource Log = new LogSource();
|
||||
public Task<ICaptureElement> Import(CancellationToken cancellationToken = default)
|
||||
{
|
||||
var screenbounds = DisplayInfo.GetAllScreenBounds();
|
||||
ICaptureElement result = new CaptureElement(screenbounds.Location, CaptureRectangle(screenbounds))
|
||||
{
|
||||
ElementType = CaptureElementType.Screen
|
||||
};
|
||||
return Task.FromResult(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper method to create an exception that might explain what is wrong while capturing
|
||||
/// </summary>
|
||||
/// <param name="method">string with current method</param>
|
||||
/// <param name="captureBounds">NativeRect of what we want to capture</param>
|
||||
/// <returns>Exception</returns>
|
||||
private static Exception CreateCaptureException(string method, NativeRect captureBounds)
|
||||
{
|
||||
var exceptionToThrow = User32Api.CreateWin32Exception(method);
|
||||
if (captureBounds.IsEmpty)
|
||||
{
|
||||
return exceptionToThrow;
|
||||
}
|
||||
|
||||
exceptionToThrow.Data.Add("Height", captureBounds.Height);
|
||||
exceptionToThrow.Data.Add("Width", captureBounds.Width);
|
||||
return exceptionToThrow;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This captures the screen at the specified location
|
||||
/// </summary>
|
||||
/// <param name="captureBounds">NativeRect</param>
|
||||
/// <returns>BitmapSource</returns>
|
||||
internal static BitmapSource CaptureRectangle(NativeRect captureBounds)
|
||||
{
|
||||
BitmapSource returnBitmap = null;
|
||||
if (captureBounds.IsEmpty)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
using (var desktopDcHandle = SafeWindowDcHandle.FromDesktop())
|
||||
{
|
||||
if (desktopDcHandle.IsInvalid)
|
||||
{
|
||||
// Get Exception before the error is lost
|
||||
var exceptionToThrow = CreateCaptureException("desktopDCHandle", captureBounds);
|
||||
// throw exception
|
||||
throw exceptionToThrow;
|
||||
}
|
||||
|
||||
// create a device context we can copy to
|
||||
using (var safeCompatibleDcHandle = Gdi32Api.CreateCompatibleDC(desktopDcHandle))
|
||||
{
|
||||
// Check if the device context is there, if not throw an error with as much info as possible!
|
||||
if (safeCompatibleDcHandle.IsInvalid)
|
||||
{
|
||||
// Get Exception before the error is lost
|
||||
var exceptionToThrow = CreateCaptureException("CreateCompatibleDC", captureBounds);
|
||||
// throw exception
|
||||
throw exceptionToThrow;
|
||||
}
|
||||
// Create BITMAPINFOHEADER for CreateDIBSection
|
||||
var bmi = BitmapInfoHeader.Create(captureBounds.Width, captureBounds.Height, 24);
|
||||
|
||||
// Make sure the last error is set to 0
|
||||
Win32.SetLastError(0);
|
||||
|
||||
// create a bitmap we can copy it to, using GetDeviceCaps to get the width/height
|
||||
using (var safeDibSectionHandle = Gdi32Api.CreateDIBSection(desktopDcHandle, ref bmi, 0, out var _, IntPtr.Zero, 0))
|
||||
{
|
||||
if (safeDibSectionHandle.IsInvalid)
|
||||
{
|
||||
// Get Exception before the error is lost
|
||||
var exceptionToThrow = CreateCaptureException("CreateDIBSection", captureBounds);
|
||||
exceptionToThrow.Data.Add("hdcDest", safeCompatibleDcHandle.DangerousGetHandle().ToInt32());
|
||||
exceptionToThrow.Data.Add("hdcSrc", desktopDcHandle.DangerousGetHandle().ToInt32());
|
||||
|
||||
// Throw so people can report the problem
|
||||
throw exceptionToThrow;
|
||||
}
|
||||
// select the bitmap object and store the old handle
|
||||
using (safeCompatibleDcHandle.SelectObject(safeDibSectionHandle))
|
||||
{
|
||||
// bitblt over (make copy)
|
||||
// ReSharper disable once BitwiseOperatorOnEnumWithoutFlags
|
||||
Gdi32Api.BitBlt(safeCompatibleDcHandle, 0, 0, captureBounds.Width, captureBounds.Height, desktopDcHandle, captureBounds.X, captureBounds.Y,
|
||||
RasterOperations.SourceCopy | RasterOperations.CaptureBlt);
|
||||
}
|
||||
|
||||
// get a .NET image object for it
|
||||
// A suggestion for the "A generic error occurred in GDI+." E_FAIL/0×80004005 error is to re-try...
|
||||
bool success = false;
|
||||
ExternalException exception = null;
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Create BitmapSource from the DibSection
|
||||
returnBitmap = Imaging.CreateBitmapSourceFromHBitmap(safeDibSectionHandle.DangerousGetHandle(), IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
|
||||
|
||||
// Now cut away invisible parts
|
||||
|
||||
// Collect all screens inside this capture
|
||||
var displaysInsideCapture = new List<DisplayInfo>();
|
||||
foreach (var displayInfo in User32Api.AllDisplays())
|
||||
{
|
||||
if (displayInfo.Bounds.IntersectsWith(captureBounds))
|
||||
{
|
||||
displaysInsideCapture.Add(displayInfo);
|
||||
}
|
||||
}
|
||||
// Check all all screens are of an equal size
|
||||
bool offscreenContent;
|
||||
using (var captureRegion = new Region(captureBounds))
|
||||
{
|
||||
// Exclude every visible part
|
||||
foreach (var displayInfo in displaysInsideCapture)
|
||||
{
|
||||
captureRegion.Exclude(displayInfo.Bounds);
|
||||
}
|
||||
// If the region is not empty, we have "offscreenContent"
|
||||
using (var screenGraphics = Graphics.FromHwnd(User32Api.GetDesktopWindow()))
|
||||
{
|
||||
offscreenContent = !captureRegion.IsEmpty(screenGraphics);
|
||||
}
|
||||
}
|
||||
// Check if we need to have a transparent background, needed for offscreen content
|
||||
if (offscreenContent)
|
||||
{
|
||||
var modifiedImage = new WriteableBitmap(returnBitmap.PixelWidth, returnBitmap.PixelHeight, returnBitmap.DpiX, returnBitmap.DpiY, PixelFormats.Bgr32, returnBitmap.Palette);
|
||||
foreach (var displayInfo in User32Api.AllDisplays())
|
||||
{
|
||||
modifiedImage.CopyPixels(returnBitmap, displayInfo.Bounds);
|
||||
}
|
||||
|
||||
returnBitmap = modifiedImage;
|
||||
}
|
||||
// We got through the capture without exception
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
catch (ExternalException ee)
|
||||
{
|
||||
Log.Warn().WriteLine("Problem getting ImageSource at try " + i + " : ", ee);
|
||||
exception = ee;
|
||||
}
|
||||
}
|
||||
if (!success)
|
||||
{
|
||||
Log.Error().WriteLine("Still couldn't create ImageSource!");
|
||||
if (exception != null)
|
||||
{
|
||||
throw exception;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
return returnBitmap;
|
||||
}
|
||||
}
|
||||
}
|
||||
93
src/Greenshot.Core/Templates/CroppedTemplate.cs
Normal file
93
src/Greenshot.Core/Templates/CroppedTemplate.cs
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Shapes;
|
||||
using Greenshot.Core.Enums;
|
||||
using Greenshot.Core.Interfaces;
|
||||
|
||||
namespace Greenshot.Core.Templates
|
||||
{
|
||||
/// <summary>
|
||||
/// A template to create a FrameworkElement from a capture, with a crop applied
|
||||
/// </summary>
|
||||
public class CroppedTemplate : ITemplate
|
||||
{
|
||||
public bool DisplayMouse { get; set; } = true;
|
||||
public FrameworkElement Apply(ICapture capture)
|
||||
{
|
||||
var width = (int)(capture.CropRect.Width + 0.5);
|
||||
var height = (int)(capture.CropRect.Height + 0.5);
|
||||
var result = new Rectangle
|
||||
{
|
||||
Width = width,
|
||||
Height = height,
|
||||
Stretch = Stretch.Fill
|
||||
};
|
||||
var visualBrush = new VisualBrush
|
||||
{
|
||||
Viewbox = capture.CropRect.IsEmpty ? capture.Bounds : capture.CropRect,
|
||||
ViewboxUnits = BrushMappingMode.Absolute,
|
||||
Viewport = new Rect(0, 0, 1, 1),
|
||||
ViewportUnits = BrushMappingMode.RelativeToBoundingBox
|
||||
};
|
||||
|
||||
var canvas = new Canvas
|
||||
{
|
||||
Width = capture.Bounds.Width,
|
||||
Height = capture.Bounds.Height,
|
||||
// TODO: What clip?
|
||||
//Clip = capture.ClipArea
|
||||
};
|
||||
|
||||
foreach (var captureCaptureElement in capture.CaptureElements)
|
||||
{
|
||||
// Skip mouse cursor
|
||||
if (captureCaptureElement.ElementType == CaptureElementType.Cursor && DisplayMouse)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var image = new Image
|
||||
{
|
||||
Source = captureCaptureElement.Content,
|
||||
Width = captureCaptureElement.Bounds.Width,
|
||||
Height = captureCaptureElement.Bounds.Height
|
||||
};
|
||||
Canvas.SetLeft(image, captureCaptureElement.Bounds.Left);
|
||||
Canvas.SetTop(image, captureCaptureElement.Bounds.Top);
|
||||
canvas.Children.Add(image);
|
||||
}
|
||||
|
||||
visualBrush.Visual = canvas;
|
||||
result.Fill = visualBrush;
|
||||
|
||||
result.Measure(new Size(width, height));
|
||||
result.Arrange(new Rect(0, 0, width, height));
|
||||
result.UpdateLayout();
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
14
src/Greenshot.Core/packages.config
Normal file
14
src/Greenshot.Core/packages.config
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.Common" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.Gdi32" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.Icons" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.Input" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.Kernel32" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.Messages" version="0.5.105" targetFramework="net461" />
|
||||
<package id="Dapplo.Windows.User32" version="0.5.105" targetFramework="net461" />
|
||||
<package id="System.Reactive" version="4.0.0" targetFramework="net461" />
|
||||
</packages>
|
||||
53
src/Greenshot.Gfx/Extensions/WriteableBitmapExtensions.cs
Normal file
53
src/Greenshot.Gfx/Extensions/WriteableBitmapExtensions.cs
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
#region Greenshot GNU General Public License
|
||||
|
||||
// Greenshot - a free and open source screenshot tool
|
||||
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||
//
|
||||
// For more information see: http://getgreenshot.org/
|
||||
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 1 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Windows;
|
||||
using System.Windows.Media.Imaging;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
|
||||
namespace Greenshot.Gfx.Extensions
|
||||
{
|
||||
public static class WriteableBitmapExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Copy the rect from source to target
|
||||
/// </summary>
|
||||
/// <param name="target"></param>
|
||||
/// <param name="source"></param>
|
||||
/// <param name="rect"></param>
|
||||
public static void CopyPixels(this WriteableBitmap target, BitmapSource source, NativeRect rect)
|
||||
{
|
||||
// Calculate stride of source
|
||||
int stride = source.PixelWidth * (source.Format.BitsPerPixel / 8);
|
||||
|
||||
// Create data array to hold source pixel data
|
||||
byte[] data = new byte[stride * source.PixelHeight];
|
||||
|
||||
// Copy source image pixels to the data array
|
||||
source.CopyPixels(data, stride, 0);
|
||||
|
||||
// Write the pixel data to the WriteableBitmap.
|
||||
target.WritePixels(new Int32Rect(0, 0, source.PixelWidth, source.PixelHeight), data, stride, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -34,20 +34,20 @@
|
|||
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
@ -139,6 +139,7 @@
|
|||
<Compile Include="Effects\Scale2xEffect.cs" />
|
||||
<Compile Include="Effects\TornEdgeEffect.cs" />
|
||||
<Compile Include="ExifOrientations.cs" />
|
||||
<Compile Include="Extensions\WriteableBitmapExtensions.cs" />
|
||||
<Compile Include="FastBitmap\Fast24RgbBitmap.cs" />
|
||||
<Compile Include="FastBitmap\Fast32ArgbBitmap.cs" />
|
||||
<Compile Include="FastBitmap\Fast32RgbBitmap.cs" />
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
<package id="Autofac.Mef" version="4.0.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="94bc3704cddfc263" culture="neutral" />
|
||||
|
|
|
|||
|
|
@ -40,20 +40,20 @@
|
|||
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
45
src/Greenshot.Tests/CaptureTests.cs
Normal file
45
src/Greenshot.Tests/CaptureTests.cs
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
using System.Threading.Tasks;
|
||||
using Greenshot.Core;
|
||||
using Greenshot.Core.Sources;
|
||||
using Xunit;
|
||||
|
||||
namespace Greenshot.Tests
|
||||
{
|
||||
/// <summary>
|
||||
/// Test the capture code
|
||||
/// </summary>
|
||||
public class CaptureTests
|
||||
{
|
||||
/// <summary>
|
||||
/// Test if a capture with the screen works
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public async Task Test_CaptureFlow_ScreenSource()
|
||||
{
|
||||
var captureFlow = new CaptureFlow
|
||||
{
|
||||
Sources = {new ScreenSource()}
|
||||
};
|
||||
var capture = await captureFlow.Execute();
|
||||
Assert.NotNull(capture);
|
||||
Assert.NotNull(capture.CaptureElements);
|
||||
Assert.Equal(1, capture.CaptureElements.Count);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test if a capture with the screen and mouse works
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public async Task Test_CaptureFlow_ScreenSource_MouseSource()
|
||||
{
|
||||
var captureFlow = new CaptureFlow
|
||||
{
|
||||
Sources = { new ScreenSource() , new MouseSource()}
|
||||
};
|
||||
var capture = await captureFlow.Execute();
|
||||
Assert.NotNull(capture);
|
||||
Assert.NotNull(capture.CaptureElements);
|
||||
Assert.Equal(2, capture.CaptureElements.Count);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -69,20 +69,20 @@
|
|||
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
@ -316,6 +316,7 @@
|
|||
<Compile Include="Implementation\BoxBlurOld.cs" />
|
||||
<Compile Include="Murmur3Tests.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="CaptureTests.cs" />
|
||||
<Compile Include="StitchTests.cs" />
|
||||
<Compile Include="UpdateTests.cs" />
|
||||
</ItemGroup>
|
||||
|
|
@ -324,6 +325,10 @@
|
|||
<Project>{5b924697-4dcd-4f98-85f1-105cb84b7341}</Project>
|
||||
<Name>Greenshot.Addons</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj">
|
||||
<Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project>
|
||||
<Name>Greenshot.Core</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Greenshot.Gfx.Experimental\Greenshot.Gfx.Experimental.csproj">
|
||||
<Project>{14894a45-aa2c-4bc3-85a3-e388d0bdc1ca}</Project>
|
||||
<Name>Greenshot.Gfx.Experimental</Name>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
|
||||
<package id="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.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Tfs", "Gree
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.OcrCommand", "Greenshot.Addon.OcrCommand\Greenshot.Addon.OcrCommand.csproj", "{7B8E9055-A054-4290-B537-075EBFDF8BDF}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -151,7 +153,6 @@ Global
|
|||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|x86
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|x86
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
|
|
@ -229,6 +230,14 @@ Global
|
|||
{7B8E9055-A054-4290-B537-075EBFDF8BDF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{7B8E9055-A054-4290-B537-075EBFDF8BDF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{7B8E9055-A054-4290-B537-075EBFDF8BDF}.Release|x86.Build.0 = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<probing privatePath="App\Greenshot" />
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using CommonServiceLocator;
|
||||
using Dapplo.Log;
|
||||
using Dapplo.Windows.Kernel32;
|
||||
using Greenshot.Addons.Components;
|
||||
|
|
@ -40,11 +39,14 @@ namespace Greenshot.Components
|
|||
{
|
||||
private static readonly LogSource Log = new LogSource();
|
||||
private readonly ICoreConfiguration _coreConfiguration;
|
||||
private readonly DestinationHolder _destinationHolder;
|
||||
|
||||
public CommandlineParser(ICoreConfiguration coreConfiguration)
|
||||
public CommandlineParser(
|
||||
ICoreConfiguration coreConfiguration,
|
||||
DestinationHolder destinationHolder)
|
||||
{
|
||||
_coreConfiguration = coreConfiguration;
|
||||
|
||||
_destinationHolder = destinationHolder;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -211,12 +213,12 @@ namespace Greenshot.Components
|
|||
"External Command like MS Paint",
|
||||
Environment.NewLine
|
||||
);
|
||||
foreach (var destination in ServiceLocator.Current.GetAllInstances<IDestination>())
|
||||
foreach (var destination in _destinationHolder.AllDestinations)
|
||||
{
|
||||
helpOutput.AppendFormat(
|
||||
"\t\t{0,-16}\t==>\t{1}{2}",
|
||||
destination.Designation,
|
||||
destination.Description,
|
||||
destination.Metadata.Designation,
|
||||
destination.Value.Description,
|
||||
Environment.NewLine
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ namespace Greenshot.Components
|
|||
{
|
||||
private static readonly LogSource Log = new LogSource();
|
||||
|
||||
/// <inheritdoc />
|
||||
public void Startup()
|
||||
{
|
||||
Log.Debug().WriteLine("Starting Windows.Forms");
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ namespace Greenshot.Components
|
|||
return AreHotkeysActive;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void Startup()
|
||||
{
|
||||
Log.Debug().WriteLine("Registering hotkeys");
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ namespace Greenshot.Components
|
|||
_windowHandle = windowHandle;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void Startup()
|
||||
{
|
||||
Log.Debug().WriteLine("Starting MainForm");
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ namespace Greenshot.Components
|
|||
_instance = this;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void Startup()
|
||||
{
|
||||
if (_gcHandle != null)
|
||||
|
|
|
|||
|
|
@ -97,11 +97,12 @@ namespace Greenshot.Components
|
|||
/// <inheritdoc />
|
||||
public void Startup()
|
||||
{
|
||||
var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token);
|
||||
//var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token);
|
||||
var ignore = BackgroundTask(() => TimeSpan.FromSeconds(20), UpdateCheck, _cancellationTokenSource.Token);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void Shutdown()
|
||||
/// <inheritdoc />
|
||||
public void Shutdown()
|
||||
{
|
||||
_cancellationTokenSource.Cancel();
|
||||
}
|
||||
|
|
@ -174,7 +175,7 @@ namespace Greenshot.Components
|
|||
|
||||
ProcessFeed(updateFeed);
|
||||
|
||||
if (IsUpdateAvailable)
|
||||
if (true ||IsUpdateAvailable)
|
||||
{
|
||||
ShowUpdate(LatestVersion);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@
|
|||
<Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
|
|
@ -56,38 +56,38 @@
|
|||
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.71\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.72\lib\net461\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Bootstrapper, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.72\lib\net461\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="Dapplo.Addons.Config, Version=1.0.72.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Config.1.0.72\lib\net461\Dapplo.Addons.Config.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.70\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.71\lib\net461\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.70\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.71\lib\net461\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.70\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.71\lib\net461\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.70\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.71\lib\net461\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.70\lib\net461\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.71\lib\net461\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.70\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.71\lib\net461\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.70\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Toasts, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Toasts.1.0.71\lib\net461\Dapplo.CaliburnMicro.Toasts.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.70.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.70\lib\net461\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.71.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.71\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>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,9 @@ using Greenshot.Configuration;
|
|||
|
||||
namespace Greenshot.Ui.Configuration.ViewModels
|
||||
{
|
||||
/// <summary>
|
||||
/// Configuration for the capture
|
||||
/// </summary>
|
||||
public sealed class CaptureConfigViewModel : SimpleConfigScreen
|
||||
{
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -7,20 +7,20 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
|
||||
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
|
||||
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
|
||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
|
||||
<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.Addons.Config" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.70" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.Addons.Config" version="1.0.72" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Toasts" version="1.0.71" targetFramework="net461" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.71" 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" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue