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 d3fb178..b3ed8e6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ - 2.6.2 - 2.6.1 + 2.7.0 + 2.6.2 12.0 enable enable diff --git a/Directory.Packages.props b/Directory.Packages.props index 0c87542..ada90ac 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,8 +3,8 @@ true - - + + diff --git a/ReleaseNotes.md b/ReleaseNotes.md index f87cae2..5251df6 100644 --- 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 index 85d08dc..e622240 100644 --- a/src/Facility.Definition.Swagger/Facility.Definition.Swagger.csproj +++ b/src/Facility.Definition.Swagger/Facility.Definition.Swagger.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0;net7.0;net8.0 + netstandard2.0;net8.0 Used to interpret Swagger (OpenAPI) 2.0 definitions. Facility FSD Swagger OpenAPI Definition true diff --git a/src/Facility.Definition.Swagger/SwaggerUtility.cs b/src/Facility.Definition.Swagger/SwaggerUtility.cs index 978e7f1..6c644d1 100644 --- a/src/Facility.Definition.Swagger/SwaggerUtility.cs +++ b/src/Facility.Definition.Swagger/SwaggerUtility.cs @@ -35,7 +35,7 @@ internal static IReadOnlyDictionary EmptyIfNull(this internal static IDictionary EmptyIfNull(this IDictionary? list) where TKey : notnull => list ?? new Dictionary(); -#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 index 1c3fd12..9200754 100644 --- a/src/fsdgenswagger/fsdgenswagger.csproj +++ b/src/fsdgenswagger/fsdgenswagger.csproj @@ -2,11 +2,12 @@ Exe - net6.0;net7.0;net8.0 + net8.0 A tool that converts OpenAPI 2.0 (Swagger) to/from a Facility Service Definition. Facility FSD Swagger OpenAPI CodeGen true true + Major diff --git a/tools/Build/Build.cs b/tools/Build/Build.cs index 552de88..1da2dce 100644 --- 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)); } });