Update ImageProcessor to 2.7

2019-11-21 13:57:31 -05:00
parent 6659d77e4f
commit 297ef37126
6 changed files with 69 additions and 64 deletions
@@ -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">
+    <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>
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
+<processing preserveExifMetaData="true" metaDataMode="None" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
+  
+  
 <presets>
-  </presets>
-  <plugins>
+  </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>
+  </plugins></processing>
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <security>
+  
 <services>
    <service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web" />
    <!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
@@ -20,5 +21,4 @@
      <whitelist>
      </whitelist>
    </service>
-  </services>
-</security>
+  </services></security>
@@ -21,13 +21,13 @@
      You can also find all config options in the "Web.Backload.Default.txt" file (Backload\Config\_Defaults folder).
    -->
    <section name="backload" type="Backload.Configuration.BackloadSection, Backload, Version=2, Culture=neutral, PublicKeyToken=02eaf42ab375d363" requirePermission="false" />
-  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --><sectionGroup name="imageProcessor">
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --><!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+  <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  <sectionGroup name="imageProcessor">
      <section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" />
      <section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" />
      <section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web" />
-    </sectionGroup><!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-  <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
+    </sectionGroup></configSections>
  <umbracoConfiguration>
    <settings configSource="config\umbracoSettings.config" />
    <BaseRestExtensions configSource="config\BaseRestExtensions.config" />
@@ -292,9 +292,9 @@
      <remove name="ClientDependencyModule" />
      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
      
-    <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
+    
    <remove name="WebDAVModule" />
-      </modules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></modules>
    <handlers accessPolicy="Read, Write, Script, Execute">
      <remove name="WebServiceHandlerFactory-Integrated" />
      <remove name="ScriptHandlerFactory" />
@@ -347,8 +347,8 @@
        <requestLimits maxAllowedContentLength="1000000000" />
      </requestFiltering>
    </security>
-    <validation validateIntegratedModeConfiguration="false" />
-  </system.webServer>
+    
+  <validation validateIntegratedModeConfiguration="false" /></system.webServer>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <!-- Old asp.net ajax assembly bindings -->
@@ -105,11 +105,11 @@
      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>True</Private>
    </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.7.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\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.10.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.4.10.0.100\lib\net452\ImageProcessor.Web.dll</HintPath>
    </Reference>
    <Reference Include="interfaces, Version=1.0.6820.12874, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\UmbracoCms.Core.7.12.2\lib\net45\interfaces.dll</HintPath>
@@ -14,9 +14,9 @@
  <package id="Hangfire.Core" version="1.6.20" targetFramework="net452" />
  <package id="Hangfire.SqlServer" version="1.6.20" targetFramework="net452" />
  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net452" />
-  <package id="ImageProcessor" version="2.5.6" targetFramework="net452" />
-  <package id="ImageProcessor.Web" version="4.8.7" targetFramework="net452" />
-  <package id="ImageProcessor.Web.Config" version="2.3.1" targetFramework="net452" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net452" />
+  <package id="ImageProcessor.Web" version="4.10.0.100" targetFramework="net452" />
+  <package id="ImageProcessor.Web.Config" version="2.5.0.100" targetFramework="net452" />
  <package id="jQuery" version="1.12.4" targetFramework="net452" />
  <package id="jQuery.UI.Combined" version="1.12.1" targetFramework="net452" />
  <package id="jquery.validate.unobtrusive.bootstrap" version="1.2.3" targetFramework="net452" />