Revert to 8e5a59f

Author: JimBobSquarePants

tests/Directory.Build.targets

@@ -30,8 +30,8 @@
     <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="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20474.4" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <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.14.5" />
     <PackageReference Update="Pfim" Version="0.9.1" />
     <PackageReference Update="SharpZipLib" Version="1.2.0" />

tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs

@@ -5,9 +5,10 @@
 // #define BENCHMARKING
 using System;
 using System.Diagnostics;
+
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
-using SixLabors.ImageSharp.Tests.TestUtilities;
+
 using Xunit;
 using Xunit.Abstractions;
 
@@ -162,29 +163,42 @@ public void Load_Store_IntArray()
         }
 
         [Fact]
-        public void TransposeInto()
+        public void TransposeIntoFallback()
         {
-            static void RunTest()
-            {
-                float[] expected = Create8x8FloatData();
-                ReferenceImplementations.Transpose8x8(expected);
+            float[] expected = Create8x8FloatData();
+            ReferenceImplementations.Transpose8x8(expected);
 
-                var source = default(Block8x8F);
-                source.LoadFrom(Create8x8FloatData());
+            var source = default(Block8x8F);
+            source.LoadFrom(Create8x8FloatData());
 
-                var dest = default(Block8x8F);
-                source.TransposeInto(ref dest);
+            var dest = default(Block8x8F);
+            source.TransposeIntoFallback(ref dest);
 
-                float[] actual = new float[64];
-                dest.ScaledCopyTo(actual);
+            float[] actual = new float[64];
+            dest.ScaledCopyTo(actual);
 
-                Assert.Equal(expected, actual);
-            }
+            Assert.Equal(expected, actual);
+        }
 
-            FeatureTestRunner.RunWithHwIntrinsicsFeature(
-                RunTest,
-                HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX);
+#if SUPPORTS_RUNTIME_INTRINSICS
+        [Fact]
+        public void TransposeIntoAvx()
+        {
+            float[] expected = Create8x8FloatData();
+            ReferenceImplementations.Transpose8x8(expected);
+
+            var source = default(Block8x8F);
+            source.LoadFrom(Create8x8FloatData());
+
+            var dest = default(Block8x8F);
+            source.TransposeIntoAvx(ref dest);
+
+            float[] actual = new float[64];
+            dest.ScaledCopyTo(actual);
+
+            Assert.Equal(expected, actual);
         }
+#endif
 
         private class BufferHolder
         {