From b0a4cc33339312df06feedf107b5bf0ab3ae6a61 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Mon, 13 Jun 2016 22:43:05 +1000 Subject: [PATCH 1/3] Updates ImageProcessor :boom: - Update versions - Add ImageProcessorLogger --- build/NuSpecs/UmbracoCms.Core.nuspec | 4 +- .../Logging/ImageProcessorLogger.cs | 46 +++++++++++++++++++ src/Umbraco.Core/packages.config | 1 + src/Umbraco.Web.UI/packages.config | 4 +- 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 src/Umbraco.Core/Logging/ImageProcessorLogger.cs diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 72733c5800..077bafa760 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..ac18f1d384 --- /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(message, 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, message, new ImageProcessingException(message)); + } + } +} diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config index b69be5b5cc..784daf9ea0 100644 --- a/src/Umbraco.Core/packages.config +++ b/src/Umbraco.Core/packages.config @@ -2,6 +2,7 @@ + diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index 160a82c5fb..ae045c0ece 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -5,8 +5,8 @@ - - + + From 33cbcbb7d49036fbd4a847c175caf78bad95d644 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Mon, 13 Jun 2016 22:47:49 +1000 Subject: [PATCH 2/3] Save projects. --- src/Umbraco.Core/Umbraco.Core.csproj | 5 +++++ src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 141622687e..4f6fc38c1d 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.0.0\lib\net45\ImageProcessor.dll + True + False ..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll @@ -352,6 +356,7 @@ + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 4bd0be1308..2b7d01a46e 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.0.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 From c9c1aea8ab750f9417d5641e7ddcc20065bacd58 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 14 Jun 2016 04:54:26 +1000 Subject: [PATCH 3/3] Update ImageProcessor, clean up log message --- build/NuSpecs/UmbracoCms.Core.nuspec | 2 +- src/Umbraco.Core/Logging/ImageProcessorLogger.cs | 8 ++++---- src/Umbraco.Core/Umbraco.Core.csproj | 4 ++-- src/Umbraco.Core/packages.config | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- src/Umbraco.Web.UI/packages.config | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 077bafa760..4d6e1b3c6c 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -32,7 +32,7 @@ - + diff --git a/src/Umbraco.Core/Logging/ImageProcessorLogger.cs b/src/Umbraco.Core/Logging/ImageProcessorLogger.cs index ac18f1d384..02ca9c2949 100644 --- a/src/Umbraco.Core/Logging/ImageProcessorLogger.cs +++ b/src/Umbraco.Core/Logging/ImageProcessorLogger.cs @@ -25,8 +25,8 @@ 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(message, new ImageProcessingException(message)); + var message = string.Format("{0} {1} : {2}", callerName, lineNumber, text); + LogHelper.Error(string.Empty, new ImageProcessingException(message)); } /// @@ -39,8 +39,8 @@ 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, message, new ImageProcessingException(message)); + 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 4f6fc38c1d..47dd8b69b6 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -52,8 +52,8 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\ImageProcessor.2.4.0.0\lib\net45\ImageProcessor.dll + + ..\packages\ImageProcessor.2.4.1.0\lib\net45\ImageProcessor.dll True diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config index 784daf9ea0..a9241f46c8 100644 --- a/src/Umbraco.Core/packages.config +++ b/src/Umbraco.Core/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 2b7d01a46e..817900c36c 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -136,8 +136,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\ImageProcessor.2.4.0.0\lib\net45\ImageProcessor.dll + + ..\packages\ImageProcessor.2.4.1.0\lib\net45\ImageProcessor.dll True diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index ae045c0ece..69aecec6a1 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -5,7 +5,7 @@ - +