integrate main

src/fsharp/CheckExpressions.fs

@@ -5815,6 +5815,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) =
         mkf n e2', tpenv
 
     | SynExpr.LibraryOnlyILAssembly (s, tyargs, args, rtys, m) ->
+        let s = (s :?> ILInstr[])
         let argTys = NewInferenceTypes cenv.g args
         let tyargs', tpenv = TcTypes cenv NewTyparsOK CheckCxs ItemOccurence.UseInType env tpenv tyargs
         // No subsumption at uses of IL assembly code

src/fsharp/CompilerConfig.fs

@@ -573,6 +573,7 @@ type TcConfigBuilder =
           includewin32manifest = true
           linkResources = []
           legacyReferenceResolver = legacyReferenceResolver
+          fxResolver = Unchecked.defaultof<_>
           showFullPaths = false
           errorStyle = ErrorStyle.DefaultErrors
 

src/fsharp/FxResolver.fs

@@ -3,16 +3,21 @@
 // Functions to retrieve framework dependencies
 namespace FSharp.Compiler
 
-    open System
-    open System.Collections.Generic
-    open System.Diagnostics
-    open System.Globalization
-    open System.IO
-    open System.Reflection
-    open System.Runtime.InteropServices
-    open Internal.Utilities
-    open Internal.Utilities.FSharpEnvironment
-    open FSharp.Compiler.AbstractIL.Internal.Library
+open System
+open System.Collections.Concurrent
+open System.Collections.Generic
+open System.Diagnostics
+open System.Globalization
+open System.IO
+open System.Reflection
+open System.Runtime.InteropServices
+open System.Text
+open Internal.Utilities
+open Internal.Utilities.FSharpEnvironment
+open FSharp.Compiler.AbstractIL.ILBinaryReader
+open FSharp.Compiler.AbstractIL.Internal.Library
+open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.Range
 
 /// Resolves the references for a chosen or currently-executing framework, for
 ///   - script execution

src/fsharp/NicePrint.fs

@@ -670,9 +670,14 @@ module private PrintTypes =
           let part2 = layoutNullness part1 nullness
           part2
 
-        // Layout a type application 
-        | TType_app (tc,args, nullness) -> 
-          let part1 = layoutTypeAppWithInfoAndPrec denv env (layoutTyconRef denv tc) prec tc.IsPrefixDisplay args 
+        // Layout a type application
+        | TType_app (tc, args, nullness) ->
+          let usePrefix =
+              match denv.genericParameterStyle with
+              | GenericParameterStyle.Implicit -> tc.IsPrefixDisplay
+              | GenericParameterStyle.Prefix -> true
+              | GenericParameterStyle.Suffix -> false
+          let part1 = layoutTypeAppWithInfoAndPrec denv env (layoutTyconRef denv tc) prec usePrefix args
           let part2 = layoutNullness part1 nullness
           part2
 

src/fsharp/absil/illib.fs

@@ -1261,177 +1261,3 @@ type LayeredMultiMap<'Key, 'Value when 'Key : equality and 'Key : comparison>(co
 
     static member Empty : LayeredMultiMap<'Key, 'Value> = LayeredMultiMap LayeredMap.Empty
 
-[<AutoOpen>]
-module Shim =
-
-    type IFileSystem = 
-
-        /// A shim over File.ReadAllBytes
-        abstract ReadAllBytesShim: fileName: string -> byte[] 
-
-        /// A shim over FileStream with FileMode.Open, FileAccess.Read, FileShare.ReadWrite
-        abstract FileStreamReadShim: fileName: string -> Stream
-
-        /// A shim over FileStream with FileMode.Create, FileAccess.Write, FileShare.Read
-        abstract FileStreamCreateShim: fileName: string -> Stream
-
-        /// A shim over FileStream with FileMode.Open, FileAccess.Write, FileShare.Read
-        abstract FileStreamWriteExistingShim: fileName: string -> Stream
-
-        /// Take in a filename with an absolute path, and return the same filename
-        /// but canonicalized with respect to extra path separators (e.g. C:\\\\foo.txt) 
-        /// and '..' portions
-        abstract GetFullPathShim: fileName: string -> string
-
-        /// A shim over Path.IsPathRooted
-        abstract IsPathRootedShim: path: string -> bool
-
-        /// A shim over Path.IsInvalidPath
-        abstract IsInvalidPathShim: filename: string -> bool
-
-        /// A shim over Path.GetTempPath
-        abstract GetTempPathShim : unit -> string
-
-        /// Utc time of the last modification
-        abstract GetLastWriteTimeShim: fileName: string -> DateTime
-
-        /// A shim over File.Exists
-        abstract SafeExists: fileName: string -> bool
-
-        /// A shim over File.Delete
-        abstract FileDelete: fileName: string -> unit
-
-        /// Used to load type providers and located assemblies in F# Interactive
-        abstract AssemblyLoadFrom: fileName: string -> Assembly 
-
-        /// Used to load a dependency for F# Interactive and in an unused corner-case of type provider loading
-        abstract AssemblyLoad: assemblyName: AssemblyName -> Assembly 
-
-        /// Used to determine if a file will not be subject to deletion during the lifetime of a typical client process.
-        abstract IsStableFileHeuristic: fileName: string -> bool
-
-
-    type DefaultFileSystem() =
-        interface IFileSystem with
-
-            member __.AssemblyLoadFrom(fileName: string) = 
-                Assembly.UnsafeLoadFrom fileName
-
-            member __.AssemblyLoad(assemblyName: AssemblyName) = 
-                Assembly.Load assemblyName
-
-            member __.ReadAllBytesShim (fileName: string) = File.ReadAllBytes fileName
-
-            member __.FileStreamReadShim (fileName: string) = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)  :> Stream
-
-            member __.FileStreamCreateShim (fileName: string) = new FileStream(fileName, FileMode.Create, FileAccess.Write, FileShare.Read, 0x1000, false) :> Stream
-
-            member __.FileStreamWriteExistingShim (fileName: string) = new FileStream(fileName, FileMode.Open, FileAccess.Write, FileShare.Read, 0x1000, false) :> Stream
-
-            member __.GetFullPathShim (fileName: string) = System.IO.Path.GetFullPath fileName
-
-            member __.IsPathRootedShim (path: string) = Path.IsPathRooted path
-
-            member __.IsInvalidPathShim(path: string) = 
-#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE
-                let isInvalidPath(p: string) = 
-#else
-                let isInvalidPath(p: string?) = 
-#endif
-                    match p with 
-                    | Null | "" -> true
-                    | NonNull p -> p.IndexOfAny(Path.GetInvalidPathChars()) <> -1
-
-#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE
-                let isInvalidFilename(p: string) = 
-#else
-                let isInvalidFilename(p: string?) = 
-#endif
-                    match p with 
-                    | Null | "" -> true
-                    | NonNull p -> p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1
-
-#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE
-                let isInvalidDirectory(d: string) = 
-#else
-                let isInvalidDirectory(d: string?) = 
-#endif
-                    match d with 
-                    | Null -> true
-                    | NonNull d -> d.IndexOfAny(Path.GetInvalidPathChars()) <> -1
-
-                isInvalidPath path || 
-                let directory = Path.GetDirectoryName path
-                let filename = Path.GetFileName path
-                isInvalidDirectory directory || isInvalidFilename filename
-
-            member __.GetTempPathShim() = Path.GetTempPath()
-
-            member __.GetLastWriteTimeShim (fileName: string) = File.GetLastWriteTimeUtc fileName
-
-            member __.SafeExists (fileName: string) = File.Exists fileName 
-
-            member __.FileDelete (fileName: string) = File.Delete fileName
-
-            member __.IsStableFileHeuristic (fileName: string) = 
-                let directory = Path.GetDirectoryName fileName
-                directory.Contains("Reference Assemblies/") || 
-                directory.Contains("Reference Assemblies\\") || 
-                directory.Contains("packages/") || 
-                directory.Contains("packages\\") || 
-                directory.Contains("lib/mono/")
-
-    let mutable FileSystem = DefaultFileSystem() :> IFileSystem
-
-    // The choice of 60 retries times 50 ms is not arbitrary. The NTFS FILETIME structure 
-    // uses 2 second resolution for LastWriteTime. We retry long enough to surpass this threshold 
-    // plus 1 second. Once past the threshold the incremental builder will be able to retry asynchronously based
-    // on plain old timestamp checking.
-    //
-    // The sleep time of 50ms is chosen so that we can respond to the user more quickly for Intellisense operations.
-    //
-    // This is not run on the UI thread for VS but it is on a thread that must be stopped before Intellisense
-    // can return any result except for pending.
-    let private retryDelayMilliseconds = 50
-    let private numRetries = 60
-
-    let private getReader (filename, codePage: int option, retryLocked: bool) =
-        // Retry multiple times since other processes may be writing to this file.
-        let rec getSource retryNumber =
-          try 
-            // Use the .NET functionality to auto-detect the unicode encoding
-            let stream = FileSystem.FileStreamReadShim(filename) 
-            match codePage with 
-            | None -> new  StreamReader(stream,true)
-            | Some n -> new  StreamReader(stream,System.Text.Encoding.GetEncoding(n))
-          with 
-              // We can get here if the file is locked--like when VS is saving a file--we don't have direct
-              // access to the HRESULT to see that this is EONOACCESS.
-              | :? System.IO.IOException as err when retryLocked && err.GetType() = typeof<System.IO.IOException> -> 
-                   // This second check is to make sure the exception is exactly IOException and none of these for example:
-                   //   DirectoryNotFoundException 
-                   //   EndOfStreamException 
-                   //   FileNotFoundException 
-                   //   FileLoadException 
-                   //   PathTooLongException
-                   if retryNumber < numRetries then 
-                       System.Threading.Thread.Sleep (retryDelayMilliseconds)
-                       getSource (retryNumber + 1)
-                   else 
-                       reraise()
-        getSource 0
-
-    type File with 
-
-        static member ReadBinaryChunk (fileName, start, len) = 
-            use stream = FileSystem.FileStreamReadShim fileName
-            stream.Seek(int64 start, SeekOrigin.Begin) |> ignore
-            let buffer = Array.zeroCreate len 
-            let mutable n = 0
-            while n < len do 
-                n <- n + stream.Read(buffer, n, len-n)
-            buffer
-
-        static member OpenReaderAndRetry (filename, codepage, retryLocked)  =
-            getReader (filename, codepage, retryLocked)
-

