Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit bfb7dce

Browse files
authored
Merge pull request #7 from xamarin/fsharp-5
Fsharp 5
2 parents dd9e1b3 + 104d906 commit bfb7dce

File tree

2,278 files changed

+271589
-153356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,278 files changed

+271589
-153356
lines changed

.devcontainer/Dockerfile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#-------------------------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
4+
#-------------------------------------------------------------------------------------------------------------
5+
6+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1
7+
8+
# Avoid warnings by switching to noninteractive
9+
ENV DEBIAN_FRONTEND=noninteractive
10+
11+
# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
12+
# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
13+
# will be updated to match your local UID/GID (when using the dockerFile property).
14+
# See https://aka.ms/vscode-remote/containers/non-root-user for details.
15+
ARG USERNAME=vscode
16+
ARG USER_UID=1000
17+
ARG USER_GID=$USER_UID
18+
19+
# Configure apt and install packages
20+
RUN apt-get update \
21+
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
22+
#
23+
# Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
24+
&& apt-get -y install git openssh-client less iproute2 procps lsb-release \
25+
#
26+
# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
27+
&& groupadd --gid $USER_GID $USERNAME \
28+
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
29+
# [Optional] Add sudo support for the non-root user
30+
&& apt-get install -y sudo \
31+
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
32+
&& chmod 0440 /etc/sudoers.d/$USERNAME \
33+
#
34+
# Clean up
35+
&& apt-get autoremove -y \
36+
&& apt-get clean -y \
37+
&& rm -rf /var/lib/apt/lists/*
38+
39+
# Switch back to dialog for any ad-hoc use of apt-get
40+
ENV DEBIAN_FRONTEND=dialog

.devcontainer/devcontainer.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.108.0/containers/dotnetcore-3.1-fsharp
3+
{
4+
"name": "F# (.NET Core 3.1)",
5+
"dockerFile": "Dockerfile",
6+
7+
// Set *default* container specific settings.json values on container create.
8+
//
9+
// .NET Core is now the default for F# in .NET Core 3.0+
10+
// However, .NET Core scripting is not the default yet. Set that to true.
11+
"settings": {
12+
"terminal.integrated.shell.linux": "/bin/bash",
13+
"FSharp.useSdkScripts":true,
14+
"editor.trimAutoWhitespace": false,
15+
"files.trimTrailingWhitespace": false,
16+
"FSharp.suggestGitignore": false,
17+
"FSharp.workspacePath": "FSharp.sln"
18+
},
19+
20+
// Add the IDs of extensions you want installed when the container is created.
21+
"extensions": [
22+
"Ionide.Ionide-fsharp",
23+
"ms-dotnettools.csharp"
24+
],
25+
26+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
27+
// "forwardPorts": [],
28+
29+
// Use 'postCreateCommand' to run commands after the container is created.
30+
"postCreateCommand": "./build.sh",
31+
32+
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
33+
// "remoteUser": "vscode"
34+
}

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ mono/config.make text eol=lf
2626
targets.make text eol=lf
2727

2828
*.bsl linguist-vendored=true
29+
30+
*.png binary

.gitignore

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# Patches that may have been generated by scripts.
1010
# (These aren't generally useful to commit directly; if anything, they should be applied.)
1111
scripts/*.patch
12-
1312
/fcs/FSharp.Compiler.Service/illex.fs
1413
/fcs/FSharp.Compiler.Service/ilpars.fs
1514
/fcs/FSharp.Compiler.Service/ilpars.fsi
@@ -54,6 +53,7 @@ scripts/*.patch
5453
/src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
5554
/src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
5655
/src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
56+
/src/fsharp/*/Properties/launchSettings.json
5757
/vsintegration/src/unittests/Unittests.fsi
5858
/tests/*FSharp_Failures.env
5959
/tests/*FSharp_Failures.lst
@@ -119,7 +119,8 @@ source_link.json
119119
.vs/
120120
System.ValueTuple.dll
121121
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
122-
*/.fake
122+
**/.fake
123+
.ionide
123124
/fcs/packages/
124125
*/paket-files/
125126
/fcs/TestResult.xml
@@ -129,3 +130,16 @@ msbuild.binlog
129130
/fcs/FSharp.Compiler.Service.netstandard/*.fs
130131
/fcs/FSharp.Compiler.Service.netstandard/*.fsi
131132
/.ionide/
133+
**/.DS_Store
134+
/tests/fsharp/regression/5531/compilation.output.test.txt
135+
/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.txt
136+
/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.txt
137+
*ncrunch*.user
138+
_NCrunch_*
139+
.*crunch*.local.xml
140+
nCrunchTemp_*
141+
142+
.idea
143+
/tests/fsharp/core/members/set-only-property/vb.dll
144+
/tests/fsharp/core/members/set-only-property/fs.dll
145+
/tests/fsharp/core/members/set-only-property/cs.dll

.vscode/launch.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"editor.trimAutoWhitespace": false,
3+
"files.trimTrailingWhitespace": false,
4+
"FSharp.suggestGitignore": false,
5+
"FSharp.workspacePath": "FSharp.sln"
6+
}

.vscode/tasks.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

.vsconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
99
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
1010
"Microsoft.VisualStudio.Component.FSharp",
11-
"Microsoft.Net.Core.Component.SDK.2.1",
12-
"Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1",
1311
"Microsoft.Net.Component.4.7.2.SDK",
1412
"Microsoft.Net.Component.4.7.2.TargetingPack",
1513
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",

0 commit comments

Comments
 (0)