diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 73f71e17c..7fccb23e3 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -54,11 +54,11 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Dapplo.Addons.1.0.36-beta\lib\net45\Dapplo.Addons.dll + + ..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll - - ..\packages\Dapplo.Addons.Bootstrapper.1.0.36-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll + + ..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll ..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll @@ -66,14 +66,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll + + ..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll ..\packages\Dapplo.InterfaceImpl.0.2.12\lib\net45\Dapplo.InterfaceImpl.dll - - ..\packages\Dapplo.Language.0.5.27\lib\net45\Dapplo.Language.dll + + ..\packages\Dapplo.Language.0.5.28\lib\net45\Dapplo.Language.dll ..\packages\Dapplo.Log.1.2.1\lib\net45\Dapplo.Log.dll diff --git a/src/Greenshot.Addon.Win10/Win10AddonModule.cs b/src/Greenshot.Addon.Win10/Win10AddonModule.cs new file mode 100644 index 000000000..758221b45 --- /dev/null +++ b/src/Greenshot.Addon.Win10/Win10AddonModule.cs @@ -0,0 +1,48 @@ +/* + * Greenshot - a free and open source screenshot tool + * Copyright (C) 2007-2016 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 . + */ + +using Autofac; +using Dapplo.Addons; +using Dapplo.Windows.Common; +using Greenshot.Addons.Components; + +namespace Greenshot.Addon.Win10 +{ + /// + public class Win10AddonModule : AddonModule + { + protected override void Load(ContainerBuilder builder) + { + if (!WindowsVersion.IsWindows10OrLater) + { + builder + .RegisterType() + .As() + .SingleInstance(); + builder + .RegisterType() + .As() + .SingleInstance(); + } + base.Load(builder); + } + } +} diff --git a/src/Greenshot.Addon.Win10/Win10AutofacModule.cs b/src/Greenshot.Addon.Win10/Win10AutofacModule.cs deleted file mode 100644 index d22c79f87..000000000 --- a/src/Greenshot.Addon.Win10/Win10AutofacModule.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Autofac; -using Greenshot.Addons.Components; - -namespace Greenshot.Addon.Win10 -{ - /// - public class Win10AutofacModule : Module - { - protected override void Load(ContainerBuilder builder) - { - // TODO: Check Winows version - builder - .RegisterType() - .As() - .SingleInstance(); - builder - .RegisterType() - .As() - .SingleInstance(); - } - } -} diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config index b01723f6f..979bb9344 100644 --- a/src/Greenshot.Addon.Win10/packages.config +++ b/src/Greenshot.Addon.Win10/packages.config @@ -6,13 +6,13 @@ - - + + - + - +