Merge pull request #555 from dsyme/integrate-6

Integrate visualfsharp/master --> fsharp/master --> master

Author: dsyme

.gitignore

@@ -31,6 +31,7 @@ Release
 vsdebug
 vsrelease
 Proto
+sign_temp
 .libs
 Makefile
 configure
@@ -98,6 +99,8 @@ src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
 src/fsharp/FSharp.LanguageService.Compiler/lex.*
 src/fsharp/FSharp.LanguageService.Compiler/pars.*
 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.*
@@ -108,9 +111,10 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLi
 packages
 FSharp.Compiler.Tools.Nuget/*.nupkg
 FSharp.Core.Nuget/*.nupkg
+tests/fsharpqa/Source/*FSharpQA_Failures.env
+tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.csproj.user
 *.sln.DotSettings.user
-
 *.ide
 *.log
 *.jrs
@@ -128,3 +132,5 @@ src/fsharp/FSharp.Compiler.Service/pplex.fs
 src/fsharp/FSharp.Compiler.Service/pppars.fs
 src/fsharp/FSharp.Compiler.Service/pppars.fsi
 .fake
+*.cto
+tests/**/FSharp.Core.dll

.travis.yml

@@ -6,6 +6,7 @@ os:
 
 mono:
   - latest
+  - 4.2.2
   - 4.0.5
 
 sudo: false
@@ -14,3 +15,4 @@ install:
 
 script: 
   - ./build.sh NuGet
+

CHANGELOG-fsharp.md

@@ -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-visualfsharp.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.

CONTRIBUTING.md

