Skip to content

Commit

Permalink
Merge pull request #77 from AKlaus/feature/#76
Browse files Browse the repository at this point in the history
Added support for .NET 9 and removed .NET 5
  • Loading branch information
AKlaus authored Dec 22, 2024
2 parents 7d82bc6 + 0117886 commit 75f5546
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:
fetch-depth: 100

# Install all SDK versions targeted in the Test project
- name: Setup .NET 5
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.x
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
Expand All @@ -37,6 +33,10 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.x
- name: Setup .NET 9
uses: actions/setup-dotnet@v1
with:
dotnet-version: 9.x

- name: Install dependencies
run: dotnet restore
Expand All @@ -46,14 +46,14 @@ jobs:

# Test each targeted framework independently to spot errors faster
# Generate coverage report for the latest framework only, as coverage on multiple is not supported
- name: Test on .NET 9
run: dotnet test --no-restore --verbosity normal --framework net8.0 /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov
- name: Test on .NET 8
run: dotnet test --no-restore --verbosity normal --framework net8.0 /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov
- name: Test on .NET 7
run: dotnet test --no-restore --verbosity normal --framework net7.0 /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov
- name: Test on .NET 6
run: dotnet test --no-restore --verbosity normal --framework net6.0 /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov
- name: Test on .NET 5
run: dotnet test --no-restore --verbosity normal --framework net5.0

- name: Publish coverage report to coveralls.io
uses: coverallsapp/github-action@master
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ jobs:
fetch-depth: 100

# Install all SDK versions targeted in DomainResults.MVC project
- name: Setup .NET 5
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.x
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
with:
Expand All @@ -31,6 +27,10 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.x
- name: Setup .NET 9
uses: actions/setup-dotnet@v1
with:
dotnet-version: 9.x

- name: Install dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ The above returns:
- Install [DomainResult.Common](https://www.nuget.org/packages/DomainResult.Common) NuGet package for the _Domain Layer_ (aka _Business Layer_) projects. If the _Domain Layer_ is inside the _Web API_ project, then skip this step.
- Follow the documentation below, `samples` in the repo and common sense.

The library targets `.NET 5`, `.NET 6`, `.NET 7` and `.NET 8` (for .NET 3 & 3.1 support see older versions of the library).
The library targets `.NET 6`, `.NET 7`, `.NET 8` and `.NET 9` (for .NET v3 – v5 support see older versions of the library).

## 'DomainResult.Common' package. Returning result from Domain Layer method

Expand Down
2 changes: 1 addition & 1 deletion samples/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<Features>strict</Features>
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/DomainResults.Mvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To be used in Web API projects to accompany 'DomainResult.Common' package used i
</Description>

<!-- Can't target .NET Standard as the Microsoft.AspNetCore.XXX dependency is .NET Core specific. Hence target each main version independently. -->
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>

<AssemblyName>DomainResults.Mvc</AssemblyName>
<RootNamespace>DomainResults.Mvc</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion tests/DomainResults.Tests/DomainResults.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down

0 comments on commit 75f5546

Please sign in to comment.