From 3fc1878d656576d92cfba1231382734177defacf Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Mon, 22 Jan 2024 06:58:12 -0700 Subject: [PATCH 01/15] Updated to use Nstack v1.1.1 --- Terminal.Gui/Terminal.Gui.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 9223ff95d..600ab80b3 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -29,7 +29,7 @@ - + From 4b27ff9cd93df546936e6e71a0e82e332af89fe3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 15:02:13 +0000 Subject: [PATCH 02/15] Bump ReactiveUI from 19.6.1 to 20.0.1 Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 19.6.1 to 20.0.1. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/19.6.1...20.0.1) --- updated-dependencies: - dependency-name: ReactiveUI dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- ReactiveExample/ReactiveExample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 2d150c7e2..9e4037cc4 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -11,7 +11,7 @@ - + From e13ecf07d60b14d5deb0cde44eb159e0cdff55b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 17:35:22 +0000 Subject: [PATCH 03/15] Bump xunit from 2.7.1 to 2.8.0 Bumps [xunit](https://github.com/xunit/xunit) from 2.7.1 to 2.8.0. - [Commits](https://github.com/xunit/xunit/compare/2.7.1...2.8.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- UnitTests/UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index eaff579d3..e1aa2dbd9 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -21,7 +21,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 73681e15569d2695fb031bb49cd18ed130a1a2c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 14:39:08 +0000 Subject: [PATCH 04/15] Bump CsvHelper from 32.0.1 to 32.0.2 Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 32.0.1 to 32.0.2. - [Commits](https://github.com/JoshClose/CsvHelper/compare/32.0.1...32.0.2) --- updated-dependencies: - dependency-name: CsvHelper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- UICatalog/UICatalog.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index faa8a2b05..c392c2c4b 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -22,7 +22,7 @@ - + From 3dc558318eb97085af7c3942f982d8929254e663 Mon Sep 17 00:00:00 2001 From: Tig Date: Mon, 20 May 2024 06:54:02 -0600 Subject: [PATCH 05/15] Updated to support dotnet8 --- Terminal.Gui/Terminal.Gui.csproj | 2 +- UICatalog/UICatalog.csproj | 2 +- UnitTests/UnitTests.csproj | 2 +- global.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 94f958238..7f2b64cda 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -20,7 +20,7 @@ portable - net472;netstandard2.1;net7.0 + net472;netstandard2.1;net8.0 Terminal.Gui Terminal.Gui true diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index c392c2c4b..5f414eb3d 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -1,7 +1,7 @@ Exe - net7.0 + net8.0 9.0 UICatalog.UICatalogApp Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index e1aa2dbd9..a8115194b 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 Preview diff --git a/global.json b/global.json index cf0511e14..7b2527f81 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk":{ - "version":"7.0.200", + "version":"8.0.204", "rollForward":"latestMinor" } } From 46227cfa99dca1c5cd399dbe510f088f4cfdaded Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 14:48:22 +0000 Subject: [PATCH 06/15] Bump ReactiveUI from 20.0.1 to 20.1.1 Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 20.0.1 to 20.1.1. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/20.0.1...20.1.1) --- updated-dependencies: - dependency-name: ReactiveUI dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- ReactiveExample/ReactiveExample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 9e4037cc4..7aaf02444 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -11,7 +11,7 @@ - + From f9d683ca725b93d8705c00be51f6209fae779c3a Mon Sep 17 00:00:00 2001 From: David Nelson Date: Mon, 20 May 2024 12:37:24 -0500 Subject: [PATCH 07/15] Fix incorrect link to Conceptual Documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f54b58bf8..7326a9232 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ dotnet run _The Documentation matches the most recent Nuget release from the `main` branch ([![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui))_ -See the [`Terminal.Gui/` README](https://github.com/gui-cs/Terminal.Gui/tree/master/Terminal.Gui) for an overview of how the library is structured. The [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/articles/index.html) provides insight into core concepts. +See the [`Terminal.Gui/` README](https://github.com/gui-cs/Terminal.Gui/tree/master/Terminal.Gui) for an overview of how the library is structured. The [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/docs/index.html) provides insight into core concepts. ## Features From 736a96da771b54724c703cd393f59f6bb2ab0b29 Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 21 May 2024 07:19:48 -0600 Subject: [PATCH 08/15] readded net7.0 --- Terminal.Gui/Core/Clipboard/Clipboard.cs | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Terminal.Gui/Core/Clipboard/Clipboard.cs b/Terminal.Gui/Core/Clipboard/Clipboard.cs index 4aed183da..d58ee0374 100644 --- a/Terminal.Gui/Core/Clipboard/Clipboard.cs +++ b/Terminal.Gui/Core/Clipboard/Clipboard.cs @@ -51,8 +51,8 @@ namespace Terminal.Gui { Application.Driver.Clipboard.SetClipboardData (value.ToString ()); } contents = value; - } catch (NotSupportedException e) { - throw e; + } catch (NotSupportedException) { + throw; } catch (Exception) { contents = value; } diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 7f2b64cda..cd4805e0f 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -20,7 +20,7 @@ portable - net472;netstandard2.1;net8.0 + net472;netstandard2.1;net7.0;net8.0 Terminal.Gui Terminal.Gui true From ffd875c38a832b017ce8ad88935ea193363ba90a Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 21 May 2024 07:23:01 -0600 Subject: [PATCH 09/15] added netstandard2.0 --- Terminal.Gui/Terminal.Gui.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index cd4805e0f..9162889d1 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -20,7 +20,7 @@ portable - net472;netstandard2.1;net7.0;net8.0 + net472;netstandard2.0;netstandard2.1;net7.0;net8.0 Terminal.Gui Terminal.Gui true From b4b7db33a8f6bc38a50b16ddd06a595f2eeba216 Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 21 May 2024 07:28:39 -0600 Subject: [PATCH 10/15] Updates nuget --- ReactiveExample/ReactiveExample.csproj | 2 +- UICatalog/UICatalog.csproj | 2 +- UnitTests/UnitTests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 9e4037cc4..7aaf02444 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -11,7 +11,7 @@ - + diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 5f414eb3d..6a82bb666 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -22,7 +22,7 @@ - + diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index a8115194b..15ba506ac 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -19,7 +19,7 @@ - + From 53d88eb539d7bcf3e2bdd11cd4870f520b80d4d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 14:57:53 +0000 Subject: [PATCH 11/15] --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- UnitTests/UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index e1aa2dbd9..4060018c0 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -18,7 +18,7 @@ TRACE;DEBUG_IDISPOSABLE - + From a423836fc16ce1dad615df34d8ac42a6ee396c4f Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 29 May 2024 14:45:45 +0100 Subject: [PATCH 12/15] Fixes #3496. Escape Key not invoking OnKeyDown on Unix. --- Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs index b908708d6..0247b5671 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs @@ -505,6 +505,7 @@ namespace Terminal.Gui { keyHandler (key); } else { k = Key.Esc; + keyDownHandler (new KeyEvent (k, MapKeyModifiers (k))); keyHandler (new KeyEvent (k, MapKeyModifiers (k))); } } else if (wch == Curses.KeyTab) { From 1e3a9b2632208302b59a5aeaa2a7152c214d380c Mon Sep 17 00:00:00 2001 From: Tig Date: Wed, 29 May 2024 11:25:44 -0600 Subject: [PATCH 13/15] Rebased --- UnitTests/UnitTests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 15ba506ac..7c4b4705a 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -18,11 +18,11 @@ TRACE;DEBUG_IDISPOSABLE - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 5f3898d1908866158ed902aea092cedf73b418a6 Mon Sep 17 00:00:00 2001 From: Tig Date: Wed, 29 May 2024 11:29:20 -0600 Subject: [PATCH 14/15] Updated nuget packages --- UnitTests/UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index ffebf160d..7c4b4705a 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -19,7 +19,7 @@ - + From 97d86e4fb3142f8602da37fd94c3c17e262175ff Mon Sep 17 00:00:00 2001 From: Tig Date: Wed, 29 May 2024 11:37:00 -0600 Subject: [PATCH 15/15] Release v1.17.0 --- .github/workflows/publish.yml | 2 +- Example/Example.csproj | 2 +- ReactiveExample/ReactiveExample.csproj | 2 +- UICatalog/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 61c6c4704..69913111f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,7 +34,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.0 + dotnet-version: 8.0 dotnet-quality: 'ga' - name: Install dependencies diff --git a/Example/Example.csproj b/Example/Example.csproj index 900d2a48c..2c2fb9ecc 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -1,7 +1,7 @@  Exe - net7.0 + net8.0 1.0.0.0 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 7aaf02444..e903b9b67 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -1,7 +1,7 @@  Exe - net7.0 + net8.0