Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Commit 57535bc

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Merge branch 'develop'
2 parents 68f7fa2 + 614af1b commit 57535bc

File tree

60 files changed

+1281
-1121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1281
-1121
lines changed

‎.editorconfig‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
[*.cs]
2+
# Use soft tabs (spaces) for indentation
3+
indent_style = space
4+
5+
# Indent switch case contents
6+
csharp_indent_case_contents = true
7+
8+
# Indent switch labels
9+
csharp_indent_switch_labels = true
10+
11+
# Place catch statements on a new line
12+
csharp_new_line_before_catch = true
13+
14+
# Place else statements on a new line
15+
csharp_new_line_before_else = true
16+
17+
# Require finally statements to be on a new line after the closing brace
18+
csharp_new_line_before_finally = true
19+
20+
# 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)
21+
csharp_new_line_before_open_brace = types, properties, lambdas, object_collection_array_initializers, methods, control_blocks, accessors
22+
23+
# Sort System.* using directives alphabetically, and place them before other usings
24+
dotnet_sort_system_directives_first = true
25+
26+
# Require NO space between a cast and the value
27+
csharp_space_after_cast = false
28+
29+
# Require a space before the colon for bases or interfaces in a type declaration
30+
csharp_space_after_colon_in_inheritance_clause = true
31+
32+
# Require a space after a keyword in a control flow statement such as a for loop
33+
csharp_space_after_keywords_in_control_flow_statements = true
34+
35+
# Require a space before the colon for bases or interfaces in a type declaration
36+
csharp_space_before_colon_in_inheritance_clause = true
37+
38+
# Remove space within empty argument list parentheses
39+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
40+
41+
# Remove space between method call name and opening parenthesis
42+
csharp_space_between_method_call_name_and_opening_parenthesis = false
43+
44+
# Do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
45+
csharp_space_between_method_call_parameter_list_parentheses = false
46+
47+
# Remove space within empty parameter list parentheses for a method declaration
48+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
49+
50+
# Place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
51+
csharp_space_between_method_declaration_parameter_list_parentheses = false
52+
53+
# Leave code block on single line
54+
csharp_preserve_single_line_blocks = true
55+
56+
# Prefer expression-bodied members for accessors
57+
csharp_style_expression_bodied_accessors = true:suggestion
58+
59+
# Prefer expression-bodied members for constructors
60+
csharp_style_expression_bodied_constructors = true:suggestion
61+
62+
# Prefer expression-bodied members for indexers
63+
csharp_style_expression_bodied_indexers = true:suggestion
64+
65+
# Prefer expression-bodied members for methods
66+
csharp_style_expression_bodied_methods = true:suggestion
67+
68+
# Prefer expression-bodied members for properties
69+
csharp_style_expression_bodied_properties = true:suggestion
70+
71+
# Prefer out variables to be declared inline in the argument list of a method call when possible
72+
csharp_style_inlined_variable_declaration = true:suggestion
73+
74+
# Prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
75+
dotnet_style_predefined_type_for_member_access = true:suggestion
76+
77+
# Prefer explicit type over var to declare variables with built-in system types such as int
78+
csharp_style_var_for_built_in_types = false:suggestion
79+
80+
# Prefer var when the type is already mentioned on the right-hand side of a declaration expression
81+
csharp_style_var_when_type_is_apparent = true:suggestion
82+
83+
# 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
84+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
85+
86+
# Prefer fields to be prefaced with this. in C# or Me. in Visual Basic
87+
dotnet_style_qualification_for_field = true:suggestion
88+
89+
# Prefer methods to be prefaced with this. in C# or Me. in Visual Basic
90+
dotnet_style_qualification_for_method = true:suggestion
91+
92+
# Prefer properties to be prefaced with this. in C# or Me. in Visual Basic
93+
dotnet_style_qualification_for_property = true:suggestion

‎ImageProcessor.sln‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2026
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30011.22
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{5368AF57-74ED-4499-BCCD-38BCB18C4629}"
77
EndProject
@@ -34,13 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{4E1AB050
3434
build\build.ps1 = build\build.ps1
3535
EndProjectSection
3636
EndProject
37-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{1F68939E-8BBE-4D09-98B5-68B06BBDE68E}"
38-
ProjectSection(SolutionItems) = preProject
39-
LICENSE = LICENSE
40-
README.md = README.md
41-
EndProjectSection
42-
EndProject
43-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuspecs", "Nuspecs", "{E0B81C77-6E29-4500-9E9F-F0B72EBE8241}"
37+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{E0B81C77-6E29-4500-9E9F-F0B72EBE8241}"
4438
ProjectSection(SolutionItems) = preProject
4539
build\NuSpecs\ImageProcessor.nuspec = build\NuSpecs\ImageProcessor.nuspec
4640
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.
8175
build\content\ImageProcessor.Web.Plugins.AmazonS3Cache\config\imageprocessor\cache.config.transform = build\content\ImageProcessor.Web.Plugins.AmazonS3Cache\config\imageprocessor\cache.config.transform
8276
EndProjectSection
8377
EndProject
78+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{57BBD0FE-E8BB-45EF-B7EE-EB7669192D0D}"
79+
ProjectSection(SolutionItems) = preProject
80+
.editorconfig = .editorconfig
81+
.gitattributes = .gitattributes
82+
.gitignore = .gitignore
83+
LICENSE = LICENSE
84+
NuGet.config = NuGet.config
85+
README.md = README.md
86+
EndProjectSection
87+
EndProject
8488
Global
8589
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8690
All|Any CPU = All|Any CPU
@@ -167,6 +171,7 @@ Global
167171
{633B1C4C-4823-47BE-9A01-A665F3118C8C} = {0E113662-D6E2-473E-92BA-6005EB412C00}
168172
{ADAF0E0D-0CE9-45C2-AF95-70443273C468} = {0E113662-D6E2-473E-92BA-6005EB412C00}
169173
{7BF5274B-56A7-4B62-8105-E9BDF25BAFE7} = {0E113662-D6E2-473E-92BA-6005EB412C00}
174+
{4E1AB050-8CC4-4099-80AF-7FF2BFC000E9} = {57BBD0FE-E8BB-45EF-B7EE-EB7669192D0D}
170175
{E0B81C77-6E29-4500-9E9F-F0B72EBE8241} = {4E1AB050-8CC4-4099-80AF-7FF2BFC000E9}
171176
{A74AE40C-5374-4B15-BEBF-94D74C16AC3A} = {0E113662-D6E2-473E-92BA-6005EB412C00}
172177
{19517DBA-58AA-4294-97BF-0D02902749B4} = {4E1AB050-8CC4-4099-80AF-7FF2BFC000E9}

‎ImageProcessor.sln.DotSettings‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Nuget.config‎ renamed to ‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
55
</packageSources>
66
</configuration>

‎build/NuSpecs/ImageProcessor.Web.PostProcessor.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<language>en-GB</language>
2323
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF</tags>
2424
<dependencies>
25-
<group targetFramework=".NETFramework4.5">
25+
<group targetFramework=".NETFramework4.5.2">
2626
<dependency id="ImageProcessor.Web" version="4.11.0" />
2727
</group>
2828
</dependencies>

‎build/NuSpecs/ImageProcessor.Web.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF</tags>
2626
<dependencies>
2727
<group targetFramework=".NETFramework4.5.2">
28-
<dependency id="ImageProcessor" version="2.8.0" />
28+
<dependency id="ImageProcessor" version="2.9.0" />
2929
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" />
3030
</group>
3131
</dependencies>

‎build/NuSpecs/ImageProcessor.nuspec‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
<copyright>James Jackson-South</copyright>
2424
<language>en-GB</language>
2525
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Fluent Animated EXIF</tags>
26+
<dependencies>
27+
<group targetFramework=".NETFramework4.5.2">
28+
<dependency id="System.ValueTuple" version="4.5.0" />
29+
</group>
30+
</dependencies>
2631
</metadata>
2732
<files>
2833
<file src="..\_BuildOutput\ImageProcessor\lib\net452\ImageProcessor.dll" target="lib\net452" />

‎build/build.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $nugetOutput = Join-Path $binPath "NuGets";
88
# Projects (NuGet dependencies are handled in the nuspec files themselves)
99
$imageprocessor = @{
1010
name = "ImageProcessor"
11-
version = "2.8.0"
11+
version = "2.9.0"
1212
folder = Join-Path $buildPath "src\ImageProcessor"
1313
output = Join-Path $binPath "ImageProcessor\lib\net452"
1414
csproj = "ImageProcessor.csproj"
@@ -17,7 +17,7 @@ $imageprocessor = @{
1717

1818
$imageProcessorPluginsCair = @{
1919
name = "ImageProcessor.Plugins.Cair"
20-
version = "1.3.0"
20+
version = "1.3.1"
2121
folder = Join-Path $buildPath "src\ImageProcessor.Plugins.Cair"
2222
output = Join-Path $binPath "ImageProcessor.Plugins.Cair\lib\net452"
2323
csproj = "ImageProcessor.Plugins.Cair.csproj"
@@ -35,7 +35,7 @@ $imageProcessorPluginsWebP = @{
3535

3636
$imageprocessorWeb = @{
3737
name = "ImageProcessor.Web"
38-
version = "4.11.0"
38+
version = "4.12.0"
3939
folder = Join-Path $buildPath "src\ImageProcessor.Web"
4040
output = Join-Path $binPath "ImageProcessor.Web\lib\net452"
4141
csproj = "ImageProcessor.Web.csproj"
@@ -49,7 +49,7 @@ $imageprocessorWebConfig = @{
4949

5050
$imageProcessorWebPluginsAzureBlobCache = @{
5151
name = "ImageProcessor.Web.Plugins.AzureBlobCache"
52-
version = "1.6.0"
52+
version = "1.7.0"
5353
folder = Join-Path $buildPath "src\ImageProcessor.Web.Plugins.AzureBlobCache"
5454
output = Join-Path $binPath "ImageProcessor.Web.Plugins.AzureBlobCache\lib\net452"
5555
csproj = "ImageProcessor.Web.Plugins.AzureBlobCache.csproj"
@@ -58,7 +58,7 @@ $imageProcessorWebPluginsAzureBlobCache = @{
5858

5959
$imageProcessorWebPluginsAmazonS3Cache = @{
6060
name = "ImageProcessor.Web.Plugins.AmazonS3Cache"
61-
version = "1.1.0"
61+
version = "1.2.0"
6262
folder = Join-Path $buildPath "src\ImageProcessor.Web.Plugins.AmazonS3Cache"
6363
output = Join-Path $binPath "ImageProcessor.Web.Plugins.AmazonS3Cache\lib\net452"
6464
csproj = "ImageProcessor.Web.Plugins.AmazonS3Cache.csproj"
@@ -67,7 +67,7 @@ $imageProcessorWebPluginsAmazonS3Cache = @{
6767

6868
$imageProcessorWebPluginsPostProcessor = @{
6969
name = "ImageProcessor.Web.Plugins.PostProcessor"
70-
version = "1.5.0"
70+
version = "2.0.0"
7171
folder = Join-Path $buildPath "src\ImageProcessor.Web.Plugins.PostProcessor"
7272
output = Join-Path $binPath "ImageProcessor.Web.Plugins.PostProcessor\lib\net452"
7373
csproj = "ImageProcessor.Web.Plugins.PostProcessor.csproj"

‎build/content/ImageProcessor.Plugins.WebP/web.config.transform‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<system.webServer>
44
<staticContent>
5-
<remove fileExtension=".webp"/>
5+
<remove fileExtension=".webp" />
66
<mimeMap fileExtension=".webp" mimeType="image/webp" />
77
</staticContent>
88
</system.webServer>

‎build/content/ImageProcessor.Web.Config/web.config.transform‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<configuration>
33
<configSections>
44
<sectionGroup name="imageProcessor">
5-
<section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web"/>
6-
<section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web"/>
7-
<section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web"/>
5+
<section name="security" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageSecuritySection, ImageProcessor.Web" />
6+
<section name="processing" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageProcessingSection, ImageProcessor.Web" />
7+
<section name="caching" requirePermission="false" type="ImageProcessor.Web.Configuration.ImageCacheSection, ImageProcessor.Web" />
88
</sectionGroup>
99
</configSections>
10-
1110
<imageProcessor>
1211
<security configSource="config\imageprocessor\security.config" />
1312
<caching configSource="config\imageprocessor\cache.config" />

0 commit comments

Comments
 (0)