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

Commit 9af0723

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #777 from JimBobSquarePants/develop-v2
Version Bump
2 parents c36a37d + 61eb319 commit 9af0723

File tree

76 files changed

+758
-679
lines changed

Some content is hidden

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

76 files changed

+758
-679
lines changed

‎.gitattributes‎

Lines changed: 114 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,117 @@
1-
*.doc diff=astextplain
2-
*.DOC diff=astextplain
3-
*.docx diff=astextplain
4-
*.DOCX diff=astextplain
5-
*.dot diff=astextplain
6-
*.DOT diff=astextplain
7-
*.pdf diff=astextplain
8-
*.PDF diff=astextplain
9-
*.rtf diff=astextplain
10-
*.RTF diff=astextplain
1+
###############################################################################
2+
# Set default behavior to:
3+
# treat as text and
4+
# normalize to Unix-style line endings
5+
###############################################################################
6+
* text eol=lf
117

12-
*.jpg binary
13-
*.png binary
14-
*.gif binary
8+
###############################################################################
9+
# Set explicit file behavior to:
10+
# treat as text and
11+
# normalize to Unix-style line endings
12+
###############################################################################
13+
*.asm text eol=lf
14+
*.c text eol=lf
15+
*.clj text eol=lf
16+
*.cmd text eol=lf
17+
*.cpp text eol=lf
18+
*.css text eol=lf
19+
*.cxx text eol=lf
20+
*.config text eol=lf
21+
*.DotSettings text eol=lf
22+
*.erl text eol=lf
23+
*.fs text eol=lf
24+
*.fsx text eol=lf
25+
*.h text eol=lf
26+
*.htm text eol=lf
27+
*.html text eol=lf
28+
*.hs text eol=lf
29+
*.hxx text eol=lf
30+
*.java text eol=lf
31+
*.js text eol=lf
32+
*.json text eol=lf
33+
*.less text eol=lf
34+
*.lisp text eol=lf
35+
*.lua text eol=lf
36+
*.m text eol=lf
37+
*.md text eol=lf
38+
*.php text eol=lf
39+
*.props text eol=lf
40+
*.ps1 text eol=lf
41+
*.py text eol=lf
42+
*.rb text eol=lf
43+
*.resx text eol=lf
44+
*.runsettings text eol=lf
45+
*.ruleset text eol=lf
46+
*.sass text eol=lf
47+
*.scss text eol=lf
48+
*.sh text eol=lf
49+
*.sql text eol=lf
50+
*.svg text eol=lf
51+
*.targets text eol=lf
52+
*.tt text eol=crlf
53+
*.ttinclude text eol=crlf
54+
*.txt text eol=lf
55+
*.vb text eol=lf
56+
*.yml text eol=lf
1557

16-
*.cs text=auto diff=csharp
17-
*.vb text=auto
18-
*.c text=auto
19-
*.cpp text=auto
20-
*.cxx text=auto
21-
*.h text=auto
22-
*.hxx text=auto
23-
*.py text=auto
24-
*.rb text=auto
25-
*.java text=auto
26-
*.html text=auto
27-
*.htm text=auto
28-
*.css text=auto
29-
*.scss text=auto
30-
*.sass text=auto
31-
*.less text=auto
32-
*.js text=auto
33-
*.lisp text=auto
34-
*.clj text=auto
35-
*.sql text=auto
36-
*.php text=auto
37-
*.lua text=auto
38-
*.m text=auto
39-
*.asm text=auto
40-
*.erl text=auto
41-
*.fs text=auto
42-
*.fsx text=auto
43-
*.hs text=auto
58+
###############################################################################
59+
# Set explicit file behavior to:
60+
# treat as text
61+
# normalize to Unix-style line endings and
62+
# diff as csharp
63+
###############################################################################
64+
*.cs text eol=lf diff=csharp
4465

