From dfb3c6ff3668c618bf5326a8cb7ca1f0cfeb679b Mon Sep 17 00:00:00 2001
From: "Brett V. Forsgren" <brettfo@microsoft.com>
Date: Wed, 22 Nov 2017 16:54:52 -0800
Subject: [PATCH] restore coreclr.dll from a NuGet package

---
 tests/fsharp/packages.config   | 2 ++
 tests/fsharp/test-framework.fs | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/fsharp/packages.config b/tests/fsharp/packages.config
index 20a3b06b923..6e87b6cc374 100644
--- a/tests/fsharp/packages.config
+++ b/tests/fsharp/packages.config
@@ -3,6 +3,8 @@
   <package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
   <package id="runtime.win-x64.Microsoft.NETCore.ILDAsm" version="2.0.3" />
   <package id="runtime.win-x86.Microsoft.NETCore.ILDAsm" version="2.0.3" />
+  <package id="runtime.win-x64.Microsoft.NETCore.Runtime.CoreCLR" version="2.0.3" />
+  <package id="runtime.win-x86.Microsoft.NETCore.Runtime.CoreCLR" version="2.0.3" />
   <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/tests/fsharp/test-framework.fs b/tests/fsharp/test-framework.fs
index 915f6ac372f..5753bc1bbcb 100644
--- a/tests/fsharp/test-framework.fs
+++ b/tests/fsharp/test-framework.fs
@@ -178,6 +178,7 @@ let config configurationName envVars =
     let architectureMoniker = if Is64BitOperatingSystem then "x64" else "x86"
     let CSC = requireFile (CORDIR ++ "csc.exe")
     let ILDASM = requireFile (packagesDir ++ ("runtime.win-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm.2.0.3") ++ "runtimes" ++ ("win-" + architectureMoniker) ++ "native" ++ "ildasm.exe")
+    let coreclrdll = requireFile (packagesDir ++ ("runtime.win-" + architectureMoniker + ".Microsoft.NETCore.Runtime.CoreCLR.2.0.3") ++ "runtimes" ++ ("win-" + architectureMoniker) ++ "native" ++ "coreclr.dll")
     let PEVERIFY = requireFile (CORSDK ++ "peverify.exe")
     let FSI_FOR_SCRIPTS =
         match envVars |> Map.tryFind "_fsiexe" with
@@ -191,9 +192,8 @@ let config configurationName envVars =
             | _ -> failwithf "Found more than one 'FSharp.Compiler.Tools' inside '%s', please clean up." packagesDir
     let toolsDir = SCRIPT_ROOT ++ ".." ++ ".." ++ "Tools"
     let dotNetExe = toolsDir ++ "dotnetcli" ++ "dotnet.exe"
-    // ildasm requires coreclr.dll to run which has already been restored to the tools directory
-    let coreclrSource = toolsDir ++ "dotnet20" ++ "shared" ++ "Microsoft.NETCore.App" ++ "2.0.0" ++ "coreclr.dll"
-    File.Copy(coreclrSource, Path.GetDirectoryName(ILDASM) ++ "coreclr.dll", overwrite=true)
+    // ildasm requires coreclr.dll to run which has already been restored to the packages directory
+    File.Copy(coreclrdll, Path.GetDirectoryName(ILDASM) ++ "coreclr.dll", overwrite=true)
 
 #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
     let FSI = requireFile (FSCBinPath ++ "fsi.exe")