@@ -105,7 +105,6 @@ module Commands =
105105
106106type TestConfig =
107107{ EnvironmentVariables: Map < string , string >
108- CORDIR: string
109108 CSC: string
110109 csc_flags: string
111110 BUILD_CONFIG: string
@@ -131,25 +130,6 @@ module WindowsPlatform =
131130[| " PROCESSOR_ARCHITECTURE" |] |> Seq.tryPick( fun s -> find s) |> function None-> " " | Some x-> x
132131 value= " AMD64"
133132
134- let clrPath envVars =
135-
136- let windir =
137- match envVars|> Map.tryFind" windir" with
138- | Some x-> x
139- | None-> failwithf" environment variable '%s ' required" " WINDIR"
140-
141- let mutable CORDIR =
142- match Directory.EnumerateDirectories( windir++ " Microsoft.NET" ++ " Framework" , " v4.0.?????" ) |> List.ofSeq|> List.revwith
143- | x:: _ -> x
144- | [] -> failwith" couldn't determine CORDIR"
145-
146- // == Use the same runtime as our architecture
147- // == ASSUMPTION: This could be a good or bad thing.
148- if Is64BitOperatingSystem envVarsthen
149- CORDIR<- CORDIR.Replace( " Framework" , " Framework64" )
150-
151- CORDIR
152-
153133type FSLibPaths =
154134{ FSCOREDLLPATH: string }
155135
@@ -164,10 +144,9 @@ let config configurationName envVars =
164144let csc_flags = " /nologo"
165145let fsc_flags = " -r:System.Core.dll --nowarn:20 --define:COMPILED"
166146let fsi_flags = " -r:System.Core.dll --nowarn:20 --define:INTERACTIVE --maxerrors:1 --abortonerror"
167- let CORDIR = WindowsPlatform.clrPath envVars
168147let Is64BitOperatingSystem = WindowsPlatform.Is64BitOperatingSystem envVars
169148let architectureMoniker = if Is64BitOperatingSystemthen " x64" else " x86"
170- let CSC = requireFile( CORDIR ++ " csc.exe" )
149+ let CSC = requireFile( packagesDir ++ " Microsoft.Net.Compilers.2.4.0 " ++ " tools " ++ " csc.exe" )
171150let ILDASM = requireFile( packagesDir++ ( " runtime.win-" + architectureMoniker+ " .Microsoft.NETCore.ILDAsm.2.0.3" ) ++ " runtimes" ++ ( " win-" + architectureMoniker) ++ " native" ++ " ildasm.exe" )
172151let coreclrdll = requireFile( packagesDir++ ( " runtime.win-" + architectureMoniker+ " .Microsoft.NETCore.Runtime.CoreCLR.2.0.3" ) ++ " runtimes" ++ ( " win-" + architectureMoniker) ++ " native" ++ " coreclr.dll" )
173152let PEVERIFY = requireFile( SCRIPT_ ROOT++ " .." ++ " fsharpqa" ++ " testenv" ++ " src" ++ " PEVerify" ++ " bin" ++ configurationName++ " net46" ++ " PEVerify.exe" )
@@ -204,7 +183,6 @@ let config configurationName envVars =
204183| false -> " win7-x86"
205184
206185{ EnvironmentVariables= envVars
207- CORDIR= CORDIR|> Commands.pathAddBackslash
208186 FSCBinPath= FSCBinPath|> Commands.pathAddBackslash
209187 FSCOREDLLPATH= FSCOREDLLPATH
210188 ILDASM= ILDASM
@@ -225,7 +203,6 @@ let logConfig (cfg: TestConfig) =
225203 log" ---------------------------------------------------------------"
226204 log" Executables"
227205 log" "
228- log" CORDIR =%s " cfg.CORDIR
229206 log" CSC =%s " cfg.CSC
230207 log" BUILD_CONFIG =%s " cfg.BUILD_ CONFIG
231208 log" csc_flags =%s " cfg.csc_ flags