45-
*.csproj text=auto merge=union
46-
*.vbproj text=auto merge=union
47-
*.fsproj text=auto merge=union
48-
*.dbproj text=auto merge=union
49-
*.sln text=auto eol=crlf merge=union
66+
###############################################################################
67+
# Set explicit file behavior to:
68+
# treat as text
69+
# normalize to Unix-style line endings and
70+
# use a union merge when resoling conflicts
71+
###############################################################################
72+
*.csproj text eol=lf merge=union
73+
*.dbproj text eol=lf merge=union
74+
*.fsproj text eol=lf merge=union
75+
*.ncrunchproject text eol=lf merge=union
76+
*.vbproj text eol=lf merge=union
77+
78+
###############################################################################
79+
# Set explicit file behavior to:
80+
# treat as text
81+
# normalize to Windows-style line endings and
82+
# use a union merge when resoling conflicts
83+
###############################################################################
84+
*.sln text eol=crlf merge=union
85+
86+
###############################################################################
87+
# Set explicit file behavior to:
88+
# treat as binary
89+
###############################################################################
90+
*.bmp binary
91+
*.dll binary
92+
*.exe binary
93+
*.gif binary
94+
*.jpg binary
95+
*.png binary
96+
*.ttf binary
97+
*.snk binary
98+
*.eot binary
99+
*.ttf binary
100+
*.woff binary
101+
*.woff2 binary
102+
*.xls binary
103+
*.xlsx binary
104+
*.ppt binary
105+
*.pptx binary
106+
107+
###############################################################################
108+
# Set explicit file behavior to:
109+
# diff as plain text
110+
###############################################################################
111+
*.doc diff=astextplain
112+
*.docx diff=astextplain
113+
*.dot diff=astextplain
114+
*.pdf diff=astextplain
115+
*.pptx diff=astextplain
116+
*.rtf diff=astextplain
117+
*.svg diff=astextplain

‎build/NuSpecs/ImageProcessor.Plugins.Cair.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Cair Seam Carving</tags>
2424
<dependencies>
2525
<group targetFramework=".NETFramework4.5.2">
26-
<dependency id="ImageProcessor" version="2.7.0.0" />
26+
<dependency id="ImageProcessor" version="2.8.0" />
2727
</group>
2828
</dependencies>
2929
</metadata>

‎build/NuSpecs/ImageProcessor.Plugins.WebP.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff WebP</tags>
2424
<dependencies>
2525
<group targetFramework=".NETFramework4.5.2">
26-
<dependency id="ImageProcessor" version="2.7.0.0" />
26+
<dependency id="ImageProcessor" version="2.8.0" />
2727
</group>
2828
</dependencies>
2929
</metadata>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF</tags>
2424
<dependencies>
2525
<group targetFramework=".NETFramework4.5.2">
26-
<dependency id="ImageProcessor.Web" version="4.10.0.0" />
26+
<dependency id="ImageProcessor.Web" version="4.11.0" />
2727
</group>
2828
</dependencies>
2929
</metadata>

‎build/NuSpecs/ImageProcessor.Web.Plugins.AmazonS3Cache.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Amazon S3 Cache Asp</tags>
2424
<dependencies>
2525
<group targetFramework=".NETFramework4.5.2">
26-
<dependency id="ImageProcessor.Web" version="4.10.0.0" />
27-
<dependency id="ImageProcessor.Web.Config" version="2.5.0.0" />
26+
<dependency id="ImageProcessor.Web" version="4.11.0" />
27+
<dependency id="ImageProcessor.Web.Config" version="2.6.0" />
2828
<dependency id="AWSSDK.Core" version="3.3.23.1" />
2929
<dependency id="AWSSDK.S3" version="3.3.18.3" />
3030
</group>

‎build/NuSpecs/ImageProcessor.Web.Plugins.AzureBlobCache.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff Azure Cache Asp</tags>
2424
<dependencies>
2525
<group targetFramework=".NETFramework4.5.2">
26-
<dependency id="ImageProcessor.Web" version="4.10.0.0" />
27-
<dependency id="ImageProcessor.Web.Config" version="2.5.0.0" />
26+
<dependency id="ImageProcessor.Web" version="4.11.0" />
27+
<dependency id="ImageProcessor.Web.Config" version="2.6.0" />
2828
<dependency id="Microsoft.Data.Edm" version="5.6.2" />
2929
<dependency id="Microsoft.Data.OData" version="5.8.4" />
3030
<dependency id="Microsoft.Data.Services.Client" version="5.6.2" />
31-
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" />
31+
<dependency id="Microsoft.Azure.ConfigurationManager" version="4.0.0.0" />
3232
<dependency id="Newtonsoft.Json" version="5.0.8" />
3333
<dependency id="System.Spatial" version="5.6.2" />
34-
<dependency id="WindowsAzure.Storage" version="4.3.0" />
34+
<dependency id="Microsoft.Azure.Storage.Blob" version="10.0.3" />
3535
</group>
3636
</dependencies>
3737
</metadata>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<tags>Image Resize Crop Rotate Quality Watermark Gif Jpg Jpeg Bitmap Png Tiff ASP Cache EXIF</tags>
2424
<dependencies>
2525
<group targetFramework=".NETFramework4.5">
26-
<dependency id="ImageProcessor.Web" version="4.10.0.0" />
26+
<dependency id="ImageProcessor.Web" version="4.11.0" />
2727
</group>
2828
</dependencies>
2929
</metadata>

