mirror of
https://github.com/greenshot/greenshot
synced 2025-08-25 23:56:12 -07:00
Fixes for updates in the dependencies.
This commit is contained in:
Robin
parent
17405088bf
commit
dcf810172a
57 changed files with 967 additions and 622 deletions
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Box.ViewModels;
|
using Greenshot.Addon.Box.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Box
|
namespace Greenshot.Addon.Box
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class BoxAutofacModule : Module
|
public class BoxAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -18,6 +42,8 @@ namespace Greenshot.Addon.Box
|
||||||
.RegisterType<BoxConfigViewModel>()
|
.RegisterType<BoxConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,29 +46,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -79,14 +79,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -213,7 +213,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).dll" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).dll" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
||||||
|
|
|
||||||
|
|
@ -6,20 +6,20 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Confluence.ViewModels;
|
using Greenshot.Addon.Confluence.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Confluence
|
namespace Greenshot.Addon.Confluence
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class ConfluenceAutofacModule : Module
|
public class ConfluenceAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -18,6 +42,8 @@ namespace Greenshot.Addon.Confluence
|
||||||
.RegisterType<ConfluenceConfigViewModel>()
|
.RegisterType<ConfluenceConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -65,29 +65,29 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll</HintPath>
|
||||||
|
|
@ -101,14 +101,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -233,7 +233,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
|
|
|
||||||
|
|
@ -7,21 +7,21 @@
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" />
|
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Confluence" version="0.7.19" 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" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Dropbox.ViewModels;
|
using Greenshot.Addon.Dropbox.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Dropbox
|
namespace Greenshot.Addon.Dropbox
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class DropboxAutofacModule : Module
|
public class DropboxAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -18,6 +42,8 @@ namespace Greenshot.Addon.Dropbox
|
||||||
.RegisterType<DropboxConfigViewModel>()
|
.RegisterType<DropboxConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -91,14 +91,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -229,7 +229,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
||||||
|
|
|
||||||
|
|
@ -6,20 +6,20 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" 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.Addons;
|
using Dapplo.Addons;
|
||||||
using Dapplo.CaliburnMicro.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.ExternalCommand.ViewModels;
|
using Greenshot.Addon.ExternalCommand.ViewModels;
|
||||||
|
|
@ -7,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.ExternalCommand
|
namespace Greenshot.Addon.ExternalCommand
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class ExternalCommandAutofacModule : Module
|
public class ExternalCommandAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -20,6 +43,8 @@ namespace Greenshot.Addon.ExternalCommand
|
||||||
.RegisterType<ExternalCommandConfigViewModel>()
|
.RegisterType<ExternalCommandConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,38 +58,38 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -221,7 +221,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
|
|
|
||||||
|
|
@ -6,17 +6,17 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Flickr.ViewModels;
|
using Greenshot.Addon.Flickr.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Flickr
|
namespace Greenshot.Addon.Flickr
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class FlickrAutofacModule : Module
|
public class FlickrAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -18,6 +42,8 @@ namespace Greenshot.Addon.Flickr
|
||||||
.RegisterType<FlickrConfigViewModel>()
|
.RegisterType<FlickrConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -88,14 +88,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -218,7 +218,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
|
|
|
||||||
|
|
@ -6,19 +6,19 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.GooglePhotos.ViewModels;
|
using Greenshot.Addon.GooglePhotos.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.GooglePhotos
|
namespace Greenshot.Addon.GooglePhotos
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class GooglePhotosAutofacModule : Module
|
public class GooglePhotosAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -18,6 +42,8 @@ namespace Greenshot.Addon.GooglePhotos
|
||||||
.RegisterType<GooglePhotosConfigViewModel>()
|
.RegisterType<GooglePhotosConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,29 +44,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -74,14 +74,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -195,7 +195,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).dll" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).dll" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
||||||
|
|
|
||||||
|
|
@ -6,19 +6,19 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -63,29 +63,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -96,14 +96,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -231,7 +231,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Imgur.ViewModels;
|
using Greenshot.Addon.Imgur.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Imgur
|
namespace Greenshot.Addon.Imgur
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class ImgurAutofacModule : Module
|
public class ImgurAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -25,6 +49,8 @@ namespace Greenshot.Addon.Imgur
|
||||||
.RegisterType<ImgurApi>()
|
.RegisterType<ImgurApi>()
|
||||||
.AsSelf()
|
.AsSelf()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,20 +7,20 @@
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -63,29 +63,29 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -96,8 +96,8 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
|
|
@ -105,8 +105,8 @@
|
||||||
<Reference Include="Dapplo.Jira, Version=0.7.10.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Jira, Version=0.7.10.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Jira.0.7.10\lib\net45\Dapplo.Jira.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Jira.0.7.10\lib\net45\Dapplo.Jira.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -258,10 +258,9 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
"$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
|
||||||
del /q /s "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"\*
|
del /q /s "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"\*
|
||||||
|
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
|
|
||||||
if "$(ConfigurationName)" == "Debug" (
|
if "$(ConfigurationName)" == "Debug" (
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\Dapplo.*" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\Dapplo.*" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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;
|
||||||
using Dapplo.CaliburnMicro.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Jira.ViewModels;
|
using Greenshot.Addon.Jira.ViewModels;
|
||||||
|
|
@ -7,7 +31,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Jira
|
namespace Greenshot.Addon.Jira
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class JiraAutofacModule : Module
|
public class JiraAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -32,6 +56,8 @@ namespace Greenshot.Addon.Jira
|
||||||
.As<IUiShutdown>()
|
.As<IUiShutdown>()
|
||||||
.AsSelf()
|
.AsSelf()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,21 +7,21 @@
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Jira" version="0.7.10" targetFramework="net452" />
|
<package id="Dapplo.Jira" version="0.7.10" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
using Autofac;
|
using Autofac;
|
||||||
|
using Dapplo.Addons;
|
||||||
using Dapplo.CaliburnMicro.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.LegacyEditor.Drawing;
|
using Greenshot.Addon.LegacyEditor.Drawing;
|
||||||
using Greenshot.Addon.LegacyEditor.Forms;
|
using Greenshot.Addon.LegacyEditor.Forms;
|
||||||
|
|
@ -32,7 +33,7 @@ using Greenshot.Addons.Interfaces;
|
||||||
namespace Greenshot.Addon.LegacyEditor
|
namespace Greenshot.Addon.LegacyEditor
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class EditorAutofacModule : Module
|
public class EditorAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -63,6 +64,8 @@ namespace Greenshot.Addon.LegacyEditor
|
||||||
builder
|
builder
|
||||||
.RegisterType<Surface>()
|
.RegisterType<Surface>()
|
||||||
.As<ISurface>();
|
.As<ISurface>();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,38 +36,38 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -284,10 +284,9 @@
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
"$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
|
||||||
del /q /s "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"\*
|
del /q /s "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"\*
|
||||||
|
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
|
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
|
|
|
||||||
|
|
@ -6,17 +6,17 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -61,29 +61,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -91,14 +91,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.JsonNet, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.JsonNet, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -242,9 +242,13 @@
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
|
||||||
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
|
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
|
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
|
|
||||||
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Lutim.ViewModels;
|
using Greenshot.Addon.Lutim.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Lutim
|
namespace Greenshot.Addon.Lutim
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class LutimAutofacModule : Module
|
public class LutimAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -22,6 +46,8 @@ namespace Greenshot.Addon.Lutim
|
||||||
.RegisterType<LutimApi>()
|
.RegisterType<LutimApi>()
|
||||||
.AsSelf()
|
.AsSelf()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,19 +7,19 @@
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -58,38 +58,38 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -196,7 +196,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,34 @@
|
||||||
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 Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
||||||
namespace Greenshot.Addon.OCR
|
namespace Greenshot.Addon.OCR
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class PhotobucketAutofacModule : Module
|
public class PhotobucketAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -14,6 +38,7 @@ namespace Greenshot.Addon.OCR
|
||||||
.As<IDestination>()
|
.As<IDestination>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,17 +6,17 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -44,38 +44,38 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -251,7 +251,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
|
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"</PostBuildEvent>
|
||||||
|
|
|
||||||
|
|
@ -7,17 +7,17 @@
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -57,29 +57,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -90,14 +90,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -197,7 +197,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.OneDrive.ViewModels;
|
using Greenshot.Addon.OneDrive.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.OneDrive
|
namespace Greenshot.Addon.OneDrive
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class OneDriveAutofacModule : Module
|
public class OneDriveAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -18,6 +42,8 @@ namespace Greenshot.Addon.OneDrive
|
||||||
.RegisterType<OneDriveConfigViewModel>()
|
.RegisterType<OneDriveConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,20 +7,20 @@
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -88,14 +88,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -226,7 +226,7 @@
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Photobucket.ViewModels;
|
using Greenshot.Addon.Photobucket.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Photobucket
|
namespace Greenshot.Addon.Photobucket
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class PhotobucketAutofacModule : Module
|
public class PhotobucketAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -18,6 +42,8 @@ namespace Greenshot.Addon.Photobucket
|
||||||
.RegisterType<PhotobucketConfigViewModel>()
|
.RegisterType<PhotobucketConfigViewModel>()
|
||||||
.As<IConfigScreen>()
|
.As<IConfigScreen>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,19 +6,19 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -57,29 +57,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -87,14 +87,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.JsonNet, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.JsonNet, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
@ -200,7 +200,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
|
||||||
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,28 @@
|
||||||
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.Configuration;
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
using Greenshot.Addon.Tfs.ViewModels;
|
using Greenshot.Addon.Tfs.ViewModels;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
@ -6,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Tfs
|
namespace Greenshot.Addon.Tfs
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class TfsAutofacModule : Module
|
public class TfsAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -22,6 +46,8 @@ namespace Greenshot.Addon.Tfs
|
||||||
.RegisterType<TfsClient>()
|
.RegisterType<TfsClient>()
|
||||||
.AsSelf()
|
.AsSelf()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,19 +7,19 @@
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -22,13 +22,14 @@
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
using Autofac;
|
using Autofac;
|
||||||
|
using Dapplo.Addons;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
using Greenshot.Addons.ViewModels;
|
using Greenshot.Addons.ViewModels;
|
||||||
|
|
||||||
namespace Greenshot.Addons
|
namespace Greenshot.Addons
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class AddonsAutofacModule : Module
|
public class AddonsAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -39,6 +40,7 @@ namespace Greenshot.Addons
|
||||||
.RegisterType<DestinationHolder>()
|
.RegisterType<DestinationHolder>()
|
||||||
.AsSelf();
|
.AsSelf();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,29 +40,29 @@
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="CustomMarshalers" />
|
<Reference Include="CustomMarshalers" />
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -73,14 +73,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -6,20 +6,20 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -36,26 +36,26 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,13 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" 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="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net452" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -42,26 +42,26 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -9,13 +9,13 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net46" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net46" />
|
||||||
|
|
|
||||||
|
|
@ -71,26 +71,26 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -10,13 +10,13 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
||||||
<package id="CommandLineParser" version="2.2.1" targetFramework="net46" />
|
<package id="CommandLineParser" version="2.2.1" targetFramework="net46" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net46" />
|
||||||
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
|
||||||
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
|
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
|
||||||
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net46" />
|
<package id="Dapplo.Windows" version="0.5.56" targetFramework="net46" />
|
||||||
|
|
|
||||||
|
|
@ -57,35 +57,35 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Config, Version=1.0.36.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Config, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Config.1.0.36-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<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>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -96,14 +96,14 @@
|
||||||
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions.OAuth, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.12.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Language, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Language, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Log, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ using Greenshot.Ui.Misc.ViewModels;
|
||||||
namespace Greenshot
|
namespace Greenshot
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class GreenshotAutofacModule : Module
|
public class GreenshotAutofacModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -104,6 +104,8 @@ namespace Greenshot
|
||||||
.AssignableTo<IDestination>()
|
.AssignableTo<IDestination>()
|
||||||
.As<IDestination>()
|
.As<IDestination>()
|
||||||
.SingleInstance();
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,22 +11,22 @@
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" 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="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||||
<package id="Dapplo.Addons" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Config" version="1.0.36-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Config" version="1.0.38-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.40-beta" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" 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.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" 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" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log.LogFile" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log.LogFile" version="1.2.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Log.Loggers" version="1.2.1" targetFramework="net452" />
|
<package id="Dapplo.Log.Loggers" version="1.2.1" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -80,9 +80,9 @@
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\GreenshotOCRPlugin"
|
mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\Greenshot.Addon.OCR"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\GreenshotOCRPlugin"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\Greenshot.Addon.OCR"
|
||||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName).config" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\GreenshotOCRPlugin"
|
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName).config" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\Greenshot.Addon.OCR
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue