Skip to content

Commit 9c8aff6

Browse files
brianpopowbrianpopow
authored
Merge branch 'main' into bp/Issue2629
2 parents ce73c49 + 77cf848 commit 9c8aff6

File tree

153 files changed

+2320
-1905
lines changed

Some content is hidden

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

153 files changed

+2320
-1905
lines changed

‎ImageSharp.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{815C0625-CD3
3838
src\Directory.Build.props = src\Directory.Build.props
3939
src\Directory.Build.targets = src\Directory.Build.targets
4040
src\README.md = src\README.md
41+
src\ImageSharp.ruleset = src\ImageSharp.ruleset
4142
EndProjectSection
4243
EndProject
4344
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp", "src\ImageSharp\ImageSharp.csproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}"

‎shared-infrastructure

‎src/ImageSharp.ruleset

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<RuleSet Name="ImageSharp" ToolsVersion="17.0">
33
<Include Path="..\shared-infrastructure\sixlabors.ruleset" Action="Default" />
44
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
5-
<Rule Id="SA1011" Action="None" />
65
</Rules>
76
</RuleSet>

‎src/ImageSharp/Color/Color.Conversions.cs

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

0 commit comments

Comments
 (0)