‎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.7.0.0" />
28+
<dependency id="ImageProcessor" version="2.8.0" />
2929
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="1.2.2" />
3030
</group>
3131
</dependencies>

‎build/build.ps1‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ $testsPath = Join-Path $buildPath "tests";
55
$nuspecsPath = Join-Path $buildPath "build\nuspecs";
66
$nugetOutput = Join-Path $binPath "NuGets";
77

8-
# Projects. Nuget Dependencies are handled in the nuspec files themselves and depend on the Major.Minor.Build number only.
8+
# Projects (NuGet dependencies are handled in the nuspec files themselves)
99
$imageprocessor = @{
1010
name = "ImageProcessor"
11-
version = "2.7.0.${buildNumber}"
11+
version = "2.8.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.2.0.${buildNumber}"
20+
version = "1.3.0"
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"
@@ -26,7 +26,7 @@ $imageProcessorPluginsCair = @{
2626

2727
$imageProcessorPluginsWebP = @{
2828
name = "ImageProcessor.Plugins.WebP"
29-
version = "1.2.0.${buildNumber}"
29+
version = "1.3.0"
3030
folder = Join-Path $buildPath "src\ImageProcessor.Plugins.WebP"
3131
output = Join-Path $binPath "ImageProcessor.Plugins.WebP\lib\net452"
3232
csproj = "ImageProcessor.Plugins.WebP.csproj"
@@ -35,21 +35,21 @@ $imageProcessorPluginsWebP = @{
3535

3636
$imageprocessorWeb = @{
3737
name = "ImageProcessor.Web"
38-
version = "4.10.0.${buildNumber}"
38+
version = "4.11.0"
3939
folder = Join-Path $buildPath "src\ImageProcessor.Web"
4040
output = Join-Path $binPath "ImageProcessor.Web\lib\net452"
4141
csproj = "ImageProcessor.Web.csproj"
4242
nuspec = Join-Path $nuspecsPath "ImageProcessor.Web.nuspec"
4343
};
4444

4545
$imageprocessorWebConfig = @{
46-
version = "2.5.0.${buildNumber}"
46+
version = "2.6.0"
4747
nuspec = Join-Path $nuspecsPath "ImageProcessor.Web.Config.nuspec"
4848
};
4949

5050
$imageProcessorWebPluginsAzureBlobCache = @{
5151
name = "ImageProcessor.Web.Plugins.AzureBlobCache"
52-
version = "1.5.0.${buildNumber}"
52+
version = "1.6.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.0.0.${buildNumber}"
61+
version = "1.1.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.4.0.${buildNumber}"
70+
version = "1.5.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"
@@ -118,8 +118,9 @@ foreach ($project in $projects) {
118118
continue;
119119
}
120120

121-
Write-Host "Building project $($project.name) at version $($project.version)" -ForegroundColor Yellow;
122-
Update-AssemblyInfo -file (Join-Path $project.folder "Properties\AssemblyInfo.cs") -version $project.version;
121+
$assemblyVersion = "$($project.version).$buildNumber";
122+
Write-Host "Building Project $($project.name) at version $($assemblyVersion)" -ForegroundColor Yellow;
123+
Update-AssemblyInfo -file (Join-Path $project.folder "Properties\AssemblyInfo.cs") -version $assemblyVersion;
123124

124125
$buildCommand = "msbuild $(Join-Path $project.folder $project.csproj) /t:Build /p:Warnings=true /p:Configuration=Release /p:Platform=AnyCPU /p:PipelineDependsOnBuild=False /p:OutDir=$($project.output) /clp:WarningsOnly /clp:ErrorsOnly /clp:Summary /clp:PerformanceSummary /v:Normal /nologo";
125126
Write-Host $buildCommand -ForegroundColor Yellow;

‎src/ImageProcessor.Web.Plugins.AmazonS3Cache/AmazonS3Cache.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class AmazonS3Cache : ImageCacheBase
4040
/// <summary>
4141
/// The regular expression for parsing a remote uri.
4242
/// </summary>
43-
private static readonly Regex RemoteRegex = new Regex("^http(s)?://", RegexOptions.Compiled);
43+
private static readonly Regex RemoteRegex = new Regex("^http(s)?://", RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase);
4444

4545
/// <summary>
4646
/// The assembly version.

0 commit comments

Comments
 (0)