Merge branch 'develop'

JimBobSquarePants · Apr 18, 2020 · 57535bc · 57535bc
2 parents 68f7fa2 + 614af1b
commit 57535bc
Show file tree

Hide file tree

Showing 60 changed files with 1,281 additions and 1,121 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,93 @@
+[*.cs]
+# Use soft tabs (spaces) for indentation
+indent_style = space
+
+# Indent switch case contents
+csharp_indent_case_contents = true
+
+# Indent switch labels
+csharp_indent_switch_labels = true
+
+# Place catch statements on a new line
+csharp_new_line_before_catch = true
+
+# Place else statements on a new line
+csharp_new_line_before_else = true
+
+# Require finally statements to be on a new line after the closing brace
+csharp_new_line_before_finally = true
+
+# Require braces to be on a new line for types, properties, lambdas, object_collection_array_initializers, methods, control_blocks, and accessors (also known as "Allman" style)
+csharp_new_line_before_open_brace = types, properties, lambdas, object_collection_array_initializers, methods, control_blocks, accessors
+
+# Sort System.* using directives alphabetically, and place them before other usings
+dotnet_sort_system_directives_first = true
+
+# Require NO space between a cast and the value
+csharp_space_after_cast = false
+
+# Require a space before the colon for bases or interfaces in a type declaration
+csharp_space_after_colon_in_inheritance_clause = true
+
+# Require a space after a keyword in a control flow statement such as a for loop
+csharp_space_after_keywords_in_control_flow_statements = true
+
+# Require a space before the colon for bases or interfaces in a type declaration
+csharp_space_before_colon_in_inheritance_clause = true
+
+# Remove space within empty argument list parentheses
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+
+# Remove space between method call name and opening parenthesis
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+
+# Do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
+csharp_space_between_method_call_parameter_list_parentheses = false
+
+# Remove space within empty parameter list parentheses for a method declaration
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+
+# Place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+# Leave code block on single line
+csharp_preserve_single_line_blocks = true
+
+# Prefer expression-bodied members for accessors
+csharp_style_expression_bodied_accessors = true:suggestion
+
+# Prefer expression-bodied members for constructors
+csharp_style_expression_bodied_constructors = true:suggestion
+
+# Prefer expression-bodied members for indexers
+csharp_style_expression_bodied_indexers = true:suggestion
+
+# Prefer expression-bodied members for methods
+csharp_style_expression_bodied_methods = true:suggestion
+
+# Prefer expression-bodied members for properties
+csharp_style_expression_bodied_properties = true:suggestion
+
+# Prefer out variables to be declared inline in the argument list of a method call when possible
+csharp_style_inlined_variable_declaration = true:suggestion
+
+# Prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Prefer explicit type over var to declare variables with built-in system types such as int
+csharp_style_var_for_built_in_types = false:suggestion
+
+# Prefer var when the type is already mentioned on the right-hand side of a declaration expression
+csharp_style_var_when_type_is_apparent = true:suggestion
+
+# Prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+# Prefer fields to be prefaced with this. in C# or Me. in Visual Basic
+dotnet_style_qualification_for_field = true:suggestion
+
+# Prefer methods to be prefaced with this. in C# or Me. in Visual Basic
+dotnet_style_qualification_for_method = true:suggestion
+
+# Prefer properties to be prefaced with this. in C# or Me. in Visual Basic
+dotnet_style_qualification_for_property = true:suggestion
diff --git a/ImageProcessor.sln b/ImageProcessor.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{5368AF57-74ED-4499-BCCD-38BCB18C4629}"
 EndProject
