Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated FCS to .NET/F# 9.0 + Prepare Fable 5 alpha #3957

Merged
merged 6 commits into from
Nov 24, 2024
Merged
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
72 changes: 37 additions & 35 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

Expand All @@ -95,10 +95,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

Expand All @@ -113,10 +113,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

Expand Down Expand Up @@ -181,10 +181,10 @@ jobs:
test: ["default", "no_std", "threaded"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

Expand All @@ -207,10 +207,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

Expand All @@ -222,37 +222,39 @@ jobs:

# Separate job to run F# analyzers
analyzers:
runs-on: windows-latest
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'

- name: Restore tools
run: dotnet tool restore
- name: Restore tools
run: dotnet tool restore

- name: Build solution
run: dotnet build -c Release Fable.sln
- name: Build solution
run: dotnet build -c Release Fable.sln

- name: Run analyzers for Fable.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.AST/Fable.AST.fsproj
continue-on-error: true
- name: Run analyzers for Fable.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.AST/Fable.AST.fsproj
continue-on-error: true

- name: Run analyzers for Rust.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Rust/AST/Rust.AST.fsproj
continue-on-error: true
- name: Run analyzers for Rust.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Rust/AST/Rust.AST.fsproj
continue-on-error: true

- name: Run analyzers Fable.Transforms
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Fable.Transforms.fsproj
continue-on-error: true
- name: Run analyzers Fable.Transforms
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Fable.Transforms.fsproj
continue-on-error: true

- name: Run analyzers Fable.Compiler
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Compiler/Fable.Compiler.fsproj
continue-on-error: true
- name: Run analyzers Fable.Compiler
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Compiler/Fable.Compiler.fsproj
continue-on-error: true

- name: Upload SARIF files
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: src/reports
- name: Upload SARIF files
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: src/reports
32 changes: 15 additions & 17 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/quicktest-dart",
"--lang",
Expand All @@ -29,7 +29,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/quicktest",
"--exclude",
Expand All @@ -45,7 +45,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/quicktest",
"--lang",
Expand All @@ -62,7 +62,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/quicktest-py",
"--lang",
Expand All @@ -82,7 +82,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/quicktest-rust",
"--lang",
Expand All @@ -102,7 +102,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/quicktest-rust",
"--lang",
Expand All @@ -124,7 +124,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/quicktest-rust",
"--lang",
Expand Down Expand Up @@ -191,7 +191,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/fable-library-dart",
"--outDir", "temp/fable-library-dart",
Expand All @@ -207,7 +207,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/fable-library-ts",
"--outDir", "temp/fable-library-ts",
Expand All @@ -225,7 +225,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/fable-library-py/fable_library",
"--outDir", "temp/fable-library-py/fable_library",
Expand All @@ -241,7 +241,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"src/fable-library-rust/src",
"--outDir", "temp/fable-library-rust/src",
Expand All @@ -250,24 +250,22 @@
"--define", "FABLE_LIBRARY",
"--lang", "Rust",
"--noCache",
"--noParallelTypeCheck",
"--test:MSBuildCracker"
"--noParallelTypeCheck"
]
},
{
"name": "Fable.Cli on ../fable-test",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
"program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net8.0/fable.dll",
"args": [
"--outDir", "${workspaceRoot}/../fable-test",
"--fableLib", "${workspaceRoot}/temp/fable-library-rust",
"--exclude", "Fable.Core",
"--lang", "Rust",
"--noCache",
"--noParallelTypeCheck",
"--test:MSBuildCracker"
"--noParallelTypeCheck"
],
"cwd": "${workspaceRoot}/../fable-test",
"stopAtEntry": false,
Expand All @@ -289,4 +287,4 @@
"console": "internalConsole"
}
]
}
}
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "latestMajor"
"rollForward": "latestMinor"
}
}
Loading
Loading