diff --git a/src/Greenshot.Addon.Box/BoxAutofacModule.cs b/src/Greenshot.Addon.Box/BoxAutofacModule.cs index dffed4692..a6ff2c147 100644 --- a/src/Greenshot.Addon.Box/BoxAutofacModule.cs +++ b/src/Greenshot.Addon.Box/BoxAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Box.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Box { /// - public class BoxAutofacModule : Module + public class BoxAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -18,6 +42,8 @@ namespace Greenshot.Addon.Box .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index d411cdd6f..7047d97f7 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -46,29 +46,29 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -79,14 +79,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -213,7 +213,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index eb17647bd..15f9f4503 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -6,20 +6,20 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs b/src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs index bffe5c2a7..3b3b5b93d 100644 --- a/src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs +++ b/src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Confluence.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Confluence { /// - public class ConfluenceAutofacModule : Module + public class ConfluenceAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -18,6 +42,8 @@ namespace Greenshot.Addon.Confluence .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 2a9d1c57e..6523e8ea9 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -65,29 +65,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll @@ -101,14 +101,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -233,7 +233,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index c33d0173e..9468c0fe8 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -7,21 +7,21 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs b/src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs index f04dd907f..cab62e3c1 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Dropbox.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Dropbox { /// - public class DropboxAutofacModule : Module + public class DropboxAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -18,6 +42,8 @@ namespace Greenshot.Addon.Dropbox .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 4d5899693..3c853db1c 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -58,29 +58,29 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -91,14 +91,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -229,7 +229,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index eb17647bd..15f9f4503 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -6,20 +6,20 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs b/src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs index 6d8e54d30..3d5938f88 100644 --- a/src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs +++ b/src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.ExternalCommand.ViewModels; @@ -7,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.ExternalCommand { /// - public class ExternalCommandAutofacModule : Module + public class ExternalCommandAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -20,6 +43,8 @@ namespace Greenshot.Addon.ExternalCommand .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 6404ed762..ad37f18f4 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -58,38 +58,38 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-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 @@ -221,7 +221,7 @@ 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)" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 458be7f52..def4e64e9 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -6,17 +6,17 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs b/src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs index 03df8336c..11da3df93 100644 --- a/src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs +++ b/src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Flickr.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Flickr { /// - public class FlickrAutofacModule : Module + public class FlickrAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -18,6 +42,8 @@ namespace Greenshot.Addon.Flickr .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 299c7dc72..8c9f9ffa0 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -58,29 +58,29 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -88,14 +88,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -218,7 +218,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index 4de0e36dd..eb9cc3625 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -6,19 +6,19 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs b/src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs index 9e2679c76..745d5e573 100644 --- a/src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs +++ b/src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.GooglePhotos.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.GooglePhotos { /// - public class GooglePhotosAutofacModule : Module + public class GooglePhotosAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -18,6 +42,8 @@ namespace Greenshot.Addon.GooglePhotos .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 6ba663ffa..155ae01d2 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -44,29 +44,29 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -74,14 +74,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -195,7 +195,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index 4de0e36dd..eb9cc3625 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -6,19 +6,19 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 0e0ecc45b..922b0d859 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -63,29 +63,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -96,14 +96,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -231,7 +231,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs b/src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs index aa266c015..d8e49a260 100644 --- a/src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs +++ b/src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Imgur.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Imgur { /// - public class ImgurAutofacModule : Module + public class ImgurAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -25,6 +49,8 @@ namespace Greenshot.Addon.Imgur .RegisterType() .AsSelf() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index f41f80e42..ed5c3df2e 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -7,20 +7,20 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 107611011..6962df373 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -63,29 +63,29 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -96,8 +96,8 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -105,8 +105,8 @@ ..\packages\Dapplo.Jira.0.7.10\lib\net45\Dapplo.Jira.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 @@ -258,10 +258,9 @@ mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" -"$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp" 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" ( copy "$(ProjectDir)bin\$(Configuration)\Dapplo.*" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Jira/JiraAutofacModule.cs b/src/Greenshot.Addon.Jira/JiraAutofacModule.cs index bb93a4f9e..e7400e45f 100644 --- a/src/Greenshot.Addon.Jira/JiraAutofacModule.cs +++ b/src/Greenshot.Addon.Jira/JiraAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Jira.ViewModels; @@ -7,7 +31,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Jira { /// - public class JiraAutofacModule : Module + public class JiraAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -32,6 +56,8 @@ namespace Greenshot.Addon.Jira .As() .AsSelf() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index 016c17872..c861adde2 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -7,21 +7,21 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs b/src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs index 4b76ef478..72cd99e1e 100644 --- a/src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs +++ b/src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs @@ -22,6 +22,7 @@ #endregion using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.LegacyEditor.Drawing; using Greenshot.Addon.LegacyEditor.Forms; @@ -32,7 +33,7 @@ using Greenshot.Addons.Interfaces; namespace Greenshot.Addon.LegacyEditor { /// - public class EditorAutofacModule : Module + public class EditorAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -63,6 +64,8 @@ namespace Greenshot.Addon.LegacyEditor builder .RegisterType() .As(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index a869e731d..c5fa75214 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -36,38 +36,38 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-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 @@ -284,10 +284,9 @@ mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" -"$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp" 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)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index a13b2e718..e68a64c4b 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -6,17 +6,17 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 38cfb1ef9..a83c8a91c 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -61,29 +61,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -91,14 +91,14 @@ ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.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 @@ -242,9 +242,13 @@ mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" -copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp" -copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\" -mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" + +copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(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)" + copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" \ No newline at end of file diff --git a/src/Greenshot.Addon.Lutim/LutimAutofacModule.cs b/src/Greenshot.Addon.Lutim/LutimAutofacModule.cs index 9350290c9..3bcdb07d3 100644 --- a/src/Greenshot.Addon.Lutim/LutimAutofacModule.cs +++ b/src/Greenshot.Addon.Lutim/LutimAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Lutim.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Lutim { /// - public class LutimAutofacModule : Module + public class LutimAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -22,6 +46,8 @@ namespace Greenshot.Addon.Lutim .RegisterType() .AsSelf() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 7f859e660..4c5e8e555 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -7,19 +7,19 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 16cfe666c..abe16aa67 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -58,38 +58,38 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-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 @@ -196,7 +196,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.OCR/OcrAutofacModule.cs b/src/Greenshot.Addon.OCR/OcrAutofacModule.cs index 8ce3b44a3..a6679f16c 100644 --- a/src/Greenshot.Addon.OCR/OcrAutofacModule.cs +++ b/src/Greenshot.Addon.OCR/OcrAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Greenshot.Addons.Components; namespace Greenshot.Addon.OCR { /// - public class PhotobucketAutofacModule : Module + public class PhotobucketAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -13,7 +37,8 @@ namespace Greenshot.Addon.OCR .RegisterType() .As() .SingleInstance(); - + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 458be7f52..def4e64e9 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -6,17 +6,17 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 037abafaa..2696edac4 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -44,38 +44,38 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-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 @@ -251,7 +251,7 @@ mkdir "$(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)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index bc9376399..5db9ee402 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -7,17 +7,17 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 0900b1e95..ff1e9319b 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -57,29 +57,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -90,14 +90,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -197,7 +197,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs b/src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs index 8a61a4b66..05809d401 100644 --- a/src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs +++ b/src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.OneDrive.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.OneDrive { /// - public class OneDriveAutofacModule : Module + public class OneDriveAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -18,6 +42,8 @@ namespace Greenshot.Addon.OneDrive .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index f41f80e42..ed5c3df2e 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -7,20 +7,20 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 57adcd394..4e28e1635 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -58,29 +58,29 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -88,14 +88,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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 @@ -226,7 +226,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs b/src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs index 25c790e9f..40c978757 100644 --- a/src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs +++ b/src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Photobucket.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Photobucket { /// - public class PhotobucketAutofacModule : Module + public class PhotobucketAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -18,6 +42,8 @@ namespace Greenshot.Addon.Photobucket .RegisterType() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index 4de0e36dd..eb9cc3625 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -6,19 +6,19 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 651910535..ffd4869a7 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -57,29 +57,29 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -87,14 +87,14 @@ ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.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 @@ -200,7 +200,7 @@ 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)\" mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)" copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\Plugins\$(ProjectName)\" diff --git a/src/Greenshot.Addon.Tfs/TfsAutofacModule.cs b/src/Greenshot.Addon.Tfs/TfsAutofacModule.cs index 89f9bfadd..dc725ce70 100644 --- a/src/Greenshot.Addon.Tfs/TfsAutofacModule.cs +++ b/src/Greenshot.Addon.Tfs/TfsAutofacModule.cs @@ -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 . + +#endregion + +using Autofac; +using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Greenshot.Addon.Tfs.ViewModels; using Greenshot.Addons.Components; @@ -6,7 +30,7 @@ using Greenshot.Addons.Components; namespace Greenshot.Addon.Tfs { /// - public class TfsAutofacModule : Module + public class TfsAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -22,6 +46,8 @@ namespace Greenshot.Addon.Tfs .RegisterType() .AsSelf() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 7f859e660..4c5e8e555 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -7,19 +7,19 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Addons/AddonsAutofacModule.cs b/src/Greenshot.Addons/AddonsAutofacModule.cs index cd3632ae6..d1c6c4eb2 100644 --- a/src/Greenshot.Addons/AddonsAutofacModule.cs +++ b/src/Greenshot.Addons/AddonsAutofacModule.cs @@ -22,13 +22,14 @@ #endregion using Autofac; +using Dapplo.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.ViewModels; namespace Greenshot.Addons { /// - public class AddonsAutofacModule : Module + public class AddonsAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -39,6 +40,7 @@ namespace Greenshot.Addons .RegisterType() .AsSelf(); + base.Load(builder); } } } diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 8b20b709f..c50c8a47d 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -40,29 +40,29 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -73,14 +73,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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.Addons/packages.config b/src/Greenshot.Addons/packages.config index f1fcfa6b9..f319aaa43 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -6,20 +6,20 @@ - - - - - - - - + + + + + + + + - + - + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 13b63eba1..5a7af00e1 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -36,26 +36,26 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-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.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index e24a3438b..fbdbb1c48 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -6,13 +6,13 @@ - - - - - + + + + + - + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index ce224b78b..3814c6f4f 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -42,26 +42,26 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-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.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 8e01f9a88..03834cdf7 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -9,13 +9,13 @@ - - - - - + + + + + - + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 5a363a814..f69cc1d08 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -71,26 +71,26 @@ ..\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 + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-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.Tests/packages.config b/src/Greenshot.Tests/packages.config index 2394ebed7..3030c4b17 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -10,13 +10,13 @@ - - - - - + + + + + - + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index e108f4f99..ed3b7daa4 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -57,35 +57,35 @@ ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.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.Addons.Config.1.0.36-beta\lib\net45\Dapplo.Addons.Config.dll + + ..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll - - ..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll + + ..\packages\Dapplo.CaliburnMicro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.dll - - ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll + + ..\packages\Dapplo.CaliburnMicro.Configuration.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll - - ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll + + ..\packages\Dapplo.CaliburnMicro.Dapp.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll - - ..\packages\Dapplo.CaliburnMicro.Menu.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll + + ..\packages\Dapplo.CaliburnMicro.Menu.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll - - ..\packages\Dapplo.CaliburnMicro.Metro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll + + ..\packages\Dapplo.CaliburnMicro.Metro.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll - - ..\packages\Dapplo.CaliburnMicro.Security.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll + + ..\packages\Dapplo.CaliburnMicro.Security.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll - - ..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll + + ..\packages\Dapplo.CaliburnMicro.Translations.1.0.40-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll @@ -96,14 +96,14 @@ ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.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/GreenshotAutofacModule.cs b/src/Greenshot/GreenshotAutofacModule.cs index 3b99ffd88..a96e877ff 100644 --- a/src/Greenshot/GreenshotAutofacModule.cs +++ b/src/Greenshot/GreenshotAutofacModule.cs @@ -35,7 +35,7 @@ using Greenshot.Ui.Misc.ViewModels; namespace Greenshot { /// - public class GreenshotAutofacModule : Module + public class GreenshotAutofacModule : AddonModule { protected override void Load(ContainerBuilder builder) { @@ -104,6 +104,8 @@ namespace Greenshot .AssignableTo() .As() .SingleInstance(); + + base.Load(builder); } } } diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 94bb23825..66c7ebdf2 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -11,22 +11,22 @@ - - - - - - - - - - + + + + + + + + + + - + - + diff --git a/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj b/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj index 44bef236f..fc419ccad 100644 --- a/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj +++ b/src/GreenshotOCRCommand/GreenshotOCRCommand.csproj @@ -80,9 +80,9 @@ -mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\GreenshotOCRPlugin" -copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\GreenshotOCRPlugin" -copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName).config" "$(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\Greenshot.Addon.OCR" +copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName).config" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\Greenshot.Addon.OCR