Merge pull request #13 from ejball/roll-forward

FacilityApi · Nov 15, 2024 · b5d1666 · b5d1666
2 parents f75cf13 + 17ef2a6
commit b5d1666
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 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.6.2</VersionPrefix>
-    <PackageValidationBaselineVersion>2.6.1</PackageValidationBaselineVersion>
+    <VersionPrefix>2.7.0</VersionPrefix>
+    <PackageValidationBaselineVersion>2.6.2</PackageValidationBaselineVersion>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,8 +3,8 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Facility.CodeGen.Console" Version="2.14.0" />
-    <PackageVersion Include="Facility.Definition" Version="2.14.0" />
+    <PackageVersion Include="Facility.CodeGen.Console" Version="2.15.0" />
+    <PackageVersion Include="Facility.Definition" Version="2.15.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## 2.7.0
+
+* Drop support for end-of-life frameworks.
+* Use roll forward with .NET tools.
+
 ## 2.6.2
 
 * Fix `--service-name`.

diff --git a/src/Facility.Definition.Swagger/Facility.Definition.Swagger.csproj b/src/Facility.Definition.Swagger/Facility.Definition.Swagger.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 to interpret Swagger (OpenAPI) 2.0 definitions.</Description>
     <PackageTags>Facility FSD Swagger OpenAPI Definition</PackageTags>
     <IsPackable>true</IsPackable>

diff --git a/src/Facility.Definition.Swagger/SwaggerUtility.cs b/src/Facility.Definition.Swagger/SwaggerUtility.cs
@@ -35,7 +35,7 @@ internal static IReadOnlyDictionary<TKey, TValue> EmptyIfNull<TKey, TValue>(this
 	internal static IDictionary<TKey, TValue> EmptyIfNull<TKey, TValue>(this IDictionary<TKey, TValue>? list)
 		where TKey : notnull => list ?? new Dictionary<TKey, TValue>();
 
-#if NET6_0_OR_GREATER
+#if !NETSTANDARD2_0
 	internal static bool ContainsOrdinal(this string text, string value) => text.Contains(value, StringComparison.Ordinal);
 	internal static string ReplaceOrdinal(this string text, string oldValue, string newValue) => text.Replace(oldValue, newValue, StringComparison.Ordinal);
 #else

diff --git a/src/fsdgenswagger/fsdgenswagger.csproj b/src/fsdgenswagger/fsdgenswagger.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 converts OpenAPI 2.0 (Swagger) to/from a Facility Service Definition.</Description>
     <PackageTags>Facility FSD Swagger OpenAPI 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
@@ -55,6 +55,6 @@ void CodeGen(bool verify)
 			RunCodeGen(fsdPath, $"example/output/fsd/swagger/{Path.GetFileNameWithoutExtension(fsdPath)}.yaml");
 
 		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));
 	}
 });