Skip to content

Commit 724d60b

Browse files
KevinRansomKevinRansom
committed
merge
2 parents d97e449 + 522dd90 commit 724d60b

File tree

265 files changed

+19131
-9903
lines changed

Some content is hidden

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

265 files changed

+19131
-9903
lines changed

‎.devcontainer/Dockerfile

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

+34
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+
}

‎.vscode/launch.json

-23
This file was deleted.

‎.vscode/settings.json

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

-16
This file was deleted.

‎CODE_OF_CONDUCT.md

+4-44
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,6 @@
1-
# Contributor Covenant Code of Conduct
1+
# Code of Conduct
22

3-
## Our Pledge
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
45

5-
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6-
7-
## Our Standards
8-
9-
Examples of behavior that contributes to creating a positive environment include:
10-
11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
16-
17-
Examples of unacceptable behavior by participants include:
18-
19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21-
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
* Other conduct which could reasonably be considered inappropriate in a professional setting
24-
25-
## Our Responsibilities
26-
27-
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28-
29-
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30-
31-
## Scope
32-
33-
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34-
35-
## Enforcement
36-
37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38-
39-
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40-
41-
## Attribution
42-
43-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
44-
45-
[homepage]: https://contributor-covenant.org
46-
[version]: https://contributor-covenant.org/version/1/4/
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

‎FSharpBuild.Directory.Build.targets

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44
<Import Project="eng\targets\Imports.targets" />
55
<Import Project="eng\targets\NuGet.targets" />
6-
<Import Project="eng\targets\NGenBinaries.targets" />
76
<Import Project="FSharp.Profiles.props" />
87

98
<Target Name="NoneSubstituteTextFiles"

‎NuGet.config

+2-7
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<clear />
99
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
11+
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
12+
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
1113
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1214
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
1315
<add key="roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
14-
<add key="myget-dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
15-
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
1616
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
1818
<add key="symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
@@ -22,11 +22,6 @@
2222
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
2323
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
2424
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
25-
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
26-
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
27-
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
28-
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
29-
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
3025
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
3126
</packageSources>
3227
<disabledPackageSources>

‎README.md

+8
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ Build from the command line:
3030

3131
After it's finished, open `FSharp.sln` in your editor of choice.
3232

33+
### Visual Studio Online quickstart
34+
35+
If you'd like to use Visual Studio online (or VSCode with VSO as backend), just click this button to create a new online environment:
36+
37+
<a href="https://online.visualstudio.com/environments/new?name=my-fsharp&repo=dotnet/fsharp"><img src="https://img.shields.io/static/v1?style=flat-square&logo=microsoft&label=VS%20Online&message=Create&color=blue" alt="VS Online"></a>
38+
39+
This will provision an environment with all necessary dependencies. Initial build of the environment may take up to 10 minutes, as it's also performing initial build of the F# compiler.
40+
3341
### More options and information
3442

3543
See [DEVGUIDE.md](DEVGUIDE.md) and [TESTGUIDE.md](TESTGUIDE.md) for more details on additional configurations for building and testing, how to update compiler error messages, and more.

‎azure-pipelines.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ stages:
207207
# Linux
208208
- job: Linux
209209
pool:
210-
vmImage: ubuntu-16.04
210+
vmImage: ubuntu-latest
211211
variables:
212212
- name: _SignType
213213
value: Test
@@ -283,7 +283,7 @@ stages:
283283
# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
284284
# - job: SourceBuild_Linux
285285
# pool:
286-
# vmImage: ubuntu-16.04
286+
# vmImage: ubuntu-latest
287287
# steps:
288288
# - checkout: self
289289
# clean: true
@@ -379,7 +379,7 @@ stages:
379379

380380
- job: Linux_FCS
381381
pool:
382-
vmImage: ubuntu-16.04
382+
vmImage: ubuntu-latest
383383
variables:
384384
- name: _SignType
385385
value: Test

