Skip to content

Commit a402375

Browse files
JeavonJeavon
committed
Adding ImageProcessor.Web.Config v2.2.2 as a NuGet package to the Installer project
1 parent 5e1a250 commit a402375

File tree

7 files changed

+92
-7
lines changed

7 files changed

+92
-7
lines changed

‎build/UmbracoFileSystemProviders.Azure.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>
138138
<PackageFile Include="$(MSBuildProjectDirectory)\package.xml" />
139139
<ImageProcessorSecurityConfigXDTInstallFile Include="$(MSBuildProjectDirectory)\transforms\security.config.install.xdt" />
140-
<ImageProcessorSecurityConfigDefaultFile Include="$(MSBuildProjectDirectory)\config\security.config" />
140+
<ImageProcessorSecurityConfigDefaultFile Include="$(InstallerProjectDir)\config\imageprocessor\security.config" />
141141

142142
<!-- NuGet specific -->
143143
<SrcFiles Include="$(ProjectDir)\**\*.cs" Exclude="$(ProjectDir)\obj\**"/>

‎build/transforms/security.config.install.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<services>
44
<service prefix="media/" name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web" xdt:Locator="Match(prefix, name, type)" xdt:Transform="Remove" />
55
<service prefix="media/" name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web" xdt:Locator="Match(prefix, name, type)" xdt:Transform="InsertIfMissing">
6-
<settings xdt:Transform="InsertIfMissing">
6+
<settings xdt:Transform="InsertIfMissing">
77
<setting key="MaxBytes" value="8194304" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
88
<setting key="Timeout" value="30000" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing"/>
99
<setting key="Host" value="http://[myAccountName].blob.core.windows.net/media/" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing"/>

‎src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@
6868
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
71+
<Reference Include="ImageProcessor, Version=2.2.5.0, Culture=neutral, processorArchitecture=MSIL">
72+
<HintPath>..\packages\ImageProcessor.2.2.5.0\lib\net45\ImageProcessor.dll</HintPath>
73+
<Private>True</Private>
74+
</Reference>
75+
<Reference Include="ImageProcessor.Web, Version=4.3.2.0, Culture=neutral, processorArchitecture=MSIL">
76+
<HintPath>..\packages\ImageProcessor.Web.4.3.2.0\lib\net45\ImageProcessor.Web.dll</HintPath>
77+
<Private>True</Private>
78+
</Reference>
7179
<Reference Include="interfaces, Version=1.0.5529.18434, Culture=neutral, processorArchitecture=MSIL">
7280
<HintPath>..\packages\UmbracoCms.Core.6.2.5\lib\interfaces.dll</HintPath>
7381
<Private>True</Private>
@@ -267,6 +275,9 @@
267275
</ItemGroup>
268276
<ItemGroup>
269277
<None Include="app.config" />
278+
<None Include="config\imageprocessor\cache.config" />
279+
<None Include="config\imageprocessor\processing.config" />
280+
<None Include="config\imageprocessor\security.config" />
270281
<None Include="packages.config" />
271282
<None Include="stylecop.json" />
272283
</ItemGroup>

‎src/UmbracoFileSystemProviders.Azure.Installer/config/imageprocessor/cache.config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<caching currentCache="DiskCache">
3+
<caches>
4+
<cache name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365">
5+
<settings>
6+
<setting key="VirtualCachePath" value="~/app_data/cache" />
7+
</settings>
8+
</cache>
9+
</caches>
10+
</caching>

‎src/UmbracoFileSystemProviders.Azure.Installer/config/imageprocessor/processing.config

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<processing preserveExifMetaData="false">
3+
<presets>
4+
</presets>
5+
<plugins>
6+
<plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" />
7+
<plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" />
8+
<plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" />
9+
<plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web" />
10+
<plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web" />
11+
<plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web" />
12+
<plugin name="DetectEdges" type="ImageProcessor.Web.Processors.DetectEdges, ImageProcessor.Web" />
13+
<plugin name="EntropyCrop" type="ImageProcessor.Web.Processors.EntropyCrop, ImageProcessor.Web" />
14+
<plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web" />
15+
<plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web" />
16+
<plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" />
17+
<plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
18+
<settings>
19+
<setting key="MaxSize" value="22" />
20+
<setting key="MaxSigma" value="5.1" />
21+
<setting key="MaxThreshold" value="100" />
22+
</settings>
23+
</plugin>
24+
<plugin name="GaussianSharpen" type="ImageProcessor.Web.Processors.GaussianSharpen, ImageProcessor.Web">
25+
<settings>
26+
<setting key="MaxSize" value="22" />
27+
<setting key="MaxSigma" value="5.1" />
28+
<setting key="MaxThreshold" value="100" />
29+
</settings>
30+
</plugin>
31+
<plugin name="Halftone" type="ImageProcessor.Web.Processors.Halftone, ImageProcessor.Web" />
32+
<plugin name="Hue" type="ImageProcessor.Web.Processors.Hue, ImageProcessor.Web" />
33+
<plugin name="Mask" type="ImageProcessor.Web.Processors.Mask, ImageProcessor.Web">
34+
<settings>
35+
<setting key="VirtualPath" value="~/images/imageprocessor/mask/" />
36+
</settings>
37+
</plugin>
38+
<plugin name="Meta" type="ImageProcessor.Web.Processors.Meta, ImageProcessor.Web" />
39+
<plugin name="Overlay" type="ImageProcessor.Web.Processors.Overlay, ImageProcessor.Web">
40+
<settings>
41+
<setting key="VirtualPath" value="~/images/imageprocessor/overlay/" />
42+
</settings>
43+
</plugin>
44+
<plugin name="Pixelate" type="ImageProcessor.Web.Processors.Pixelate, ImageProcessor.Web" />
45+
<plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web" />
46+
<plugin name="ReplaceColor" type="ImageProcessor.Web.Processors.ReplaceColor, ImageProcessor.Web" />
47+
<plugin name="Resize" type="ImageProcessor.Web.Processors.Resize, ImageProcessor.Web">
48+
<settings>
49+
<setting key="MaxWidth" value="5000" />
50+
<setting key="MaxHeight" value="5000" />
51+
</settings>
52+
</plugin>
53+
<plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web" />
54+
<plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web" />
55+
<plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web" />
56+
<plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web" />
57+
<plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" />
58+
<plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" />
59+
<plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" />
60+
</plugins>
61+
</processing>

‎build/config/security.config renamed to ‎src/UmbracoFileSystemProviders.Azure.Installer/config/imageprocessor/security.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<security>
33
<services>
4-
<service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web"/>
4+
<service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web" />
55
<!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
66
<!--<service name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web">
77
<settings>
@@ -12,12 +12,12 @@
1212
</service>-->
1313
<service prefix="remote.axd" name="RemoteImageService" type="ImageProcessor.Web.Services.RemoteImageService, ImageProcessor.Web">
1414
<settings>
15-
<setting key="MaxBytes" value="4194304"/>
16-
<setting key="Timeout" value="3000"/>
17-
<setting key="Protocol" value="http"/>
15+
<setting key="MaxBytes" value="4194304" />
16+
<setting key="Timeout" value="3000" />
17+
<setting key="Protocol" value="http" />
1818
</settings>
1919
<whitelist>
2020
</whitelist>
2121
</service>
2222
</services>
23-
</security>
23+
</security>

‎src/UmbracoFileSystemProviders.Azure.Installer/packages.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
55
<package id="Examine" version="0.1.57.2941" targetFramework="net45" />
66
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
7+
<package id="ImageProcessor" version="2.2.5.0" targetFramework="net45" />
8+
<package id="ImageProcessor.Web" version="4.3.2.0" targetFramework="net45" />
9+
<package id="ImageProcessor.Web.Config" version="2.2.2.0" targetFramework="net45" />
710
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
811
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net45" />
912
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />

0 commit comments

Comments
 (0)