diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c7c592..0b214ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,5 +28,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 3.1.x + 6.0.x + 8.0.x - name: Run './build.cmd Ci' run: ./build.cmd Ci diff --git a/.github/workflows/ci_publish.yml b/.github/workflows/ci_publish.yml index 1ff5730..0b28c7e 100644 --- a/.github/workflows/ci_publish.yml +++ b/.github/workflows/ci_publish.yml @@ -29,6 +29,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 3.1.x + 6.0.x + 8.0.x - name: Run './build.cmd CiPublish' run: ./build.cmd CiPublish env: diff --git a/Sieve.Sample/Sieve.Sample.csproj b/Sieve.Sample/Sieve.Sample.csproj index 8aca6b9..3672966 100644 --- a/Sieve.Sample/Sieve.Sample.csproj +++ b/Sieve.Sample/Sieve.Sample.csproj @@ -1,17 +1,36 @@  - netcoreapp3.1 + netcoreapp3.1;net6.0;net8.0 - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + diff --git a/Sieve/Exceptions/SieveException.cs b/Sieve/Exceptions/SieveException.cs index 8ea5e96..a1823d1 100644 --- a/Sieve/Exceptions/SieveException.cs +++ b/Sieve/Exceptions/SieveException.cs @@ -16,8 +16,10 @@ public SieveException() { } +#if !NET8_0_OR_GREATER protected SieveException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } +#endif } } diff --git a/Sieve/Exceptions/SieveIncompatibleMethodException.cs b/Sieve/Exceptions/SieveIncompatibleMethodException.cs index 890e1b2..94e27ae 100644 --- a/Sieve/Exceptions/SieveIncompatibleMethodException.cs +++ b/Sieve/Exceptions/SieveIncompatibleMethodException.cs @@ -45,8 +45,10 @@ public SieveIncompatibleMethodException() { } +#if !NET8_0_OR_GREATER protected SieveIncompatibleMethodException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } +#endif } } diff --git a/Sieve/Exceptions/SieveMethodNotFoundException.cs b/Sieve/Exceptions/SieveMethodNotFoundException.cs index c4d5b67..be766a6 100644 --- a/Sieve/Exceptions/SieveMethodNotFoundException.cs +++ b/Sieve/Exceptions/SieveMethodNotFoundException.cs @@ -28,8 +28,10 @@ public SieveMethodNotFoundException() { } +#if !NET8_0_OR_GREATER protected SieveMethodNotFoundException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } +#endif } } diff --git a/Sieve/Sieve.csproj b/Sieve/Sieve.csproj index 78b51b0..8102dc3 100644 --- a/Sieve/Sieve.csproj +++ b/Sieve/Sieve.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + netstandard2.1;net6.0;net8.0 Sieve is a simple, clean, and extensible framework for .NET Core that adds sorting, filtering, and pagination functionality out of the box. Most common use case would be for serving ASP.NET Core GET queries. Documentation available on GitHub: https://github.com/Biarity/Sieve/ Biarity;Ashish Patel;Kevin Sommer @@ -21,10 +21,18 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + + + + + + + + + diff --git a/SieveUnitTests/SieveUnitTests.csproj b/SieveUnitTests/SieveUnitTests.csproj index 1c26e54..2b0ffd8 100644 --- a/SieveUnitTests/SieveUnitTests.csproj +++ b/SieveUnitTests/SieveUnitTests.csproj @@ -1,19 +1,35 @@ - + - netcoreapp3.1 + netcoreapp3.1;net6.0;net8.0 false - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/build/Build.cs b/build/Build.cs index 3146ffc..019c7e6 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using GlobExpressions; using Nuke.Common; using Nuke.Common.CI; @@ -34,7 +34,7 @@ class Build : NukeBuild [GitRepository] readonly GitRepository GitRepository; - [GitVersion(Framework = "netcoreapp3.1")] readonly GitVersion GitVersion; + [GitVersion(Framework = "net6.0")] readonly GitVersion GitVersion; [Solution] readonly Solution Solution; diff --git a/build/_build.csproj b/build/_build.csproj index c432dd2..b4d031d 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -1,8 +1,8 @@ - + Exe - net5.0 + net6.0 CS0649;CS0169 .. @@ -11,7 +11,7 @@ - +