Merge pull request #48 from ejball/roll-forward

FacilityApi · Nov 14, 2024 · 8318822 · 8318822
2 parents 4784752 + d03a73f
commit 8318822
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 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>2.14.0</VersionPrefix>
-    <PackageValidationBaselineVersion>2.13.0</PackageValidationBaselineVersion>
+    <VersionPrefix>2.15.0</VersionPrefix>
+    <PackageValidationBaselineVersion>2.14.0</PackageValidationBaselineVersion>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## 2.15.0
+
+* Drop support for end-of-life frameworks (.NET 6 and 7).
+* Use roll forward with .NET tool.
+
 ## 2.14.0
 
 * Support events. (Must opt-in via `FsdParserSettings.SupportsEvents`.)

diff --git a/src/Facility.CodeGen.Console/Facility.CodeGen.Console.csproj b/src/Facility.CodeGen.Console/Facility.CodeGen.Console.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>Helpers for Facility code generator tools.</Description>
     <PackageTags>Facility FSD CodeGen Console</PackageTags>
     <IsPackable>true</IsPackable>

diff --git a/src/Facility.Definition/Facility.Definition.csproj b/src/Facility.Definition/Facility.Definition.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>Used by code generators to process Facility Service Definitions.</Description>
     <PackageTags>Facility FSD Definition</PackageTags>
     <IsPackable>true</IsPackable>

diff --git a/src/fsdgenfsd/fsdgenfsd.csproj b/src/fsdgenfsd/fsdgenfsd.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 FSD for a Facility Service Definition.</Description>
     <PackageTags>Facility FSD CodeGen</PackageTags>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
+    <RollForward>Major</RollForward>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 

diff --git a/tools/Build/Build.cs b/tools/Build/Build.cs
@@ -48,6 +48,6 @@ void CodeGen(bool verify)
 		RunCodeGen("example/ExampleApi.fsd.md", "example/output/ExampleApi-nowidgets.fsd", "--excludeTag", "widgets", "--verify");
 
 		void RunCodeGen(params string?[] args) =>
-			RunDotNet(new[] { "run", "--no-build", "--project", $"src/{codegen}", "-f", "net6.0", "-c", configuration, "--", "--newline", "lf" }.Concat(args));
+			RunDotNet(new[] { "run", "--no-build", "--project", $"src/{codegen}", "-c", configuration, "--", "--newline", "lf" }.Concat(args));
 	}
 });