Merge pull request #558 from dsyme/integrate-6

Integrate visualfsharp/master --> fsharp/master

Author: dsyme

.gitignore

@@ -31,6 +31,7 @@ Release
 vsdebug
 vsrelease
 Proto
+sign_temp
 .libs
 Makefile
 configure
@@ -119,6 +120,8 @@ src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
 src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
 src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
 vsintegration/src/unittests/Unittests.fsi
+tests/*FSharp_Failures.env
+tests/*FSharp_Failures.lst
 tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
 tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
 tests/XFSharpQA_Failures.log.*
@@ -128,9 +131,10 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
 tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
 packages
 FSharp.Core.Nuget/*.nupkg
+tests/fsharpqa/Source/*FSharpQA_Failures.env
+tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.csproj.user
 *.sln.DotSettings.user
-
 *.ide
 *.log
 *.jrs
@@ -141,3 +145,5 @@ FSharp.Core.Nuget/*.nupkg
 *.orig
 *.mdf
 *.ldf
+*.cto
+tests/**/FSharp.Core.dll

.nuget/NuGet.Config

@@ -9,4 +9,4 @@
     <add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/" />  
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />  
   </packageSources>  
-</configuration>
+</configuration>

.nuget/NuGet.exe

@@ -14,13 +14,7 @@ install:
 before_script:
   - chmod +x travis-autogen.sh
 
-script: 
-  - ./travis-autogen.sh
-  - make 
-  - sudo make install
-  - xbuild ./src/fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
-  - (cd tests/projects; ./build.sh)
-  - (cd tests/fsharp/core; ./run-opt.sh)
+script: ./travis-autogen.sh && make && sudo make install && xbuild ./src/fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release && (cd tests/projects; ./build.sh) && (cd tests/fsharp/core; ./run-opt.sh)
 
 matrix:
   allow_failures:

.travis.yml

@@ -1,3 +1,12 @@
+4.0.1.2
+  * Integrate Microsoft\visualfsharp to 5d8126a. F# 4.1 work
+  *    FCS API integration and alignment
+  *    [#528 Compiler does not catch typing error in pattern matching when using literals](https://github.com/Microsoft/visualfsharp/issues/528)
+  *    [#659 Fsi fails to augment a type constructor](https://github.com/Microsoft/visualfsharp/issues/659)
+  *    [#807 Async.Choice](https://github.com/Microsoft/visualfsharp/pull/807)
+  *    [Response files for fsc/fsi](https://github.com/Microsoft/visualfsharp/pull/831)
+  *    [#919 Fix handling of optional IDispatch, IUnknown method args](https://github.com/Microsoft/visualfsharp/pull/919)
+
 4.0.1.1
   * Integrate Microsoft\visualfsharp to 8111c63. See CHANGELOG-visualfsharp.md for changes from Microsoft\visualfsharp
   * 04cd959 - fix problem with loop optimization

CHANGELOG-fsharp.md

@@ -1,5 +1,5 @@
 
-    Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  
+    Copyright (c) Microsoft Corporation.  All Rights Reserved.  
 
     Licensed under the Apache License, Version 2.0.  
     See License.txt in the project root for license information.

CHANGELOG-visualfsharp.md

@@ -42,6 +42,11 @@
     <file src="..\lib\release\fsiAnyCpu.xml" target="tools\fsiAnyCpu.xml" />
     <file src="..\lib\release\FSharp.Build.dll" target="tools\FSharp.Build.dll" />
     <file src="..\lib\release\FSharp.Build.xml" target="tools\FSharp.Build.xml" />
+	  
+	<!-- Microsoft.FSharp.Targets : Must be used un any distribution of F# for Mono+Linux or any case-sensitive file system using MSBuild --> 
+	<!-- Microsoft.FSharp.Targets or Microsoft.FSharp.targets : Used in the Visual F# Tools distribution (on Windows it doesn't matter). -->
+	<!-- Microsoft.FSharp.targets : Used in the source tree as of 08/04/2016 (prior this was Microsoft.FSharp.Targets) -->
+
     <file src="..\lib\release\Microsoft.FSharp.Targets" target="tools\Microsoft.FSharp.Targets" />
     <file src="..\lib\release\Microsoft.Build.dll" target="tools\Microsoft.Build.dll" />
     <file src="..\lib\release\Microsoft.Build.Engine.dll" target="tools\Microsoft.Build.Engine.dll" />

FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec

@@ -0,0 +1,37 @@
+
+
+Please provide a succinct description of the issue.
+
+#### Repro steps
+
+Provide the steps required to reproduce the problem
+
+1. Step A
+
+2. Step B
+
+#### Expected behavior
+
+Provide a description of the expected behaviour.
+
+#### Actual behavior
+
+Provide a description of the actual behaviour observed. 
+
+#### Known workarounds
+
+Provide a description of any known workarounds.
+
+#### Related information 
+
+Provide any related information 
+
+* Operating system
+* Branch
+* .NET Runtime, CoreCLR or Mono Version
+* Editing Tools (e.g. Visual Studio Version)
+* Links to F# RFCs or entries on http://fslang.uservoice.com
+* Links to performance testing scripts
+* Indications of severity
+
+

ISSUE_TEMPLATE.md

@@ -11,9 +11,13 @@ repository at https://github.com/Microsoft/visualfsharp.  This ensures that the
 packaging of F# on Windows (the Visual F# Tools) also includes any contributions that are made, and
 ensures that the versions do not diverge.
 
-If you are using Windows, you should fork that repo and contribute directly there. Your contributions will
+### Contributing on Windows
+
+If you are using Windows, you should fork the https://github.com/Microsoft/visualfsharp repo and contribute directly there. Your contributions will
 then be merged into this repo.
 
+### Contributing on Linux/OSX when using Mono
+
 If you are using Linux or OSX, you can prepare your contributions by forking this repository (the code is
 essentially the same). This will give you access to the cross-platform testing
 available from this repo. At the moment the process is:

README.md

@@ -1,9 +1,11 @@
 os: Visual Studio 2015
 init:
   - git config --global core.autocrlf input
-build_script:
+
+build_script: 
   - cmd: build.bat
   - ps: .\appveyor.ps1
+
 test: off
 version: '{build}'
 artifacts: