Update System.Memory

src/ImageSharp/Advanced/AdvancedImageExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -148,6 +149,6 @@ namespace SixLabors.ImageSharp.Advanced
         /// <returns>A reference to the element.</returns>
         private static ref TPixel DangerousGetPinnableReferenceToPixelBuffer<TPixel>(IPixelSource<TPixel> source)
             where TPixel : struct, IPixel<TPixel>
-            => ref source.PixelBuffer.Span.DangerousGetPinnableReference();
+            => ref MemoryMarshal.GetReference(source.PixelBuffer.Span);
     }
 }

src/ImageSharp/Common/Extensions/SimdUtils.cs

@@ -76,8 +76,8 @@ namespace SixLabors.ImageSharp
                 return;
             }
 
-            ref Vector<float> srcBase = ref Unsafe.As<float, Vector<float>>(ref source.DangerousGetPinnableReference());
-            ref Octet.OfByte destBase = ref Unsafe.As<byte, Octet.OfByte>(ref dest.DangerousGetPinnableReference());
+            ref Vector<float> srcBase = ref Unsafe.As<float, Vector<float>>(ref MemoryMarshal.GetReference(source));
+            ref Octet.OfByte destBase = ref Unsafe.As<byte, Octet.OfByte>(ref MemoryMarshal.GetReference(dest));
             int n = source.Length / 8;
 
             Vector<float> magick = new Vector<float>(32768.0f);
@@ -117,8 +117,8 @@ namespace SixLabors.ImageSharp
                 return;
             }
 
-            ref Vector<float> srcBase = ref Unsafe.As<float, Vector<float>>(ref source.DangerousGetPinnableReference());
-            ref Octet.OfByte destBase = ref Unsafe.As<byte, Octet.OfByte>(ref dest.DangerousGetPinnableReference());
+            ref Vector<float> srcBase = ref Unsafe.As<float, Vector<float>>(ref MemoryMarshal.GetReference(source));
+            ref Octet.OfByte destBase = ref Unsafe.As<byte, Octet.OfByte>(ref MemoryMarshal.GetReference(dest));
             int n = source.Length / 8;
 
             Vector<float> magick = new Vector<float>(32768.0f);

src/ImageSharp/Formats/Jpeg/Common/Block8x8.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Text;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Common
@@ -34,7 +35,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public Block8x8(Span<short> coefficients)
         {
             ref byte selfRef = ref Unsafe.As<Block8x8, byte>(ref this);
-            ref byte sourceRef = ref coefficients.NonPortableCast<short, byte>().DangerousGetPinnableReference();
+            ref byte sourceRef = ref MemoryMarshal.GetReference(coefficients.NonPortableCast<short, byte>());
             Unsafe.CopyBlock(ref selfRef, ref sourceRef, Size * sizeof(short));
         }
 
@@ -204,7 +205,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public void CopyTo(Span<short> destination)
         {
             ref byte selfRef = ref Unsafe.As<Block8x8, byte>(ref this);
-            ref byte destRef = ref destination.NonPortableCast<short, byte>().DangerousGetPinnableReference();
+            ref byte destRef = ref MemoryMarshal.GetReference(destination.NonPortableCast<short, byte>());
             Unsafe.CopyBlock(ref destRef, ref selfRef, Size * sizeof(short));
         }
 

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs

