Skip to content
This repository was archived by the owner on Feb 22, 2020. It is now read-only.

Commit 2db3a31

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #33 from SixLabors/af/shared-guard
Apply SharedInfrastructure, introduce shared guards
2 parents 9cc6808 + eb82ffd commit 2db3a31

18 files changed

Lines changed: 775 additions & 378 deletions

‎.editorconfig‎

Lines changed: 370 additions & 1 deletion
Large diffs are not rendered by default.

‎.gitattributes‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
###############################################################################
2+
# Set default behavior to:
3+
# treat as text and
4+
# normalize to Unix-style line endings
5+
###############################################################################
6+
* text eol=lf
7+
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
57+
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
65+
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

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "shared-infrastructure"]
2+
path = shared-infrastructure
3+
url = https://github.com/SixLabors/SharedInfrastructure.git

‎SixLabors.Core.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ VisualStudioVersion = 16.0.28803.352
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
77
ProjectSection(SolutionItems) = preProject
8-
.editorconfig = .editorconfig
98
appveyor.yml = appveyor.yml
109
.github\ISSUE_TEMPLATE\ask-question.md = .github\ISSUE_TEMPLATE\ask-question.md
1110
.github\ISSUE_TEMPLATE\bug-report.md = .github\ISSUE_TEMPLATE\bug-report.md
@@ -16,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
1615
gitversion.yml = gitversion.yml
1716
.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
1817
README.md = README.md
18+
shared-infrastructure\.editorconfig = shared-infrastructure\.editorconfig
1919
EndProjectSection
2020
EndProject
2121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"

‎appveyor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ image: Visual Studio 2017
33

44

55
before_build:
6+
- git submodule -q update --init
67
- cmd: dotnet --version
78

89
build_script:

‎shared-infrastructure‎

Submodule shared-infrastructure added at 9b5a5b7

‎src/SixLabors.Core/Helpers/DebugGuard.cs‎

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

0 commit comments

Comments
 (0)