src/fsharp/absil/ilsign.fs

@@ -13,6 +13,7 @@ open System.Reflection
 open System.Runtime.CompilerServices
 open System.Runtime.InteropServices
 
+open FSharp.Compiler
 open FSharp.Compiler.AbstractIL.Internal.Library
 open FSharp.Compiler.AbstractIL.Internal.Utils
 open FSharp.Compiler.SourceCodeServices

src/fsharp/fsi/fsi.fs

@@ -361,7 +361,7 @@ type internal FsiValuePrinter(fsi: FsiEvaluationSessionHostConfig, tcConfigB: Tc
                                        let text = printer obj
                                        match box text with 
                                        | null -> None
-                                       | _ -> Some (wordL (TaggedTextOps.tagText text)) 
+                                       | _ -> Some (wordL (TaggedText.tagText text)) 
                                    | _ -> None)
 
                          | Choice2Of2 (aty: System.Type, converter) -> 

src/fsharp/utils/FileSystem.fs

@@ -77,14 +77,35 @@ module FileSystemAutoOpens =
             member __.IsPathRootedShim (path: string) = Path.IsPathRooted path
 
             member __.IsInvalidPathShim(path: string) = 
+#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE
                 let isInvalidPath(p: string) = 
                     String.IsNullOrEmpty p || p.IndexOfAny(Path.GetInvalidPathChars()) <> -1
+#else
+                let isInvalidPath(p: string?) = 
+#endif
+                    match p with 
+                    | Null | "" -> true
+                    | NonNull p -> p.IndexOfAny(Path.GetInvalidPathChars()) <> -1
+
+#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE
 
                 let isInvalidFilename(p: string) = 
-                    String.IsNullOrEmpty p || p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1
+#else
+                let isInvalidFilename(p: string?) = 
+#endif
+                    match p with 
+                    | Null | "" -> true
+                    | NonNull p -> p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1
+
+#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE
 
                 let isInvalidDirectory(d: string) = 
-                    d=null || d.IndexOfAny(Path.GetInvalidPathChars()) <> -1
+#else
+                let isInvalidDirectory(d: string?) = 
+#endif
+                    match d with 
+                    | Null -> true
+                    | NonNull d -> d.IndexOfAny(Path.GetInvalidPathChars()) <> -1
 
                 isInvalidPath path || 
                 let directory = Path.GetDirectoryName path

src/fsharp/utils/sformat.fs

@@ -123,11 +123,9 @@ module NullShim =
     let inline (|Null|NonNull|) (x: 'T) : Choice<unit,'T> = match x with null -> Null | v -> NonNull v
 #endif
 
-module TaggedTextOps =
-    let mkTag tag text = 
-        { new TaggedText with 
-            member _.Tag = tag
-            member _.Text = text }
+[<AutoOpen>]
+module TaggedText =
+    let mkTag tag text = TaggedText(tag, text)
 
     let length (tt: TaggedText) = tt.Text.Length
     let toText (tt: TaggedText) = tt.Text

tests/FSharp.Compiler.ComponentTests/ErrorMessages/TypeEqualsMissingTests.fs

@@ -15,7 +15,7 @@ open FSharp.Compiler.SourceCodeServices
 //             """
 // type X | A | B
 //             """
-//             FSharpErrorSeverity.Error
+//             FSharpDiagnosticSeverity.Error
 //             3360 
 //             (2, 8, 2, 9)
 //             "Unexpected token in type definition. Expected '=' after the type 'X'."