Merge pull request #498 from dsyme/integrate-oct-06

Integrate visualfsharp --> fsharp master

Author: dsyme

.gitignore

@@ -112,29 +112,16 @@ build.ok
 *.userprefs
 extras
 ossreadme*.txt
-tests/fsharp/typecheck/sigs/*.exe
-tests/fsharp/typecheck/sigs/*.diff
-tests/fsharp/typecheck/sigs/*.err
-tests/fsharp/typecheck/sigs/*.vsdiff
-tests/fsharp/typecheck/sigs/*.dll
-tests/fsharp/typecheck/sigs/*.vserr
 src/fsharp/FSharp.LanguageService.Compiler/illex.*
 src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
 src/fsharp/FSharp.LanguageService.Compiler/lex.*
 src/fsharp/FSharp.LanguageService.Compiler/pars.*
 src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
 src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
 src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
-tests/fsharp/typecheck/sigs/*.dll
-tests/fsharp/typecheck/sigs/*.exe
-tests/fsharp/typeProviders/builtin/SqlDataConnection/DataDirectory/
-tests/fsharp/typeProviders/builtin/SqlDataConnection/ExampleResolutionFolder/
-tests/fsharp/typeProviders/builtin/SqlEntityConnection/DataDirectory/
 vsintegration/src/unittests/Unittests.fsi
 tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
 tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
-tests/fsharp/typeProviders/helloWorld/bincompat1/
-tests/fsharp/typeProviders/helloWorld/bincompat2/
 tests/XFSharpQA_Failures.log.*
 vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
 vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
@@ -143,6 +130,7 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLi
 packages
 FSharp.Core.Nuget/*.nupkg
 *.csproj.user
+*.sln.DotSettings.user
 
 *.ide
 *.log
@@ -152,3 +140,5 @@ FSharp.Core.Nuget/*.nupkg
 FSharp.Compiler.Tools.Nuget/*.nupkg
 FSharp.Core.Nuget/*.nupkg
 *.orig
+*.mdf
+*.ldf

CHANGES.txt

@@ -1,3 +1,6 @@
+4.0.0.4
+  * Integrate Microsoft\visualfsharp to 2d413fb94. See CHANGELOG.md for changes from Microsoft\visualfsharp
+
 4.0.0.3
   * Fix build problems
 

src/absil/ildiag.fsi

@@ -2,7 +2,7 @@
 
 /// Diagnostics from the AbsIL toolkit. You can reset the diagnostics 
 /// stream to point elsewhere, or turn it
-/// off altogether by setting it to 'None'.  The logging channel initally
+/// off altogether by setting it to 'None'.  The logging channel initially
 /// points to stderr.  All functions call flush() automatically.
 ///
 /// REVIEW: review if we should just switch to System.Diagnostics

src/absil/illib.fs

@@ -767,7 +767,7 @@ type LazyWithContext<'T,'ctxt> =
         match x.funcOrException with 
         | null -> x.value 
         | _ -> 
-            // Enter the lock in case another thread is in the process of evaluting the result
+            // Enter the lock in case another thread is in the process of evaluating the result
             System.Threading.Monitor.Enter(x);
             try 
                 x.UnsynchronizedForce(ctxt)