Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 418fb1f

Browse files
ncaveMangelMaxime
ncave
and
MangelMaxime
authoredNov 24, 2024··
Updated FCS to .NET/F# 9.0 + Prepare Fable 5 alpha (#3957)
Co-authored-by: Maxime Mangel <[email protected]>
1 parent 04f5238 commit 418fb1f

File tree

32 files changed

+5207
-2668
lines changed

32 files changed

+5207
-2668
lines changed
 

‎.github/workflows/build.yml‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ jobs:
7474
runs-on: ubuntu-latest
7575

7676
steps:
77-
- uses: actions/checkout@v2
77+
- uses: actions/checkout@v4
7878

7979
- name: Setup .NET
80-
uses: actions/setup-dotnet@v1
80+
uses: actions/setup-dotnet@v3
8181
with:
8282
dotnet-version: '8.0.x'
8383

@@ -95,10 +95,10 @@ jobs:
9595
runs-on: ubuntu-latest
9696

9797
steps:
98-
- uses: actions/checkout@v2
98+
- uses: actions/checkout@v4
9999

100100
- name: Setup .NET
101-
uses: actions/setup-dotnet@v1
101+
uses: actions/setup-dotnet@v3
102102
with:
103103
dotnet-version: '8.0.x'
104104

@@ -113,10 +113,10 @@ jobs:
113113
runs-on: ubuntu-latest
114114

115115
steps:
116-
- uses: actions/checkout@v2
116+
- uses: actions/checkout@v4
117117

118118
- name: Setup .NET
119-
uses: actions/setup-dotnet@v1
119+
uses: actions/setup-dotnet@v3
120120
with:
121121
dotnet-version: '8.0.x'
122122

@@ -181,10 +181,10 @@ jobs:
181181
test: ["default", "no_std", "threaded"]
182182

183183
steps:
184-
- uses: actions/checkout@v2
184+
- uses: actions/checkout@v4
185185

186186
- name: Setup .NET
187-
uses: actions/setup-dotnet@v1
187+
uses: actions/setup-dotnet@v3
188188
with:
189189
dotnet-version: '8.0.x'
190190

@@ -207,10 +207,10 @@ jobs:
207207
runs-on: ubuntu-latest
208208

209209
steps:
210-
- uses: actions/checkout@v2
210+
- uses: actions/checkout@v4
211211

212212
- name: Setup .NET
213-
uses: actions/setup-dotnet@v1
213+
uses: actions/setup-dotnet@v3
214214
with:
215215
dotnet-version: '8.0.x'
216216

@@ -222,37 +222,39 @@ jobs:
222222

223223
# Separate job to run F# analyzers
224224
analyzers:
225-
runs-on: windows-latest
225+
runs-on: ubuntu-latest
226226

227-
steps:
228-
- uses: actions/checkout@v4
227+
steps:
228+
- uses: actions/checkout@v4
229229

230-
- name: Setup .NET
231-
uses: actions/setup-dotnet@v4
230+
- name: Setup .NET
231+
uses: actions/setup-dotnet@v3
232+
with:
233+
dotnet-version: '8.0.x'
232234

233-
- name: Restore tools
234-
run: dotnet tool restore
235+
- name: Restore tools
236+
run: dotnet tool restore
235237

236-
- name: Build solution
237-
run: dotnet build -c Release Fable.sln
238+
- name: Build solution
239+
run: dotnet build -c Release Fable.sln
238240

239-
- name: Run analyzers for Fable.AST
240-
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.AST/Fable.AST.fsproj
241-
continue-on-error: true
241+
- name: Run analyzers for Fable.AST
242+
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.AST/Fable.AST.fsproj
243+
continue-on-error: true
242244

243-
- name: Run analyzers for Rust.AST
244-
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Rust/AST/Rust.AST.fsproj
245-
continue-on-error: true
245+
- name: Run analyzers for Rust.AST
246+
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Rust/AST/Rust.AST.fsproj
247+
continue-on-error: true
246248

247-
- name: Run analyzers Fable.Transforms
248-
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Fable.Transforms.fsproj
249-
continue-on-error: true
249+
- name: Run analyzers Fable.Transforms
250+
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Fable.Transforms.fsproj
251+
continue-on-error: true
250252

251-
- name: Run analyzers Fable.Compiler
252-
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Compiler/Fable.Compiler.fsproj
253-
continue-on-error: true
253+
- name: Run analyzers Fable.Compiler
254+
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Compiler/Fable.Compiler.fsproj
255+
continue-on-error: true
254256

