Skip to content

Commit c3d18f3

Browse files
committed
fixup build.yml
1 parent 82e1444 commit c3d18f3

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 16 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"
2221
build_net9: false
23-
globaljson-command: "dotnet new globaljson --sdk-version 6.0.400"
24-
# latest 6.0 stable
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"
25+
dotnet-version: "8.0.x"
26+
label: "8.0 stable"
2927
build_net9: false
30-
globaljson-command: "dotnet new globaljson --sdk-version 6.0.0 --roll-forward latestMinor"
31-
# latest 7.0 preview
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"
31+
dotnet-version: "9.0.x"
32+
label: "9.0 stable"
3633
build_net9: true
37-
globaljson-command: "dotnet new globaljson --sdk-version 7.0.0 --roll-forward latestMinor"
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

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.0",
3+
"version": "8.0.100",
44
"rollForward": "latestMinor",
55
"allowPrerelease": true
66
}

0 commit comments

Comments
 (0)