Merge pull request #16 from ejball/roll-forward

FacilityApi · Nov 15, 2024 · 2eac98e · 2eac98e
2 parents e165fff + b0c4d78
commit 2eac98e
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git 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
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>3.10.1</VersionPrefix>
-    <PackageValidationBaselineVersion>3.10.0</PackageValidationBaselineVersion>
+    <VersionPrefix>3.11.0</VersionPrefix>
+    <PackageValidationBaselineVersion>3.10.1</PackageValidationBaselineVersion>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,10 +3,10 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Facility.CodeGen.Console" Version="2.14.0" />
-    <PackageVersion Include="Facility.ConformanceApi" Version="2.29.0" />
-    <PackageVersion Include="Facility.Core" Version="2.29.0" />
-    <PackageVersion Include="Facility.Definition" Version="2.14.0" />
+    <PackageVersion Include="Facility.CodeGen.Console" Version="2.15.0" />
+    <PackageVersion Include="Facility.ConformanceApi" Version="2.30.0" />
+    <PackageVersion Include="Facility.Core" Version="2.30.0" />
+    <PackageVersion Include="Facility.Definition" Version="2.15.0" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.3.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />

diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <Description>Helpers for using Facility with ASP.NET Core.</Description>
     <PackageTags>Facility FSD ASP.NET Core</PackageTags>
     <IsPackable>true</IsPackable>

diff --git 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <Description>A library that generates an ASP.NET controller for a Facility Service Definition.</Description>
     <PackageTags>Facility FSD ASP.NET CodeGen</PackageTags>
     <IsPackable>true</IsPackable>

diff --git a/src/fsdgenaspnet/fsdgenaspnet.csproj b/src/fsdgenaspnet/fsdgenaspnet.csproj
@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <Description>A tool that generates an ASP.NET controller for a Facility Service Definition.</Description>
     <PackageTags>Facility FSD ASP.NET CodeGen</PackageTags>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>

diff --git 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));
 	}
 });