From a0cc788f278d72a165c59cc6d76b6f70a526aeac Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 28 Sep 2018 12:24:16 +1000
Subject: [PATCH] Updates to latest Image Processor versions

---
 src/Umbraco.Core/Umbraco.Core.csproj            |  4 ++--
 src/Umbraco.Core/packages.config                |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj        |  8 ++++----
 .../config/imageprocessor/cache.config          |  8 ++++----
 .../config/imageprocessor/processing.config     | 17 +++++++++++------
 .../config/imageprocessor/security.config       |  6 +++---
 src/Umbraco.Web.UI/packages.config              |  6 +++---
 7 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index c2092016eb..fb030310eb 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -51,8 +51,8 @@
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.6.2.25, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.6.2.25\lib\net452\ImageProcessor.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 3e0884757c..35cabcdb71 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -3,7 +3,7 @@
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.6.2.25" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net452" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 1d49d4b0ab..893f118007 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -137,11 +137,11 @@
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.6.2.25, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.6.2.25\lib\net452\ImageProcessor.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor.Web, Version=4.8.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.Web.4.8.7\lib\net45\ImageProcessor.Web.dll</HintPath>
+    <Reference Include="ImageProcessor.Web, Version=4.9.3.25, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.4.9.3.25\lib\net452\ImageProcessor.Web.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
diff --git a/src/Umbraco.Web.UI/config/imageprocessor/cache.config b/src/Umbraco.Web.UI/config/imageprocessor/cache.config
index 4bdfd99ffc..1bd6cd7101 100644
--- a/src/Umbraco.Web.UI/config/imageprocessor/cache.config
+++ b/src/Umbraco.Web.UI/config/imageprocessor/cache.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <caching currentCache="DiskCache">
   <caches>
-    <cache name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" browserMaxDays="7" trimCache="false">
-      <settings>
+    <cache trimCache="false" name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" memoryMaxMinutes="1" browserMaxDays="7">
+      
+    <settings>
         <setting key="VirtualCachePath" value="~/app_data/cache" />
-      </settings>
-    </cache>
+      </settings></cache>
   </caches>
 </caching>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/imageprocessor/processing.config b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
index 208cd33062..009fc7ae76 100644
--- a/src/Umbraco.Web.UI/config/imageprocessor/processing.config
+++ b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
-  <presets>
-  </presets>
-  <plugins>
+<processing preserveExifMetaData="true" metaDataMode="None" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
+  
+  
+<presets>
+  </presets><plugins>
     <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" />
     <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true" />
+    <plugin name="Background" type="ImageProcessor.Web.Processors.Background, ImageProcessor.Web">
+      <settings>
+        <setting key="VirtualPath" value="~/images/imageprocessor/background/" />
+      </settings>
+    </plugin>
     <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" enabled="true" />
     <plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web" />
     <plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web" />
@@ -58,5 +64,4 @@
     <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" />
     <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" />
     <plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" />
-  </plugins>
-</processing>
\ No newline at end of file
+  </plugins></processing>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/imageprocessor/security.config b/src/Umbraco.Web.UI/config/imageprocessor/security.config
index 7bce8ee7b5..3168b751c8 100644
--- a/src/Umbraco.Web.UI/config/imageprocessor/security.config
+++ b/src/Umbraco.Web.UI/config/imageprocessor/security.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <security>
-  <services>
+  
+<services>
     <service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web" />
     <!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
     <!--<service name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web">
@@ -20,5 +21,4 @@
       <whitelist>
       </whitelist>
     </service>
-  </services>
-</security>
\ No newline at end of file
+  </services></security>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index ca4a649e3f..a2b0a1b645 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -5,9 +5,9 @@
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
   <package id="dotless" version="1.5.2" targetFramework="net45" />
   <package id="Examine" version="0.1.89" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="4.8.7" targetFramework="net45" />
-  <package id="ImageProcessor.Web.Config" version="2.3.1" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.6.2.25" targetFramework="net452" />
+  <package id="ImageProcessor.Web" version="4.9.3.25" targetFramework="net452" />
+  <package id="ImageProcessor.Web.Config" version="2.4.1.19" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net452" />