From f1d931a67ca265ecf58ae12b9a444b934e5f2a87 Mon Sep 17 00:00:00 2001
From: Jason Nelson <jason@carbonmade.com>
Date: Fri, 15 Jun 2018 08:07:35 -0700
Subject: [PATCH] Specify the runtime when running tests for netcoreapp2.1
 [take 1]

---
 run-tests.ps1                                  | 5 +++++
 tests/ImageSharp.Tests/ImageSharp.Tests.csproj | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/run-tests.ps1 b/run-tests.ps1
index d774f7a61..3218d9d67 100644
--- a/run-tests.ps1
+++ b/run-tests.ps1
@@ -75,6 +75,11 @@ else {
         $xunitArgs += " --fx-version 2.0.0"
     }
 
+    if ($targetFramework -eq "netcoreapp2.1") {
+        # There were issues matching the correct installed runtime if we do not specify it explicitly:
+        $xunitArgs += " --fx-version 2.1.0"
+    }
+
     if ($is32Bit -eq "True") {
         $xunitArgs += " -x86"
     }
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 7ecf1baca..139df3972 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -9,7 +9,6 @@
     <RootNamespace>SixLabors.ImageSharp.Tests</RootNamespace>
     <AssemblyName>SixLabors.ImageSharp.Tests</AssemblyName>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -29,7 +28,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.console" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />