Skip to content

Commit acb039c

Browse files
dmanning23dmanning23
authored
Merge pull request #1 from SixLabors/master
Update from SixLabors/ImageSharp
2 parents abaf558 + a48de63 commit acb039c

File tree

1,030 files changed

+30249
-16690
lines changed

Some content is hidden

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

1,030 files changed

+30249
-16690
lines changed

‎.editorconfig‎

Lines changed: 360 additions & 9 deletions
Large diffs are not rendered by default.

‎.gitattributes‎

Lines changed: 105 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,108 @@
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=lf
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+
99+
###############################################################################
100+
# Set explicit file behavior to:
101+
# diff as plain text
102+
###############################################################################
103+
*.doc diff=astextplain
104+
*.docx diff=astextplain
105+
*.dot diff=astextplain
106+
*.pdf diff=astextplain
107+
*.pptx diff=astextplain
108+
*.rtf diff=astextplain

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
open_collective: imagesharp

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
path = tests/Images/External
33
url = https://github.com/SixLabors/Imagesharp.Tests.Images.git
44
branch = master
5+
[submodule "standards"]
6+
path = standards
7+
url = https://github.com/SixLabors/Standards

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ solution: ImageSharp.sln
33

44
matrix:
55
include:
6-
- os: linux # Ubuntu 14.04
7-
dist: trusty
6+
- os: linux # Ubuntu 16.04
7+
dist: xenial
88
sudo: required
9-
dotnet: 2.1.401
9+
dotnet: 2.1.603
1010
mono: latest
1111
# - os: osx # OSX 10.11
1212
# osx_image: xcode7.3.1

‎Directory.Build.props‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<!--
5+
Directory.Build.props is automatically picked up and imported by
6+
Microsoft.Common.props. This file needs to exist, even if empty so that
7+
files in the parent directory tree, with the same name, are not imported
8+
instead. The import fairly early and only Sdk.props will have been imported
9+
beforehand. We also don't need to add ourselves to MSBuildAllProjects, as
10+
that is done by the file that imports us.
11+
-->
12+
13+
<!-- Default settings that are used by other settings -->
14+
<PropertyGroup>
15+
<BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath>
16+
<BaseArtifactsPathSuffix>$(ImageSharpProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
17+
<RepositoryUrl>https://github.com/SixLabors/ImageSharp/</RepositoryUrl>
18+
</PropertyGroup>
19+
20+
<!-- Default settings that explicitly differ from the Sdk.props defaults -->
21+
<PropertyGroup>
22+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
23+
<BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
24+
<DebugType>portable</DebugType>
25+
<DebugType Condition="'$(codecov)' != ''">full</DebugType>
26+
<NullableContextOptions>disable</NullableContextOptions>
27+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
28+
<SignAssembly>false</SignAssembly>
29+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
30+
</PropertyGroup>
31+
32+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
33+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
34+
</PropertyGroup>
35+
36+
<!--TODO: Check what this is testing for and why does it fail?-->
37+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
38+
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
39+
</PropertyGroup>
40+
41+
<!-- Default settings that explicitly differ from the Sdk.targets defaults-->
42+
<PropertyGroup>
43+
<Authors>Six Labors and contributors</Authors>
44+
<BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
45+
<Company>Six Labors</Company>
46+
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(BaseArtifactsPathSuffix)/$(Configuration)/</PackageOutputPath>
47+
<Product>SixLabors.ImageSharp</Product>
48+
<VersionPrefix>0.0.1</VersionPrefix>
49+
<VersionPrefix Condition="'$(packageversion)' != ''">$(PackageVersion)</VersionPrefix>
50+
<VersionSuffix></VersionSuffix>
51+
</PropertyGroup>
52+
53+
<!-- Default settings that are otherwise undefined -->
54+
<PropertyGroup>
55+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)standards/SixLabors.snk</AssemblyOriginatorKeyFile>
56+
<Copyright>Copyright © Six Labors and Contributors</Copyright>
57+
<Features>strict;IOperation</Features>
58+
<HighEntropyVA>true</HighEntropyVA>
59+
<LangVersion>7.3</LangVersion>
60+
<NeutralLanguage>en</NeutralLanguage>
61+
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
62+
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl>
63+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
64+
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
65+
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
66+
<RepositoryType>git</RepositoryType>
67+
<RestoreSources>
68+
https://www.myget.org/F/sixlabors/api/v3/index.json;
69+
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
70+
https://api.nuget.org/v3/index.json;
71+
</RestoreSources>
72+
<SixLaborsPublicKey>002400000c8000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
73+
<UseSharedCompilation>true</UseSharedCompilation>
74+
</PropertyGroup>
75+
76+
<!-- Package references which are consumed by all projects -->
77+
<ItemGroup>
78+
<PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" />
79+
</ItemGroup>
80+
81+
</Project>

‎Directory.Build.targets‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<!--
5+
Directory.Build.targets is automatically picked up and imported by
6+
Microsoft.Common.targets. This file needs to exist, even if empty so that
7+
files in the parent directory tree, with the same name, are not imported
8+
instead. The import fairly late and most other props/targets will have been
9+
imported beforehand. We also don't need to add ourselves to
10+
MSBuildAllProjects, as that is done by the file that imports us.
11+
-->
12+
13+
<!-- Settings that append the existing setting value -->
14+
<PropertyGroup>
15+
<DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
16+
</PropertyGroup>
17+
18+
<!-- Tool versions for tool references across all projects -->
19+
<ItemGroup>
20+
<DotNetCliToolReference Update="dotnet-xunit" Version="2.3.1" />
21+
</ItemGroup>
22+
23+
<!-- Package versions for package references across all projects -->
24+
<ItemGroup>
25+
<PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
26+
<PackageReference Update="Colourful" Version="2.0.2" />
27+
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.12.0" />
28+
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.1.0" />
29+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
30+
<PackageReference Update="Moq" Version="4.10.0" />
31+
<PackageReference Update="SixLabors.Core" Version="1.0.0-dev000101" />
32+
<PackageReference Update="SixLabors.Fonts" Version="1.0.0-beta0008" />
33+
<PackageReference Update="SixLabors.Shapes" Version="1.0.0-beta0008" />
34+
<PackageReference Update="SixLabors.Shapes.Text" Version="1.0.0-beta0007" />
35+
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
36+
<PackageReference Update="System.Drawing.Common" Version="4.5.1" />
37+
<PackageReference Update="System.IO.Compression" Version="4.3.0" />
38+
<PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
39+
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
40+
<PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" />
41+
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
42+
<PackageReference Update="xunit" Version="2.3.1" />
43+
<PackageReference Update="xunit.runner.console" Version="2.3.1" />
44+
<PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
45+
</ItemGroup>
46+
47+
</Project>

‎ImageSharp.ruleset‎

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

0 commit comments

Comments
 (0)