From 3970e02258837d9e4f049b3ebe13d38544b919be Mon Sep 17 00:00:00 2001 From: Romfos Date: Thu, 15 Aug 2024 19:48:58 +0300 Subject: [PATCH] [.NET] Update target frameworks (#265) - Drop .NET 7 from test matrix - Replace .NET 6 to .NET 8. because .NET 6 will reach End of Support on November 12, 2024 - Update C# language version to 12 - .NET 7 is out of support. https://devblogs.microsoft.com/dotnet/dotnet-7-end-of-support/ - .NET 6 (LTS) will reach End of Support on November 12, 2024 https://devblogs.microsoft.com/dotnet/dotnet-6-end-of-support/ --- .github/workflows/test-dotnet.yml | 2 -- CHANGELOG.md | 1 + dotnet/Directory.Build.props | 2 +- dotnet/Gherkin.Specs/Gherkin.Specs.csproj | 2 +- dotnet/Gherkin/Gherkin.csproj | 2 +- dotnet/Makefile | 4 ++-- dotnet/bin/gherkin | 2 +- dotnet/bin/gherkin-generate-tokens | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-dotnet.yml b/.github/workflows/test-dotnet.yml index 2bc19b875..421fbc914 100644 --- a/.github/workflows/test-dotnet.yml +++ b/.github/workflows/test-dotnet.yml @@ -26,8 +26,6 @@ jobs: - uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x 8.0.x - run: dotnet test working-directory: dotnet diff --git a/CHANGELOG.md b/CHANGELOG.md index ba19f13fc..fd602ece4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ## [Unreleased] ### Changed - [Ruby] Upgraded messages support to permit up to v26 +- [.NET] Drop unsupported frameworks. Now supported target frameworks are .NET 8, .NET Framework 4.6.2, .NET Standard 2.0 ## [29.0.0] - 2024-08-12 ### Added diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props index 0a333c078..7f5ce1c47 100644 --- a/dotnet/Directory.Build.props +++ b/dotnet/Directory.Build.props @@ -1,7 +1,7 @@ - 11 + 12 diff --git a/dotnet/Gherkin.Specs/Gherkin.Specs.csproj b/dotnet/Gherkin.Specs/Gherkin.Specs.csproj index 62328e433..616b1b9a4 100644 --- a/dotnet/Gherkin.Specs/Gherkin.Specs.csproj +++ b/dotnet/Gherkin.Specs/Gherkin.Specs.csproj @@ -1,6 +1,6 @@ - net8.0;net7.0;net6.0 + net8.0 Exe Gherkin.Specs.CLI.Program diff --git a/dotnet/Gherkin/Gherkin.csproj b/dotnet/Gherkin/Gherkin.csproj index 9923c1197..e4b7610d7 100644 --- a/dotnet/Gherkin/Gherkin.csproj +++ b/dotnet/Gherkin/Gherkin.csproj @@ -1,6 +1,6 @@ - net6.0;netstandard2.0;net462 + net8.0;netstandard2.0;net462 true 1591 false diff --git a/dotnet/Makefile b/dotnet/Makefile index 8f1630897..b68d7bc8a 100644 --- a/dotnet/Makefile +++ b/dotnet/Makefile @@ -42,10 +42,10 @@ clean: ## Remove all build artifacts and files generated by the acceptance tests acceptance: .built $(TOKENS) $(ASTS) $(PICKLES) $(ERRORS) $(SOURCES) ## Build acceptance test dir and compare results with reference -.built: $(SOURCE_FILES) Gherkin.Specs/bin/Debug/net6.0/Gherkin.Specs.dll +.built: $(SOURCE_FILES) Gherkin.Specs/bin/Debug/net8.0/Gherkin.Specs.dll touch $@ -Gherkin.Specs/bin/Debug/net6.0/Gherkin.Specs.dll: +Gherkin.Specs/bin/Debug/net8.0/Gherkin.Specs.dll: dotnet test $(GHERKIN_PARSER): $(GHERKIN_RAZOR) ../gherkin.berp diff --git a/dotnet/bin/gherkin b/dotnet/bin/gherkin index 79e6f7dc5..d32c93b0d 100755 --- a/dotnet/bin/gherkin +++ b/dotnet/bin/gherkin @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -euf -o pipefail -arch="net6.0" +arch="net8.0" dotnet "Gherkin.Specs/bin/Debug/$arch/Gherkin.Specs.dll" events "${@:1}" diff --git a/dotnet/bin/gherkin-generate-tokens b/dotnet/bin/gherkin-generate-tokens index 7c3d20886..e9df068cc 100755 --- a/dotnet/bin/gherkin-generate-tokens +++ b/dotnet/bin/gherkin-generate-tokens @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -euf -o pipefail -arch="net6.0" +arch="net8.0" dotnet "Gherkin.Specs/bin/Debug/$arch/Gherkin.Specs.dll" tokens "${@:1}"