mirror of
https://github.com/greenshot/greenshot
synced 2025-08-26 08:06:09 -07:00
Updated the dependencies and made some small fixes towards a more dependency managed system.
This commit is contained in:
Robin
parent
44791146e5
commit
a42972c19e
52 changed files with 629 additions and 560 deletions
|
|
@ -46,29 +46,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -65,29 +65,29 @@
|
|||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Confluence" version="0.7.19" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -58,29 +58,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -58,29 +58,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -58,29 +58,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -44,29 +44,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -63,29 +63,29 @@
|
|||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@ namespace Greenshot.Addon.Imgur
|
|||
.SingleInstance();
|
||||
builder
|
||||
.RegisterType<ImgurHistoryViewModel>()
|
||||
.AsSelf()
|
||||
.SingleInstance();
|
||||
.AsSelf();
|
||||
builder
|
||||
.RegisterType<ImgurApi>()
|
||||
.AsSelf()
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@
|
|||
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Reactive.Disposables;
|
||||
using Autofac.Features.OwnedInstances;
|
||||
using Caliburn.Micro;
|
||||
using Dapplo.CaliburnMicro.Configuration;
|
||||
using Dapplo.CaliburnMicro.Extensions;
|
||||
|
|
@ -30,6 +32,9 @@ using Greenshot.Addons.ViewModels;
|
|||
|
||||
namespace Greenshot.Addon.Imgur.ViewModels
|
||||
{
|
||||
/// <summary>
|
||||
/// The imgure config VM
|
||||
/// </summary>
|
||||
public sealed class ImgurConfigViewModel : SimpleConfigScreen
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -43,7 +48,7 @@ namespace Greenshot.Addon.Imgur.ViewModels
|
|||
|
||||
public IWindowManager WindowManager { get; }
|
||||
|
||||
public ImgurHistoryViewModel ImgurHistoryViewModel { get;}
|
||||
public Func<Owned<ImgurHistoryViewModel>> ImgurHistoryViewModelFactory { get;}
|
||||
|
||||
public FileConfigPartViewModel FileConfigPartViewModel { get; }
|
||||
|
||||
|
|
@ -51,14 +56,14 @@ namespace Greenshot.Addon.Imgur.ViewModels
|
|||
IImgurConfiguration imgurConfiguration,
|
||||
IImgurLanguage imgurLanguage ,
|
||||
IWindowManager windowManager,
|
||||
ImgurHistoryViewModel imgurHistoryViewModel,
|
||||
Func<Owned<ImgurHistoryViewModel>> imgurHistoryViewModelFactory,
|
||||
FileConfigPartViewModel fileConfigPartViewModel
|
||||
)
|
||||
{
|
||||
ImgurConfiguration = imgurConfiguration;
|
||||
ImgurLanguage = imgurLanguage;
|
||||
WindowManager = windowManager;
|
||||
ImgurHistoryViewModel = imgurHistoryViewModel;
|
||||
ImgurHistoryViewModelFactory = imgurHistoryViewModelFactory;
|
||||
FileConfigPartViewModel = fileConfigPartViewModel;
|
||||
}
|
||||
public override void Initialize(IConfig config)
|
||||
|
|
@ -92,7 +97,10 @@ namespace Greenshot.Addon.Imgur.ViewModels
|
|||
|
||||
public void ShowHistory()
|
||||
{
|
||||
WindowManager.ShowWindow(ImgurHistoryViewModel);
|
||||
using (var imgurHistoryViewModel = ImgurHistoryViewModelFactory())
|
||||
{
|
||||
WindowManager.ShowDialog(imgurHistoryViewModel.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -63,29 +63,29 @@
|
|||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@ namespace Greenshot.Addon.Jira
|
|||
.SingleInstance();
|
||||
builder
|
||||
.RegisterType<JiraViewModel>()
|
||||
.AsSelf()
|
||||
.SingleInstance();
|
||||
.AsSelf();
|
||||
builder
|
||||
.RegisterType<JiraConnector>()
|
||||
.AsSelf()
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ using System.Collections.Generic;
|
|||
using System.Drawing;
|
||||
using System.IO.Compression;
|
||||
using System.Windows.Forms;
|
||||
using Autofac.Features.OwnedInstances;
|
||||
using Caliburn.Micro;
|
||||
using Dapplo.Addons;
|
||||
using Dapplo.HttpExtensions;
|
||||
|
|
@ -55,7 +56,7 @@ namespace Greenshot.Addon.Jira
|
|||
private readonly Issue _jiraIssue;
|
||||
private readonly JiraConnector _jiraConnector;
|
||||
private readonly IWindowManager _windowManager;
|
||||
private readonly JiraViewModel _jiraViewModel;
|
||||
private readonly Func<Owned<JiraViewModel>> _jiraViewModelFactory;
|
||||
private readonly IResourceProvider _resourceProvider;
|
||||
private readonly IJiraConfiguration _jiraConfiguration;
|
||||
private readonly IJiraLanguage _jiraLanguage;
|
||||
|
|
@ -64,7 +65,7 @@ namespace Greenshot.Addon.Jira
|
|||
IJiraConfiguration jiraConfiguration,
|
||||
IJiraLanguage jiraLanguage,
|
||||
JiraConnector jiraConnector,
|
||||
JiraViewModel jiraViewModel,
|
||||
Func<Owned<JiraViewModel>> jiraViewModelFactory,
|
||||
IWindowManager windowManager,
|
||||
IResourceProvider resourceProvider,
|
||||
ICoreConfiguration coreConfiguration,
|
||||
|
|
@ -75,20 +76,20 @@ namespace Greenshot.Addon.Jira
|
|||
_jiraLanguage = jiraLanguage;
|
||||
_jiraConnector = jiraConnector;
|
||||
_windowManager = windowManager;
|
||||
_jiraViewModel = jiraViewModel;
|
||||
_jiraViewModelFactory = jiraViewModelFactory;
|
||||
_resourceProvider = resourceProvider;
|
||||
}
|
||||
|
||||
protected JiraDestination(IJiraConfiguration jiraConfiguration,
|
||||
IJiraLanguage jiraLanguage,
|
||||
JiraConnector jiraConnector,
|
||||
JiraViewModel jiraViewModel,
|
||||
Func<Owned<JiraViewModel>> jiraViewModelFactory,
|
||||
IWindowManager windowManager,
|
||||
IResourceProvider resourceProvider,
|
||||
Issue jiraIssue,
|
||||
ICoreConfiguration coreConfiguration,
|
||||
IGreenshotLanguage greenshotLanguage
|
||||
) : this(jiraConfiguration, jiraLanguage, jiraConnector, jiraViewModel, windowManager, resourceProvider, coreConfiguration, greenshotLanguage)
|
||||
) : this(jiraConfiguration, jiraLanguage, jiraConnector, jiraViewModelFactory, windowManager, resourceProvider, coreConfiguration, greenshotLanguage)
|
||||
{
|
||||
_jiraIssue = jiraIssue;
|
||||
}
|
||||
|
|
@ -158,7 +159,7 @@ namespace Greenshot.Addon.Jira
|
|||
foreach (var jiraDetails in _jiraConnector.RecentJiras)
|
||||
{
|
||||
yield return new JiraDestination(
|
||||
_jiraConfiguration, _jiraLanguage, _jiraConnector, _jiraViewModel,
|
||||
_jiraConfiguration, _jiraLanguage, _jiraConnector, _jiraViewModelFactory,
|
||||
_windowManager, _resourceProvider, jiraDetails.JiraIssue, CoreConfiguration, GreenshotLanguage);
|
||||
}
|
||||
}
|
||||
|
|
@ -191,24 +192,26 @@ namespace Greenshot.Addon.Jira
|
|||
{
|
||||
// TODO: set filename
|
||||
// _jiraViewModel.SetFilename(filename);
|
||||
if (_windowManager.ShowDialog(_jiraViewModel) == true)
|
||||
using (var jiraViewModel = _jiraViewModelFactory())
|
||||
{
|
||||
if (_windowManager.ShowDialog(jiraViewModel.Value) == true)
|
||||
{
|
||||
try
|
||||
{
|
||||
surface.UploadUrl = _jiraConnector.JiraBaseUri.AppendSegments("browse", _jiraViewModel.JiraIssue.Key).AbsoluteUri;
|
||||
surface.UploadUrl = _jiraConnector.JiraBaseUri.AppendSegments("browse", jiraViewModel.Value.JiraIssue.Key).AbsoluteUri;
|
||||
// Run upload in the background
|
||||
new PleaseWaitForm().ShowAndWait(Description, _jiraLanguage.CommunicationWait,
|
||||
async () =>
|
||||
{
|
||||
await _jiraConnector.AttachAsync(_jiraViewModel.JiraIssue.Key, surface, _jiraViewModel.Filename).ConfigureAwait(true);
|
||||
await _jiraConnector.AttachAsync(jiraViewModel.Value.JiraIssue.Key, surface, jiraViewModel.Value.Filename).ConfigureAwait(true);
|
||||
|
||||
if (!string.IsNullOrEmpty(_jiraViewModel.Comment))
|
||||
if (!string.IsNullOrEmpty(jiraViewModel.Value.Comment))
|
||||
{
|
||||
await _jiraConnector.AddCommentAsync(_jiraViewModel.JiraIssue.Key, _jiraViewModel.Comment).ConfigureAwait(true);
|
||||
await _jiraConnector.AddCommentAsync(jiraViewModel.Value.JiraIssue.Key, jiraViewModel.Value.Comment).ConfigureAwait(true);
|
||||
}
|
||||
}
|
||||
);
|
||||
Log.Debug().WriteLine("Uploaded to Jira {0}", _jiraViewModel.JiraIssue.Key);
|
||||
Log.Debug().WriteLine("Uploaded to Jira {0}", jiraViewModel.Value.JiraIssue.Key);
|
||||
exportInformation.ExportMade = true;
|
||||
exportInformation.Uri = surface.UploadUrl;
|
||||
}
|
||||
|
|
@ -217,6 +220,7 @@ namespace Greenshot.Addon.Jira
|
|||
MessageBox.Show(_jiraLanguage.UploadFailure + " " + e.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ProcessExport(exportInformation, surface);
|
||||
return exportInformation;
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,27 @@
|
|||
using Autofac;
|
||||
#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 Autofac;
|
||||
using Dapplo.CaliburnMicro.Configuration;
|
||||
using Greenshot.Addon.LegacyEditor.Drawing;
|
||||
using Greenshot.Addon.LegacyEditor.Forms;
|
||||
|
|
@ -25,6 +48,15 @@ namespace Greenshot.Addon.LegacyEditor
|
|||
.RegisterType<EditorFactory>()
|
||||
.AsSelf()
|
||||
.SingleInstance();
|
||||
builder
|
||||
.RegisterType<ResizeSettingsForm>()
|
||||
.AsSelf();
|
||||
builder
|
||||
.RegisterType<TornEdgeSettingsForm>()
|
||||
.AsSelf();
|
||||
builder
|
||||
.RegisterType<DropShadowSettingsForm>()
|
||||
.AsSelf();
|
||||
builder
|
||||
.RegisterType<ImageEditorForm>()
|
||||
.AsSelf();
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ using System.Linq;
|
|||
using System.Reactive.Disposables;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using Autofac.Features.OwnedInstances;
|
||||
using Dapplo.Log;
|
||||
using Dapplo.Windows.Clipboard;
|
||||
using Dapplo.Windows.Common.Extensions;
|
||||
|
|
@ -66,11 +67,10 @@ namespace Greenshot.Addon.LegacyEditor.Forms
|
|||
{
|
||||
private static readonly LogSource Log = new LogSource();
|
||||
private static readonly List<string> IgnoreDestinations = new List<string> { "Picker", "Editor"};
|
||||
private static readonly string[] SupportedClipboardFormats = { typeof(string).FullName, "Text", typeof(IDrawableContainerList).FullName };
|
||||
private readonly IEditorConfiguration _editorConfiguration;
|
||||
private readonly IEditorLanguage _editorLanguage;
|
||||
|
||||
private static readonly string[] SupportedClipboardFormats = {typeof(string).FullName, "Text", typeof(IDrawableContainerList).FullName};
|
||||
|
||||
// whether part of the editor controls are disabled depending on selected item(s)
|
||||
private bool _controlsDisabledDueToConfirmable;
|
||||
private bool _originalBoldCheckState;
|
||||
|
|
@ -81,18 +81,28 @@ namespace Greenshot.Addon.LegacyEditor.Forms
|
|||
private readonly IDisposable _clipboardSubscription;
|
||||
private readonly EditorFactory _editorFactory;
|
||||
private readonly DestinationHolder _destinationHolder;
|
||||
private readonly Func<ResizeEffect, Owned<ResizeSettingsForm>> _resizeSettingsFormFactory;
|
||||
private readonly Func<TornEdgeEffect, Owned<TornEdgeSettingsForm>> _tornEdgeSettingsFormFactory;
|
||||
private readonly Func<DropShadowEffect, Owned<DropShadowSettingsForm>> _dropShadowSettingsFormFactory;
|
||||
private CompositeDisposable _disposables;
|
||||
|
||||
public ImageEditorForm(
|
||||
IEditorConfiguration editorConfiguration,
|
||||
IEditorLanguage editorLanguage,
|
||||
EditorFactory editorFactory,
|
||||
DestinationHolder destinationHolder)
|
||||
DestinationHolder destinationHolder,
|
||||
Func<ResizeEffect, Owned<ResizeSettingsForm>> resizeSettingsFormFactory,
|
||||
Func<TornEdgeEffect, Owned<TornEdgeSettingsForm>> tornEdgeSettingsFormFactory,
|
||||
Func<DropShadowEffect, Owned<DropShadowSettingsForm>> dropShadowSettingsFormFactory
|
||||
)
|
||||
{
|
||||
_editorConfiguration = editorConfiguration;
|
||||
_editorLanguage = editorLanguage;
|
||||
_editorFactory = editorFactory;
|
||||
_destinationHolder = destinationHolder;
|
||||
_resizeSettingsFormFactory = resizeSettingsFormFactory;
|
||||
_tornEdgeSettingsFormFactory = tornEdgeSettingsFormFactory;
|
||||
_dropShadowSettingsFormFactory = dropShadowSettingsFormFactory;
|
||||
//
|
||||
// The InitializeComponent() call is required for Windows Forms designer support.
|
||||
//
|
||||
|
|
@ -1079,8 +1089,11 @@ namespace Greenshot.Addon.LegacyEditor.Forms
|
|||
apply = true;
|
||||
break;
|
||||
case MouseButtons.Right:
|
||||
var result = new DropShadowSettingsForm(dropShadowEffect).ShowDialog(this);
|
||||
using (var dropShadowSettingsForm = _dropShadowSettingsFormFactory(dropShadowEffect))
|
||||
{
|
||||
var result = dropShadowSettingsForm.Value.ShowDialog(this);
|
||||
apply = result == DialogResult.OK;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
|
@ -1097,18 +1110,21 @@ namespace Greenshot.Addon.LegacyEditor.Forms
|
|||
/// <summary>
|
||||
/// Open the resize settings from, and resize if ok was pressed
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
/// <param name="sender">object</param>
|
||||
/// <param name="e">EventArgs</param>
|
||||
private void BtnResizeClick(object sender, EventArgs e)
|
||||
{
|
||||
var resizeEffect = new ResizeEffect(_surface.Screenshot.Width, _surface.Screenshot.Height, true);
|
||||
var result = new ResizeSettingsForm(resizeEffect).ShowDialog(this);
|
||||
using (var resizeSettingsForm = _resizeSettingsFormFactory(resizeEffect))
|
||||
{
|
||||
var result = resizeSettingsForm.Value.ShowDialog(this);
|
||||
if (result == DialogResult.OK)
|
||||
{
|
||||
_surface.ApplyBitmapEffect(resizeEffect);
|
||||
UpdateUndoRedoSurfaceDependencies();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This is used when the torn-edge button is used
|
||||
|
|
@ -1125,8 +1141,11 @@ namespace Greenshot.Addon.LegacyEditor.Forms
|
|||
apply = true;
|
||||
break;
|
||||
case MouseButtons.Right:
|
||||
var result = new TornEdgeSettingsForm(tornEdgeEffect).ShowDialog(this);
|
||||
using (var ownedForm = _tornEdgeSettingsFormFactory(tornEdgeEffect))
|
||||
{
|
||||
var result = ownedForm.Value.ShowDialog(this);
|
||||
apply = result == DialogResult.OK;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -36,29 +36,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -61,29 +61,29 @@
|
|||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -58,29 +58,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -44,29 +44,29 @@
|
|||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -57,29 +57,29 @@
|
|||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -58,29 +58,29 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -57,29 +57,29 @@
|
|||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -54,17 +54,17 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.29.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.29-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.29.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.29-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.29-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.29-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -40,29 +40,29 @@
|
|||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CustomMarshalers" />
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -36,17 +36,17 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
||||
|
|
|
|||
|
|
@ -42,17 +42,17 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
|
||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />
|
||||
|
|
|
|||
|
|
@ -71,17 +71,17 @@
|
|||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@
|
|||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
||||
<package id="CommandLineParser" version="2.2.1" targetFramework="net46" />
|
||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net46" />
|
||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" />
|
||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ namespace Greenshot.Forms
|
|||
/// </summary>
|
||||
public sealed partial class AboutForm : AnimatingBaseForm
|
||||
{
|
||||
private static readonly LogSource Log = new LogSource();
|
||||
// Variables are used to define the location of the dots
|
||||
private const int w = 13;
|
||||
private const int p1 = 7;
|
||||
|
|
@ -58,7 +59,6 @@ namespace Greenshot.Forms
|
|||
private const int p5 = p4 + w;
|
||||
private const int p6 = p5 + w;
|
||||
private const int p7 = p6 + w;
|
||||
private static readonly LogSource Log = new LogSource();
|
||||
private readonly Color _backColor = Color.FromArgb(61, 61, 61);
|
||||
private readonly ColorAnimator _backgroundAnimation;
|
||||
private readonly IList<Color> _colorFlow = new List<Color>();
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ using System.Linq;
|
|||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Windows.Forms;
|
||||
using Autofac.Features.OwnedInstances;
|
||||
using Caliburn.Micro;
|
||||
using Dapplo.Ini;
|
||||
using Dapplo.Windows.Desktop;
|
||||
|
|
@ -77,12 +78,10 @@ namespace Greenshot.Forms
|
|||
// Timer for the double click test
|
||||
private readonly Timer _doubleClickTimer = new Timer();
|
||||
// Make sure we have only one settings form
|
||||
private readonly SettingsForm _settingsForm;
|
||||
private readonly Func<Owned<SettingsForm>> _settingsFormFactory;
|
||||
private readonly Func<Owned<AboutForm>> _aboutFormFactory;
|
||||
|
||||
private readonly DestinationHolder _destinationHolder;
|
||||
|
||||
// Make sure we have only one about form
|
||||
private AboutForm _aboutForm;
|
||||
// Thumbnail preview
|
||||
private ThumbnailForm _thumbnailForm;
|
||||
|
||||
|
|
@ -90,13 +89,16 @@ namespace Greenshot.Forms
|
|||
|
||||
public MainForm(ICoreConfiguration coreConfiguration,
|
||||
IWindowManager windowManager,
|
||||
ConfigViewModel configViewModel, SettingsForm settingsForm,
|
||||
ConfigViewModel configViewModel,
|
||||
Func<Owned<SettingsForm>> settingsFormFactory,
|
||||
Func<Owned<AboutForm>> aboutFormFactory,
|
||||
DestinationHolder destinationHolder)
|
||||
{
|
||||
_coreConfiguration = coreConfiguration;
|
||||
_windowManager = windowManager;
|
||||
_configViewModel = configViewModel;
|
||||
_settingsForm = settingsForm;
|
||||
_settingsFormFactory = settingsFormFactory;
|
||||
_aboutFormFactory = aboutFormFactory;
|
||||
_destinationHolder = destinationHolder;
|
||||
Instance = this;
|
||||
}
|
||||
|
|
@ -109,7 +111,6 @@ namespace Greenshot.Forms
|
|||
//
|
||||
try
|
||||
{
|
||||
_settingsForm.Initialize();
|
||||
InitializeComponent();
|
||||
SetupBitmapScaleHandler();
|
||||
}
|
||||
|
|
@ -848,19 +849,14 @@ namespace Greenshot.Forms
|
|||
_windowManager.ShowDialog(_configViewModel);
|
||||
}
|
||||
|
||||
if (Application.OpenForms.OfType<SettingsForm>().Any())
|
||||
using (var settingsForm = _settingsFormFactory())
|
||||
{
|
||||
// TODO: Await?
|
||||
InteropWindowFactory.CreateFor(_settingsForm.Handle).ToForegroundAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_settingsForm.ShowDialog() == DialogResult.OK)
|
||||
settingsForm.Value.Initialize();
|
||||
if (settingsForm.Value.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
InitializeQuickSettingsMenu();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -875,24 +871,9 @@ namespace Greenshot.Forms
|
|||
|
||||
public void ShowAbout()
|
||||
{
|
||||
if (_aboutForm != null)
|
||||
using (var aboutForm = _aboutFormFactory())
|
||||
{
|
||||
// TODO: Await?
|
||||
InteropWindowFactory.CreateFor(_aboutForm.Handle).ToForegroundAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
using (_aboutForm = new AboutForm())
|
||||
{
|
||||
_aboutForm.ShowDialog(this);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
_aboutForm = null;
|
||||
}
|
||||
aboutForm.Value.ShowDialog(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,35 +57,35 @@
|
|||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.32-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.32-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.Addons.Config, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Config.1.0.32-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
|
||||
<Reference Include="Dapplo.Addons.Config, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.Addons.Config.1.0.36-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.36-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,32 @@
|
|||
using Autofac;
|
||||
#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 Autofac;
|
||||
using Dapplo.Addons;
|
||||
using Dapplo.CaliburnMicro;
|
||||
using Dapplo.CaliburnMicro.Configuration;
|
||||
using Dapplo.CaliburnMicro.Security;
|
||||
using Greenshot.Addons.Components;
|
||||
using Greenshot.Addons.Interfaces.Plugin;
|
||||
using Greenshot.Components;
|
||||
using Greenshot.Forms;
|
||||
using Greenshot.Ui.Configuration.ViewModels;
|
||||
|
|
@ -44,11 +66,14 @@ namespace Greenshot
|
|||
.As<IUiShutdown>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.RegisterType<AboutForm>()
|
||||
.AsSelf();
|
||||
|
||||
// TODO: Should be removed
|
||||
builder
|
||||
.RegisterType<SettingsForm>()
|
||||
.AsSelf()
|
||||
.SingleInstance();
|
||||
.AsSelf();
|
||||
|
||||
// Configuration
|
||||
builder
|
||||
|
|
@ -66,8 +91,7 @@ namespace Greenshot
|
|||
|
||||
builder
|
||||
.RegisterType<ErrorViewModel>()
|
||||
.AsSelf()
|
||||
.SingleInstance();
|
||||
.AsSelf();
|
||||
|
||||
builder
|
||||
.RegisterType<WindowHandle>()
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ using System.Windows;
|
|||
using System.Windows.Forms;
|
||||
using Autofac;
|
||||
using Autofac.Extras.CommonServiceLocator;
|
||||
using Autofac.Features.OwnedInstances;
|
||||
using Caliburn.Micro;
|
||||
using CommonServiceLocator;
|
||||
using Dapplo.Addons.Bootstrapper.Resolving;
|
||||
|
|
@ -132,14 +133,16 @@ namespace Greenshot
|
|||
private static void DisplayErrorViewModel(Dapplication application, Exception exception)
|
||||
{
|
||||
var windowManager = application.Bootstrapper.Container.Resolve<IWindowManager>();
|
||||
var errorViewModel = application.Bootstrapper.Container.Resolve<ErrorViewModel>();
|
||||
using (var errorViewModel = application.Bootstrapper.Container.Resolve<Owned<ErrorViewModel>>())
|
||||
{
|
||||
if (windowManager == null || errorViewModel == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
errorViewModel.Value.SetExceptionToDisplay(exception);
|
||||
windowManager.ShowDialog(errorViewModel.Value);
|
||||
}
|
||||
|
||||
errorViewModel.SetExceptionToDisplay(exception);
|
||||
windowManager.ShowWindow(errorViewModel);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||
<package id="Dapplo.Addons" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Config" version="1.0.32-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.Addons.Config" version="1.0.36-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue