Skip to content

Commit

Permalink
Merge branch 'main' into sw/image-brush-offsets
Browse files Browse the repository at this point in the history
  • Loading branch information
JimBobSquarePants authored Dec 11, 2023
2 parents 4d30fd9 + 3fb38a4 commit 184fe2e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ jobs:

- name: DotNet Setup
if: ${{ matrix.options.sdk-preview != true }}
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
- name: DotNet Setup Preview
if: ${{ matrix.options.sdk-preview == true }}
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
Expand Down

0 comments on commit 184fe2e

Please sign in to comment.