Skip to content

Commit

Permalink
Restore net461-net462 bump lost in merge resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
rmunn committed Nov 15, 2024
1 parent ab90408 commit 510cfd0
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci+cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
framework: [net461, net8.0]
framework: [net462, net8.0]
exclude:
# dotnet on Linux cannot build net461 without additional, unnecessary, work
# dotnet on Linux cannot build net462 without additional, unnecessary, work
- os: ubuntu-latest
framework: net461
framework: net462
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.framework }}
cancel-in-progress: true
Expand Down Expand Up @@ -60,11 +60,11 @@ jobs:

- name: Test Chorus
run: dotnet test src/Chorus.Tests/Chorus.Tests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
if: matrix.framework == 'net461'
if: matrix.framework == 'net462'

- name: Test Chorus Hub
run: dotnet test src/ChorusHubTests/ChorusHubTests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
if: matrix.framework == 'net461'
if: matrix.framework == 'net462'

- name: Test ChorusMerge
run: dotnet test src/ChorusMerge.Tests/ChorusMerge.Tests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
Expand Down

0 comments on commit 510cfd0

Please sign in to comment.