diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index a486f8a58b..cbabc01bb7 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -32,8 +32,8 @@
-
-
+
+
diff --git a/src/Umbraco.Core/Logging/ImageProcessorLogger.cs b/src/Umbraco.Core/Logging/ImageProcessorLogger.cs
new file mode 100644
index 0000000000..02ca9c2949
--- /dev/null
+++ b/src/Umbraco.Core/Logging/ImageProcessorLogger.cs
@@ -0,0 +1,46 @@
+namespace Umbraco.Core.Logging
+{
+ using System;
+ using System.Runtime.CompilerServices;
+
+ using ImageProcessor.Common.Exceptions;
+
+ ///
+ /// A logger for explicitly logging ImageProcessor exceptions.
+ ///
+ /// Creating this logger is enough for ImageProcessor to find and replace its in-built debug logger
+ /// without any additional configuration required. This class currently has to be public in order
+ /// to do so.
+ ///
+ ///
+ public sealed class ImageProcessorLogger : ImageProcessor.Common.Exceptions.ILogger
+ {
+ ///
+ /// Logs the specified message as an error.
+ ///
+ /// The type calling the logger.
+ /// The message to log.
+ /// The property or method name calling the log.
+ /// The line number where the method is called.
+ public void Log(string text, [CallerMemberName] string callerName = null, [CallerLineNumber] int lineNumber = 0)
+ {
+ // Using LogHelper since the ImageProcessor logger expects a parameterless constructor.
+ var message = string.Format("{0} {1} : {2}", callerName, lineNumber, text);
+ LogHelper.Error(string.Empty, new ImageProcessingException(message));
+ }
+
+ ///
+ /// Logs the specified message as an error.
+ ///
+ /// The type calling the logger.
+ /// The message to log.
+ /// The property or method name calling the log.
+ /// The line number where the method is called.
+ public void Log(Type type, string text, [CallerMemberName] string callerName = null, [CallerLineNumber] int lineNumber = 0)
+ {
+ // Using LogHelper since the ImageProcessor logger expects a parameterless constructor.
+ var message = string.Format("{0} {1} : {2}", callerName, lineNumber, text);
+ LogHelper.Error(type, string.Empty, new ImageProcessingException(message));
+ }
+ }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3e14fc7758..e3cf2206e2 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -52,6 +52,10 @@
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
+
+ ..\packages\ImageProcessor.2.4.1.0\lib\net45\ImageProcessor.dll
+ True
+
False
..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll
@@ -353,6 +357,7 @@
+
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index b69be5b5cc..a9241f46c8 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -2,6 +2,7 @@
+
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 004b791890..6911829bb8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -136,12 +136,12 @@
False
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
-
- ..\packages\ImageProcessor.2.3.3.0\lib\net45\ImageProcessor.dll
+
+ ..\packages\ImageProcessor.2.4.1.0\lib\net45\ImageProcessor.dll
True
-
- ..\packages\ImageProcessor.Web.4.5.3.0\lib\net45\ImageProcessor.Web.dll
+
+ ..\packages\ImageProcessor.Web.4.6.1.0\lib\net45\ImageProcessor.Web.dll
True
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index e85831fd82..7891f928e8 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -5,8 +5,8 @@
-
-
+
+