Skip to content

Commit b2042ba

Browse files
authored
Merge branch 'main' into merges/release/dev17.8-to-main
2 parents 0f0e7f9 + abe96cd commit b2042ba

Some content is hidden

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

56 files changed

+390
-301
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apt-get update \
1414
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
1515
# Verify bash, git, process tools, lsb-release (common in install instructions for CLIs) installed
1616
&& apt-get -y install bash git openssh-client less iproute2 procps lsb-release \
17+
&& apt-get -y install gnupg \
1718
# Clean up
1819
&& apt-get autoremove -y \
1920
&& apt-get clean -y \
@@ -23,4 +24,4 @@ RUN apt-get update \
2324
ENV DEBIAN_FRONTEND=dialog
2425

2526
# Make sure we can build using plain dotnet
26-
ENV BUILDING_USING_DOTNET="true"
27+
ENV BUILDING_USING_DOTNET="true"

.vscode/tasks.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020
"type": "shell",
2121
"args": [
2222
"build",
23-
"-c Debug",
23+
"-c",
24+
"Debug",
2425
"FSharp.Compiler.Service.sln"
2526
],
2627
"windows": {
2728
"command": "dotnet",
2829
"args": [
2930
"build",
30-
"-c Debug",
31+
"-c",
32+
"Debug",
3133
"FSharp.Compiler.Service.sln"
3234
],
3335
},
@@ -40,14 +42,16 @@
4042
"type": "shell",
4143
"args": [
4244
"build",
43-
"-c Release",
45+
"-c",
46+
"Release",
4447
"FSharp.Compiler.Service.sln"
4548
],
4649
"windows": {
4750
"command": "dotnet",
4851
"args": [
4952
"build",
50-
"-c Release",
53+
"-c",
54+
"Release",
5155
"FSharp.Compiler.Service.sln"
5256
],
5357
},

DEVGUIDE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@ You can find all test options as separate flags. For example `build -testAll`:
122122

123123
Running any of the above will build the latest changes and run tests against them.
124124

125+
## Using your custom compiler to build this repository
126+
127+
By removing all the subfolders called `Proto` under `artifacts` and running the `build` script again, the proto compiler will include your changes.
128+
129+
Once the "proto" compiler is built, it won't be built again, so you may want to perform those steps again to ensure your changes don't break building the compiler itself.
130+
125131
## Using your custom compiler to build other projects
126132

127133
Building the compiler using `build.cmd` or `build.sh` will output artifacts in `artifacts\bin`.

INTERNAL.md

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,29 +98,6 @@ Since github issue filtering is currently not flexible enough, that query was ge
9898
Invoke-WebRequest -Uri "https://api.github.com/repos/dotnet/fsharp/labels?per_page=100" | ConvertFrom-Json | % { $_.name } | ? { $_.StartsWith("Area-") } | % { Write-Host -NoNewLine ('-label:"' + $_ + '" ') }
9999
```
100100

101-
## Less interesting links
102-
103-
[FSharp.Core (Official NuGet Release)](https://dev.azure.com/dnceng/internal/_release?_a=releases&definitionId=72).
104-
Uploads the final `FSharp.Core` package from the specified build to NuGet. This should only be run when we know for
105-
certain which build produced the final offical package.
106-
107-
[FSharp.Core (Preview NuGet Release)](https://dev.azure.com/dnceng/internal/_release?_a=releases&definitionId=92).
108-
Uploads the preview `FSharp.Core.*-beta.*` package from the specified build to NuGet. This should be run every time
109-
a new SDK preview is released.
110-
111-
[FCS (Official NuGet Release)](https://dev.azure.com/dnceng/internal/_release?view=mine&_a=releases&definitionId=99).
112-
Uploads the final `FSharp.Compiler.Service` package from the specified build to NuGet. Only builds from the `release/fcs`
113-
branch can be selected. This should only be run when we're fairly certain that the package is complete.
114-
115-
[FCS (Preview NuGet Release)](https://dev.azure.com/dnceng/internal/_release?view=mine&_a=releases&definitionId=98).
116-
Uploads the preview `FSharp.Compiler.Service.*-preview.*` package from the specified build to NuGet. Only builds from the
117-
`main` branch can be selected. This can be run whenever we think we're ready to preview a new FCS build.
118-
119-
[Nightly VSIX (main) uploader](https://dev.azure.com/dnceng/internal/_release?_a=releases&definitionId=70). Uploads
120-
a package from every build of `main` to the [Nightly VSIX feed](README.md#using-nightly-releases-in-visual-studio).
121-
122-
[Nightly VSIX (preview) uploader](https://dev.azure.com/dnceng/internal/_release?_a=releases&definitionId=71). Uploads
123-
a package from every build of the branch that corresponds to the current Visual Studio preview to the
124-
[Preview VSIX feed](README.md#using-nightly-releases-in-visual-studio).
101+
## Other links
125102

126103
[Internal source mirror](https://dev.azure.com/dnceng/internal/_git/dotnet-fsharp).

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ Even if you find a single-character typo, we're happy to take the change! Althou
7575
<add key="fsharp-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
7676
```
7777

78+
**NOTE:** Official NuGet releases of FCS and FSharp.Core are synched with SDK releases (on purpose - we want to be in sync). Nightly packages release to Azure feeds on every successful insertion.
79+
7880
## Branches
7981

8082
These are the branches in use:

0 commit comments

Comments
 (0)