Merge pull request #168 from SixLabors/bp/updateReferences

JimBobSquarePants · web-flow · commit 7ffae70dfb9e · 2021-10-09T00:55:49.000+11:00
Update References to latest stable versions
diff --git a/samples/DrawShapesWithImageSharp/Program.cs b/samples/DrawShapesWithImageSharp/Program.cs
@@ -221,17 +221,15 @@ private static void OutputClippedRectangle()
             paths.SaveImage("Clipping", "RectangleWithTopClipped.png");
         }
 
-        public static void SaveImage(this IPath shape, params string[] path)
-        {
-            new PathCollection(shape).SaveImage(path);
-        }
+        public static void SaveImage(this IPath shape, params string[] path) => new PathCollection(shape).SaveImage(path);
 
         public static void SaveImage(this IPathCollection shape, params string[] path)
         {
             shape = shape.Translate(-shape.Bounds.Location) // touch top left
                     .Translate(new Vector2(10)); // move in from top left
 
             string fullPath = IOPath.GetFullPath(IOPath.Combine("Output", IOPath.Combine(path)));
+
             // pad even amount around shape
             int width = (int)(shape.Bounds.Left + shape.Bounds.Right);
             int height = (int)(shape.Bounds.Top + shape.Bounds.Bottom);
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.15" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
diff --git a/src/ImageSharp.Drawing/Shapes/EllipticalArcLineSegment.cs b/src/ImageSharp.Drawing/Shapes/EllipticalArcLineSegment.cs
@@ -27,14 +27,14 @@ public sealed class EllipticalArcLineSegment : ILineSegment
         /// <summary>
         /// Initializes a new instance of the <see cref="EllipticalArcLineSegment"/> class.
         /// </summary>
-        /// <param name="x"> The x-coordinate of the center point of the ellips from which the arc is taken.</param>
-        /// <param name="y"> The y-coordinate of the center point of the ellips from which the arc is taken.</param>
+        /// <param name="x"> The x-coordinate of the center point of the ellipse from which the arc is taken.</param>
+        /// <param name="y"> The y-coordinate of the center point of the ellipse from which the arc is taken.</param>
         /// <param name="radiusX">X radius of the ellipsis.</param>
         /// <param name="radiusY">Y radius of the ellipsis.</param>
         /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
-        /// <param name="transformation">The Tranformation matrix, that should be used on the arc.</param>
+        /// <param name="transformation">The Transformation matrix, that should be used on the arc.</param>
         public EllipticalArcLineSegment(float x, float y, float radiusX, float radiusY, float rotation, float startAngle, float sweepAngle, Matrix3x2 transformation)
         {
             Guard.MustBeGreaterThanOrEqualTo(radiusX, 0, nameof(radiusX));
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
@@ -18,13 +18,13 @@
 
   <ItemGroup>
     <!-- Test Dependencies -->
-    <PackageReference Update="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.22.0" />
-    <PackageReference Update="Moq" Version="4.14.6" />
+    <PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="8.3.3" />
+    <PackageReference Update="Moq" Version="4.16.1" />
     <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="'$(IsOSX)'=='true'" />
-    <PackageReference Update="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Update="System.Drawing.Common" Version="5.0.2" />
     <PackageReference Update="GeoJSON.Net" Version="1.2.19" />
-    <PackageReference Update="SkiaSharp" Version="2.80.2" />
+    <PackageReference Update="SkiaSharp" Version="2.80.3" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawBeziers.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawBeziers.cs
@@ -12,7 +12,7 @@
 using SixLabors.ImageSharp.Processing;
 using SDPointF = System.Drawing.PointF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     public class DrawBeziers
     {
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawPolygon.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawPolygon.cs
@@ -14,10 +14,9 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SkiaSharp;
-using SDPoint = System.Drawing.Point;
 using SDPointF = System.Drawing.PointF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     public abstract class DrawPolygon
     {
@@ -26,7 +25,7 @@ public abstract class DrawPolygon
         private Image<Rgba32> image;
 
         private SDPointF[][] sdPoints;
-        private System.Drawing.Bitmap sdBitmap;
+        private Bitmap sdBitmap;
         private Graphics sdGraphics;
 
         private SKPath skPath;
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawText.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawText.cs
@@ -13,7 +13,7 @@
 using SDFont = System.Drawing.Font;
 using SDRectangleF = System.Drawing.RectangleF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     [MemoryDiagnoser]
     public class DrawText
@@ -42,7 +42,7 @@ public class DrawText
         public void Setup()
         {
             this.image = new Image<Rgba32>(Width, Height);
-            this.sdBitmap = new Bitmap(Width, Height);
+            this.sdBitmap = new SDBitmap(Width, Height);
             this.sdGraphics = Graphics.FromImage(this.sdBitmap);
             this.sdGraphics.InterpolationMode = InterpolationMode.Default;
             this.sdGraphics.SmoothingMode = SmoothingMode.AntiAlias;
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawTextOutline.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawTextOutline.cs
@@ -11,7 +11,7 @@
 
 using SDRectangleF = System.Drawing.RectangleF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     [MemoryDiagnoser]
     public class DrawTextOutline
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPathGradientBrush.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPathGradientBrush.cs
@@ -1,12 +1,12 @@
-﻿// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     public class FillPathGradientBrush
     {
@@ -23,8 +23,11 @@ public void FillGradientBrush_ImageSharp()
         {
             var star = new Star(50, 50, 5, 20, 45);
             PointF[] points = star.Points.ToArray();
-            Color[] colors = { Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple,
-                Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple };
+            Color[] colors =
+            {
+                Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple,
+                Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple
+            };
 
             var brush = new PathGradientBrush(points, colors, Color.White);
 
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPolygon.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPolygon.cs
@@ -18,7 +18,7 @@
 using SDBitmap = System.Drawing.Bitmap;
 using SDPointF = System.Drawing.PointF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     public abstract class FillPolygon
     {
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillRectangle.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillRectangle.cs
@@ -12,7 +12,7 @@
 using SDRectangle = System.Drawing.Rectangle;
 using SDSize = System.Drawing.Size;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     public class FillRectangle
     {
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillWithPattern.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillWithPattern.cs
@@ -11,7 +11,7 @@
 using CoreBrushes = SixLabors.ImageSharp.Drawing.Processing.Brushes;
 using SDRectangle = System.Drawing.Rectangle;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
 {
     public class FillWithPattern
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/BezierLineSegmentTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/BezierLineSegmentTests.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class BezierLineSegmentTests
     {
@@ -21,7 +21,7 @@ public void SingleSegmentConstructor()
         }
 
         [Fact]
-        public void MustHaveAtleast4Points()
+        public void MustHaveAtLeast4Points()
         {
             ArgumentOutOfRangeException error = Assert.Throws<ArgumentOutOfRangeException>(() => new CubicBezierLineSegment(new[] { new PointF(0, 0) }));
         }
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/EllipseTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/EllipseTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class EllipseTests
     {
@@ -13,7 +13,7 @@ public class EllipseTests
         [InlineData(0, true)]
         [InlineData(0.00001, false)]
         [InlineData(1, false)]
-        public void WidthMustBeGreateThan0(float width, bool throws)
+        public void WidthMustBeGreaterThan0(float width, bool throws)
         {
             if (throws)
             {
@@ -33,7 +33,7 @@ public void WidthMustBeGreateThan0(float width, bool throws)
         [InlineData(0, true)]
         [InlineData(0.00001, false)]
         [InlineData(1, false)]
-        public void HeightMustBeGreateThan0(float height, bool throws)
+        public void HeightMustBeGreaterThan0(float height, bool throws)
         {
             if (throws)
             {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/EllipticalArcLineSegmentTest.cs b/tests/ImageSharp.Drawing.Tests/Shapes/EllipticalArcLineSegmentTest.cs
@@ -5,12 +5,12 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class EllipticalArcLineSegmentTest
     {
         [Fact]
-        public void ContainsStartandEnd()
+        public void ContainsStartAndEnd()
         {
             var segment = new EllipticalArcLineSegment(10, 10, 10, 20, 0, 0, 90, Matrix3x2.Identity);
             IReadOnlyList<PointF> points = segment.Flatten().ToArray();
@@ -21,7 +21,7 @@ public void ContainsStartandEnd()
         }
 
         [Fact]
-        public void checkZeroRadii()
+        public void CheckZeroRadii()
         {
             IReadOnlyCollection<PointF> xRadiusZero = new EllipticalArcLineSegment(20, 10, 0, 20, 0, 0, 360, Matrix3x2.Identity).Flatten().ToArray();
             IReadOnlyCollection<PointF> yRadiusZero = new EllipticalArcLineSegment(20, 10, 30, 0, 0, 0, 360, Matrix3x2.Identity).Flatten().ToArray();
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/InternalPathTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/InternalPathTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     /// <summary>
     /// The internal path tests.
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/LinearLineSegmentTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/LinearLineSegmentTests.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class LinearLineSegmentTests
     {
@@ -21,15 +21,12 @@ public void SingleSegmentConstructor()
         }
 
         [Fact]
-        public void MustHaveAtleast2Points()
+        public void MustHaveAtLeast2Points()
         {
             ArgumentOutOfRangeException error = Assert.Throws<ArgumentOutOfRangeException>(() => new LinearLineSegment(new[] { new PointF(0, 0) }));
         }
 
         [Fact]
-        public void NullPointsArrayThrowsCountException()
-        {
-            Assert.ThrowsAny<ArgumentNullException>(() => new LinearLineSegment(null));
-        }
+        public void NullPointsArrayThrowsCountException() => Assert.ThrowsAny<ArgumentNullException>(() => new LinearLineSegment(null));
     }
 }
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PathBuilderTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PathBuilderTests.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class PathBuilderTests
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PathExtentionTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PathExtentionTests.cs
@@ -6,7 +6,7 @@
 using Moq;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class PathExtentionTests
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PathTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PathTests.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     /// <summary>
     /// The internal path tests.
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PolygonTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PolygonTests.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class PolygonTests
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/RectangleTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/RectangleTests.cs
@@ -7,7 +7,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class RectangleTests
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/RegularPolygonTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/RegularPolygonTests.cs
@@ -17,7 +17,7 @@ public class RegularPolygonTests
         [InlineData(2, true)]
         [InlineData(3, false)]
         [InlineData(4, false)]
-        public void RequiresAtleast3Verticies(int points, bool throws)
+        public void RequiresAtLeast3Verticies(int points, bool throws)
         {
             if (throws)
             {
@@ -37,7 +37,7 @@ public void RequiresAtleast3Verticies(int points, bool throws)
         [InlineData(0, true)]
         [InlineData(0.00001, false)]
         [InlineData(1, false)]
-        public void RadiusMustBeGreateThan0(float radius, bool throws)
+        public void RadiusMustBeGreaterThan0(float radius, bool throws)
         {
             if (throws)
             {
@@ -62,10 +62,10 @@ public void GeneratesCorrectPath()
 
             IReadOnlyList<PointF> points = poly.Flatten().ToArray()[0].Points.ToArray();
 
-            // calcualte baselineDistance
+            // calculates baselineDistance
             float baseline = Vector2.Distance(points[0], points[1]);
 
-            // all points are extact the same distance away from the center
+            // all points are exact the same distance away from the center
             for (int i = 0; i < points.Count; i++)
             {
                 int j = i - 1;
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/StarTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/StarTests.cs
@@ -7,7 +7,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
 {
     public class StarTests
     {
@@ -17,7 +17,7 @@ public class StarTests
         [InlineData(2, true)]
         [InlineData(3, false)]
         [InlineData(4, false)]
-        public void RequiresAtleast3Verticies(int points, bool throws)
+        public void RequiresAtLeast3Verticies(int points, bool throws)
         {
             if (throws)
             {
@@ -37,7 +37,7 @@ public void RequiresAtleast3Verticies(int points, bool throws)
         [InlineData(0, true)]
         [InlineData(0.00001, false)]
         [InlineData(1, false)]
-        public void RadiusMustBeGreateThan0(float radius, bool throws)
+        public void RadiusMustBeGreaterThan0(float radius, bool throws)
         {
             if (throws)
             {
@@ -65,10 +65,10 @@ public void GeneratesCorrectPath()
 
             PointF[] points = poly.Flatten().ToArray()[0].Points.ToArray();
 
-            // calcualte baselineDistance
+            // calculates baselineDistance
             float baseline = Vector2.Distance(points[0], points[1]);
 
-            // all points are extact the same distance away from the center
+            // all points are exact the same distance away from the center
             Assert.Equal(pointsCount * 2, points.Length);
             for (int i = 0; i < points.Length; i++)
             {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/TestShapes.cs b/tests/ImageSharp.Drawing.Tests/Shapes/TestShapes.cs
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`using SixLabors.ImageSharp.Processing;`
`13`	`13`	`using SDPointF = System.Drawing.PointF;`
`14`	`14`
`15`		`-namespace SixLabors.ImageSharp.Drawing.Benchmarks`
	`15`	`+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing`
`16`	`16`	`{`
`17`	`17`	`public class DrawBeziers`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`using SDRectangleF = System.Drawing.RectangleF;`
`13`	`13`
`14`		`-namespace SixLabors.ImageSharp.Drawing.Benchmarks`
	`14`	`+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing`
`15`	`15`	`{`
`16`	`16`	`[MemoryDiagnoser]`
`17`	`17`	`public class DrawTextOutline`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`using SDBitmap = System.Drawing.Bitmap;`
`19`	`19`	`using SDPointF = System.Drawing.PointF;`
`20`	`20`
`21`		`-namespace SixLabors.ImageSharp.Drawing.Benchmarks`
	`21`	`+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing`
`22`	`22`	`{`
`23`	`23`	`public abstract class FillPolygon`
`24`	`24`	`{`