@@ -163,7 +163,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void LoadFrom(Span<float> source)
         {
-            ref byte s = ref Unsafe.As<float, byte>(ref source.DangerousGetPinnableReference());
+            ref byte s = ref Unsafe.As<float, byte>(ref MemoryMarshal.GetReference(source));
             ref byte d = ref Unsafe.As<Block8x8F, byte>(ref this);
 
             Unsafe.CopyBlock(ref d, ref s, Size * sizeof(float));
@@ -203,7 +203,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void CopyTo(Span<float> dest)
         {
-            ref byte d = ref Unsafe.As<float, byte>(ref dest.DangerousGetPinnableReference());
+            ref byte d = ref Unsafe.As<float, byte>(ref MemoryMarshal.GetReference(dest));
             ref byte s = ref Unsafe.As<Block8x8F, byte>(ref this);
 
             Unsafe.CopyBlock(ref d, ref s, Size * sizeof(float));

src/ImageSharp/Formats/Jpeg/Common/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimd.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Common.Tuples;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
@@ -37,14 +38,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
                 DebugGuard.IsTrue(result.Length % 8 == 0, nameof(result), "result.Length should be divisable by 8!");
 
                 ref Vector4Pair yBase =
-                    ref Unsafe.As<float, Vector4Pair>(ref values.Component0.DangerousGetPinnableReference());
+                    ref Unsafe.As<float, Vector4Pair>(ref MemoryMarshal.GetReference(values.Component0));
                 ref Vector4Pair cbBase =
-                    ref Unsafe.As<float, Vector4Pair>(ref values.Component1.DangerousGetPinnableReference());
+                    ref Unsafe.As<float, Vector4Pair>(ref MemoryMarshal.GetReference(values.Component1));
                 ref Vector4Pair crBase =
-                    ref Unsafe.As<float, Vector4Pair>(ref values.Component2.DangerousGetPinnableReference());
+                    ref Unsafe.As<float, Vector4Pair>(ref MemoryMarshal.GetReference(values.Component2));
 
                 ref Vector4Octet resultBase =
-                    ref Unsafe.As<Vector4, Vector4Octet>(ref result.DangerousGetPinnableReference());
+                    ref Unsafe.As<Vector4, Vector4Octet>(ref MemoryMarshal.GetReference(result));
 
                 var chromaOffset = new Vector4(-128f);
 

src/ImageSharp/Formats/Jpeg/Common/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimdAvx2.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Common.Tuples;
 
 // ReSharper disable ImpureMethodCallOnReadonlyValueField
@@ -46,14 +47,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
                 }
 
                 ref Vector<float> yBase =
-                    ref Unsafe.As<float, Vector<float>>(ref values.Component0.DangerousGetPinnableReference());
+                    ref Unsafe.As<float, Vector<float>>(ref MemoryMarshal.GetReference(values.Component0));
                 ref Vector<float> cbBase =
-                    ref Unsafe.As<float, Vector<float>>(ref values.Component1.DangerousGetPinnableReference());
+                    ref Unsafe.As<float, Vector<float>>(ref MemoryMarshal.GetReference(values.Component1));
                 ref Vector<float> crBase =
-                    ref Unsafe.As<float, Vector<float>>(ref values.Component2.DangerousGetPinnableReference());
+                    ref Unsafe.As<float, Vector<float>>(ref MemoryMarshal.GetReference(values.Component2));
 
                 ref Vector4Octet resultBase =
-                    ref Unsafe.As<Vector4, Vector4Octet>(ref result.DangerousGetPinnableReference());
+                    ref Unsafe.As<Vector4, Vector4Octet>(ref MemoryMarshal.GetReference(result));
 
                 var chromaOffset = new Vector<float>(-128f);
 

src/ImageSharp/Formats/Jpeg/Common/Decoder/ColorConverters/JpegColorConverter.cs

@@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
         /// <summary>
         /// A stack-only struct to reference the input buffers using <see cref="ReadOnlySpan{T}"/>-s.
         /// </summary>
-        public struct ComponentValues
+        public ref struct ComponentValues
         {
             /// <summary>
             /// The component count

src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs

@@ -85,7 +85,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 
             ref byte blockStart = ref Unsafe.As<GenericBlock8x8<T>, byte>(ref this);
             ref byte imageStart = ref Unsafe.As<T, byte>(
-                                      ref Unsafe.Add(ref source.GetRowSpan(sourceY).DangerousGetPinnableReference(), sourceX));
+                                      ref Unsafe.Add(ref MemoryMarshal.GetReference(source.GetRowSpan(sourceY)), sourceX));
 
             int blockRowSizeInBytes = 8 * Unsafe.SizeOf<T>();
             int imageRowSizeInBytes = source.Width * Unsafe.SizeOf<T>();

src/ImageSharp/Formats/Png/Filters/AverageFilter.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
@@ -24,8 +25,8 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
         {
             DebugGuard.MustBeSameSized(scanline, previousScanline, nameof(scanline));
 
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
-            ref byte prevBaseRef = ref previousScanline.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
+            ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
 
             // Average(x) + floor((Raw(x-bpp)+Prior(x))/2)
             for (int x = 1; x < scanline.Length; x++)
@@ -60,9 +61,9 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
             DebugGuard.MustBeSameSized(scanline, previousScanline, nameof(scanline));
             DebugGuard.MustBeSizedAtLeast(result, scanline, nameof(result));
 
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
-            ref byte prevBaseRef = ref previousScanline.DangerousGetPinnableReference();
-            ref byte resultBaseRef = ref result.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
+            ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
+            ref byte resultBaseRef = ref MemoryMarshal.GetReference(result);
             sum = 0;
 
             // Average(x) = Raw(x) - floor((Raw(x-bpp)+Prior(x))/2)

src/ImageSharp/Formats/Png/Filters/PaethFilter.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
@@ -25,8 +26,8 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
         {
             DebugGuard.MustBeSameSized(scanline, previousScanline, nameof(scanline));
 
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
-            ref byte prevBaseRef = ref previousScanline.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
+            ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
 
             // Paeth(x) + PaethPredictor(Raw(x-bpp), Prior(x), Prior(x-bpp))
             int offset = bytesPerPixel + 1;
@@ -61,9 +62,9 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
             DebugGuard.MustBeSameSized(scanline, previousScanline, nameof(scanline));
             DebugGuard.MustBeSizedAtLeast(result, scanline, nameof(result));
 
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
-            ref byte prevBaseRef = ref previousScanline.DangerousGetPinnableReference();
-            ref byte resultBaseRef = ref result.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
+            ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
+            ref byte resultBaseRef = ref MemoryMarshal.GetReference(result);
             sum = 0;
 
             // Paeth(x) = Raw(x) - PaethPredictor(Raw(x-bpp), Prior(x), Prior(x - bpp))

src/ImageSharp/Formats/Png/Filters/SubFilter.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
@@ -21,7 +22,7 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void Decode(Span<byte> scanline, int bytesPerPixel)
         {
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
 
             // Sub(x) + Raw(x-bpp)
             for (int x = 1; x < scanline.Length; x++)
@@ -52,8 +53,8 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
         {
             DebugGuard.MustBeSizedAtLeast(result, scanline, nameof(result));
 
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
-            ref byte resultBaseRef = ref result.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
+            ref byte resultBaseRef = ref MemoryMarshal.GetReference(result);
             sum = 0;
 
             // Sub(x) = Raw(x) - Raw(x-bpp)

src/ImageSharp/Formats/Png/Filters/UpFilter.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
@@ -23,8 +24,8 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
         {
             DebugGuard.MustBeSameSized(scanline, previousScanline, nameof(scanline));
 
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
-            ref byte prevBaseRef = ref previousScanline.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
+            ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
 
             // Up(x) + Prior(x)
             for (int x = 1; x < scanline.Length; x++)
@@ -48,9 +49,9 @@ namespace SixLabors.ImageSharp.Formats.Png.Filters
             DebugGuard.MustBeSameSized(scanline, previousScanline, nameof(scanline));
             DebugGuard.MustBeSizedAtLeast(result, scanline, nameof(result));
 
-            ref byte scanBaseRef = ref scanline.DangerousGetPinnableReference();
-            ref byte prevBaseRef = ref previousScanline.DangerousGetPinnableReference();
-            ref byte resultBaseRef = ref result.DangerousGetPinnableReference();
+            ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
+            ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);
+            ref byte resultBaseRef = ref MemoryMarshal.GetReference(result);
             sum = 0;
 
             // Up(x) = Raw(x) - Prior(x)

src/ImageSharp/Formats/Png/PngDecoderCore.cs

@@ -701,7 +701,7 @@ namespace SixLabors.ImageSharp.Formats.Png
             Span<TPixel> rowSpan = pixels.GetPixelRowSpan(this.currentRow);
 
             // Trim the first marker byte from the buffer
-            var scanlineBuffer = new Span<byte>(defilteredScanline, 1);
+            var scanlineBuffer = new Span<byte>(defilteredScanline, 1, defilteredScanline.Length - 1);
 
             switch (this.pngColorType)
             {
@@ -932,7 +932,7 @@ namespace SixLabors.ImageSharp.Formats.Png
             var color = default(TPixel);
 
             // Trim the first marker byte from the buffer
-            var scanlineBuffer = new Span<byte>(defilteredScanline, 1);
+            var scanlineBuffer = new Span<byte>(defilteredScanline, 1, defilteredScanline.Length - 1);
 
             switch (this.pngColorType)
             {

src/ImageSharp/ImageSharp.csproj

@@ -29,6 +29,7 @@
     <DebugType Condition="$(codecov) == ''">portable</DebugType>
     <DebugSymbols>True</DebugSymbols>
     <Features>IOperation</Features>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
@@ -40,12 +41,11 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Buffers" Version="4.4.0" />
-    <PackageReference Include="System.Memory" Version="4.4.0-preview2-25405-01" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" />
+    <PackageReference Include="System.Memory" Version="4.5.0-preview1-26216-02" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-preview1-26216-02" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.4.0" />
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>

src/ImageSharp/Memory/BufferExtensions.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
@@ -53,7 +54,7 @@ namespace SixLabors.ImageSharp.Memory
 
         public static ref T DangerousGetPinnableReference<T>(this IBuffer<T> buffer)
             where T : struct =>
-            ref buffer.Span.DangerousGetPinnableReference();
+            ref MemoryMarshal.GetReference(buffer.Span);
 
         public static void Read(this Stream stream, IManagedByteBuffer buffer)
         {

src/ImageSharp/Memory/SpanHelper.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.Memory
 {
@@ -22,7 +23,7 @@ namespace SixLabors.ImageSharp.Memory
         public static ref Vector<T> FetchVector<T>(this Span<T> span)
             where T : struct
         {
-            return ref Unsafe.As<T, Vector<T>>(ref span.DangerousGetPinnableReference());
+            return ref Unsafe.As<T, Vector<T>>(ref MemoryMarshal.GetReference(span));
         }
 
         /// <summary>
@@ -39,8 +40,8 @@ namespace SixLabors.ImageSharp.Memory
             DebugGuard.MustBeLessThanOrEqualTo(count, source.Length, nameof(count));
             DebugGuard.MustBeLessThanOrEqualTo(count, destination.Length, nameof(count));
 
-            ref byte srcRef = ref Unsafe.As<T, byte>(ref source.DangerousGetPinnableReference());
-            ref byte destRef = ref Unsafe.As<T, byte>(ref destination.DangerousGetPinnableReference());
+            ref byte srcRef = ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(source));
+            ref byte destRef = ref Unsafe.As<T, byte>(ref MemoryMarshal.GetReference(destination));
 
             int byteCount = Unsafe.SizeOf<T>() * count;
 

src/ImageSharp/PixelFormats/Generated/PixelOperations{TPixel}.Generated.cs

@@ -6,6 +6,7 @@ namespace SixLabors.ImageSharp.PixelFormats
 {
     using System;
     using System.Runtime.CompilerServices;
+    using System.Runtime.InteropServices;
 	    
     public partial class PixelOperations<TPixel>
     {
@@ -20,8 +21,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
 			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
             
-            ref Rgba32 sourceRef = ref source.DangerousGetPinnableReference();
-            ref TPixel destRef = ref destPixels.DangerousGetPinnableReference();
+            ref Rgba32 sourceRef = ref MemoryMarshal.GetReference(source);
+            ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
             Rgba32 rgba = new Rgba32(0, 0, 0, 255);
 
@@ -57,8 +58,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
             GuardSpans(sourcePixels, nameof(sourcePixels), dest, nameof(dest), count);
 
-            ref TPixel sourceBaseRef = ref sourcePixels.DangerousGetPinnableReference();
-            ref Rgba32 destBaseRef = ref dest.DangerousGetPinnableReference();
+            ref TPixel sourceBaseRef = ref MemoryMarshal.GetReference(sourcePixels);
+            ref Rgba32 destBaseRef = ref MemoryMarshal.GetReference(dest);
 
             for (int i = 0; i < count; i++)
             {
@@ -91,8 +92,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
 			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
             
-            ref Bgra32 sourceRef = ref source.DangerousGetPinnableReference();
-            ref TPixel destRef = ref destPixels.DangerousGetPinnableReference();
+            ref Bgra32 sourceRef = ref MemoryMarshal.GetReference(source);
+            ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
             Rgba32 rgba = new Rgba32(0, 0, 0, 255);
 
@@ -128,8 +129,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
             GuardSpans(sourcePixels, nameof(sourcePixels), dest, nameof(dest), count);
 
-            ref TPixel sourceBaseRef = ref sourcePixels.DangerousGetPinnableReference();
-            ref Bgra32 destBaseRef = ref dest.DangerousGetPinnableReference();
+            ref TPixel sourceBaseRef = ref MemoryMarshal.GetReference(sourcePixels);
+            ref Bgra32 destBaseRef = ref MemoryMarshal.GetReference(dest);
 
             for (int i = 0; i < count; i++)
             {
@@ -162,8 +163,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
 			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
             
-            ref Rgb24 sourceRef = ref source.DangerousGetPinnableReference();
-            ref TPixel destRef = ref destPixels.DangerousGetPinnableReference();
+            ref Rgb24 sourceRef = ref MemoryMarshal.GetReference(source);
+            ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
             Rgba32 rgba = new Rgba32(0, 0, 0, 255);
 
@@ -199,8 +200,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
             GuardSpans(sourcePixels, nameof(sourcePixels), dest, nameof(dest), count);
 
-            ref TPixel sourceBaseRef = ref sourcePixels.DangerousGetPinnableReference();
-            ref Rgb24 destBaseRef = ref dest.DangerousGetPinnableReference();
+            ref TPixel sourceBaseRef = ref MemoryMarshal.GetReference(sourcePixels);
+            ref Rgb24 destBaseRef = ref MemoryMarshal.GetReference(dest);
 
             for (int i = 0; i < count; i++)
             {
@@ -233,8 +234,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
 			GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
             
-            ref Bgr24 sourceRef = ref source.DangerousGetPinnableReference();
-            ref TPixel destRef = ref destPixels.DangerousGetPinnableReference();
+            ref Bgr24 sourceRef = ref MemoryMarshal.GetReference(source);
+            ref TPixel destRef = ref MemoryMarshal.GetReference(destPixels);
 
             Rgba32 rgba = new Rgba32(0, 0, 0, 255);
 
@@ -270,8 +271,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
             GuardSpans(sourcePixels, nameof(sourcePixels), dest, nameof(dest), count);
 
-            ref TPixel sourceBaseRef = ref sourcePixels.DangerousGetPinnableReference();
-            ref Bgr24 destBaseRef = ref dest.DangerousGetPinnableReference();
+            ref TPixel sourceBaseRef = ref MemoryMarshal.GetReference(sourcePixels);
+            ref Bgr24 destBaseRef = ref MemoryMarshal.GetReference(dest);
 
             for (int i = 0; i < count; i++)
             {

src/ImageSharp/PixelFormats/Generated/Rgba32.PixelOperations.Generated.cs

@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp
 {
     using System;
     using System.Runtime.CompilerServices;
-
+    using System.Runtime.InteropServices;
     using SixLabors.ImageSharp.PixelFormats;
 	    
     /// <content>
@@ -22,8 +22,8 @@ namespace SixLabors.ImageSharp
             {
                 GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
 
-                ref Rgb24 sourceRef = ref source.DangerousGetPinnableReference();
-                ref Rgba32 destRef = ref destPixels.DangerousGetPinnableReference();
+                ref Rgb24 sourceRef = ref MemoryMarshal.GetReference(source);
+                ref Rgba32 destRef = ref MemoryMarshal.GetReference(destPixels);
 
                 for (int i = 0; i < count; i++)
                 {
@@ -38,8 +38,8 @@ namespace SixLabors.ImageSharp
             {
                 GuardSpans(sourcePixels, nameof(sourcePixels), dest, nameof(dest), count);
 
-                ref Rgba32 sourceRef = ref sourcePixels.DangerousGetPinnableReference();
-                ref Rgb24 destRef = ref dest.DangerousGetPinnableReference();
+                ref Rgba32 sourceRef = ref MemoryMarshal.GetReference(sourcePixels);
+                ref Rgb24 destRef = ref MemoryMarshal.GetReference(dest);
 
                 for (int i = 0; i < count; i++)
                 {
@@ -54,8 +54,8 @@ namespace SixLabors.ImageSharp
             {
                 GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
 
-                ref Bgr24 sourceRef = ref source.DangerousGetPinnableReference();
-                ref Rgba32 destRef = ref destPixels.DangerousGetPinnableReference();
+                ref Bgr24 sourceRef = ref MemoryMarshal.GetReference(source);
+                ref Rgba32 destRef = ref MemoryMarshal.GetReference(destPixels);
 
                 for (int i = 0; i < count; i++)
                 {
@@ -70,8 +70,8 @@ namespace SixLabors.ImageSharp
             {
                 GuardSpans(sourcePixels, nameof(sourcePixels), dest, nameof(dest), count);
 
-                ref Rgba32 sourceRef = ref sourcePixels.DangerousGetPinnableReference();
-                ref Bgr24 destRef = ref dest.DangerousGetPinnableReference();
+                ref Rgba32 sourceRef = ref MemoryMarshal.GetReference(sourcePixels);
+                ref Bgr24 destRef = ref MemoryMarshal.GetReference(dest);
 
                 for (int i = 0; i < count; i++)
                 {
@@ -86,8 +86,8 @@ namespace SixLabors.ImageSharp
             {
                 GuardSpans(source, nameof(source), destPixels, nameof(destPixels), count);
 
-                ref Bgra32 sourceRef = ref source.DangerousGetPinnableReference();
-                ref Rgba32 destRef = ref destPixels.DangerousGetPinnableReference();
+                ref Bgra32 sourceRef = ref MemoryMarshal.GetReference(source);
+                ref Rgba32 destRef = ref MemoryMarshal.GetReference(destPixels);
 
                 for (int i = 0; i < count; i++)
                 {
@@ -102,8 +102,8 @@ namespace SixLabors.ImageSharp
             {
                 GuardSpans(sourcePixels, nameof(sourcePixels), dest, nameof(dest), count);
 
-                ref Rgba32 sourceRef = ref sourcePixels.DangerousGetPinnableReference();
-                ref Bgra32 destRef = ref dest.DangerousGetPinnableReference();
+                ref Rgba32 sourceRef = ref MemoryMarshal.GetReference(sourcePixels);
+                ref Bgra32 destRef = ref MemoryMarshal.GetReference(dest);
 
                 for (int i = 0; i < count; i++)
                 {

src/ImageSharp/PixelFormats/PixelOperations{TPixel}.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.PixelFormats
 {
@@ -30,8 +31,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
             GuardSpans(sourceVectors, nameof(sourceVectors), destColors, nameof(destColors), count);
 
-            ref Vector4 sourceRef = ref sourceVectors.DangerousGetPinnableReference();
-            ref TPixel destRef = ref destColors.DangerousGetPinnableReference();
+            ref Vector4 sourceRef = ref MemoryMarshal.GetReference(sourceVectors);
+            ref TPixel destRef = ref MemoryMarshal.GetReference(destColors);
 
             for (int i = 0; i < count; i++)
             {
@@ -51,8 +52,8 @@ namespace SixLabors.ImageSharp.PixelFormats
         {
             GuardSpans(sourceColors, nameof(sourceColors), destVectors, nameof(destVectors), count);
 
-            ref TPixel sourceRef = ref sourceColors.DangerousGetPinnableReference();
-            ref Vector4 destRef = ref destVectors.DangerousGetPinnableReference();
+            ref TPixel sourceRef = ref MemoryMarshal.GetReference(sourceColors);
+            ref Vector4 destRef = ref MemoryMarshal.GetReference(destVectors);
 
             for (int i = 0; i < count; i++)
             {

src/ImageSharp/PixelFormats/Rgba32.PixelOperations.cs

@@ -57,8 +57,8 @@ namespace SixLabors.ImageSharp
 
                 int unpackedRawCount = count * 4;
 
-                ref uint sourceBase = ref Unsafe.As<Rgba32, uint>(ref sourceColors.DangerousGetPinnableReference());
-                ref UnpackedRGBA destBaseAsUnpacked = ref Unsafe.As<Vector4, UnpackedRGBA>(ref destVectors.DangerousGetPinnableReference());
+                ref uint sourceBase = ref Unsafe.As<Rgba32, uint>(ref MemoryMarshal.GetReference(sourceColors));
+                ref UnpackedRGBA destBaseAsUnpacked = ref Unsafe.As<Vector4, UnpackedRGBA>(ref MemoryMarshal.GetReference(destVectors));
                 ref Vector<uint> destBaseAsUInt = ref Unsafe.As<UnpackedRGBA, Vector<uint>>(ref destBaseAsUnpacked);
                 ref Vector<float> destBaseAsFloat = ref Unsafe.As<UnpackedRGBA, Vector<float>>(ref destBaseAsUnpacked);
 

src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
-
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Processing.Processors
@@ -79,7 +79,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         {
             ref float horizontalValues = ref this.GetStartReference();
             int left = this.Left;
-            ref Vector4 vecPtr = ref Unsafe.Add(ref rowSpan.DangerousGetPinnableReference(), left + sourceX);
+            ref Vector4 vecPtr = ref Unsafe.Add(ref MemoryMarshal.GetReference(rowSpan), left + sourceX);
 
             // Destination color components
             Vector4 result = Vector4.Zero;
@@ -106,7 +106,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
         {
             ref float horizontalValues = ref this.GetStartReference();
             int left = this.Left;
-            ref Vector4 vecPtr = ref Unsafe.Add(ref rowSpan.DangerousGetPinnableReference(), left + sourceX);
+            ref Vector4 vecPtr = ref Unsafe.Add(ref MemoryMarshal.GetReference(rowSpan), left + sourceX);
 
             // Destination color components
             Vector4 result = Vector4.Zero;

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@@ -19,9 +19,7 @@
     <PackageReference Include="Colourful" Version="1.1.2" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview2-26202-05" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net461'">
-    <PackageReference Include="System.Numerics.Vectors" Version="4.4.0" />
-  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\ImageSharp.Drawing\ImageSharp.Drawing.csproj" />
     <ProjectReference Include="..\..\src\ImageSharp\ImageSharp.csproj" />

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@@ -16,7 +16,8 @@
     <None Include="PixelFormats\PixelOperationsTests.Blender.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview2-26202-05" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview1-26216-02" />
+    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-26216-02" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Moq" Version="4.7.145" />

tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs

@@ -133,7 +133,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         public void ReleaseRetainedResources_ReplacesInnerArrayPool(bool keepBufferAlive)
         {
             IBuffer<int> buffer = this.MemoryManager.Allocate<int>(32);
-            ref int ptrToPrev0 = ref buffer.Span.DangerousGetPinnableReference();
+            ref int ptrToPrev0 = ref MemoryMarshal.GetReference(buffer.Span);
 
             if (!keepBufferAlive)
             {

tests/ImageSharp.Tests/Memory/Buffer2DTests.cs

@@ -5,7 +5,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 {
     using System;
     using System.Runtime.CompilerServices;
-
+    using System.Runtime.InteropServices;
     using SixLabors.ImageSharp.Memory;
     using SixLabors.ImageSharp.Tests.Common;
     using SixLabors.Primitives;
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             public static void SpanPointsTo<T>(Span<T> span, IBuffer<T> buffer, int bufferOffset = 0)
                 where T : struct
             {
-                ref T actual = ref span.DangerousGetPinnableReference();
+                ref T actual = ref MemoryMarshal.GetReference(span);
                 ref T expected = ref Unsafe.Add(ref buffer.DangerousGetPinnableReference(), bufferOffset);
 
                 Assert.True(Unsafe.AreSame(ref expected, ref actual), "span does not point to the expected position");

tests/ImageSharp.Tests/Memory/BufferTestSuite.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Memory;
 using Xunit;
 // ReSharper disable InconsistentNaming
@@ -165,9 +166,9 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, false, testManagedByteBuffer))
             {
-                ref T a = ref buffer.Span.DangerousGetPinnableReference();
-                ref T b = ref buffer.Span.DangerousGetPinnableReference();
-                ref T c = ref buffer.Span.DangerousGetPinnableReference();
+                ref T a = ref MemoryMarshal.GetReference(buffer.Span);
+                ref T b = ref MemoryMarshal.GetReference(buffer.Span);
+                ref T c = ref MemoryMarshal.GetReference(buffer.Span);
 
                 Assert.True(Unsafe.AreSame(ref a, ref b));
                 Assert.True(Unsafe.AreSame(ref b, ref c));

tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs

@@ -78,8 +78,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.Foo[] source = TestStructs.Foo.CreateArray(count + 2);
                 TestStructs.Foo[] dest = new TestStructs.Foo[count + 5];
 
-                var apSource = new Span<TestStructs.Foo>(source, 1);
-                var apDest = new Span<TestStructs.Foo>(dest, 1);
+                var apSource = new Span<TestStructs.Foo>(source, 1, source.Length - 1);
+                var apDest = new Span<TestStructs.Foo>(dest, 1, dest.Length - 1);
 
                 SpanHelper.Copy(apSource, apDest, count - 1);
 
@@ -101,8 +101,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.AlignedFoo[] source = TestStructs.AlignedFoo.CreateArray(count + 2);
                 TestStructs.AlignedFoo[] dest = new TestStructs.AlignedFoo[count + 5];
 
-                var apSource = new Span<TestStructs.AlignedFoo>(source, 1);
-                var apDest = new Span<TestStructs.AlignedFoo>(dest, 1);
+                var apSource = new Span<TestStructs.AlignedFoo>(source, 1, source.Length - 1);
+                var apDest = new Span<TestStructs.AlignedFoo>(dest, 1, dest.Length - 1);
 
                 SpanHelper.Copy(apSource, apDest, count - 1);
 
@@ -124,8 +124,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 int[] source = CreateTestInts(count + 2);
                 int[] dest = new int[count + 5];
 
-                var apSource = new Span<int>(source, 1);
-                var apDest = new Span<int>(dest, 1);
+                var apSource = new Span<int>(source, 1, source.Length - 1);
+                var apDest = new Span<int>(dest, 1, dest.Length - 1);
 
                 SpanHelper.Copy(apSource, apDest, count - 1);
 
@@ -148,8 +148,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.Foo[] source = TestStructs.Foo.CreateArray(count + 2);
                 byte[] dest = new byte[destCount + sizeof(TestStructs.Foo) * 2];
 
-                var apSource = new Span<TestStructs.Foo>(source, 1);
-                var apDest = new Span<byte>(dest, sizeof(TestStructs.Foo));
+                var apSource = new Span<TestStructs.Foo>(source, 1, source.Length - 1);
+                var apDest = new Span<byte>(dest, sizeof(TestStructs.Foo), dest.Length - sizeof(TestStructs.Foo));
 
                 SpanHelper.Copy(apSource.AsBytes(), apDest, (count - 1) * sizeof(TestStructs.Foo));
 
@@ -171,8 +171,8 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 TestStructs.AlignedFoo[] source = TestStructs.AlignedFoo.CreateArray(count + 2);
                 byte[] dest = new byte[destCount + sizeof(TestStructs.AlignedFoo) * 2];
 
-                var apSource = new Span<TestStructs.AlignedFoo>(source, 1);
-                var apDest = new Span<byte>(dest, sizeof(TestStructs.AlignedFoo));
+                var apSource = new Span<TestStructs.AlignedFoo>(source, 1, source.Length - 1);
+                var apDest = new Span<byte>(dest, sizeof(TestStructs.AlignedFoo), dest.Length - sizeof(TestStructs.AlignedFoo));
 
                 SpanHelper.Copy(apSource.AsBytes(), apDest, (count - 1) * sizeof(TestStructs.AlignedFoo));