Skip to content

Commit 0e15b52

Browse files
Update Proj-Info to use FCS and FSharp.Core from 9.0.100 (#219)
This change * removes .NET 6 and 7 targets, adding a .NET 9 target * removes Paket in favor of NuGet CPM * updates the packaging of the app to include READMEs Co-authored-by: Chet Husk <[email protected]> Co-authored-by: Chet Husk <[email protected]>
1 parent 2a86558 commit 0e15b52

36 files changed

+344
-1277
lines changed

.config/dotnet-tools.json

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,5 @@
11
{
2-
"version": 1,
3-
"isRoot": true,
4-
"tools": {
5-
"paket": {
6-
"version": "8.0.3",
7-
"commands": [
8-
"paket"
9-
]
10-
},
11-
"fake-cli": {
12-
"version": "6.0.0",
13-
"commands": [
14-
"fake"
15-
]
16-
},
17-
"octonav": {
18-
"version": "0.0.1",
19-
"commands": [
20-
"octonav"
21-
]
22-
},
23-
"fantomas": {
24-
"version": "6.1.2",
25-
"commands": [
26-
"fantomas"
27-
]
28-
}
29-
}
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {}
305
}

.editorconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ end_of_line = crlf
5555
[*.{ps1, psm1}]
5656
end_of_line = crlf
5757

58-
# Paket files
59-
[paket.*]
60-
trim_trailing_whitespace = true
61-
indent_size = 2
62-
63-
[*.paket.references]
64-
trim_trailing_whitespace = true
65-
indent_size = 2
66-
67-
6858
# YAML Files
6959
[*.{yml,yaml}]
7060
indent_size = 2

.github/workflows/build.yml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,27 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest, windows-latest, macOS-latest]
14-
dotnet-version: ["", "6.0.x", "7.0.x"]
14+
dotnet-version: ["", "8.0.x", "9.0.x"]
1515
# these entries will mesh with the above combinations
1616
include:
1717
# just use what's in the repo
1818
- global-json-file: "global.json"
1919
dotnet-version: ""
20-
include-prerelease: false
2120
label: "repo global.json"
22-
build_net7: false
23-
globaljson-command: "dotnet new globaljson --sdk-version 6.0.400"
24-
# latest 6.0 stable
21+
build_net9: false
22+
globaljson-command: "dotnet new globaljson --sdk-version 8.0.400"
23+
# latest 8.0 stable
2524
- global-json-file: "global.json"
26-
dotnet-version: "6.0.x"
27-
include-prerelease: false
28-
label: "6.0 stable"
29-
build_net7: false
30-
globaljson-command: "dotnet new globaljson --sdk-version 6.0.0 --roll-forward latestMinor"
31-
# latest 7.0 preview
25+
dotnet-version: "8.0.x"
26+
label: "8.0 stable"
27+
build_net9: false
28+
globaljson-command: "dotnet new globaljson --sdk-version 8.0.0 --roll-forward latestMinor"
29+
# latest 9.0 stable
3230
- global-json-file: "global.json"
33-
dotnet-version: "7.0.x"
34-
include-prerelease: true
35-
label: "7.0 preview"
36-
build_net7: true
37-
globaljson-command: "dotnet new globaljson --sdk-version 7.0.0 --roll-forward latestMinor"
31+
dotnet-version: "9.0.x"
32+
label: "9.0 stable"
33+
build_net9: true
34+
globaljson-command: "dotnet new globaljson --sdk-version 9.0.0 --roll-forward latestMinor"
3835
fail-fast: false # we have timing issues on some OS, so we want them all to run
3936
runs-on: ${{ matrix.os }}
4037
timeout-minutes: 15
@@ -46,13 +43,12 @@ jobs:
4643

4744
# setup .NET per the repo global.json
4845
- name: Setup .NET
49-
uses: actions/setup-dotnet@v2
46+
uses: actions/setup-dotnet@v4
5047

5148
# setup .NET per test session
5249
- name: Setup .NET
53-
uses: actions/setup-dotnet@v2
50+
uses: actions/setup-dotnet@v4
5451
with:
55-
include-prerelease: ${{ matrix.include-prerelease }}
5652
global-json-file: ${{ matrix.global-json-file }}
5753
dotnet-version: ${{ matrix.dotnet-version }}
5854

@@ -72,7 +68,7 @@ jobs:
7268
- name: Run build and test
7369
run: dotnet run --project build
7470
env:
75-
BuildNet7: ${{ matrix.build_net7 }}
71+
BuildNet9: ${{ matrix.build_net9 }}
7672

7773
- name: Archive test results
7874
uses: actions/upload-artifact@v3

.github/workflows/publish.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Setup .NET Core
15-
uses: actions/setup-dotnet@v2
15+
uses: actions/setup-dotnet@v4
1616
with:
1717
dotnet-version: |
18-
6.0.x
19-
7.0.x
20-
include-prerelease: true
18+
8.0.x
19+
9.0.x
2120
# since we're packaging for net7 now...
2221
- name: remove global.json
2322
run: rm global.json
@@ -28,11 +27,11 @@ jobs:
2827
- name: Run build
2928
run: dotnet run --project build
3029
env:
31-
BuildNet7: true
30+
BuildNet9: true
3231
IgnoreTests: true
3332
- name: Get Changelog Entry
3433
id: changelog_reader
35-
uses: mindsers/changelog-reader-action@v1.1.0
34+
uses: mindsers/changelog-reader-action@v2
3635
with:
3736
version: ${{ github.ref }}
3837
path: ./CHANGELOG.md
@@ -48,7 +47,7 @@ jobs:
4847
draft: false
4948
prerelease: false
5049
- name: Upload binaries to release
51-
uses: svenstaro/upload-release-action@v1-release
50+
uses: svenstaro/upload-release-action@v2
5251
with:
5352
repo_token: ${{ secrets.GITHUB_TOKEN }}
5453
file: src/**/*.nupkg

0 commit comments

Comments
 (0)