diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a313bbb..e7a38ef 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,16 +22,12 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: Install .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: | - 6.0.x - 8.0.x - name: Check out code uses: actions/checkout@v3 with: fetch-depth: 0 # required to publish docs + - name: Install .NET + uses: actions/setup-dotnet@v4 - name: Restore run: .\build.ps1 restore - name: Build diff --git a/Directory.Build.props b/Directory.Build.props index 52df9d9..c00af3b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ - 3.10.1 - 3.10.0 + 3.11.0 + 3.10.1 12.0 enable enable diff --git a/Directory.Packages.props b/Directory.Packages.props index 6e290c7..cc47133 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,10 +3,10 @@ true - - - - + + + + diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 8a0e719..e29acc8 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,10 @@ # Release Notes +## 3.11.0 + +* Drop support for end-of-life frameworks. +* Use roll forward with .NET tool. + ## 3.10.1 * Disable buffering for text/event-stream. diff --git a/dotnet-tools.json b/dotnet-tools.json index 194ceef..628a8d8 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "facilityconformance": { - "version": "2.29.0", + "version": "2.30.0", "commands": [ "FacilityConformance" ], diff --git a/src/Facility.AspNetCore/Facility.AspNetCore.csproj b/src/Facility.AspNetCore/Facility.AspNetCore.csproj index a11843c..dbd7277 100644 --- a/src/Facility.AspNetCore/Facility.AspNetCore.csproj +++ b/src/Facility.AspNetCore/Facility.AspNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net8.0 Helpers for using Facility with ASP.NET Core. Facility FSD ASP.NET Core true diff --git a/src/Facility.AspNetCore/FacilityEndpointFilter.cs b/src/Facility.AspNetCore/FacilityEndpointFilter.cs index 6cd830d..9e4ecf5 100644 --- a/src/Facility.AspNetCore/FacilityEndpointFilter.cs +++ b/src/Facility.AspNetCore/FacilityEndpointFilter.cs @@ -1,4 +1,3 @@ -#if NET7_0_OR_GREATER using System.Net; using Facility.Core; using Facility.Core.Http; @@ -30,4 +29,3 @@ public sealed class FacilityEndpointFilter : IEndpointFilter return result; } } -#endif diff --git a/src/Facility.CodeGen.AspNet/Facility.CodeGen.AspNet.csproj b/src/Facility.CodeGen.AspNet/Facility.CodeGen.AspNet.csproj index 95920d5..0d71772 100644 --- a/src/Facility.CodeGen.AspNet/Facility.CodeGen.AspNet.csproj +++ b/src/Facility.CodeGen.AspNet/Facility.CodeGen.AspNet.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0;net7.0;net8.0 + netstandard2.0;net8.0 A library that generates an ASP.NET controller for a Facility Service Definition. Facility FSD ASP.NET CodeGen true diff --git a/src/fsdgenaspnet/fsdgenaspnet.csproj b/src/fsdgenaspnet/fsdgenaspnet.csproj index 5d36bdd..594729a 100644 --- a/src/fsdgenaspnet/fsdgenaspnet.csproj +++ b/src/fsdgenaspnet/fsdgenaspnet.csproj @@ -2,11 +2,12 @@ Exe - net6.0;net7.0;net8.0 + net8.0 A tool that generates an ASP.NET controller for a Facility Service Definition. Facility FSD ASP.NET CodeGen true true + Major diff --git a/tools/Build/Build.cs b/tools/Build/Build.cs index 7893b09..1b769d6 100644 --- a/tools/Build/Build.cs +++ b/tools/Build/Build.cs @@ -50,6 +50,6 @@ void CodeGen(bool verify) "--namespace", "CoreControllerServer.Controllers", "--target", "core"); void RunCodeGen(params string?[] args) => - RunDotNet(new[] { "run", "--no-build", "--project", $"src/{codegen}", "-f", "net6.0", "-c", configuration, "--", "--newline", "lf", verifyOption }.Concat(args)); + RunDotNet(new[] { "run", "--no-build", "--project", $"src/{codegen}", "-c", configuration, "--", "--newline", "lf", verifyOption }.Concat(args)); } });