255-
- name: Upload SARIF files
256-
uses: github/codeql-action/upload-sarif@v2
257-
with:
258-
sarif_file: src/reports
257+
- name: Upload SARIF files
258+
uses: github/codeql-action/upload-sarif@v2
259+
with:
260+
sarif_file: src/reports

‎.vscode/launch.json‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "coreclr",
1010
"request": "launch",
1111
"preLaunchTask": "build",
12-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
12+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
1313
"args": [
1414
"src/quicktest-dart",
1515
"--lang",
@@ -29,7 +29,7 @@
2929
"type": "coreclr",
3030
"request": "launch",
3131
"preLaunchTask": "build",
32-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
32+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
3333
"args": [
3434
"src/quicktest",
3535
"--exclude",
@@ -45,7 +45,7 @@
4545
"type": "coreclr",
4646
"request": "launch",
4747
"preLaunchTask": "build",
48-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
48+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
4949
"args": [
5050
"src/quicktest",
5151
"--lang",
@@ -62,7 +62,7 @@
6262
"type": "coreclr",
6363
"request": "launch",
6464
"preLaunchTask": "build",
65-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
65+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
6666
"args": [
6767
"src/quicktest-py",
6868
"--lang",
@@ -82,7 +82,7 @@
8282
"type": "coreclr",
8383
"request": "launch",
8484
"preLaunchTask": "build",
85-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
85+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
8686
"args": [
8787
"src/quicktest-rust",
8888
"--lang",
@@ -102,7 +102,7 @@
102102
"type": "coreclr",
103103
"request": "launch",
104104
"preLaunchTask": "build",
105-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
105+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
106106
"args": [
107107
"src/quicktest-rust",
108108
"--lang",
@@ -124,7 +124,7 @@
124124
"type": "coreclr",
125125
"request": "launch",
126126
"preLaunchTask": "build",
127-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
127+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
128128
"args": [
129129
"src/quicktest-rust",
130130
"--lang",
@@ -191,7 +191,7 @@
191191
"type": "coreclr",
192192
"request": "launch",
193193
"preLaunchTask": "build",
194-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
194+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
195195
"args": [
196196
"src/fable-library-dart",
197197
"--outDir", "temp/fable-library-dart",
@@ -207,7 +207,7 @@
207207
"type": "coreclr",
208208
"request": "launch",
209209
"preLaunchTask": "build",
210-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
210+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
211211
"args": [
212212
"src/fable-library-ts",
213213
"--outDir", "temp/fable-library-ts",
@@ -225,7 +225,7 @@
225225
"type": "coreclr",
226226
"request": "launch",
227227
"preLaunchTask": "build",
228-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
228+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
229229
"args": [
230230
"src/fable-library-py/fable_library",
231231
"--outDir", "temp/fable-library-py/fable_library",
@@ -241,7 +241,7 @@
241241
"type": "coreclr",
242242
"request": "launch",
243243
"preLaunchTask": "build",
244-
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
244+
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
245245
"args": [
246246
"src/fable-library-rust/src",
247247
"--outDir", "temp/fable-library-rust/src",
@@ -250,24 +250,22 @@
250250
"--define", "FABLE_LIBRARY",
251251
"--lang", "Rust",
252252
"--noCache",
253-
"--noParallelTypeCheck",
254-
"--test:MSBuildCracker"
253+
"--noParallelTypeCheck"
255254
]
256255
},
257256
{
258257
"name": "Fable.Cli on ../fable-test",
259258
"type": "coreclr",
260259
"request": "launch",
261260
"preLaunchTask": "build",
262-
"program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
261+
"program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
263262
"args": [
264263
"--outDir", "${workspaceRoot}/../fable-test",
265264
"--fableLib", "${workspaceRoot}/temp/fable-library-rust",
266265
"--exclude", "Fable.Core",
267266
"--lang", "Rust",
268267
"--noCache",
269-
"--noParallelTypeCheck",
270-
"--test:MSBuildCracker"
268+
"--noParallelTypeCheck"
271269
],
272270
"cwd": "${workspaceRoot}/../fable-test",
273271
"stopAtEntry": false,
@@ -289,4 +287,4 @@
289287
"console": "internalConsole"
290288
}
291289
]
292-
}
290+
}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"version": "8.0.100",
4-
"rollForward": "latestMajor"
4+
"rollForward": "latestMinor"
55
}
66
}

0 commit comments

Comments
 (0)