Skip to content

Commit 712fdb1

Browse files
committed
default resolver
1 parent 9e4727a commit 712fdb1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/fsharp/ReferenceResolver.fs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ type Resolver =
6565
logerror:(string->string->unit)
6666
-> ResolvedFile[]
6767

68-
let ScriptingNaiveResolver =
68+
let SimplisticResolver =
6969
{ new Resolver with
7070
member __.HighestInstalledNetFrameworkVersion() = "v4.5"
7171
member __.DotNetFrameworkReferenceAssembliesRootDirectory =
@@ -146,8 +146,8 @@ let ScriptingNaiveResolver =
146146
| Some ass -> yield! success ass.Location |] }
147147

148148
#if INTERACTIVE
149-
ScriptingNaiveResolver.DotNetFrameworkReferenceAssembliesRootDirectory
150-
ScriptingNaiveResolver.HighestInstalledNetFrameworkVersion()
149+
SimplisticResolver.DotNetFrameworkReferenceAssembliesRootDirectory
150+
SimplisticResolver.HighestInstalledNetFrameworkVersion()
151151

152152
let fscoreDir =
153153
if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then // file references only valid on Windows
@@ -160,7 +160,7 @@ let fscoreDir =
160160
System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
161161

162162
let resolve s =
163-
ScriptingNaiveResolver.Resolve(ResolutionEnvironment.CompileTimeLike,[| for a in s -> ("", a) |],"v4.5.1", [ScriptingNaiveResolver.DotNetFrameworkReferenceAssembliesRootDirectory + @"\v4.5.1" ],"", "", fscoreDir,[],__SOURCE_DIRECTORY__,ignore, (fun _ _ -> ()), (fun _ _-> ()))
163+
SimplisticResolver.Resolve(ResolutionEnvironment.CompileTimeLike,[| for a in s -> ("", a) |],"v4.5.1", [SimplisticResolver.DotNetFrameworkReferenceAssembliesRootDirectory + @"\v4.5.1" ],"", "", fscoreDir,[],__SOURCE_DIRECTORY__,ignore, (fun _ _ -> ()), (fun _ _-> ()))
164164

165165
resolve ["System"; "mscorlib"; "mscorlib.dll"; "FSharp.Core"; "FSharp.Core.dll"; "Microsoft.SqlServer.Dmf.dll"; "Microsoft.SqlServer.Dmf" ]
166166

@@ -191,4 +191,4 @@ let GetDefaultResolver(msbuildEnabled: bool, msbuildVersion: string option) =
191191
match tryMSBuild "12" with
192192
| Some r -> r
193193
| None ->
194-
ScriptingNaiveResolver
194+
SimplisticResolver

0 commit comments

Comments
 (0)