From 0c416ae960562e7711000a3086f7fcd14f14f173 Mon Sep 17 00:00:00 2001 From: Romfos Date: Fri, 9 Aug 2024 12:58:40 +0000 Subject: [PATCH 1/4] Update target frameworks for .NET --- .github/workflows/test-dotnet.yml | 2 -- 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 +- 7 files changed, 7 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/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 e651a774b..0a2ddf325 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}" From e191cc99c2117e4a1b859a970e07fc4988d85701 Mon Sep 17 00:00:00 2001 From: Romfos Date: Fri, 9 Aug 2024 13:05:34 +0000 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b5f947c0..11733fca8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ### Added - (i18n) Added Gujarati translation for "Rule" ([#249](https://github.com/cucumber/gherkin/pull/249)) - [Ruby] Skeleton to begin technical refactor of internals ([#259](https://github.com/cucumber/gherkin/pull/259)) +- [.NET] Drop unsupported frameworks. Now supported target frameworks are .NET 8, .NET Framework 4.6.2, .NET Standard 2.0 ### Fixed - [.NET] Provide informative exception for trailing escapes in tables ([#245](https://github.com/cucumber/gherkin/pull/245)) From 73a03b659e44147c5cf1517b6e673ce143eea3da Mon Sep 17 00:00:00 2001 From: Romfos Date: Fri, 9 Aug 2024 13:40:52 +0000 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11733fca8..0bc2756e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,6 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ### Added - (i18n) Added Gujarati translation for "Rule" ([#249](https://github.com/cucumber/gherkin/pull/249)) - [Ruby] Skeleton to begin technical refactor of internals ([#259](https://github.com/cucumber/gherkin/pull/259)) -- [.NET] Drop unsupported frameworks. Now supported target frameworks are .NET 8, .NET Framework 4.6.2, .NET Standard 2.0 ### Fixed - [.NET] Provide informative exception for trailing escapes in tables ([#245](https://github.com/cucumber/gherkin/pull/245)) @@ -25,6 +24,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ### Changed - [Java, JavaScript, PHP, Go, Ruby] Upgraded messages to v25 - [Ruby] Update minimum ruby requirement from 2.5 to 3.0 ([#259](https://github.com/cucumber/gherkin/pull/259)) +- [.NET] Drop unsupported frameworks. Now supported target frameworks are .NET 8, .NET Framework 4.6.2, .NET Standard 2.0 ## [28.0.0] - 2024-02-15 ### Added From 2a090b59bfb4b5cb992ac0771443db086c6a67c0 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Thu, 15 Aug 2024 17:04:43 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a8f87e16..fd602ece4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,10 +31,6 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt - (i18n) Remove duplicate scenario keyword from "sr-Cyrl" ([#264](https://github.com/cucumber/gherkin/pull/264)) - Intermittent failure of cpp test jobs in CI ([#217](https://github.com/cucumber/gherkin/issues/217)) -### Changed -- [Java, JavaScript, PHP, Go, Ruby] Upgraded messages to v25 -- [Ruby] Update minimum ruby requirement from 2.5 to 3.0 ([#259](https://github.com/cucumber/gherkin/pull/259)) - ## [28.0.0] - 2024-02-15 ### Added - [Python] Added release workflow for releasing to Pypi ([#213](https://github.com/cucumber/gherkin/pull/213))