Skip to content

Commit 71903d7

Browse files
committed
Merge branch 'fix-1311-2' of https://github.com/dsyme/visualfsharp into fix-1311-2
2 parents 7b0e800 + 5585e55 commit 71903d7

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/fsharp/CompileOps.fs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,29 +1613,37 @@ let GetFsiLibraryName () = "FSharp.Compiler.Interactive.Settings"
16131613
// -- for files given on a command line without --noframework set
16141614
let DefaultBasicReferencesForOutOfProjectSources =
16151615
[ // These are .NET-Framework -style references
1616+
#if !TODO_REWORK_ASSEMBLY_LOAD
16161617
yield "System"
16171618
yield "System.Xml"
16181619
yield "System.Runtime.Remoting"
16191620
yield "System.Runtime.Serialization.Formatters.Soap"
16201621
yield "System.Data"
16211622
yield "System.Drawing"
16221623
yield "System.Core"
1624+
#endif
16231625

1624-
// These are the Portable-profile and .NET Core dependencies of FSharp.Core.dll. These are needed
1625-
// when an F# sript references an F# profile 7, 78, 259 or .NET Core component which in turn refers
1626-
// to FSharp.Core for profile 7, 78, 259 or .NET Core.
1626+
// These are the Portable-profile and .NET Standard 1.6 dependencies of FSharp.Core.dll. These are needed
1627+
// when an F# sript references an F# profile 7, 78, 259 or .NET Standard 1.6 component which in turn refers
1628+
// to FSharp.Core for profile 7, 78, 259 or .NET Standard.
16271629
yield "System.Runtime" // lots of types
16281630
yield "System.Linq" // System.Linq.Expressions.Expression<T>
16291631
yield "System.Reflection" // System.Reflection.ParameterInfo
16301632
yield "System.Linq.Expressions" // System.Linq.IQueryable<T>
16311633
yield "System.Threading.Tasks" // valuetype [System.Threading.Tasks]System.Threading.CancellationToken
16321634
yield "System.IO" // System.IO.TextWriter
1635+
yield "System.Console" // System.Console.Out etc.
1636+
yield "System.Net.Requests" // System.Net.WebResponse etc.
16331637
yield "System.Collections" // System.Collections.Generic.List<T>
1638+
yield "System.Runtime.Numerics" // BigInteger
16341639
yield "System.Threading" // OperationCanceledException
16351640

1641+
#if !TODO_REWORK_ASSEMBLY_LOAD
16361642
yield "System.Web"
16371643
yield "System.Web.Services"
1638-
yield "System.Windows.Forms" ]
1644+
yield "System.Windows.Forms"
1645+
#endif
1646+
]
16391647

16401648
// Extra implicit references for .NET 4.0
16411649
let DefaultBasicReferencesForOutOfProjectSources40 =

0 commit comments

Comments
 (0)