Merge branch 'master' into merges/release/dev16.4-to-master

Author: KevinRansom

.gitattributes

@@ -21,8 +21,7 @@
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
 
-mono/launcher text eol=lf
-mono/config.make text eol=lf
+*.sh text eol=lf
 targets.make text eol=lf
 
 *.bsl linguist-vendored=true

.github/issue_template.md

@@ -0,0 +1,5 @@
+# FSharp.Compiler.Service Issue Template
+
+> Thanks for your intention to help out!
+
+We appreciate your enthusiasm, but this repository is a *read-only* fork of the official F# compiler. Please raise your issue at the [upstream repository](https://github.com/dotnet/fsharp/issues/new).

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+# FSharp.Compiler.Service Pull Request Template
+
+> Thanks for your intention to help out!
+
+We appreciate your enthusiasm, but this repository is a *read-only* fork of the official F# compiler. Please raise your Pull Request at the [upstream repository](https://github.com/dotnet/fsharp/compare).

.gitignore

@@ -9,7 +9,6 @@ artifacts/
 # Patches that may have been generated by scripts.
 # (These aren't generally useful to commit directly; if anything, they should be applied.)
 scripts/*.patch
-
 /fcs/FSharp.Compiler.Service/illex.fs
 /fcs/FSharp.Compiler.Service/ilpars.fs
 /fcs/FSharp.Compiler.Service/ilpars.fsi
@@ -83,32 +82,136 @@ lib/bootstrap/4.1/policy*
 obj/
 bin/
 aclocal.m4
+src/*.userprefs
+src/fsharp/FSStrings.resources
+packages
+src/fsharp/FSharp.Build/*.resx
+src/fsharp/FSharp.Build-proto/*.resx
+src/fsharp/FSharp.Build-proto/*.resources
+src/fsharp/FSharp.Compiler-proto/*.resx
+src/fsharp/FSharp.Compiler-proto/*.resources
+src/fsharp/FSharp.Compiler-proto/*.sln
+src/fsharp/FSharp.Compiler-proto/*.userprefs
+src/fsharp/fsi/*.resx
+src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx
+src/fsharp/FSharp.Compiler.Server.Shared/*.resx
+src/fsharp/fsi/Fsi.sln
+src/fsharp/FSharp.Build/*.resources
+src/fsharp/FSharp.Compiler/*.resx
+src/fsharp/FSharp.Compiler/*.resources
+src/fsharp/FSharp.Compiler/*.sln
+src/fsharp/FSharp.Compiler/*.userprefs
+Debug
+Release
+Proto
 sign_temp
 .libs
 configure
 config.log
 config.status
+src/fsharp/FSharp.Compiler/illex.fs
+src/fsharp/FSharp.Compiler/ilpars.fs
+src/fsharp/FSharp.Compiler/ilpars.fsi
+src/fsharp/FSharp.Compiler/lex.fs
+src/fsharp/FSharp.Compiler/pars.fs
+src/fsharp/FSharp.Compiler/pars.fsi
+src/fsharp/FSharp.Compiler/pplex.fs
+src/fsharp/FSharp.Compiler/pppars.fs
+src/fsharp/FSharp.Compiler/pppars.fsi
+src/fsharp/FSharp.Compiler-proto/illex.fs
+src/fsharp/FSharp.Compiler-proto/ilpars.fs
+src/fsharp/FSharp.Compiler-proto/ilpars.fsi
+src/fsharp/FSharp.Compiler-proto/lex.fs
+src/fsharp/FSharp.Compiler-proto/pars.fs
+src/fsharp/FSharp.Compiler-proto/pars.fsi
+src/fsharp/FSharp.Compiler.Silverlight/lex.fs
+src/fsharp/FSharp.Compiler.Silverlight/pars.fs
+src/fsharp/FSharp.Compiler.Silverlight/pars.fsi
+src/fsharp/FSharp.Compiler-proto/pplex.fs
+src/fsharp/FSharp.Compiler-proto/pppars.fs
+src/fsharp/FSharp.Compiler-proto/pppars.fsi
+
 *~
 *.suo
 obj
+src/fsharp/FSharp.Data.TypeProviders/FSData.resx
+src/fsharp/fsiAnyCpu/FSIstrings.resx
+
+*.nupkg
+
+bin
+packages
+*.bak
+temp/
+src/fsharp/fsi/FSIStrings.fs
+
+src/fsharp/FSharp.Compiler.Service/FSComp.resx
+src/fsharp/FSharp.Compiler.Service/FSIstrings.resx
+src/fsharp/FSharp.Compiler.Service/illex.fs
+src/fsharp/FSharp.Compiler.Service/ilpars.fs
+src/fsharp/FSharp.Compiler.Service/ilpars.fsi
+src/fsharp/FSharp.Compiler.Service/lex.fs
+src/fsharp/FSharp.Compiler.Service/pars.fs
+src/fsharp/FSharp.Compiler.Service/pars.fsi
+TestResults.xml
+*.userprefs
 extras
 ossreadme*.txt
+*.XML
+src/assemblyinfo/assemblyinfo.shared.fs
+*.csproj.user
+src/fsharp/FSharp.LanguageService.Compiler/illex.*
+src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
+src/fsharp/FSharp.LanguageService.Compiler/lex.*
+src/fsharp/FSharp.LanguageService.Compiler/pars.*
+vsintegration/src/unittests/Unittests.fsi
+vsintegration/src/FSharp.ProjectSystem.FSharp/ctofiles/MenusAndCommands.cto
+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.*
+vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
+vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
+tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
+tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
+packages
+FSharp.Compiler.Tools.Nuget/*.nupkg
+FSharp.Core.Nuget/*.nupkg
+tests/fsharpqa/Source/*FSharpQA_Failures.env
+tests/fsharpqa/Source/*FSharpQA_Failures.lst
 *.csproj.user
 *.fsproj.user
 *.vbproj.user
 *.sln.DotSettings.user
 *.log
 *.jrs
 *.chk
+*.bak
+FSharp.Compiler.Tools.Nuget/*.nupkg
+FSharp.Core.Nuget/*.nupkg
+artifacts/*.nupkg
 *.bak                                                     
 *.vserr
 *.err
 *.orig
 *.mdf
 *.ldf
+.paket/paket.exe
+paket-files
+docsrc/tools/FSharp.Formatting.svclog
+src/fsharp/FSharp.Compiler.Service/pplex.fs
+src/fsharp/FSharp.Compiler.Service/pppars.fs
+src/fsharp/FSharp.Compiler.Service/pppars.fsi
+.fake
 *.cto
 *.vstman
 project.lock.json
+src/fsharp/FSharp.Compiler.Service/FSComp.fs
+src/fsharp/FSharp.Compiler.Service/FSComp.resx
+src/fsharp/FSharp.Compiler.Service/FSIstrings.fs
+src/fsharp/FSharp.Compiler.Service/FSIstrings.resx
+Tools/
 Backup/
 tests/fsharp/core/array/dont.run.peverify
 tests/fsharp/core/innerpoly/dont.run.peverify
@@ -120,7 +223,8 @@ source_link.json
 System.ValueTuple.dll
 tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 **/.fake
-.ionide
+lib/netcore/fsc/bin/
+!lib/bootstrap/signed/**/*
 /fcs/packages/
 */paket-files/
 /fcs/TestResult.xml
@@ -129,4 +233,6 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 msbuild.binlog
 /fcs/FSharp.Compiler.Service.netstandard/*.fs
 /fcs/FSharp.Compiler.Service.netstandard/*.fsi
-/.ionide/
+.ionide
+.vscode
+**/.DS_Store

.travis.yml

@@ -0,0 +1,23 @@
+language: csharp
+
+os:
+  - linux
+  - osx
+
+osx_image: xcode11.2
+
+mono:
+  - weekly
+  - latest
+  - 6.6.0
+
+dotnet: 3.1.100
+
+sudo: false
+
+install:
+
+script: 
+  - ./fcs/build.sh
+
+

.vscode/launch.json

@@ -0,0 +1,5 @@
+# Contributing to FSharp.Compiler.Service
+
+> Thanks for your intention to help out!
+
+We appreciate your enthusiasm, but this repository is a *read-only* fork of the official F# compiler. If you have issues, contributions, or questions, please raise them at the [upstream repository](https://github.com/dotnet/fsharp).