update packages

.gitattributes

@@ -21,7 +21,6 @@
 *.rtf diff=astextplain
 *.RTF diff=astextplain
 
-targets.make text eol=lf
 install-sh text eol=lf
 *.in text eol=lf
 *.ac text eol=lf

.gitignore

@@ -98,12 +98,11 @@ Release
 Proto
 sign_temp
 .libs
-Makefile
 configure
-launcher
+mono/launcher
 autom4te.cache
 config.log
-config.make
+mono/config.make
 config.status
 src/fsharp/FSharp.Compiler/illex.fs
 src/fsharp/FSharp.Compiler/ilpars.fs
@@ -186,6 +185,7 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.bak
 FSharp.Compiler.Tools.Nuget/*.nupkg
 FSharp.Core.Nuget/*.nupkg
+artifacts/*.nupkg
 *.orig
 *.mdf
 *.ldf

.travis.yml

@@ -30,6 +30,8 @@ matrix:
  - os: osx
  mono: 4.8.0
  allow_failures:
+ - os: osx
+ mono: latest
  - os: linux
  mono: latest
  - os: linux

CHANGELOG-fsharp.md

@@ -1,3 +1,21 @@
+4.1.15
+ * fix regression on binding redirects for System.Collections.Immutable
+
+4.1.10
+ * Integrate visualfsharp to 55ffe91
+
+4.1.9
+ * Fix duplicate resources on OSX
+
+4.1.8
+ * [Fix regression in Microsoft.Build.FSharp.targets](https:/fsharp/fsharp/pull/707)
+
+4.1.7
+ * [fix binding redirects for System.Collections.Immutable](https:/fsharp/fsharp/issues/699)
+
+4.1.6
+ * fix version of library going in /usr/lib/mono/fsharp
+
 4.1.4
  * [align fsc task and target file](https:/fsharp/fsharp/pull/690)
  * [use install layout that includes mono/fsharp](https:/fsharp/fsharp/pull/689)

FSharp.Compiler.Service.sln

@@ -50,9 +50,6 @@ EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UntypedTree", "samples\UntypedTree\UntypedTree.fsproj", "{C816728D-BBEA-472D-9F6C-E8913957A673}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.Tests", "tests\service\FSharp.Compiler.Service.Tests.fsproj", "{5EF9FF95-1C75-458A-983A-168E43945913}"
- ProjectSection(ProjectDependencies) = postProject
- {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} = {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}
- EndProjectSection
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FscExe", "samples\FscExe\FscExe.fsproj", "{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
 EndProject

README.md

@@ -50,7 +50,7 @@ If using Paket, add the source at the top of `paket.dependencies`.
 Maintainers
 -----------
 
-The maintainers of this repository appointed by the F# Core Engineering Group are:
+The maintainers of this repository from the F# Core Engineering Group are:
 
- - [Robin Neatherway](https:/rneatherway), [Tomas Petricek](http:/tpetricek) 
- - with help and guidance from [Don Syme](http:/dsyme), [Dave Thomas](http:/7sharp9), [Lincoln Atkinson](http:/latkin), [Kevin Ransom](http:/KevinRansom) and [Vladimir Matveev](http:/vladima)
+ - [Don Syme](http:/dsyme), [Dave Thomas](http:/7sharp9)
+ - with help and guidance from [Robin Neatherway](https:/rneatherway), [Tomas Petricek](http:/tpetricek), [Lincoln Atkinson](http:/latkin), [Kevin Ransom](http:/KevinRansom), [Vladimir Matveev](http:/vladima) and others

samples/FsiExe/fsiserver.fs

@@ -12,7 +12,7 @@ namespace Microsoft.FSharp.Compiler.Server.Shared
 // For FSI VS plugin, require FSI to provide services:
 // e.g.
 // - interrupt
-// - intelisense completion
+// - intellisense completion
 // 
 // This is done via remoting.
 // Here we define the service class.

src/absil/il.fs

@@ -111,7 +111,7 @@ let splitILTypeName (nm:string) =
 
 let emptyStringArray = ([| |] : string[])
 
-// Duplciate of comment in import.fs:
+// Duplicate of comment in import.fs:
 // The type names that flow to the point include the "mangled" type names used for static parameters for provided types.
 // For example, 
 // Foo.Bar,"1.0"
@@ -1680,7 +1680,7 @@ type ILAssemblyManifest =
  IgnoreSymbolStoreSequencePoints: bool;
  Retargetable: bool;
 
- /// Records the types impemented by other modules. 
+ /// Records the types implemented by other modules. 
  ExportedTypes: ILExportedTypesAndForwarders;
  /// Records whether the entrypoint resides in another module. 
  EntrypointElsewhere: ILModuleRef option; 
@@ -1769,7 +1769,7 @@ let mkSimpleModRef n =
 // --------------------------------------------------------------------
 // The toplevel class of a module is called "<Module>"
 //
-// REVIEW: the following comments from the ECMA Spec (Parition II, Section 9.8)
+// REVIEW: the following comments from the ECMA Spec (Partition II, Section 9.8)
 //
 // "For an ordinary type, if the metadata merges two definitions 
 // of the same type, it simply discards one definition on the 
@@ -2616,9 +2616,9 @@ let emptyILMethodImpls = mkILMethodImpls []
 // them in fields. preblock is how to call the superclass constructor....
 // -------------------------------------------------------------------- 
 
-let mkILStorageCtorWithParamNames(tag,preblock,typ,flds,access) = 
+let mkILStorageCtorWithParamNames(tag,preblock,typ,extraParams,flds,access) = 
  mkILCtor(access,
- flds |> List.map (fun (pnm,_,ty) -> mkILParamNamed (pnm,ty)),
+ (flds |> List.map (fun (pnm,_,ty) -> mkILParamNamed (pnm,ty))) @ extraParams,
  mkMethodBody
  (false,[],2,
  nonBranchingInstrsToCode
@@ -2632,22 +2632,22 @@ let mkILStorageCtorWithParamNames(tag,preblock,typ,flds,access) =
  ]) flds)
  end,tag))
 
-let mkILSimpleStorageCtorWithParamNames(tag,base_tspec,typ,flds,access) = 
+let mkILSimpleStorageCtorWithParamNames(tag,base_tspec,typ,extraParams,flds,access) = 
  let preblock = 
  match base_tspec with 
  None -> []
  | Some tspec -> 
  ([ mkLdarg0; 
  mkNormalCall (mkILCtorMethSpecForTy (mkILBoxedType tspec,[])) ])
- mkILStorageCtorWithParamNames(tag,preblock,typ,flds,access)
+ mkILStorageCtorWithParamNames(tag,preblock,typ,extraParams,flds,access)
 
 let addParamNames flds = 
  flds |> List.map (fun (nm,ty) -> (nm,nm,ty))
 
-let mkILSimpleStorageCtor(tag,base_tspec,typ,flds,access) = 
- mkILSimpleStorageCtorWithParamNames(tag,base_tspec,typ, addParamNames flds, access)
+let mkILSimpleStorageCtor(tag,base_tspec,typ,extraParams,flds,access) = 
+ mkILSimpleStorageCtorWithParamNames(tag,base_tspec,typ, extraParams, addParamNames flds, access)
 
-let mkILStorageCtor(tag,preblock,typ,flds,access) = mkILStorageCtorWithParamNames(tag,preblock,typ, addParamNames flds, access)
+let mkILStorageCtor(tag,preblock,typ,flds,access) = mkILStorageCtorWithParamNames(tag, preblock, typ, [], addParamNames flds, access)
 
 
 let mkILGenericClass (nm, access, genparams, extends, impl, methods, fields, nestedTypes, props, events, attrs, init) =
@@ -3418,7 +3418,7 @@ let decodeILAttribData (ilg: ILGlobals) (ca: ILAttribute) =
 
 // -------------------------------------------------------------------- 
 // Functions to collect up all the references in a full module or
-// asssembly manifest. The process also allocates
+// assembly manifest. The process also allocates
 // a unique name to each unique internal assembly reference.
 // -------------------------------------------------------------------- 
 

src/absil/il.fsi

@@ -261,23 +261,31 @@ type ILGenericVariance =
 /// Type refs, i.e. references to types in some .NET assembly
 [<Sealed>]
 type ILTypeRef =
+
  /// Create a ILTypeRef.
  static member Create : scope: ILScopeRef * enclosing: string list * name: string -> ILTypeRef
 
  /// Where is the type, i.e. is it in this module, in another module in this assembly or in another assembly? 
  member Scope: ILScopeRef
+
  /// The list of enclosing type names for a nested type. If non-nil then the first of these also contains the namespace.
  member Enclosing: string list
+
  /// The name of the type. This also contains the namespace if Enclosing is empty.
  member Name: string
+
  /// The name of the type in the assembly using the '.' notation for nested types.
  member FullName: string
+
  /// The name of the type in the assembly using the '+' notation for nested types.
  member BasicQualifiedName : string
+
  member QualifiedName: string
+
 #if EXTENSIONTYPING
  member QualifiedNameWithNoShortPrimaryAssembly: string
 #endif
+
  interface System.IComparable
  
 /// Type specs and types. 
@@ -295,6 +303,7 @@ type ILTypeSpec =
 
  /// Which type is being referred to?
  member TypeRef: ILTypeRef
+
  /// The type instantiation if the type is generic, otherwise empty
  member GenericArgs: ILGenericArgs
  member Scope: ILScopeRef
@@ -1397,7 +1406,7 @@ type ILAssemblyManifest =
  JitTracking: bool;
  IgnoreSymbolStoreSequencePoints: bool;
  Retargetable: bool;
- /// Records the types impemented by this asssembly in auxiliary 
+ /// Records the types implemented by this assembly in auxiliary 
  /// modules. 
  ExportedTypes: ILExportedTypesAndForwarders;
  /// Records whether the entrypoint resides in another module. 
@@ -1484,7 +1493,7 @@ val ungenericizeTypeName: string -> string (* e.g. List`1 --> List *)
 // e.g. by filling in all appropriate record fields.
 // ==================================================================== *)
 
-/// A table of common references to items in primary assebly (System.Runtime or mscorlib).
+/// A table of common references to items in primary assembly (System.Runtime or mscorlib).
 /// If a particular version of System.Runtime.dll has been loaded then you should 
 /// reference items from it via an ILGlobals for that specific version built using mkILGlobals. 
 [<NoEquality; NoComparison; Class>]
@@ -1591,7 +1600,7 @@ val mkILFieldSpecInTy: ILType * string * ILType -> ILFieldSpec
 
 val mkILCallSig: ILCallingConv * ILType list * ILType -> ILCallingSignature
 
-/// Make generalized verions of possibly-generic types,
+/// Make generalized versions of possibly-generic types,
 /// e.g. Given the ILTypeDef for List, return the type "List<T>".
 val mkILFormalBoxedTy: ILTypeRef -> ILGenericParameterDef list -> ILType
 val mkILFormalNamedTy: ILBoxity -> ILTypeRef -> ILGenericParameterDef list -> ILType
@@ -1710,8 +1719,8 @@ val prependInstrsToClassCtor: ILInstr list -> ILSourceMarker option -> ILTypeDef
 
 /// Derived functions for making some simple constructors
 val mkILStorageCtor: ILSourceMarker option * ILInstr list * ILType * (string * ILType) list * ILMemberAccess -> ILMethodDef
-val mkILSimpleStorageCtor: ILSourceMarker option * ILTypeSpec option * ILType * (string * ILType) list * ILMemberAccess -> ILMethodDef
-val mkILSimpleStorageCtorWithParamNames: ILSourceMarker option * ILTypeSpec option * ILType * (string * string * ILType) list * ILMemberAccess -> ILMethodDef
+val mkILSimpleStorageCtor: ILSourceMarker option * ILTypeSpec option * ILType * ILParameter list * (string * ILType) list * ILMemberAccess -> ILMethodDef
+val mkILSimpleStorageCtorWithParamNames: ILSourceMarker option * ILTypeSpec option * ILType * ILParameter list * (string * string * ILType) list * ILMemberAccess -> ILMethodDef
 
 val mkILDelegateMethods: ILGlobals -> ILType * ILType -> ILParameter list * ILReturn -> ILMethodDef list