From 362c5ddbc9a3d90985d7cffb52b5b53d53f45625 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 7 Jul 2020 11:27:22 +0100
Subject: [PATCH] Update all dependency references.

---
 Directory.Build.targets                             |  6 +++---
 tests/Directory.Build.targets                       | 10 +++++-----
 tests/ImageSharp.Tests/Formats/Tga/TgaTestUtils.cs  |  8 +++-----
 .../ReferenceCodecs/MagickReferenceDecoder.cs       | 13 +++++--------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index cc14bbdbf7..ab1193e93f 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -25,12 +25,12 @@
     <!--Src Dependencies-->
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
-    <PackageReference Update="System.Buffers" Version="4.5.0" />
+    <PackageReference Update="System.Buffers" Version="4.5.1" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
     <PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Update="System.Memory" Version="4.5.3" />
-    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7" />
+    <PackageReference Update="System.Memory" Version="4.5.4" />
+    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
     <PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />
 
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index b2d2b1c319..118005382c 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -25,14 +25,14 @@
 
   <ItemGroup>
     <!--Test Dependencies-->
-    <PackageReference Update="BenchmarkDotNet" Version="0.12.0" />
-    <PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.0" Condition="'$(OS)' == 'Windows_NT'" />    
-    <PackageReference Update="Colourful" Version="2.0.3" />
+    <PackageReference Update="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" Condition="'$(OS)' == 'Windows_NT'" />    
+    <PackageReference Update="Colourful" Version="2.0.5" />
     <PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All"/>
-    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.15.5" />
+    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.20.0.1" />
     <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20069.1" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0-preview-20200116-01" />
-    <PackageReference Update="Moq" Version="4.10.0" />
+    <PackageReference Update="Moq" Version="4.14.5" />
     <PackageReference Update="Pfim" Version="0.9.1" />
     <PackageReference Update="SharpZipLib" Version="1.2.0" />
     <PackageReference Update="System.Drawing.Common" Version="4.7.0" />
diff --git a/tests/ImageSharp.Tests/Formats/Tga/TgaTestUtils.cs b/tests/ImageSharp.Tests/Formats/Tga/TgaTestUtils.cs
index af93884fda..58ed31e610 100644
--- a/tests/ImageSharp.Tests/Formats/Tga/TgaTestUtils.cs
+++ b/tests/ImageSharp.Tests/Formats/Tga/TgaTestUtils.cs
@@ -5,8 +5,6 @@ using System;
 using System.IO;
 
 using ImageMagick;
-
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using Xunit;
@@ -20,7 +18,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tga
             Image<TPixel> image,
             bool useExactComparer = true,
             float compareTolerance = 0.01f)
-            where TPixel : unmanaged, IPixel<TPixel>
+            where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>
         {
             string path = TestImageProvider<TPixel>.GetFilePathOrNull(provider);
             if (path == null)
@@ -41,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tga
         }
 
         public static Image<TPixel> DecodeWithMagick<TPixel>(Configuration configuration, FileInfo fileInfo)
-            where TPixel : unmanaged, IPixel<TPixel>
+            where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>
         {
             using (var magickImage = new MagickImage(fileInfo))
             {
@@ -50,7 +48,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tga
 
                 Assert.True(result.TryGetSinglePixelSpan(out Span<TPixel> resultPixels));
 
-                using (IPixelCollection pixels = magickImage.GetPixelsUnsafe())
+                using (IUnsafePixelCollection<ushort> pixels = magickImage.GetPixelsUnsafe())
                 {
                     byte[] data = pixels.ToByteArray(PixelMapping.RGBA);
 
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
index 4d1e754402..61016f2772 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
@@ -3,12 +3,9 @@
 
 using System;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ImageMagick;
-
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
@@ -20,7 +17,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
         public static MagickReferenceDecoder Instance { get; } = new MagickReferenceDecoder();
 
         private static void FromRgba32Bytes<TPixel>(Configuration configuration, Span<byte> rgbaBytes, IMemoryGroup<TPixel> destinationGroup)
-            where TPixel : unmanaged, IPixel<TPixel>
+            where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>
         {
             foreach (Memory<TPixel> m in destinationGroup)
             {
@@ -35,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
         }
 
         private static void FromRgba64Bytes<TPixel>(Configuration configuration, Span<byte> rgbaBytes, IMemoryGroup<TPixel> destinationGroup)
-            where TPixel : unmanaged, IPixel<TPixel>
+            where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>
         {
             foreach (Memory<TPixel> m in destinationGroup)
             {
@@ -50,17 +47,17 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
         }
 
         public Task<Image<TPixel>> DecodeAsync<TPixel>(Configuration configuration, Stream stream)
-            where TPixel : unmanaged, IPixel<TPixel>
+            where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>
             => Task.FromResult(this.Decode<TPixel>(configuration, stream));
 
         public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream)
-            where TPixel : unmanaged, IPixel<TPixel>
+            where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>
         {
             using var magickImage = new MagickImage(stream);
             var result = new Image<TPixel>(configuration, magickImage.Width, magickImage.Height);
             MemoryGroup<TPixel> resultPixels = result.GetRootFramePixelBuffer().FastMemoryGroup;
 
-            using (IPixelCollection pixels = magickImage.GetPixelsUnsafe())
+            using (IUnsafePixelCollection<ushort> pixels = magickImage.GetPixelsUnsafe())
             {
                 if (magickImage.Depth == 8)
                 {