Merge pull request #2601 from stefannikolei/sn/promote-pixeltype

Promote PixelTypeInfo to Pixel
SixLabors · Jan 8, 2024 · 77cf848 · 77cf848
2 parents efd0c8e + 029381e
commit 77cf848
Show file tree

Hide file tree

Showing 153 changed files with 2,320 additions and 1,905 deletions.
diff --git a/ImageSharp.sln b/ImageSharp.sln
@@ -38,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{815C0625-CD3
 		src\Directory.Build.props = src\Directory.Build.props
 		src\Directory.Build.targets = src\Directory.Build.targets
 		src\README.md = src\README.md
+		src\ImageSharp.ruleset = src\ImageSharp.ruleset
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp", "src\ImageSharp\ImageSharp.csproj", "{2AA31A1F-142C-43F4-8687-09ABCA4B3A26}"

diff --git a/shared-infrastructure b/shared-infrastructure
diff --git a/src/ImageSharp.ruleset b/src/ImageSharp.ruleset
@@ -2,6 +2,5 @@
 <RuleSet Name="ImageSharp" ToolsVersion="17.0">
   <Include Path="..\shared-infrastructure\sixlabors.ruleset" Action="Default" />
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <Rule Id="SA1011" Action="None" />
   </Rules>
 </RuleSet>
diff --git a/src/ImageSharp/Color/Color.Conversions.cs b/src/ImageSharp/Color/Color.Conversions.cs
+1 −1		.github/workflows/build-and-test.yml
+1 −1		msbuild/props/SixLabors.Global.props
+2 −2		msbuild/props/SixLabors.Tests.props