Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,20 @@
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "6.1.3",
"commands": [
"fake"
]
},
"paket": {
"version": "8.0.3",
"version": "10.3.1",
"commands": [
"paket"
]
},
"fantomas": {
"version": "6.3.16",
"version": "8.0.0-alpha-024",
"commands": [
"fantomas"
]
},
"fsdocs-tool": {
"version": "20.0.1",
"version": "22.1.0",
"commands": [
"fsdocs"
]
Expand Down
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ fsharp_max_function_binding_width = 40
fsharp_max_if_then_else_short_width = 60
fsharp_max_infix_operator_expression = 80
fsharp_max_array_or_list_width = 80
fsharp_max_dot_get_expression_width = 80
fsharp_multiline_bracket_style = aligned
fsharp_keep_max_number_of_blank_lines = 1
3 changes: 2 additions & 1 deletion .fantomasignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Generated by FAKE
AssemblyInfo.fs
.fake/

# Generated files
src/FsLex.Core/fslexlex.fs
Expand All @@ -9,6 +8,8 @@ src/FsLex.Core/fslexpars.fsi
src/FsYacc.Core/fsyacclex.fs
src/FsYacc.Core/fsyaccpars.fs
src/FsYacc.Core/fsyaccpars.fsi
src/FsLex.Core/fslexlex.fsi
src/FsYacc.Core/fsyacclex.fsi

# Ignore for now
tests/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v7
- name: Setup .NET for main project build
uses: actions/setup-dotnet@v5
uses: actions/setup-dotnet@v6
- name: Install local tools
run: dotnet tool restore
- name: Paket restore
run: dotnet paket restore
- name: Build
run: dotnet fake run build.fsx
run: dotnet fsi build.fsx
6 changes: 3 additions & 3 deletions .github/workflows/push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
steps:
- uses: actions/checkout@v7
- name: Setup .NET for main project build
uses: actions/setup-dotnet@v5
uses: actions/setup-dotnet@v6
- name: Install local tools
run: dotnet tool restore
- name: Paket restore
run: dotnet paket restore
- name: Build
run: dotnet fake run build.fsx -t Release
run: dotnet fsi build.fsx -p Release
- name: Publish NuGets (if main version changed)
run: dotnet nuget push "bin/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_KEY }} --skip-duplicate
- name: Build documentation
run: dotnet fake run build.fsx -t GenerateDocs
run: dotnet fsi build.fsx -p Docs
- name: Upload documentation
uses: actions/upload-pages-artifact@v5
with:
Expand Down
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ TestResults.xml
nuget/*.nupkg

# FAKE build
.fake/

# IDEs
.vs/
Expand All @@ -193,6 +192,8 @@ src/FsLex/fslexpars.fsi
src/FsYacc/fsyacclex.fs
src/FsYacc/fsyaccpars.fs
src/FsYacc/fsyaccpars.fsi
src/FsLex.Core/fslexlex.fsi
src/FsYacc.Core/fsyacclex.fsi
tests/fsyacc/test1-unicode.exe.config
tests/fsyacc/test1.exe.config
tests/fsyacc/test1.input1.bsl.err
Expand All @@ -202,16 +203,22 @@ tests/fsyacc/test2compat.exe.config
tests/fsyacc/Test1/test1.fs
tests/fsyacc/Test1/test1.fsi
tests/fsyacc/Test1/test1lex.fs
tests/fsyacc/Test1/test1lex.fsi

.paket
.idea/
.vs/
.ionide/
tests/fsyacc/unicode/test1-unicode-lex.fs
tests/fsyacc/unicode/test1-unicode-lex.fsi
tests/fsyacc/unicode/test1-unicode.fs
tests/fsyacc/unicode/test1-unicode.fsi
tests/fsyacc/unicode/test1-unicode.input3.tokens.bsl.err
tests/fsyacc/Test2/test2lex.fs
tests/fsyacc/Test2/test2lex.fsi
tests/fsyacc/Test2/test2.fs
tests/fsyacc/Test2/test2.fsi
tests/fsyacc/repro_#141/Lexer_fail_option_i.fs
tests/fsyacc/repro_#141/Lexer_fail_option_i.fsi
tests/fsyacc/repro1885/repro1885.fs
tests/fsyacc/repro1885/repro1885.fsi
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#### 12.0.0 - Unreleased
* Migrate fslex and fsyacc to net10.0. The tools now require a .NET 10 runtime #244
* Raise the minimum FSharp.Core version to 10.0.0 #244

#### 11.4.1 - 28 August, 2026
* Fix fslex generating an invalid signature file when the header defines a module #240

Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off
dotnet tool restore
dotnet paket restore
dotnet fake run build.fsx %*
dotnet fsi build.fsx %*
Loading
Loading