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 @@
-
+
-
-
+
+
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 @@
-
-
-
+
+
+
-
+
-
+
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 image,
bool useExactComparer = true,
float compareTolerance = 0.01f)
- where TPixel : unmanaged, IPixel
+ where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel
{
string path = TestImageProvider.GetFilePathOrNull(provider);
if (path == null)
@@ -41,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tga
}
public static Image DecodeWithMagick(Configuration configuration, FileInfo fileInfo)
- where TPixel : unmanaged, IPixel
+ where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel
{
using (var magickImage = new MagickImage(fileInfo))
{
@@ -50,7 +48,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tga
Assert.True(result.TryGetSinglePixelSpan(out Span resultPixels));
- using (IPixelCollection pixels = magickImage.GetPixelsUnsafe())
+ using (IUnsafePixelCollection 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(Configuration configuration, Span rgbaBytes, IMemoryGroup destinationGroup)
- where TPixel : unmanaged, IPixel
+ where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel
{
foreach (Memory m in destinationGroup)
{
@@ -35,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
}
private static void FromRgba64Bytes(Configuration configuration, Span rgbaBytes, IMemoryGroup destinationGroup)
- where TPixel : unmanaged, IPixel
+ where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel
{
foreach (Memory m in destinationGroup)
{
@@ -50,17 +47,17 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
}
public Task> DecodeAsync(Configuration configuration, Stream stream)
- where TPixel : unmanaged, IPixel
+ where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel
=> Task.FromResult(this.Decode(configuration, stream));
public Image Decode(Configuration configuration, Stream stream)
- where TPixel : unmanaged, IPixel
+ where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel
{
using var magickImage = new MagickImage(stream);
var result = new Image(configuration, magickImage.Width, magickImage.Height);
MemoryGroup resultPixels = result.GetRootFramePixelBuffer().FastMemoryGroup;
- using (IPixelCollection pixels = magickImage.GetPixelsUnsafe())
+ using (IUnsafePixelCollection pixels = magickImage.GetPixelsUnsafe())
{
if (magickImage.Depth == 8)
{