Skip to content

Commit 9e4727a

Browse files
committed
trial changes
1 parent 96160a9 commit 9e4727a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/absil/illib.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ open System
88
open System.Collections
99
open System.Collections.Generic
1010
open Internal.Utilities
11-
open Internal.Utilities.Collections
1211

1312
#if FX_RESHAPED_REFLECTION
1413
open Microsoft.FSharp.Core.ReflectionAdapters

src/fsharp/ReferenceResolver.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

33
#if INTERACTIVE
4-
#load "../utils/ResizeArray.fs"
5-
#load "../absil/illib.fs"
4+
#load "../utils/ResizeArray.fs" "../absil/illib.fs"
65
#else
76
module Microsoft.FSharp.Compiler.ReferenceResolver
87
#endif
@@ -118,7 +117,7 @@ let ScriptingNaiveResolver =
118117
if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then
119118
yield! registrySearchPaths() ]
120119

121-
[| for (baggage,r) in references do
120+
[| for (baggage,r) in references do
122121
let mutable found = false
123122
let success path =
124123
if not found then
@@ -165,10 +164,11 @@ let resolve s =
165164

166165
resolve ["System"; "mscorlib"; "mscorlib.dll"; "FSharp.Core"; "FSharp.Core.dll"; "Microsoft.SqlServer.Dmf.dll"; "Microsoft.SqlServer.Dmf" ]
167166

167+
resolve [ "FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" ]
168168
#endif
169169

170170
let GetDefaultResolver(msbuildEnabled: bool, msbuildVersion: string option) =
171-
let msbuildEnabled = msbuildEnabled && false
171+
//let msbuildEnabled = msbuildEnabled && false
172172
let tryMSBuild v =
173173
if msbuildEnabled then
174174
// Detect if MSBuild v12 is on the machine, if so use the resolver from there

0 commit comments

Comments
 (0)