@@ -34,13 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{4E1AB050
 		build\build.ps1 = build\build.ps1
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{1F68939E-8BBE-4D09-98B5-68B06BBDE68E}"
-	ProjectSection(SolutionItems) = preProject
-		LICENSE = LICENSE
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuspecs", "Nuspecs", "{E0B81C77-6E29-4500-9E9F-F0B72EBE8241}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{E0B81C77-6E29-4500-9E9F-F0B72EBE8241}"
 	ProjectSection(SolutionItems) = preProject
 		build\NuSpecs\ImageProcessor.nuspec = build\NuSpecs\ImageProcessor.nuspec
 		build\NuSpecs\ImageProcessor.Plugins.Cair.nuspec = build\NuSpecs\ImageProcessor.Plugins.Cair.nuspec
@@ -81,6 +75,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImageProcessor.Web.Plugins.
 		build\content\ImageProcessor.Web.Plugins.AmazonS3Cache\config\imageprocessor\cache.config.transform = build\content\ImageProcessor.Web.Plugins.AmazonS3Cache\config\imageprocessor\cache.config.transform
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{57BBD0FE-E8BB-45EF-B7EE-EB7669192D0D}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		LICENSE = LICENSE
+		NuGet.config = NuGet.config
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Any CPU = All|Any CPU
@@ -167,6 +171,7 @@ Global
 		{633B1C4C-4823-47BE-9A01-A665F3118C8C} = {0E113662-D6E2-473E-92BA-6005EB412C00}
 		{ADAF0E0D-0CE9-45C2-AF95-70443273C468} = {0E113662-D6E2-473E-92BA-6005EB412C00}
 		{7BF5274B-56A7-4B62-8105-E9BDF25BAFE7} = {0E113662-D6E2-473E-92BA-6005EB412C00}
+		{4E1AB050-8CC4-4099-80AF-7FF2BFC000E9} = {57BBD0FE-E8BB-45EF-B7EE-EB7669192D0D}
 		{E0B81C77-6E29-4500-9E9F-F0B72EBE8241} = {4E1AB050-8CC4-4099-80AF-7FF2BFC000E9}
 		{A74AE40C-5374-4B15-BEBF-94D74C16AC3A} = {0E113662-D6E2-473E-92BA-6005EB412C00}
 		{19517DBA-58AA-4294-97BF-0D02902749B4} = {4E1AB050-8CC4-4099-80AF-7FF2BFC000E9}

diff --git a/ImageProcessor.sln.DotSettings b/ImageProcessor.sln.DotSettings
diff --git a/Nuget.config → NuGet.config b/Nuget.config → NuGet.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build/NuSpecs/ImageProcessor.Web.PostProcessor.nuspec b/build/NuSpecs/ImageProcessor.Web.PostProcessor.nuspec
@@ -22,7 +22,7 @@
     <language>en-GB</language>
     <tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF</tags>
     <dependencies>
-      <group targetFramework=".NETFramework4.5">
+      <group targetFramework=".NETFramework4.5.2">
         <dependency id="ImageProcessor.Web" version="4.11.0" />
       </group>
     </dependencies>

diff --git a/build/NuSpecs/ImageProcessor.Web.nuspec b/build/NuSpecs/ImageProcessor.Web.nuspec
@@ -25,7 +25,7 @@
     <tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.5.2">
-        <dependency id="ImageProcessor" version="2.8.0" />
+        <dependency id="ImageProcessor" version="2.9.0" />
         <dependency id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" />
       </group>
     </dependencies>

diff --git a/build/NuSpecs/ImageProcessor.nuspec b/build/NuSpecs/ImageProcessor.nuspec
@@ -23,6 +23,11 @@
     <copyright>James Jackson-South</copyright>
     <language>en-GB</language>
     <tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Fluent  Animated EXIF</tags>
+    <dependencies>
+      <group targetFramework=".NETFramework4.5.2">
+        <dependency id="System.ValueTuple" version="4.5.0" />
+      </group>
+    </dependencies>
   </metadata>
   <files>
     <file src="..\_BuildOutput\ImageProcessor\lib\net452\ImageProcessor.dll" target="lib\net452" />

diff --git a/build/build.ps1 b/build/build.ps1
@@ -8,7 +8,7 @@ $nugetOutput = Join-Path $binPath "NuGets";
 # Projects (NuGet dependencies are handled in the nuspec files themselves)
 $imageprocessor = @{
     name    = "ImageProcessor"
-    version = "2.8.0"
+    version = "2.9.0"
     folder  = Join-Path $buildPath "src\ImageProcessor"
     output  = Join-Path $binPath "ImageProcessor\lib\net452"
     csproj  = "ImageProcessor.csproj"
@@ -17,7 +17,7 @@ $imageprocessor = @{
 
 $imageProcessorPluginsCair = @{
     name    = "ImageProcessor.Plugins.Cair"
-    version = "1.3.0"
+    version = "1.3.1"
     folder  = Join-Path $buildPath "src\ImageProcessor.Plugins.Cair"
     output  = Join-Path $binPath "ImageProcessor.Plugins.Cair\lib\net452"
     csproj  = "ImageProcessor.Plugins.Cair.csproj"
@@ -35,7 +35,7 @@ $imageProcessorPluginsWebP = @{
 
 $imageprocessorWeb = @{
     name    = "ImageProcessor.Web"
-    version = "4.11.0"
+    version = "4.12.0"
     folder  = Join-Path $buildPath "src\ImageProcessor.Web"
     output  = Join-Path $binPath "ImageProcessor.Web\lib\net452"
     csproj  = "ImageProcessor.Web.csproj"
@@ -49,7 +49,7 @@ $imageprocessorWebConfig = @{
 
 $imageProcessorWebPluginsAzureBlobCache = @{
     name    = "ImageProcessor.Web.Plugins.AzureBlobCache"
-    version = "1.6.0"
+    version = "1.7.0"
     folder  = Join-Path $buildPath "src\ImageProcessor.Web.Plugins.AzureBlobCache"
     output  = Join-Path $binPath "ImageProcessor.Web.Plugins.AzureBlobCache\lib\net452"
     csproj  = "ImageProcessor.Web.Plugins.AzureBlobCache.csproj"
@@ -58,7 +58,7 @@ $imageProcessorWebPluginsAzureBlobCache = @{
 
 $imageProcessorWebPluginsAmazonS3Cache = @{
     name    = "ImageProcessor.Web.Plugins.AmazonS3Cache"
-    version = "1.1.0"
+    version = "1.2.0"
     folder  = Join-Path $buildPath "src\ImageProcessor.Web.Plugins.AmazonS3Cache"
     output  = Join-Path $binPath "ImageProcessor.Web.Plugins.AmazonS3Cache\lib\net452"
     csproj  = "ImageProcessor.Web.Plugins.AmazonS3Cache.csproj"
@@ -67,7 +67,7 @@ $imageProcessorWebPluginsAmazonS3Cache = @{
 
 $imageProcessorWebPluginsPostProcessor = @{
     name    = "ImageProcessor.Web.Plugins.PostProcessor"
-    version = "1.5.0"
+    version = "2.0.0"
     folder  = Join-Path $buildPath "src\ImageProcessor.Web.Plugins.PostProcessor"
     output  = Join-Path $binPath "ImageProcessor.Web.Plugins.PostProcessor\lib\net452"
     csproj  = "ImageProcessor.Web.Plugins.PostProcessor.csproj"

diff --git a/build/content/ImageProcessor.Plugins.WebP/web.config.transform b/build/content/ImageProcessor.Plugins.WebP/web.config.transform
@@ -2,7 +2,7 @@
 <configuration>
   <system.webServer>
     <staticContent>
-      <remove fileExtension=".webp"/>
+      <remove fileExtension=".webp" />
       <mimeMap fileExtension=".webp" mimeType="image/webp" />
     </staticContent>
   </system.webServer>

diff --git a/build/content/ImageProcessor.Web.Config/web.config.transform b/build/content/ImageProcessor.Web.Config/web.config.transform
@@ -2,12 +2,11 @@
 <configuration>
   <configSections>
     <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"/>
+      <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>
   </configSections>
-
   <imageProcessor>
     <security configSource="config\imageprocessor\security.config" />
     <caching configSource="config\imageprocessor\cache.config" />

diff --git a/...ent/ImageProcessor.Web.Plugins.AmazonS3Cache/config/imageprocessor/cache.config.transform b/...ent/ImageProcessor.Web.Plugins.AmazonS3Cache/config/imageprocessor/cache.config.transform
@@ -4,7 +4,7 @@
       <settings>
         <setting key="AwsAccessKey" value="" />
         <setting key="AwsSecretKey" value="" />
-        <setting key="AwsBucketName" value="[BucketName]"/>
+        <setting key="AwsBucketName" value="[BucketName]" />
         <setting key="AwsCacheKeyPrefix" value="cache" />
         <setting key="RegionEndpoint" value="[RegionEndPoint]" />
         <setting key="SourceRegionEndpoint" value="" />
@@ -16,4 +16,3 @@
     </cache>
   </caches>
 </caching>
-
diff --git a/...nt/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform b/...nt/ImageProcessor.Web.Plugins.AzureBlobCache/config/imageprocessor/cache.config.transform
@@ -2,16 +2,15 @@
   <caches>
     <cache name="AzureBlobCache" type="ImageProcessor.Web.Plugins.AzureBlobCache.AzureBlobCache, ImageProcessor.Web.Plugins.AzureBlobCache" maxDays="365">
       <settings>
-        <setting key="CachedStorageAccount" value="DefaultEndpointsProtocol=https;AccountName=[CacheAccountName];AccountKey=[CacheAccountKey]"/>
-        <setting key="CachedBlobContainer" value="cache"/>
-        <setting key="UseCachedContainerInUrl" value="true"/>
-        <setting key="CachedCDNRoot" value="[CdnRootUrl]"/>
-        <setting key="CachedCDNTimeout" value="1000"/>
-        <setting key="SourceStorageAccount" value=""/>
-        <setting key="SourceBlobContainer" value=""/>
-        <setting key="StreamCachedImage" value="false"/>
+        <setting key="CachedStorageAccount" value="DefaultEndpointsProtocol=https;AccountName=[CacheAccountName];AccountKey=[CacheAccountKey]" />
+        <setting key="CachedBlobContainer" value="cache" />
+        <setting key="UseCachedContainerInUrl" value="true" />
+        <setting key="CachedCDNRoot" value="[CdnRootUrl]" />
+        <setting key="CachedCDNTimeout" value="1000" />
+        <setting key="SourceStorageAccount" value="" />
+        <setting key="SourceBlobContainer" value="" />
+        <setting key="StreamCachedImage" value="false" />
       </settings>
     </cache>
   </caches>
 </caching>
-
diff --git a/build/content/ImageProcessor.Web/web.config.transform b/build/content/ImageProcessor.Web/web.config.transform
@@ -3,13 +3,13 @@
   <system.web>
     <httpRuntime fcnMode="Single" />
     <httpModules>
-      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
     </httpModules>
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
     <modules>
-      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
     </modules>
   </system.webServer>
 </configuration>
diff --git a/src/ImageProcessor.Plugins.Cair/ImageProcessor.Plugins.Cair.csproj b/src/ImageProcessor.Plugins.Cair/ImageProcessor.Plugins.Cair.csproj
@@ -38,6 +38,9 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -62,6 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Unmanaged\x86\CAIR.exe" />
+    <None Include="packages.config" />
     <None Include="Resources\Unmanaged\x86\GPL.txt" />
     <EmbeddedResource Include="Resources\Unmanaged\x86\pthreadVSE2.dll" />
     <None Include="Resources\Unmanaged\x86\ReadMe.txt" />