@@ -0,0 +1,58 @@
+## How to contribute to F#
+
+See [contributing guide][fsharp-contributing-guide] for more info
+
+### First, check if this is the right repository
+
+The https://github.com/fsharp/fsharp repository is for cross platform packaging only.
+The development of the compiler and core library is at [Microsoft/visualfsharp][Microsoft/visualfsharp].
+
+* **Is this a language suggestion?** Use the [F# Language User Voice](http://fslang.uservoice.com)
+
+* **Is the issue specific to F# on Mono/OSX/Linux?** This might be the right repository.
+
+* **Is the issue a bug in Mono?** Please report to [Mono Bugzilla](https://bugzilla.xamarin.com/)
+
+* **Is the issue specific to F# on Windows or Visual Studio?** Use the [Microsoft/visualfsharp][Microsoft/visualfsharp] repository
+
+* **Is the issue a general bug in the F# compiler/core library?** Use the  [Microsoft/visualfsharp][Microsoft/visualfsharp] repository
+
+#### **Did you find a bug?**
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/fsharp/fsharp/issues) and in the [Microsoft/visualfsharp Issues](https://github.com/Microsoft/visualfsharp/issues).
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/fsharp/fsharp/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+
+* For more detailed information on submitting a bug report and creating an issue, visit our [contributing guide][fsharp-contributing-guide].
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new GitHub pull request with the patch
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+* Is the issue about the future evolution of the F# Language or Core Library? Suggest your change in the [F# Language Design User Voice site](https://fslang.uservoice.com/forums/245727-f-language).
+  After a feature/change is "approved-in-principle", it's discussed in the [F# language design repository](https://github.com/fsharp/FSharpLangDesign/issues)
+  and implemented as Github pull request in the [Microsoft/visualfsharp][Microsoft/visualfsharp] repository
+  
+* Otherwise, open a Github pull request
+
+#### **Do you have questions about the source code?**
+
+* Ask any question about how to use F# in the [F# mailing list](https://groups.google.com/forum/m/#!forum/fsharp-opensource) or on stackoverflow.
+
+* Check the Contribute section in the [fsharp.org site](http://fsharp.org/) for more info
+
+</br>
+
+Thanks!
+
+The [F# Core Engineering Group][fsg] (a technical working group of [The F# Software Foundation][fsf])
+
+ [fsg]: http://fsharp.github.io/
+ [fsf]: http://fsharp.org
+ [Microsoft/visualfsharp]: https://github.com/Microsoft/visualfsharp
+ [fsharp-contributing-guide]: http://fsharp.github.io/2014/06/18/fsharp-contributions.html
+ 

ISSUE_TEMPLATE.md

@@ -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
+
+

README.md

@@ -22,7 +22,6 @@ Head (branch ``master``), Mono 3.x, OSX + unit tests (Travis) [![Build Status](h
 Head (branch ``master``), Windows Server 2012 R2 + unit tests (AppVeyor)  [![Build status](https://ci.appveyor.com/api/projects/status/3yllu2qh19brk61d)](https://ci.appveyor.com/project/fsgit/fsharp-compiler-service)
 
 NuGet Feed  [![NuGet Badge](https://buildstats.info/nuget/FSharp.Compiler.Service)](https://www.nuget.org/packages/FSharp.Compiler.Service)
-------------
 
 Stable builds are available in the NuGet Gallery:
 [https://www.nuget.org/packages/FSharp.Compiler.Service](https://www.nuget.org/packages/FSharp.Compiler.Service)

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 4.0.0
+* Integrate Microsoft\visualfsharp and fsharp\fsharp to master
+
 #### 3.0.0.0
 * #538 - BackgroundCompiler takes a very long time on a big solution with a very connected project dependency graph
 * #544 - Losing operator call when one of operands is application of a partially applied function

netci.groovy

@@ -0,0 +1,65 @@
+import jobs.generation.Utilities;
+
+def project = GithubProject
+def branch = GithubBranchName
+
+def osList = ['Windows_NT'] //'Ubuntu', 'OSX', 'CentOS7.1'
+
+def machineLabelMap = ['Ubuntu':'ubuntu-doc',
+                       'OSX':'mac',
+                       'Windows_NT':'windows-elevated',
+                       'CentOS7.1' : 'centos-71']
+
+def static getBuildJobName(def configuration, def os) {
+    return configuration.toLowerCase() + '_' + os.toLowerCase()
+}
+
+[true, false].each { isPullRequest ->
+    ['Debug', 'Release'].each { configuration ->
+        osList.each { os ->
+
+            def lowerConfiguration = configuration.toLowerCase()
+	        
+            // Calculate job name
+            def jobName = getBuildJobName(configuration, os)
+
+            def buildCommand = '';
+            if (os == 'Windows_NT') {
+                buildCommand = ".\\jenkins-build.cmd ${lowerConfiguration}"
+            }
+            else {
+                buildCommand = "./jenkins-build.sh ${lowerConfiguration}"
+            }
+
+            def newJobName = Utilities.getFullJobName(project, jobName, isPullRequest)
+            def newJob = job(newJobName) {
+                label(machineLabelMap[os])
+                steps {
+                    if (os == 'Windows_NT') {
+                        // Batch
+                        batchFile(buildCommand)
+                    }
+                    else {
+                        // Shell
+                        shell(buildCommand)
+                    }
+                }
+            }
+			
+			// TODO: set to false after tests are fully enabled
+			def skipIfNoTestFiles = true
+            
+			Utilities.setMachineAffinity(newJob, os, 'latest-or-auto')
+			Utilities.standardJobSetup(newJob, project, isPullRequest, "*/${branch}")
+			Utilities.addXUnitDotNETResults(newJob, 'tests/TestResults/**/*_Xml.xml', skipIfNoTestFiles)
+			Utilities.addArchival(newJob, "${lowerConfiguration}/**")
+			
+			if (isPullRequest) {
+				Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${configuration} Build")
+			}
+			else {
+				Utilities.addGithubPushTrigger(newJob)
+			}
+        }
+    }
+}

paket.dependencies

@@ -9,5 +9,7 @@ nuget SQLite.Net.Platform.Generic 2.4.1
 nuget FAKE
 nuget FSharp.Formatting
 nuget SourceLink.Fake
+nuget fssrgen
+nuget FSharp.SRGen.Build.Tasks
 
 github fsharp/FAKE modules/Octokit/Octokit.fsx