‎eng/Build.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ try {
324324

325325
if ($bootstrap) {
326326
$script:BuildMessage = "Failure building bootstrap compiler"
327+
$toolsetBuildProj = InitializeToolset
327328
$bootstrapDir = Make-BootstrapBuild
328329
}
329330

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20124.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20208.8">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>0b8ce7c1c078eefb4cbc4d7e67ffc02f1f73382d</Sha>
8+
<Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/build-utils.ps1

+22-8
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,30 @@ function Make-BootstrapBuild() {
237237
Create-Directory $dir
238238

239239
# prepare FsLex and Fsyacc and AssemblyCheck
240-
Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Publish /p:PublishWindowsPdb=false" -logFileName "BuildTools" -configuration $bootstrapConfiguration
241-
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp3.0\publish" -Destination "$dir\fslex" -Force -Recurse
242-
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp3.0\publish" -Destination "$dir\fsyacc" -Force -Recurse
243-
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\netcoreapp3.0\publish" -Destination "$dir\AssemblyCheck" -Force -Recurse
240+
$dotnetPath = InitializeDotNetCli
241+
$dotnetExe = Join-Path $dotnetPath "dotnet.exe"
242+
$buildToolsProject = "$RepoRoot\src\buildtools\buildtools.proj"
243+
244+
$argNoRestore = if ($norestore) { " --no-restore" } else { "" }
245+
$argNoIncremental = if ($rebuild) { " --no-incremental" } else { "" }
246+
247+
$args = "build $buildToolsProject -c $bootstrapConfiguration -v $verbosity -f netcoreapp3.0" + $argNoRestore + $argNoIncremental
248+
Exec-Console $dotnetExe $args
249+
250+
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\fslex" -Force -Recurse
251+
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\fsyacc" -Force -Recurse
252+
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\netcoreapp3.0" -Destination "$dir\AssemblyCheck" -Force -Recurse
244253

245254
# prepare compiler
246-
$projectPath = "$RepoRoot\proto.proj"
247-
Run-MSBuild $projectPath "/restore /t:Publish /p:TargetFramework=$bootstrapTfm;ProtoTargetFramework=$bootstrapTfm /p:PublishWindowsPdb=false" -logFileName "Bootstrap" -configuration $bootstrapConfiguration
248-
Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsc" -Force -Recurse
249-
Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsi" -Force -Recurse
255+
$protoProject = "$RepoRoot\proto.proj"
256+
$args = "build $protoProject -c $bootstrapConfiguration -v $verbosity -f $bootstrapTfm" + $argNoRestore + $argNoIncremental
257+
Exec-Console $dotnetExe $args
258+
259+
Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm" -Destination "$dir\fsc" -Force -Recurse
260+
Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm" -Destination "$dir\fsi" -Force -Recurse
250261

251262
return $dir
252263
}
264+
265+
266+

‎eng/common/tools.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,14 @@ function InstallDotNet {
210210

211211
local runtimeSourceFeedKey=''
212212
if [[ -n "${7:-}" ]]; then
213-
decodedFeedKey=`echo $7 | base64 --decode`
213+
# The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
214+
# '-d'. To work around this, do a simple detection and switch the parameter
215+
# accordingly.
216+
decodeArg="--decode"
217+
if base64 --help 2>&1 | grep -q "BusyBox"; then
218+
decodeArg="-d"
219+
fi
220+
decodedFeedKey=`echo $7 | base64 $decodeArg`
214221
runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
215222
fi
216223

‎eng/release/insert-into-vs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
componentBranchName: ''
3-
insertBuildPolicy: 'CloudBuild - Request RPS'
3+
insertBuildPolicy: 'Request Perf DDRITs'
44
insertTargetBranch: ''
55
insertTeamEmail: ''
66
insertTeamName: ''
@@ -27,7 +27,7 @@ stages:
2727
- name: InsertTeamName
2828
value: ${{ parameters.insertTeamName }}
2929
- name: InsertPayloadName
30-
value: 'F# $(Build.SourceBranchName) $(Build.BuildNumber)'
30+
value: '${{ parameters.insertTeamName }} $(Build.SourceBranchName) $(Build.BuildNumber)'
3131
steps:
3232
- task: DownloadBuildArtifacts@0
3333
displayName: Download Insertion Artifacts

‎fcs/FSharp.Compiler.Service.sln

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{B6B6
77
build.cmd = build.cmd
88
build.fsx = build.fsx
99
build.sh = build.sh
10-
nuget\FSharp.Compiler.Service.MSBuild.v12.nuspec = nuget\FSharp.Compiler.Service.MSBuild.v12.nuspec
11-
nuget\FSharp.Compiler.Service.nuspec = nuget\FSharp.Compiler.Service.nuspec
1210
paket.dependencies = paket.dependencies
1311
README.md = README.md
1412
RELEASE_NOTES.md = RELEASE_NOTES.md

0 commit comments

Comments
 (0)