Skip to content

Added default script references for .NET Core #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsyme merged 1 commit into from
Jun 20, 2016
Merged

Added default script references for .NET Core #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,6 +1585,25 @@ let GetFsiLibraryName () = "FSharp.Compiler.Interactive.Settings"
// (b) included in environment for files 'orphaned' from a project context
// -- for orphaned files (files in VS without a project context)
// -- for files given on a command line without --noframework set
#if TODO_REWORK_ASSEMBLY_LOAD

// .NET Core references
let DefaultBasicReferencesForOutOfProjectSources =
[ yield typeof<System.Object>.Assembly.Location; // mscorlib
yield typeof<System.Console>.Assembly.Location; // System.Console
yield typeof<System.ComponentModel.DefaultValueAttribute>.Assembly.Location; // System.Runtime
yield typeof<System.ComponentModel.PropertyChangedEventArgs>.Assembly.Location; // System.ObjectModel
yield typeof<System.IO.BufferedStream>.Assembly.Location; // System.IO
yield typeof<System.Linq.Enumerable>.Assembly.Location; // System.Linq
yield typeof<System.Xml.Linq.XDocument>.Assembly.Location; // System.Xml.Linq
yield typeof<System.Net.WebRequest>.Assembly.Location; // System.Net.Requests
yield typeof<System.Numerics.BigInteger>.Assembly.Location; // System.Runtime.Numerics
yield typeof<System.Threading.Tasks.TaskExtensions>.Assembly.Location; // System.Threading.Tasks
yield typeof<Microsoft.FSharp.Core.MeasureAttribute>.Assembly.Location; // FSharp.Core
]
let DefaultBasicReferencesForOutOfProjectSources40 = []

#else
let DefaultBasicReferencesForOutOfProjectSources =
[ yield "System"
yield "System.Xml"
Expand Down Expand Up @@ -1618,6 +1637,8 @@ let DefaultBasicReferencesForOutOfProjectSources =
// Extra implicit references for .NET 4.0
let DefaultBasicReferencesForOutOfProjectSources40 =
[ "System.Numerics" ]

#endif

// A set of assemblies to always consider to be system assemblies
let SystemAssemblies primaryAssemblyName =
Expand Down
4 changes: 3 additions & 1 deletion src/fsharp/vs/IncrementalBuild.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,7 +1787,9 @@ type IncrementalBuilder(frameworkTcImportsCache: FrameworkImportsCache, tcConfig
define::tcConfigB.conditionalCompilationDefines

tcConfigB.projectReferences <- projectReferences

#if TODO_REWORK_ASSEMBLY_LOAD
tcConfigB.useMonoResolution <- true // turn off msbuild resolution
#endif
// Apply command-line arguments and collect more source files if they are in the arguments
let sourceFilesNew =
try
Expand Down