From 019421072b4ebd2ea0a74637d1ebd8c7da5fd593 Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 9 Jul 2024 09:30:09 -0600 Subject: [PATCH 1/5] Latest packages --- ...nal.Gui.Analyzers.Internal.Debugging.csproj | 14 +++++++++----- ...erminal.Gui.Analyzers.Internal.Tests.csproj | 16 ++++++++++------ .../Terminal.Gui.Analyzers.Internal.csproj | 18 +++++++++++------- .../CommunityToolkitExample.csproj | 4 ++++ Example/Example.csproj | 3 +++ ReactiveExample/ReactiveExample.csproj | 5 ++++- Terminal.Gui/Terminal.Gui.csproj | 12 ++++++------ UICatalog/UICatalog.csproj | 7 +++++-- UnitTests/UnitTests.csproj | 13 ++++++++----- 9 files changed, 60 insertions(+), 32 deletions(-) diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj b/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj index 3cad5995b..5594dd0da 100644 --- a/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj +++ b/Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj @@ -6,12 +6,12 @@ enable - - - - + + + + - + @@ -22,4 +22,8 @@ + + + + diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj b/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj index e4e88bd61..42445111d 100644 --- a/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj +++ b/Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Terminal.Gui.Analyzers.Internal.Tests.csproj @@ -14,13 +14,13 @@ - - - - + + + + - - + + all @@ -45,4 +45,8 @@ + + + + diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj b/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj index 80d788ac3..06ce0794b 100644 --- a/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj +++ b/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj @@ -47,17 +47,21 @@ - - - - + + + + - - - + + + + + + + diff --git a/CommunityToolkitExample/CommunityToolkitExample.csproj b/CommunityToolkitExample/CommunityToolkitExample.csproj index fdb41dfcd..44b28218e 100644 --- a/CommunityToolkitExample/CommunityToolkitExample.csproj +++ b/CommunityToolkitExample/CommunityToolkitExample.csproj @@ -16,4 +16,8 @@ + + + + diff --git a/Example/Example.csproj b/Example/Example.csproj index 4bb8cc0bc..47fafd9a1 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -13,4 +13,7 @@ + + + \ No newline at end of file diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 54f46753a..42ddcc91d 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -12,10 +12,13 @@ - + + + + \ No newline at end of file diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 1959d51d3..b436834a1 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -50,14 +50,14 @@ - - - - + + + + - - + + all diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index e461d7c2f..1295f4f5a 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -29,9 +29,9 @@ - + - + @@ -46,4 +46,7 @@ + + + \ No newline at end of file diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 716afb0fa..d64e3c63a 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -29,12 +29,12 @@ true - - - - + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -57,6 +57,9 @@ + + + False From c981eefed8f9bcf9e44990af67fcf5c5b982d021 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 9 Jul 2024 16:54:00 +0100 Subject: [PATCH 2/5] Fix hanging xml comment --- Terminal.Gui/Drawing/Gradient.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Terminal.Gui/Drawing/Gradient.cs b/Terminal.Gui/Drawing/Gradient.cs index 5091cc314..622f93239 100644 --- a/Terminal.Gui/Drawing/Gradient.cs +++ b/Terminal.Gui/Drawing/Gradient.cs @@ -34,7 +34,9 @@ public enum GradientDirection } /// -/// Describes +/// Describes a of colors that can be combined +/// to make a color gradient. Use +/// to create into gradient fill area maps. /// public class Gradient { From 1ba84ded9a800206a1724a92980d634522c19bc7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 9 Jul 2024 16:59:21 +0100 Subject: [PATCH 3/5] Fix bad namespace --- Terminal.Gui/Drawing/FillPair.cs | 2 -- Terminal.Gui/Drawing/SolidFill.cs | 2 +- UICatalog/Scenarios/TextEffectsScenario.cs | 2 -- UnitTests/Drawing/FillPairTests.cs | 1 - UnitTests/Drawing/LineCanvasTests.cs | 1 - UnitTests/Drawing/SolidFillTests.cs | 2 -- 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Terminal.Gui/Drawing/FillPair.cs b/Terminal.Gui/Drawing/FillPair.cs index 648dbb40f..5a7caf6d8 100644 --- a/Terminal.Gui/Drawing/FillPair.cs +++ b/Terminal.Gui/Drawing/FillPair.cs @@ -1,6 +1,4 @@  -using Terminal.Gui.Drawing; - namespace Terminal.Gui; diff --git a/Terminal.Gui/Drawing/SolidFill.cs b/Terminal.Gui/Drawing/SolidFill.cs index 67e1bdf1f..d456df8a9 100644 --- a/Terminal.Gui/Drawing/SolidFill.cs +++ b/Terminal.Gui/Drawing/SolidFill.cs @@ -1,4 +1,4 @@ -namespace Terminal.Gui.Drawing; +namespace Terminal.Gui; /// diff --git a/UICatalog/Scenarios/TextEffectsScenario.cs b/UICatalog/Scenarios/TextEffectsScenario.cs index b34e77321..71c75cfca 100644 --- a/UICatalog/Scenarios/TextEffectsScenario.cs +++ b/UICatalog/Scenarios/TextEffectsScenario.cs @@ -4,8 +4,6 @@ using System.Text; using System.Threading; using Terminal.Gui; -using Terminal.Gui.Drawing; - namespace UICatalog.Scenarios; [ScenarioMetadata ("Text Effects", "Text Effects.")] diff --git a/UnitTests/Drawing/FillPairTests.cs b/UnitTests/Drawing/FillPairTests.cs index bbe8b6563..34953a4a4 100644 --- a/UnitTests/Drawing/FillPairTests.cs +++ b/UnitTests/Drawing/FillPairTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Terminal.Gui.Drawing; namespace Terminal.Gui.DrawingTests; diff --git a/UnitTests/Drawing/LineCanvasTests.cs b/UnitTests/Drawing/LineCanvasTests.cs index d160b5420..05df06bcf 100644 --- a/UnitTests/Drawing/LineCanvasTests.cs +++ b/UnitTests/Drawing/LineCanvasTests.cs @@ -1,5 +1,4 @@ using System.Text; -using Terminal.Gui.Drawing; using Xunit.Abstractions; namespace Terminal.Gui.DrawingTests; diff --git a/UnitTests/Drawing/SolidFillTests.cs b/UnitTests/Drawing/SolidFillTests.cs index 50eaa9f9f..9e70103d5 100644 --- a/UnitTests/Drawing/SolidFillTests.cs +++ b/UnitTests/Drawing/SolidFillTests.cs @@ -1,6 +1,4 @@  -using Terminal.Gui.Drawing; - namespace Terminal.Gui.DrawingTests; public class SolidFillTests From 918bd3ae568b21d52991e80e05721a51bc1c879a Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 9 Jul 2024 11:30:48 -0600 Subject: [PATCH 4/5] Removed orig --- GitVersion.yml.orig | 103 -------------------------------------------- 1 file changed, 103 deletions(-) delete mode 100644 GitVersion.yml.orig diff --git a/GitVersion.yml.orig b/GitVersion.yml.orig deleted file mode 100644 index 345f7237f..000000000 --- a/GitVersion.yml.orig +++ /dev/null @@ -1,103 +0,0 @@ -mode: ContinuousDeployment -tag-prefix: '[vV]' -continuous-delivery-fallback-tag: dev -branches: - develop: - mode: ContinuousDeployment - tag: dev - regex: develop - source-branches: - - main - pre-release-weight: 100 - - v2_develop: - mode: ContinuousDeployment - tag: dev - regex: ^v2_develop?[/-] -<<<<<<< HEAD - #is-release-branch: true -======= ->>>>>>> v2_develop - tracks-release-branches: true - is-source-branch-for: ['v2_release'] - source-branches: [] - - v2_release: - mode: ContinuousDeployment - tag: prealpha - regex: v2_release - is-release-branch: true - source-branches: ['v2_develop'] - - pull-request: - mode: ContinuousDeployment - tag: PullRequest.{BranchName} - increment: Inherit - tag-number-pattern: '[/-](?\d+)' - regex: ^(pull|pull\-requests|pr)[/-] - source-branches: - - develop - - main - - release - - v2_develop - - v2_release - - feature - - support - - hotfix - pre-release-weight: 30000 - -ignore: - sha: [] - - -# next-version: 2.0.0 -# mode: ContinuousDeployment -# tag-prefix: '[vV]' -# continuous-delivery-fallback-tag: 'pre' -# branches: -# # v1_develop: -# # mode: ContinuousDeployment -# # tag: pre -# # regex: ^v1_develop?[/-] -# # is-release-branch: false -# # source-branches: -# # - v1 -# # v1: -# # tag: rc -# # increment: Patch -# # regex: ^v2?[/-] -# # is-release-branch: false -# # source-branches: [] -# # is-mainline: true - -# v2_develop: -# mode: ContinuousDeployment -# tag: pre -# regex: ^v2_develop?[/-] -# is-release-branch: true -# tracks-release-branches: true -# is-source-branch-for: ['v2'] -# source-branches: [] -# v2: -# mode: ContinuousDeployment -# is-release-branch: false -# tag: alpha -# increment: Patch -# regex: ^v2?[/-] -# source-branches: ['v2_develop'] - -# # feature: -# # tag: useBranchName -# # regex: ^features?[/-] -# # source-branches: -# # - v1 -# # - v1_develop -# # - v2 -# # - v2_develop - -# pull-request: -# tag: PullRequest.{BranchName} -# increment: Inherit -# ignore: -# sha: [] -# merge-message-formats: {} From 47d3762ee2a5329dce24eaf1d29d26cd6a153804 Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 9 Jul 2024 11:31:59 -0600 Subject: [PATCH 5/5] Fixed .gitignore --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bbfa8e16e..cca1f4801 100644 --- a/.gitignore +++ b/.gitignore @@ -50,9 +50,9 @@ UnitTests/TestResults TestResults # git merge files -.orig -.theirs -.ours +*.orig +*.theirs +*.ours demo.*