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

Author: KevinRansom

.devcontainer/Dockerfile

@@ -0,0 +1,40 @@
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1
+
+# Avoid warnings by switching to noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
+# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
+# will be updated to match your local UID/GID (when using the dockerFile property).
+# See https://aka.ms/vscode-remote/containers/non-root-user for details.
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Configure apt and install packages
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
+    #
+    # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
+    && apt-get -y install git openssh-client less iproute2 procps lsb-release \
+    #
+    # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
+    && groupadd --gid $USER_GID $USERNAME \
+    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    # [Optional] Add sudo support for the non-root user
+    && apt-get install -y sudo \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
+    && chmod 0440 /etc/sudoers.d/$USERNAME \
+    #
+    # Clean up
+    && apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
+
+# Switch back to dialog for any ad-hoc use of apt-get
+ENV DEBIAN_FRONTEND=dialog

.devcontainer/devcontainer.json

@@ -0,0 +1,34 @@
+// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.108.0/containers/dotnetcore-3.1-fsharp
+{
+	"name": "F# (.NET Core 3.1)",
+	"dockerFile": "Dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	//
+	// .NET Core is now the default for F# in .NET Core 3.0+
+	// However, .NET Core scripting is not the default yet. Set that to true.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"FSharp.useSdkScripts":true,
+		"editor.trimAutoWhitespace": false,
+		"files.trimTrailingWhitespace": false,
+		"FSharp.suggestGitignore": false,
+		"FSharp.workspacePath": "FSharp.sln"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"Ionide.Ionide-fsharp",
+		"ms-dotnettools.csharp"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "./build.sh",
+
+	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+	// "remoteUser": "vscode"
+}

.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

@@ -82,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
@@ -119,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
@@ -128,5 +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,6 @@
+{
+    "editor.trimAutoWhitespace": false,
+    "files.trimTrailingWhitespace": false,
+    "FSharp.suggestGitignore": false,
+    "FSharp.workspacePath": "FSharp.sln"
+}