Merge pull request #531 from dsyme/integrate-78

Integrate from visualfsharp/master

Author: dsyme

.gitignore

@@ -9,7 +9,6 @@ lib/bootstrap/4.0/policy*
 aclocal.m4
 src/*.userprefs
 src/fsharp/FSStrings.resources
-lkg
 packages
 src/fsharp/FSharp.Build/*.resx
 src/fsharp/FSharp.Build-proto/*.resx

CHANGELOG-visualfsharp.md

@@ -9,6 +9,28 @@ Visual F<span>#</span>
 
 All notable changes to this project will be documented in this file.
 
+### [4.0.0] - Visual Studio 2015 Update 1 - 30 November 2015
+
+#### Enhancements
+* Perf: `for i in expr do body` optimization [#219](https://github.com/Microsoft/visualfsharp/pull/219)
+* Remove type provider security dialog and use custom icon for type provider assembly reference [#448](https://github.com/Microsoft/visualfsharp/pull/448)
+* Perf: Enable parallel build inside Visual Studio [#487](https://github.com/Microsoft/visualfsharp/pull/487)
+* Perf: Remove StructBox for Value Types [#549](https://github.com/Microsoft/visualfsharp/pull/549)
+* Add compiler warnings for redundant arguments in raise/failwith/failwithf/nullArg/invalidOp/invalidArg [#630](https://github.com/Microsoft/visualfsharp/pull/630)
+* Add a compiler warning for lower case literals in patterns [#666](https://github.com/Microsoft/visualfsharp/pull/666)
+
+#### Bug fixes
+* Fix scope of types for named values in attributes improperly set [#437](https://github.com/Microsoft/visualfsharp/pull/437)
+* Add general check for escaping typars to check phase [#442](https://github.com/Microsoft/visualfsharp/pull/442)
+* Fix AccessViolationException on obfuscated assemblies [#519](https://github.com/Microsoft/visualfsharp/pull/519)
+* Fix memory leaks while reloading solutions in Visual Studio [#591](https://github.com/Microsoft/visualfsharp/pull/591)
+* Enable breakpoints in `with` augmentations for class types [#608](https://github.com/Microsoft/visualfsharp/pull/608)
+* Fix false escaping type parameter check error [#613](https://github.com/Microsoft/visualfsharp/pull/613)
+* Fix quotation of readonly fields [#622](https://github.com/Microsoft/visualfsharp/pull/622)
+* Keep the reference icons when opening references [#623](https://github.com/Microsoft/visualfsharp/pull/623)
+* Don't suppress missing FSI transitive references [#626](https://github.com/Microsoft/visualfsharp/pull/626)
+* Make Seq.cast's non-generic and generic IEnumerable implementations equivalent [#651](https://github.com/Microsoft/visualfsharp/pull/651)
+
 ### [4.0.0] - 20 July 2015
 
 Includes commits up to `dd8252eb8d20aaedf7b1c7576cd2a8a82d24f587`

appveyor.yml

@@ -1,4 +1,4 @@
-os: Windows Server 2012 R2
+os: Visual Studio 2015
 init:
   - git config --global core.autocrlf input
 build_script:

lib/bootstrap/4.0/SupportedRuntimes.xml

@@ -162,10 +162,9 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
     <!-- MSbuild works out the assembly references -->
   </PropertyGroup>
 
-  <!-- Target MonoAndroid -->
-  <PropertyGroup Condition="'$(TargetFramework)'=='monodroid'">
-    <!--<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>-->
-    <!-- <TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier> -->
+
+  <!-- MonoAndroid, MonoTouch, XamarinWatchOS, XamarinTVOS -->
+  <PropertyGroup Condition="('$(TargetFramework)'=='monodroid') OR ('$(TargetFramework)'=='monotouch') OR ('$(TargetFramework)'=='xamarinwatchos') OR ('$(TargetFramework)'=='xamarintvos')">
     <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
     <DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_ATLEAST_45</DefineConstants>
@@ -179,63 +178,26 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
     <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
+    <AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1\XamarinWatchOS;$(AssemblySearchPaths)</AssemblySearchPaths>
+  </PropertyGroup>
+
+  <!-- Target MonoAndroid -->
+  <PropertyGroup Condition="'$(TargetFramework)'=='monodroid'">
     <AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1\MonoAndroid;$(AssemblySearchPaths)</AssemblySearchPaths>
   </PropertyGroup>
 
-  <!-- Target MonoTouch (should be identical to MonoAndroid configurations, though we sanity check --> 
-  <!-- by building against the MonoTouch mscorlib) -->
+  <!-- Target MonoTouch: identical to MonoAndroid configurations, though we sanity check by building against the MonoTouch mscorlib -->
   <PropertyGroup Condition="'$(TargetFramework)'=='monotouch'">
-    <!--<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>-->
-    <!-- <TargetFrameworkIdentifier>MonoTouch</TargetFrameworkIdentifier> --> 
-    <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
-    <DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_45</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
-    <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
-    <DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE;</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
     <AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1\MonoTouch;$(AssemblySearchPaths)</AssemblySearchPaths>
   </PropertyGroup>
-
-  <!-- Target XamarinWatchOS (should be identical to MonoTouch configurations, though we sanity check --> 
-  <!-- by building against the Xamarin.WatchOS mscorlib) -->
+	
+  <!-- Target XamarinWatchOS: identical to MonoTouch configurations, though we sanity check by building against the Xamarin.WatchOS mscorlib -->
   <PropertyGroup Condition="'$(TargetFramework)'=='xamarinwatchos'">
-    <!--<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>-->
-    <!-- <TargetFrameworkIdentifier>Xamarin.WatchOS</TargetFrameworkIdentifier> --> 
-    <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
-    <DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_45</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
-    <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
-    <DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE;</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
     <AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1\XamarinWatchOS;$(AssemblySearchPaths)</AssemblySearchPaths>
   </PropertyGroup>
 
-  <!-- Target XamarinTVOS (should be identical to MonoTouch configurations, though we sanity check --> 
-  <!-- by building against the Xamarin.TVOS mscorlib) -->
+  <!-- Target XamarinTVOS: identical to MonoTouch configurations, though we sanity check by building against the Xamarin.TVOS mscorlib -->
   <PropertyGroup Condition="'$(TargetFramework)'=='xamarintvos'">
-    <!--<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>-->
-    <!-- <TargetFrameworkIdentifier>Xamarin.TVOS</TargetFrameworkIdentifier> --> 
-    <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
-    <DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_45</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
-    <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
-    <DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE;</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
     <AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1\XamarinTVOS;$(AssemblySearchPaths)</AssemblySearchPaths>
   </PropertyGroup>
 

lkg/FSharp-4.0.30319.1/bin/FsLex.exe.config

@@ -220,9 +220,6 @@ type MemoryMappedFile(hMap: MemoryMapping.HANDLE, start:nativeint) =
 type ByteFile(bytes:byte[]) = 
     inherit BinaryFile()
 
-    static member OpenIn f = ByteFile(FileSystem.ReadAllBytesShim f)
-    static member OpenBytes bytes = ByteFile(bytes)
-
     override mc.ReadByte addr = bytes.[addr]
     override mc.ReadBytes addr len = Array.sub bytes addr len
     override m.CountUtf8String addr = 
@@ -905,6 +902,8 @@ type ILModuleReader =
       dispose: unit -> unit }
     member x.ILModuleDef = x.modul
     member x.ILAssemblyRefs = x.ilAssemblyRefs.Force()
+    interface IDisposable with
+        member x.Dispose() = x.dispose()
 
 
 type MethodData = MethodData of ILType * ILCallingConv * string * ILTypes * ILType * ILTypes
@@ -3946,8 +3945,6 @@ let rec genOpenBinaryReader infile is opts =
 
     ilModule,ilAssemblyRefs,pdb
 
-let CloseILModuleReader x = x.dispose()
-
 let mkDefault ilg = 
     { optimizeForMemory=false; 
       pdbPath= None; 
@@ -3973,7 +3970,7 @@ let OpenILModuleReader infile opts =
             mmap.Close();
             ClosePdbReader pdb) }
     with _ ->
-        let mc = ByteFile.OpenIn infile
+        let mc = ByteFile(infile |> FileSystem.ReadAllBytesShim)
         let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mc opts
         { modul = modul; 
           ilAssemblyRefs = ilAssemblyRefs;
@@ -3999,7 +3996,7 @@ let OpenILModuleReaderAfterReadingAllBytes infile opts =
     match cacheResult with 
     | Some(ilModuleReader) -> ilModuleReader
     | None -> 
-        let mc = ByteFile.OpenIn infile
+        let mc = ByteFile(infile |> FileSystem.ReadAllBytesShim)
         let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mc opts
         let ilModuleReader = 
             { modul = modul; 
@@ -4011,7 +4008,7 @@ let OpenILModuleReaderAfterReadingAllBytes infile opts =
 
 let OpenILModuleReaderFromBytes fileNameForDebugOutput bytes opts = 
         assert opts.pdbPath.IsNone
-        let mc = ByteFile.OpenBytes bytes
+        let mc = ByteFile(bytes)
         let modul,ilAssemblyRefs,pdb = genOpenBinaryReader fileNameForDebugOutput mc opts
         let ilModuleReader = 
             { modul = modul; 

lkg/FSharp-4.0.30319.1/bin/FsYacc.exe.config

@@ -41,16 +41,16 @@ type ILReaderOptions =
 val mkDefault :  ILGlobals -> ILReaderOptions
 
 // The non-memory resources (i.e. the file handle) associated with 
-// the read can be recovered by calling CloseILModuleReader.  Any remaining 
+// the read can be recovered by calling Dispose.  Any remaining 
 // lazily-computed items in the metadata graph returned by MetadataOfILModuleReader 
 // will no longer be valid. 
 [<Sealed>]
 type ILModuleReader =
     member ILModuleDef : ILModuleDef
     member ILAssemblyRefs : ILAssemblyRef list
+    interface System.IDisposable
 
 val OpenILModuleReader: string -> ILReaderOptions -> ILModuleReader
-val CloseILModuleReader: ILModuleReader -> unit
 
 /// Open a binary reader, except first copy the entire contents of the binary into 
 /// memory, close the file and ensure any subsequent reads happen from the in-memory store.