Skip to content

Commit

Permalink
reverted the removal of dotnet 5
Browse files Browse the repository at this point in the history
  • Loading branch information
RagingKore committed Nov 9, 2023
1 parent 89dd71a commit 78db186
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [ net6.0, net7.0 ]
framework: [ net5.0, net6.0, net7.0 ]
os: [ ubuntu-latest ]
test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
configuration: [ release ]
Expand All @@ -33,6 +33,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
- name: Compile
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [ net6.0, net7.0 ]
framework: [ net5.0, net6.0, net7.0 ]
os: [ ubuntu-latest, windows-latest ]
runs-on: ${{ matrix.os }}
name: scan-vulnerabilities/${{ matrix.os }}/${{ matrix.framework }}
Expand All @@ -25,6 +25,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
- name: Scan for Vulnerabilities
Expand All @@ -42,7 +43,7 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [ net6.0, net7.0 ]
framework: [ net5.0, net6.0, net7.0 ]
services:
esdb:
image: ghcr.io/eventstore/eventstore:lts
Expand All @@ -61,6 +62,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
- name: Compile
Expand All @@ -77,9 +79,9 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [net6.0, net7.0]
os: [ubuntu-latest, windows-latest]
configuration: [release]
framework: [ net5.0, net6.0, net7.0 ]
os: [ ubuntu-latest, windows-latest ]
configuration: [ release ]
runs-on: ${{ matrix.os }}
name: test/EventStore.Client/${{ matrix.os }}/${{ matrix.framework }}
steps:
Expand All @@ -92,6 +94,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
- name: Compile
Expand Down Expand Up @@ -129,6 +132,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
5.0.x
6.0.x
7.0.x
- name: Dotnet Pack
Expand Down Expand Up @@ -157,5 +161,4 @@ jobs:
run: |
dotnet nuget list source
dotnet tool restore
find . -name "*.nupkg" | xargs -n1 dotnet nuget push --api-key=${{ secrets.nuget_key }} --source https://api.nuget.org/v3/index.json --skip-duplicate
find . -name "*.nupkg" | xargs -n1 dotnet nuget push --api-key=${{ secrets.nuget_key }} --source https://api.nuget.org/v3/index.json --skip-duplicate
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;net7.0;</TargetFrameworks>
<Platform>x64</Platform>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Nullable>enable</Nullable>
Expand Down

0 comments on commit 78db186

Please sign in to comment.