diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ce7d28..a8fdd77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,30 +11,27 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - dotnet-version: ["", "6.0.x", "7.0.x"] + dotnet-version: ["", "8.0.x", "9.0.x"] # these entries will mesh with the above combinations include: # just use what's in the repo - global-json-file: "global.json" dotnet-version: "" - include-prerelease: false label: "repo global.json" build_net9: false - globaljson-command: "dotnet new globaljson --sdk-version 6.0.400" - # latest 6.0 stable + globaljson-command: "dotnet new globaljson --sdk-version 8.0.400" + # latest 8.0 stable - global-json-file: "global.json" - dotnet-version: "6.0.x" - include-prerelease: false - label: "6.0 stable" + dotnet-version: "8.0.x" + label: "8.0 stable" build_net9: false - globaljson-command: "dotnet new globaljson --sdk-version 6.0.0 --roll-forward latestMinor" - # latest 7.0 preview + globaljson-command: "dotnet new globaljson --sdk-version 8.0.0 --roll-forward latestMinor" + # latest 9.0 stable - global-json-file: "global.json" - dotnet-version: "7.0.x" - include-prerelease: true - label: "7.0 preview" + dotnet-version: "9.0.x" + label: "9.0 stable" build_net9: true - globaljson-command: "dotnet new globaljson --sdk-version 7.0.0 --roll-forward latestMinor" + globaljson-command: "dotnet new globaljson --sdk-version 9.0.0 --roll-forward latestMinor" fail-fast: false # we have timing issues on some OS, so we want them all to run runs-on: ${{ matrix.os }} timeout-minutes: 15 @@ -46,13 +43,12 @@ jobs: # setup .NET per the repo global.json - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v4 # setup .NET per test session - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v4 with: - include-prerelease: ${{ matrix.include-prerelease }} global-json-file: ${{ matrix.global-json-file }} dotnet-version: ${{ matrix.dotnet-version }} diff --git a/global.json b/global.json index 1966db5..fe136d1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.0", + "version": "8.0.100", "rollForward": "latestMinor", "allowPrerelease": true }