From 3fc1878d656576d92cfba1231382734177defacf Mon Sep 17 00:00:00 2001 From: Tig Kindel Date: Mon, 22 Jan 2024 06:58:12 -0700 Subject: [PATCH 1/7] 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 3dc558318eb97085af7c3942f982d8929254e663 Mon Sep 17 00:00:00 2001 From: Tig Date: Mon, 20 May 2024 06:54:02 -0600 Subject: [PATCH 2/7] 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 736a96da771b54724c703cd393f59f6bb2ab0b29 Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 21 May 2024 07:19:48 -0600 Subject: [PATCH 3/7] 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 4/7] 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 5/7] 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 1e3a9b2632208302b59a5aeaa2a7152c214d380c Mon Sep 17 00:00:00 2001 From: Tig Date: Wed, 29 May 2024 11:25:44 -0600 Subject: [PATCH 6/7] 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 7/7] 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 @@ - +