From cdad0e7f4711782981caf6bc55c3c70decf50590 Mon Sep 17 00:00:00 2001 From: Tig Date: Sat, 16 Mar 2024 07:44:09 -0800 Subject: [PATCH 01/39] Updated nuget packages --- ReactiveExample/ReactiveExample.csproj | 2 +- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 55eaefa28..ccbbcc065 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -11,7 +11,7 @@ - + diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index d246dd6ea..813f4abfd 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index d88ce47fb..d59737af7 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -19,14 +19,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 9de09db72e025386131e3f66f01b72c48c78dfdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:27:54 +0000 Subject: [PATCH 02/39] Bump gittools/actions from 0 to 1 Bumps [gittools/actions](https://github.com/gittools/actions) from 0 to 1. - [Release notes](https://github.com/gittools/actions/releases) - [Commits](https://github.com/gittools/actions/compare/v0...v1) --- updated-dependencies: - dependency-name: gittools/actions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 83d18ebbc..61c6c4704 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,13 +19,13 @@ jobs: fetch-depth: 0 # fetch-depth is needed for GitVersion - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0 + uses: gittools/actions/gitversion/setup@v1 with: versionSpec: '5.x' includePrerelease: true - name: Determine Version - uses: gittools/actions/gitversion/execute@v0 + uses: gittools/actions/gitversion/execute@v1 with: useConfigFile: true #additionalArguments: /b develop From 58fa801917a98f5f621bbd5a7d3094081871f375 Mon Sep 17 00:00:00 2001 From: BDisp Date: Tue, 26 Mar 2024 23:54:40 +0000 Subject: [PATCH 03/39] Fixes #3351. TabIndex with the same setter value but with wrong index return without set the correct value. --- Terminal.Gui/Core/View.cs | 2 +- UnitTests/Views/ViewTests.cs | 47 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/Terminal.Gui/Core/View.cs b/Terminal.Gui/Core/View.cs index c89d433d2..5ea7785d1 100644 --- a/Terminal.Gui/Core/View.cs +++ b/Terminal.Gui/Core/View.cs @@ -282,7 +282,7 @@ namespace Terminal.Gui { } else if (SuperView?.tabIndexes == null || SuperView?.tabIndexes.Count == 1) { tabIndex = 0; return; - } else if (tabIndex == value) { + } else if (tabIndex == value && TabIndexes.IndexOf (this) == value) { return; } tabIndex = value > SuperView.tabIndexes.Count - 1 ? SuperView.tabIndexes.Count - 1 : value < 0 ? 0 : value; diff --git a/UnitTests/Views/ViewTests.cs b/UnitTests/Views/ViewTests.cs index dc366989d..f7af521bd 100644 --- a/UnitTests/Views/ViewTests.cs +++ b/UnitTests/Views/ViewTests.cs @@ -371,6 +371,53 @@ namespace Terminal.Gui.ViewTests { Assert.True (r.TabIndexes.IndexOf (v1) == 1); } + [Fact] + public void TabIndex_Invert_Order () + { + var r = new View (); + var v1 = new View () { Id = "1", CanFocus = true }; + var v2 = new View () { Id = "2", CanFocus = true }; + var v3 = new View () { Id = "3", CanFocus = true }; + + r.Add (v1, v2, v3); + + v1.TabIndex = 2; + v2.TabIndex = 1; + v3.TabIndex = 0; + Assert.True (r.TabIndexes.IndexOf (v1) == 2); + Assert.True (r.TabIndexes.IndexOf (v2) == 1); + Assert.True (r.TabIndexes.IndexOf (v3) == 0); + + Assert.True (r.Subviews.IndexOf (v1) == 0); + Assert.True (r.Subviews.IndexOf (v2) == 1); + Assert.True (r.Subviews.IndexOf (v3) == 2); + } + + [Fact] + public void TabIndex_Invert_Order_Mixed () + { + var r = new View (); + var vl1 = new View () { Id = "vl1" }; + var v1 = new View () { Id = "v1", CanFocus = true }; + var vl2 = new View () { Id = "vl2" }; + var v2 = new View () { Id = "v2", CanFocus = true }; + var vl3 = new View () { Id = "vl3" }; + var v3 = new View () { Id = "v3", CanFocus = true }; + + r.Add (vl1, v1, vl2, v2, vl3, v3); + + v1.TabIndex = 2; + v2.TabIndex = 1; + v3.TabIndex = 0; + Assert.True (r.TabIndexes.IndexOf (v1) == 4); + Assert.True (r.TabIndexes.IndexOf (v2) == 2); + Assert.True (r.TabIndexes.IndexOf (v3) == 0); + + Assert.True (r.Subviews.IndexOf (v1) == 1); + Assert.True (r.Subviews.IndexOf (v2) == 3); + Assert.True (r.Subviews.IndexOf (v3) == 5); + } + [Fact] public void TabStop_And_CanFocus_Are_All_True () { From bf07d24d9b34924145bd25e510f1638c0abad678 Mon Sep 17 00:00:00 2001 From: BDisp Date: Wed, 27 Mar 2024 15:25:41 +0000 Subject: [PATCH 04/39] Add unit test that proof setting TabIndex before all views are added, will have unexpected result. --- UnitTests/Views/ViewTests.cs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/UnitTests/Views/ViewTests.cs b/UnitTests/Views/ViewTests.cs index f7af521bd..eeeb62452 100644 --- a/UnitTests/Views/ViewTests.cs +++ b/UnitTests/Views/ViewTests.cs @@ -393,6 +393,32 @@ namespace Terminal.Gui.ViewTests { Assert.True (r.Subviews.IndexOf (v3) == 2); } + [Fact] + public void TabIndex_Invert_Order_Added_One_By_One_Does_Not_Do_What_Is_Expected () + { + var r = new View (); + var v1 = new View () { Id = "1", CanFocus = true }; + r.Add (v1); + v1.TabIndex = 2; + var v2 = new View () { Id = "2", CanFocus = true }; + r.Add (v2); + v2.TabIndex = 1; + var v3 = new View () { Id = "3", CanFocus = true }; + r.Add (v3); + v3.TabIndex = 0; + + Assert.False (r.TabIndexes.IndexOf (v1) == 2); + Assert.True (r.TabIndexes.IndexOf (v1) == 1); + Assert.False (r.TabIndexes.IndexOf (v2) == 1); + Assert.True (r.TabIndexes.IndexOf (v2) == 2); + // Only the last is in the expected index + Assert.True (r.TabIndexes.IndexOf (v3) == 0); + + Assert.True (r.Subviews.IndexOf (v1) == 0); + Assert.True (r.Subviews.IndexOf (v2) == 1); + Assert.True (r.Subviews.IndexOf (v3) == 2); + } + [Fact] public void TabIndex_Invert_Order_Mixed () { From 9afd59c8e0fdfb480115c9ed0de547d00d59ec13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:45:44 +0000 Subject: [PATCH 05/39] Bump ReportGenerator from 5.2.3 to 5.2.4 Bumps [ReportGenerator](https://github.com/danielpalme/ReportGenerator) from 5.2.3 to 5.2.4. - [Release notes](https://github.com/danielpalme/ReportGenerator/releases) - [Commits](https://github.com/danielpalme/ReportGenerator/compare/v5.2.3...v5.2.4) --- updated-dependencies: - dependency-name: ReportGenerator dependency-type: direct:production update-type: version-update:semver-patch ... 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 d59737af7..7231d4aeb 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -19,7 +19,7 @@ - + From 4e0f8367e5735377413586be751de439f69ad66d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:47:15 +0000 Subject: [PATCH 06/39] Bump ReactiveUI from 19.5.72 to 19.6.1 Bumps [ReactiveUI](https://github.com/reactiveui/reactiveui) from 19.5.72 to 19.6.1. - [Release notes](https://github.com/reactiveui/reactiveui/releases) - [Commits](https://github.com/reactiveui/reactiveui/compare/19.5.72...19.6.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 ccbbcc065..2d150c7e2 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -11,7 +11,7 @@ - + From 236f29ed550b37e7a77c3e517d5acacdb02b2268 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 14:25:22 +0000 Subject: [PATCH 07/39] Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets Bumps Microsoft.VisualStudio.Azure.Containers.Tools.Targets from 1.19.6 to 1.20.0. --- updated-dependencies: - dependency-name: Microsoft.VisualStudio.Azure.Containers.Tools.Targets dependency-type: direct:production update-type: version-update:semver-minor ... 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 813f4abfd..a18310091 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -20,7 +20,7 @@ - + From 2136eba558fbb5007a421ece6f82344e8b5e2c94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 14:02:16 +0000 Subject: [PATCH 08/39] Bump actions/configure-pages from 4 to 5 Bumps [actions/configure-pages](https://github.com/actions/configure-pages) from 4 to 5. - [Release notes](https://github.com/actions/configure-pages/releases) - [Commits](https://github.com/actions/configure-pages/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/configure-pages dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/api-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 4fe7d5f38..a97953233 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -31,7 +31,7 @@ jobs: continue-on-error: false - name: Setup Pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v5 - name: Upload artifact uses: actions/upload-pages-artifact@v2 From 7d3b5fa6f56c90bf4dec356bb86644a487831ebc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 14:51:00 +0000 Subject: [PATCH 09/39] Bump CsvHelper from 31.0.2 to 31.0.3 Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 31.0.2 to 31.0.3. - [Commits](https://github.com/JoshClose/CsvHelper/compare/31.0.2...31.0.3) --- 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 a18310091..5fb8ff415 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -22,7 +22,7 @@ - + From df138d505667d16c01f610ce11044549d741a905 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 14:53:38 +0000 Subject: [PATCH 10/39] Bump Microsoft.VisualStudio.Azure.Containers.Tools.Targets Bumps Microsoft.VisualStudio.Azure.Containers.Tools.Targets from 1.20.0 to 1.20.1. --- updated-dependencies: - dependency-name: Microsoft.VisualStudio.Azure.Containers.Tools.Targets 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 a18310091..a1b68f87c 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -20,7 +20,7 @@ - + From aea13ce70b187b2170acb335b5996b333c850f9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:33:59 +0000 Subject: [PATCH 11/39] Bump SixLabors.ImageSharp from 3.1.3 to 3.1.4 Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/SixLabors/ImageSharp/releases) - [Commits](https://github.com/SixLabors/ImageSharp/compare/v3.1.3...v3.1.4) --- updated-dependencies: - dependency-name: SixLabors.ImageSharp 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 44a142085..678991366 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -21,7 +21,7 @@ - + From a686684186e2a4c30fe7e1ed30c585c469340a43 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 11 Apr 2024 17:01:20 +0100 Subject: [PATCH 12/39] Allow mouse horizontal scrolling. --- Terminal.Gui/Core/Event.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Terminal.Gui/Core/Event.cs b/Terminal.Gui/Core/Event.cs index a46bbf7e5..af22472df 100644 --- a/Terminal.Gui/Core/Event.cs +++ b/Terminal.Gui/Core/Event.cs @@ -753,13 +753,13 @@ namespace Terminal.Gui { /// WheeledDown = unchecked((int)0x20000000), /// - /// Vertical button wheeled up while pressing ButtonShift. + /// Vertical button wheeled up while pressing ButtonCtrl. /// - WheeledLeft = ButtonShift | WheeledUp, + WheeledLeft = ButtonCtrl | WheeledUp, /// - /// Vertical button wheeled down while pressing ButtonShift. + /// Vertical button wheeled down while pressing ButtonCtrl. /// - WheeledRight = ButtonShift | WheeledDown, + WheeledRight = ButtonCtrl | WheeledDown, /// /// Mask that captures all the events. /// From ba3af075f773266cc17be32a2ba30328e3fc2af1 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 11 Apr 2024 17:28:48 +0100 Subject: [PATCH 13/39] Fix horizontal scrolling in the ListView. --- Terminal.Gui/Views/ListView.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs index 3ccdc0395..e0d4edbda 100644 --- a/Terminal.Gui/Views/ListView.cs +++ b/Terminal.Gui/Views/ListView.cs @@ -864,7 +864,8 @@ namespace Terminal.Gui { void RenderUstr (ConsoleDriver driver, ustring ustr, int col, int line, int width, int start = 0) { - var u = TextFormatter.ClipAndJustify (ustr, width + start, TextAlignment.Left); + ustring str = start > ustr.ConsoleWidth ? string.Empty : ustr.Substring (Math.Min (start, ustr.ToRunes ().Length - 1)); + ustring u = TextFormatter.ClipAndJustify (str, width, TextAlignment.Left); driver.AddStr (u); width -= TextFormatter.GetTextWidth (u); while (width-- + start > 0) { @@ -876,7 +877,7 @@ namespace Terminal.Gui { public void Render (ListView container, ConsoleDriver driver, bool marked, int item, int col, int line, int width, int start = 0) { var savedClip = container.ClipToBounds (); - container.Move (col - start, line); + container.Move (Math.Max (col - start, 0), line); var t = src? [item]; if (t == null) { RenderUstr (driver, ustring.Make (""), col, line, width); From 108afa97b893573d070ee4392c1081f0cbeb8628 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 11 Apr 2024 17:30:55 +0100 Subject: [PATCH 14/39] Fix size in the scenario. --- UICatalog/Scenarios/ListViewWithSelection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UICatalog/Scenarios/ListViewWithSelection.cs b/UICatalog/Scenarios/ListViewWithSelection.cs index c132cf8f5..2b668b3ea 100644 --- a/UICatalog/Scenarios/ListViewWithSelection.cs +++ b/UICatalog/Scenarios/ListViewWithSelection.cs @@ -79,9 +79,9 @@ namespace UICatalog.Scenarios { }; _listView.DrawContent += (e) => { - _scrollBar.Size = _listView.Source.Count - 1; + _scrollBar.Size = _listView.Source.Count; _scrollBar.Position = _listView.TopItem; - _scrollBar.OtherScrollBarView.Size = _listView.Maxlength - 1; + _scrollBar.OtherScrollBarView.Size = _listView.Maxlength; _scrollBar.OtherScrollBarView.Position = _listView.LeftItem; _scrollBar.Refresh (); }; From 64a21073faf779e5d82a87b8ef2fe2762172d7d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:09:49 +0000 Subject: [PATCH 15/39] Bump xunit from 2.7.0 to 2.7.1 Bumps [xunit](https://github.com/xunit/xunit) from 2.7.0 to 2.7.1. - [Commits](https://github.com/xunit/xunit/compare/2.7.0...2.7.1) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... 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 7231d4aeb..eee07514b 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -21,7 +21,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From cf35c58a0f427e6eccc24e9b5bff01c2acb69dd8 Mon Sep 17 00:00:00 2001 From: BDisp Date: Sun, 21 Apr 2024 23:50:09 +0100 Subject: [PATCH 16/39] Fixes #3423. v1 - Wizards scenario doesn't refresh after opened by mouse. --- Terminal.Gui/Core/Application.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Terminal.Gui/Core/Application.cs b/Terminal.Gui/Core/Application.cs index a7ed8cdce..52343079b 100644 --- a/Terminal.Gui/Core/Application.cs +++ b/Terminal.Gui/Core/Application.cs @@ -1040,9 +1040,7 @@ namespace Terminal.Gui { if (refreshDriver) { MdiTop?.OnChildLoaded (toplevel); toplevel.OnLoaded (); - Redraw (toplevel); - toplevel.PositionCursor (); - Driver.Refresh (); + Refresh (); } NotifyNewRunState?.Invoke (rs); From 2ba162405e5dc2076ae03a0a759b3e94ced1b26d Mon Sep 17 00:00:00 2001 From: BDisp Date: Mon, 22 Apr 2024 00:00:54 +0100 Subject: [PATCH 17/39] Fixes #3424. v1 - Views should not force focus if they are not selected. --- Terminal.Gui/Views/ComboBox.cs | 2 +- Terminal.Gui/Windows/Wizard.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Terminal.Gui/Views/ComboBox.cs b/Terminal.Gui/Views/ComboBox.cs index 0483d82e7..7e5177142 100644 --- a/Terminal.Gui/Views/ComboBox.cs +++ b/Terminal.Gui/Views/ComboBox.cs @@ -792,7 +792,7 @@ namespace Terminal.Gui { listview.SetSource (searchset); listview.Height = CalculatetHeight (); - if (Subviews.Count > 0) { + if (HasFocus && Subviews.Count > 0) { search.SetFocus (); } } diff --git a/Terminal.Gui/Windows/Wizard.cs b/Terminal.Gui/Windows/Wizard.cs index d63ae274d..c1d326281 100644 --- a/Terminal.Gui/Windows/Wizard.cs +++ b/Terminal.Gui/Windows/Wizard.cs @@ -773,6 +773,10 @@ namespace Terminal.Gui { var oldStep = currentStep; currentStep = newStep; + if (currentStep is null) { + return false; + } + UpdateButtonsAndTitle (); // Set focus to the nav buttons From 9646c101b02fc843217739067dd854f17a6c78ee Mon Sep 17 00:00:00 2001 From: BDisp Date: Mon, 22 Apr 2024 00:05:07 +0100 Subject: [PATCH 18/39] Fix a conflict with this unit test and the TestVKPacket unit test. --- UnitTests/Views/ViewTests.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UnitTests/Views/ViewTests.cs b/UnitTests/Views/ViewTests.cs index eeeb62452..0a64c17b9 100644 --- a/UnitTests/Views/ViewTests.cs +++ b/UnitTests/Views/ViewTests.cs @@ -1246,6 +1246,10 @@ namespace Terminal.Gui.ViewTests { Application.Run (); + // Ensures cleaning any keystroke. + // This was conflicting with the TestVKPacket unit test + Console.MockKeyPresses.Clear (); + // Shutdown must be called to safely clean up Application if Init has been called Application.Shutdown (); } From b6df2cc3d15b2dc03b704dc0c8105f496b8970c2 Mon Sep 17 00:00:00 2001 From: BDisp Date: Mon, 22 Apr 2024 00:07:24 +0100 Subject: [PATCH 19/39] Fixes #3425. v1 - ScrollView is not clearing the background by duplicating views. --- Terminal.Gui/Views/ScrollView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Terminal.Gui/Views/ScrollView.cs b/Terminal.Gui/Views/ScrollView.cs index e7baa90c4..44c4272fa 100644 --- a/Terminal.Gui/Views/ScrollView.cs +++ b/Terminal.Gui/Views/ScrollView.cs @@ -349,7 +349,7 @@ namespace Terminal.Gui { { Driver.SetAttribute (GetNormalColor ()); SetViewsNeedsDisplay (); - //Clear (); + Clear (); var savedClip = ClipToBounds (); OnDrawContent (new Rect (ContentOffset, From 2b6627f33bfb896141853b3c0dd3c977abafb00f Mon Sep 17 00:00:00 2001 From: BDisp Date: Mon, 22 Apr 2024 11:40:03 +0100 Subject: [PATCH 20/39] ReSharper is always forcing this changing --- Terminal.sln.DotSettings | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Terminal.sln.DotSettings b/Terminal.sln.DotSettings index 222edc098..8fdbdf5a4 100644 --- a/Terminal.sln.DotSettings +++ b/Terminal.sln.DotSettings @@ -112,6 +112,9 @@ <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy><Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> True Terminal.sln.DotSettings @@ -125,4 +128,5 @@ True True True - True + True + True From 6760d992ddece213d774deb2d8e66bc364d369c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:02:06 +0000 Subject: [PATCH 21/39] Bump ReportGenerator from 5.2.4 to 5.2.5 Bumps [ReportGenerator](https://github.com/danielpalme/ReportGenerator) from 5.2.4 to 5.2.5. - [Release notes](https://github.com/danielpalme/ReportGenerator/releases) - [Commits](https://github.com/danielpalme/ReportGenerator/compare/v5.2.4...v5.2.5) --- updated-dependencies: - dependency-name: ReportGenerator dependency-type: direct:production update-type: version-update:semver-patch ... 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 eee07514b..5081a7193 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -19,7 +19,7 @@ - + From 36528139b1e40de731de6b5f0690095111839d97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:24:31 +0000 Subject: [PATCH 22/39] Bump CsvHelper from 31.0.3 to 32.0.0 Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 31.0.3 to 32.0.0. - [Commits](https://github.com/JoshClose/CsvHelper/compare/31.0.3...32.0.0) --- updated-dependencies: - dependency-name: CsvHelper dependency-type: direct:production update-type: version-update:semver-major ... 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 678991366..9570fc22a 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -22,7 +22,7 @@ - + From 7cd7390c846c12694606b5d5729b1b2c546bf2b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:57:09 +0000 Subject: [PATCH 23/39] Bump CsvHelper from 32.0.0 to 32.0.1 Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 32.0.0 to 32.0.1. - [Commits](https://github.com/JoshClose/CsvHelper/commits) --- 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 9570fc22a..faa8a2b05 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -22,7 +22,7 @@ - + From 333bb047e51a464fb8c2f8dbb8c74702b0ca01ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:57:33 +0000 Subject: [PATCH 24/39] Bump xunit.runner.visualstudio from 2.5.7 to 2.8.0 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.7 to 2.8.0. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.5.7...2.8.0) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio 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 5081a7193..eaff579d3 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 64f73abec71d7d0c91feccf9d59f8581ac6aab6a Mon Sep 17 00:00:00 2001 From: Dries Horions Date: Wed, 1 May 2024 08:50:17 +0200 Subject: [PATCH 25/39] Add Capital and Cargo to showcase.md Add https://github.com/dhorions/Capital-and-Cargo to showcase.md --- Showcase.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Showcase.md b/Showcase.md index 158360425..a4215cd80 100644 --- a/Showcase.md +++ b/Showcase.md @@ -16,10 +16,14 @@ ![PoshDotnetDumpAnalyzerViewer.png](docfx/images/PoshDotnetDumpAnalyzerViewer.png) ⠀ * **[TerminalGuiDesigner](https://github.com/tznind/TerminalGuiDesigner)** - Cross platform view designer for building Terminal.Gui applications. - ![TerminalGuiDesigner.gif](docfx/images/TerminalGuiDesigner.gif) + ![TerminalGuiDesigner.gif](docfx/images/TerminalGuiDesigner.gif) + +* **[Capital and Cargo](https://github.com/dhorions/Capital-and-Cargo)** - A retro console game where you buy, sell, produce and transport goods built with Terminal.Gui + ![image](https://github.com/gui-cs/Terminal.Gui/assets/1682004/ed89f3d6-020f-4a8a-ae18-e057514f4c43) + # Examples # * **[C# Example](https://github.com/gui-cs/Terminal.Gui/tree/master/Example)** - Run `dotnet run` in the `Example` directory to run the C# Example. * **[F# Example](https://github.com/gui-cs/Terminal.Gui/tree/master/FSharpExample)** - An example showing how to build a Terminal.Gui app using F#. -* **[Reactive Example](https://github.com/gui-cs/Terminal.Gui/tree/master/ReactiveExample)** - A sample app that shows how to use `System.Reactive` and `ReactiveUI` with `Terminal.Gui`. The app uses the MVVM architecture that may seem familiar to folks coming from WPF, Xamarin Forms, UWP, Avalonia, or Windows Forms. In this app, we implement the data bindings using ReactiveUI `WhenAnyValue` syntax and [Pharmacist](https://github.com/reactiveui/pharmacist) — a tool that converts all events in a NuGet package into observable wrappers. \ No newline at end of file +* **[Reactive Example](https://github.com/gui-cs/Terminal.Gui/tree/master/ReactiveExample)** - A sample app that shows how to use `System.Reactive` and `ReactiveUI` with `Terminal.Gui`. The app uses the MVVM architecture that may seem familiar to folks coming from WPF, Xamarin Forms, UWP, Avalonia, or Windows Forms. In this app, we implement the data bindings using ReactiveUI `WhenAnyValue` syntax and [Pharmacist](https://github.com/reactiveui/pharmacist) — a tool that converts all events in a NuGet package into observable wrappers. 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 26/39] 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 27/39] 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 28/39] 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 29/39] 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 30/39] 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 31/39] 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 32/39] 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 33/39] 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 34/39] 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 35/39] --- 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 36/39] 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 37/39] 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 38/39] 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 39/39] 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