Skip to content

Commit

Permalink
Net8 configuration (#555)
Browse files Browse the repository at this point in the history
  • Loading branch information
wallymathieu authored Nov 20, 2023
1 parent 8b35146 commit 812f4eb
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"fsdocs-tool": {
"version": "17.2.3",
"version": "19.1.1",
"commands": [
"fsdocs"
]
Expand Down
37 changes: 17 additions & 20 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.100
dotnet-version: |
8.0.x
7.0.x
- name: Restore
run: git submodule update --init --recursive
- name: Build with dotnet
Expand All @@ -42,14 +44,13 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.100
- name: Setup .NET Core 6
uses: actions/setup-dotnet@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.201
dotnet-version: |
8.0.x
7.0.x
6.0.x
- name: Restore
run: git submodule update --init --recursive
- name: Extract branch name
Expand Down Expand Up @@ -85,18 +86,14 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.100
- name: Setup .NET Core 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.201
- name: Setup .NET Core 5
uses: actions/setup-dotnet@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 5.0.405
dotnet-version: |
8.0.x
7.0.x
6.0.x
5.0.x
- name: Restore
run: git submodule update --init --recursive
- name: Build All Docs
Expand Down
39 changes: 18 additions & 21 deletions .github/workflows/fable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ jobs:
run: git submodule update --init --recursive
- name: Remove global json
run: rm global.json
- name: Setup .NET Core 7
uses: actions/setup-dotnet@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.200
- name: Setup .NET Core 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.201
dotnet-version: |
8.0.x
7.0.x
6.0.x
- name: Restore tools
run: dotnet tool restore
- name: Install fable
Expand All @@ -49,14 +48,13 @@ jobs:
run: git submodule update --init --recursive
- name: Remove global json
run: rm global.json
- name: Setup .NET Core 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.200
- name: Setup .NET Core 6
uses: actions/setup-dotnet@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.201
dotnet-version: |
8.0.x
7.0.x
6.0.x
- name: Restore tools
run: dotnet tool restore
- name: Install jq
Expand Down Expand Up @@ -88,14 +86,13 @@ jobs:
- name: Remove global json in subfolder
run: rm global.json
working-directory: tests/FSharpPlusFable.Tests
- name: Setup .NET Core 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.200
- name: Setup .NET Core 6
uses: actions/setup-dotnet@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.201
dotnet-version: |
8.0.x
7.0.x
6.0.x
- name: Restore tools
run: dotnet tool restore
# - name: Run tests (Fable2 subset but on .net)
Expand Down
4 changes: 3 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ before_build:
init:
- git config --global core.autocrlf input
install:
- cmd: choco install dotnetcore-sdk -y
- ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
- ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet"
#- cmd: winget install Microsoft.DotNet.SDK.8
- cmd: git submodule update --init --recursive
build_script:
- cmd: dotnet restore ./FSharpPlus.sln
Expand Down
8 changes: 5 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"sdk": {
"version": "7.0.100",
"rollForward": "latestFeature"
"version": "8.0.0",
"rollForward": "latestFeature",
"allowPrerelease": true
},

"additionalSdks": [
"5.0.405",
"6.0.201"
"6.0.201",
"7.0.100"
]
}

0 comments on commit 812f4eb

Please sign in to comment.