From 4080dc9833578feecb667088785290a511ab470a Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 07:32:27 -0600 Subject: [PATCH 01/19] Initial commit --- Example/Example.csproj | 8 ++--- FSharpExample/FSharpExample.fsproj | 8 ++--- ReactiveExample/ReactiveExample.csproj | 8 ++--- Terminal.Gui/Terminal.Gui.csproj | 44 ++++++++++++++++++++------ UICatalog/UICatalog.csproj | 8 ++--- UnitTests/UnitTests.csproj | 10 +++--- 6 files changed, 56 insertions(+), 30 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index d53cc3e760..398b5e592c 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -5,10 +5,10 @@ - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d + 1.14.0.0 + 1.14.0.0 + 1.14.0-pre0109 + 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 0be44075ae..3a4b998d9d 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -2,10 +2,10 @@ Exe net6.0 - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d - 1.13.6-pre0002 + 1.14.0.0 + 1.14.0.0 + 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf + 1.14.0-pre0109 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 67bc3c4590..b11bfa3619 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -5,10 +5,10 @@ - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d + 1.14.0.0 + 1.14.0.0 + 1.14.0-pre0109 + 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 72d467a0f0..2121d90ca2 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -1,29 +1,51 @@ - + + portable + + $(VersionPrefix) + 1.14.0.0 + 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf TRACE;DEBUG_IDISPOSABLE portable + pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) + 1.14.0-pre0109 + - - - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d - 1.13.6-pre0002 + 1.14.0 + 1.14.0.0 + false + $(Version) + + + + + + + + + + + + + @@ -35,6 +57,7 @@ \ + True @@ -42,26 +65,29 @@ Strings.resx + ResXFileCodeGenerator Strings.Designer.cs + + + net472;netstandard2.1;net7.0 Terminal.Gui Terminal.Gui bin\Release\Terminal.Gui.xml - true true + true Terminal.Gui - $(PackageVersion) MIT https://github.com/gui-cs/Terminal.Gui/ https://github.com/gui-cs/Terminal.Gui.git diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 8feabd825f..0710b516ce 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -7,10 +7,10 @@ - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d + 1.14.0.0 + 1.14.0.0 + 1.14.0-pre0109 + 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index a2571e2cff..131f30113d 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -9,10 +9,10 @@ - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d + 1.14.0.0 + 1.14.0.0 + 1.14.0-pre0109 + 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf TRACE From fccf0213e2c55836fe3c05c08d7164b976f30cf8 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 07:37:45 -0600 Subject: [PATCH 02/19] Updated gitversion to test --- GitVersion.yml | 9 +++------ Terminal.sln | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 7372abcf28..7a336711d6 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,5 @@ mode: ContinuousDeployment +next-version: 1.14.0 tag-prefix: '[vV]' branches: develop: @@ -8,17 +9,13 @@ branches: increment: Patch source-branches: - develop - - release + - main # v1_release feature: tag: useBranchName regex: ^features?[/-] source-branches: - develop - - main - - release - - feature - - support - - hotfix + - main # v1_release pull-request: tag: PullRequest increment: Inherit diff --git a/Terminal.sln b/Terminal.sln index b0837d7501..9af00ffe79 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md CONTRIBUTING.md = CONTRIBUTING.md .github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml + GitVersion.yml = GitVersion.yml .github\workflows\publish.yml = .github\workflows\publish.yml README.md = README.md testenvironments.json = testenvironments.json From 1e9c48c2ec1488b48d00d60f014c6cdee53e9604 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 07:40:05 -0600 Subject: [PATCH 03/19] Updated gitversion to test --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 20 ++------------------ UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 6 files changed, 12 insertions(+), 28 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 398b5e592c..27bae7fea4 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-pre0109 - 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf + 1.14.0-v1-develop-branc0111 + 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 3a4b998d9d..7226a3163b 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf - 1.14.0-pre0109 + 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 + 1.14.0-v1-develop-branc0111 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index b11bfa3619..f49b26cf2e 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-pre0109 - 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf + 1.14.0-v1-develop-branc0111 + 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 2121d90ca2..3c86cae41c 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -1,51 +1,40 @@  - portable $(VersionPrefix) 1.14.0.0 - 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf + 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 TRACE;DEBUG_IDISPOSABLE portable pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) - 1.14.0-pre0109 + 1.14.0-v1-develop-branc0111 - 1.14.0 - 1.14.0.0 - false $(Version) - - - - - - - @@ -57,7 +46,6 @@ \ - True @@ -65,21 +53,17 @@ Strings.resx - ResXFileCodeGenerator Strings.Designer.cs - - - net472;netstandard2.1;net7.0 Terminal.Gui diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 0710b516ce..427c25d59b 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-pre0109 - 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf + 1.14.0-v1-develop-branc0111 + 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 131f30113d..a39d4a5bb8 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -11,8 +11,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-pre0109 - 1.14.0-pre.109+Branch.develop.Sha.bdf9ec112cb6fe4860dd9eb238144c65528327cf + 1.14.0-v1-develop-branc0111 + 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 TRACE From a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 07:40:48 -0600 Subject: [PATCH 04/19] tweaking csproj --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 8 +++++--- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 27bae7fea4..b164f7cdb8 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0111 - 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 + 1.14.0-v1-develop-branc0112 + 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 7226a3163b..3b897c43c8 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 - 1.14.0-v1-develop-branc0111 + 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 + 1.14.0-v1-develop-branc0112 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index f49b26cf2e..d3aa7d6e7f 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0111 - 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 + 1.14.0-v1-develop-branc0112 + 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 3c86cae41c..dde76e89bd 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -3,20 +3,22 @@ portable $(VersionPrefix) - 1.14.0.0 - 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 + 1.14.0.0 TRACE;DEBUG_IDISPOSABLE portable pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) - 1.14.0-v1-develop-branc0111 + 1.14.0-v1-develop-branc0112 + 1.14.0 $(Version) + + 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0111 - 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 + 1.14.0-v1-develop-branc0112 + 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index a39d4a5bb8..6d1b510d36 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -11,8 +11,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0111 - 1.14.0-v1-develop-branching-update.111+Branch.v1-develop-branching-update.Sha.fccf0213e2c55836fe3c05c08d7164b976f30cf8 + 1.14.0-v1-develop-branc0112 + 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 TRACE From da42a3c595a0e7146db50be7001215a563e857b3 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 07:50:30 -0600 Subject: [PATCH 05/19] coimmented csproj --- Example/Example.csproj | 4 +- FSharpExample/FSharpExample.fsproj | 4 +- ReactiveExample/ReactiveExample.csproj | 4 +- Terminal.Gui/Terminal.Gui.csproj | 92 ++++++++++++++++---------- UICatalog/UICatalog.csproj | 4 +- UnitTests/UnitTests.csproj | 4 +- 6 files changed, 66 insertions(+), 46 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index b164f7cdb8..80336301ad 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0112 - 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 + 1.14.0-v1-develop-branc0113 + 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 3b897c43c8..178408bc5b 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 - 1.14.0-v1-develop-branc0112 + 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d + 1.14.0-v1-develop-branc0113 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index d3aa7d6e7f..46a0844f56 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0112 - 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 + 1.14.0-v1-develop-branc0113 + 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index dde76e89bd..b0587c8fb6 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -1,24 +1,19 @@  - - portable - - $(VersionPrefix) - 1.14.0.0 - - - TRACE;DEBUG_IDISPOSABLE - portable - pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) - 1.14.0-v1-develop-branc0112 - - + + + + - 1.14.0 + 1.14.0.0 + 1.14.0.0 + 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d $(Version) + 1.14.0-v1-develop-branc0113 - - + + + + + + + portable + + + + TRACE;DEBUG_IDISPOSABLE + portable + pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) + + + net472;netstandard2.1;net7.0 + Terminal.Gui + Terminal.Gui + + + + @@ -37,7 +52,9 @@ + + True @@ -48,6 +65,9 @@ \ + + + True @@ -61,38 +81,38 @@ Strings.Designer.cs - - - - - + + + - net472;netstandard2.1;net7.0 - Terminal.Gui - Terminal.Gui - bin\Release\Terminal.Gui.xml - true - true Terminal.Gui MIT https://github.com/gui-cs/Terminal.Gui/ - https://github.com/gui-cs/Terminal.Gui.git - git - true - snupkg - - true - - true logo.png README.md csharp, terminal, c#, f#, gui, toolkit, console, tui Cross platform Terminal UI toolkit for .NET - Miguel de Icaza, Charlie Kindel + Miguel de Icaza, Tig Kindel A toolkit for building rich console apps for .NET that works on Windows, Mac, and Linux/Unix. Terminal.Gui - Cross platform Terminal User Interface (TUI) toolkit for .NET See: https://github.com/gui-cs/Terminal.Gui/releases + bin\Release\Terminal.Gui.xml + true + true + https://github.com/gui-cs/Terminal.Gui.git + git + true + snupkg + + true + + true + + + + + \ No newline at end of file diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 52877bd4cb..6635d93eae 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0112 - 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 + 1.14.0-v1-develop-branc0113 + 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 6d1b510d36..01fbb39ef5 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -11,8 +11,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0112 - 1.14.0-v1-develop-branching-update.112+Branch.v1-develop-branching-update.Sha.1e9c48c2ec1488b48d00d60f014c6cdee53e9604 + 1.14.0-v1-develop-branc0113 + 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d TRACE From 196872f2340046682a9fc98bceba4894e866e1c5 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 08:26:36 -0600 Subject: [PATCH 06/19] coimmented csproj --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 21 ++++++++------------- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 80336301ad..e6f0933c49 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0113 - 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d + 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 178408bc5b..32e7a024cb 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d - 1.14.0-v1-develop-branc0113 + 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0114 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 46a0844f56..d3b7082d08 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0113 - 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d + 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index b0587c8fb6..bd6d919628 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -1,27 +1,23 @@ - + + 1.14.0 + pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d + 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 $(Version) - 1.14.0-v1-develop-branc0113 + 1.14.0-v1-develop-branc0114 - + - - - - - + + @@ -33,7 +29,6 @@ TRACE;DEBUG_IDISPOSABLE portable - pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) net472;netstandard2.1;net7.0 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 6635d93eae..4aaac8a5ba 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0113 - 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d + 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 01fbb39ef5..3fbdd94d96 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -11,8 +11,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0113 - 1.14.0-v1-develop-branching-update.113+Branch.v1-develop-branching-update.Sha.a36b5c45a68b3d89f4a920cd6ad775ed40cdc51d + 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 TRACE From c5c48b01c52fa7235ef92be4bd95db903ccb1ef8 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:01:59 -0600 Subject: [PATCH 07/19] Fixing source link --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 21 +++++++++++---------- Terminal.sln | 1 + UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- global.json | 4 ++-- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index e6f0933c49..389809912b 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 32e7a024cb..2ca4f71907 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 - 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 + 1.14.0-v1-develop-branc0115 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index d3b7082d08..9e8d0565f4 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -7,8 +7,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index bd6d919628..c7a8d9998a 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -5,13 +5,11 @@ - 1.14.0 - pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm")) 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 $(Version) - 1.14.0-v1-develop-branc0114 + 1.14.0-v1-develop-branc0115 @@ -34,16 +32,20 @@ net472;netstandard2.1;net7.0 Terminal.Gui Terminal.Gui + true + + + - + @@ -103,11 +105,10 @@ true + upstream true + true + Embedded + Miguel de Icaza, Tig Kindel (@tig), @BDisp - - - - - \ No newline at end of file diff --git a/Terminal.sln b/Terminal.sln index 9af00ffe79..70bcb83432 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CONTRIBUTING.md = CONTRIBUTING.md .github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml GitVersion.yml = GitVersion.yml + global.json = global.json .github\workflows\publish.yml = .github\workflows\publish.yml README.md = README.md testenvironments.json = testenvironments.json diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 4aaac8a5ba..f583f8a01d 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 Linux diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 3fbdd94d96..5550585680 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -11,8 +11,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0114 - 1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3 + 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 TRACE diff --git a/global.json b/global.json index 2dd1c167e4..cf0511e14d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk":{ - "version":"7.0.100", - "rollForward":"latestMajor" + "version":"7.0.200", + "rollForward":"latestMinor" } } From c8b2ebe44cb3cb1975289990ed9cd3c11b47869c Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:11:27 -0600 Subject: [PATCH 08/19] updated yml --- .github/workflows/publish.yml | 11 +++++++++-- Terminal.Gui/Terminal.Gui.csproj | 6 ------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c42f6e1900..9b31ec8751 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,11 +1,19 @@ name: Publish Terminal.Gui + on: push: + branches: [ main, v2_release ] tags: - v* + paths-ignore: + - '**.md' -jobs: + pull_request: + branches: [ develop, v2_develop ] + paths-ignore: + - '**.md' +jobs: publish: name: Build and Publish to Nuget.org runs-on: ubuntu-latest @@ -59,7 +67,6 @@ jobs: color: brightgreen path: UnitTests/TestResults/coverage.opencover.xml gist-filename: code-coverage.json - # https://gist.github.com/migueldeicaza/90ef67a684cb71db1817921a970f8d27 gist-id: 90ef67a684cb71db1817921a970f8d27 gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }} diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index c7a8d9998a..e59982e786 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -12,12 +12,6 @@ 1.14.0-v1-develop-branc0115 - - - - - - From d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:13:50 -0600 Subject: [PATCH 09/19] tweaked csproj files --- Example/Example.csproj | 1 - ReactiveExample/ReactiveExample.csproj | 1 - UICatalog/UICatalog.csproj | 3 +-- UnitTests/UnitTests.csproj | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 389809912b..ee355e55c2 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -3,7 +3,6 @@ Exe net7.0 - 1.14.0.0 1.14.0.0 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 9e8d0565f4..eb91722cd1 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -3,7 +3,6 @@ Exe net7.0 - 1.14.0.0 1.14.0.0 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index f583f8a01d..4e018b0d28 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -4,14 +4,13 @@ net7.0 8.0 UICatalog.UICatalogApp + Linux - 1.14.0.0 1.14.0.0 1.14.0-v1-develop-branc0115 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 - Linux TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 5550585680..98447beae9 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -7,7 +7,6 @@ false - 1.14.0.0 1.14.0.0 From d281cbd60434cd4f4404cb947dcd8c755969723c Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:14:11 -0600 Subject: [PATCH 10/19] new version --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 4 ++-- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index ee355e55c2..dcd2406e4f 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0115 - 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 + 1.14.0-v1-develop-branc0118 + 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 2ca4f71907..d2aebe34ec 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 - 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c + 1.14.0-v1-develop-branc0118 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index eb91722cd1..d28a602ea2 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0115 - 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 + 1.14.0-v1-develop-branc0118 + 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index e59982e786..baaa1c999b 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -7,9 +7,9 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 + 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c $(Version) - 1.14.0-v1-develop-branc0115 + 1.14.0-v1-develop-branc0118 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 4e018b0d28..a56d52f91d 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0115 - 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 + 1.14.0-v1-develop-branc0118 + 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 98447beae9..31d713ba5a 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -10,8 +10,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0115 - 1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5 + 1.14.0-v1-develop-branc0118 + 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c TRACE From 22135af9a115fe3abcb494cdc61e2a8d20174ffd Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:26:43 -0600 Subject: [PATCH 11/19] tweaking gitversion --- GitVersion.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 7a336711d6..03a4ad20b8 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,21 +1,22 @@ mode: ContinuousDeployment -next-version: 1.14.0 tag-prefix: '[vV]' +next-version: 1.14.0 branches: develop: + mode: ContinuousDeployment tag: pre main: tag: rc increment: Patch source-branches: - develop - - main # v1_release + - main feature: tag: useBranchName regex: ^features?[/-] source-branches: - develop - - main # v1_release + - main pull-request: tag: PullRequest increment: Inherit From 53bf0d55cd2b04eebf52951c70970344df2fc339 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:35:00 -0600 Subject: [PATCH 12/19] tweaking gitversion --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- GitVersion.yml | 5 +++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 4 ++-- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index dcd2406e4f..dd4be72ba7 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0118 - 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c + 1.14.0-v1-develop-branc0134 + 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index d2aebe34ec..1a33ac3eb7 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c - 1.14.0-v1-develop-branc0118 + 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd + 1.14.0-v1-develop-branc0134 diff --git a/GitVersion.yml b/GitVersion.yml index 03a4ad20b8..76dc2d77f3 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,10 +1,11 @@ +next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' -next-version: 1.14.0 +continuous-delivery-fallback-tag: 'pre' branches: develop: mode: ContinuousDeployment - tag: pre + tag: pre.{BranchName} main: tag: rc increment: Patch diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index d28a602ea2..0f6617f4dd 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0118 - 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c + 1.14.0-v1-develop-branc0134 + 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index baaa1c999b..ed1402fe71 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -7,9 +7,9 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c + 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd $(Version) - 1.14.0-v1-develop-branc0118 + 1.14.0-v1-develop-branc0134 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index a56d52f91d..f6c591fcc6 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0118 - 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c + 1.14.0-v1-develop-branc0134 + 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 85f8453b62..b58ca4dbf8 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -10,8 +10,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0118 - 1.14.0-v1-develop-branching-update.118+Branch.v1-develop-branching-update.Sha.d88d0eb9f66ab7ee0e63dcfc84e8444bc8efee5c + 1.14.0-v1-develop-branc0134 + 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd TRACE From 3c78cfd7f1bdefd6b33aec3ce873c730e8655597 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:41:45 -0600 Subject: [PATCH 13/19] tweaking gitversion --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- GitVersion.yml | 2 +- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 4 ++-- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index dd4be72ba7..99f36862e2 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0134 - 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd + 1.14.0-v1-develop-branc0135 + 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 1a33ac3eb7..ba9a78a10d 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd - 1.14.0-v1-develop-branc0134 + 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 + 1.14.0-v1-develop-branc0135 diff --git a/GitVersion.yml b/GitVersion.yml index 76dc2d77f3..4c910e91cb 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -19,7 +19,7 @@ branches: - develop - main pull-request: - tag: PullRequest + tag: PullRequest.{BranchName} increment: Inherit ignore: sha: [] diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 0f6617f4dd..0afe0c66b5 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0134 - 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd + 1.14.0-v1-develop-branc0135 + 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index ed1402fe71..33e74d65b3 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -7,9 +7,9 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd + 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 $(Version) - 1.14.0-v1-develop-branc0134 + 1.14.0-v1-develop-branc0135 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index f6c591fcc6..e1522cc7bd 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0134 - 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd + 1.14.0-v1-develop-branc0135 + 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index b58ca4dbf8..daed1be9ad 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -10,8 +10,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0134 - 1.14.0-v1-develop-branching-update.134+Branch.v1-develop-branching-update.Sha.22135af9a115fe3abcb494cdc61e2a8d20174ffd + 1.14.0-v1-develop-branc0135 + 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 TRACE From e2050553033de604dd0560e5de87bcfcbb20d6c6 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:48:13 -0600 Subject: [PATCH 14/19] tweaking gitversion --- .github/workflows/publish.yml | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9b31ec8751..e36382600d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -53,27 +53,27 @@ jobs: - name: Pack run: dotnet pack -c Release --include-symbols -p:Version='${{ steps.gitversion.outputs.SemVer }}' - - name: Test to generate Code Coverage Report - run: | - sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json - dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings - mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ - - - name: Create Test Coverage Badge - uses: simon-k/dotnet-code-coverage-badge@v1.0.0 - id: create_coverage_badge - with: - label: Unit Test Coverage - color: brightgreen - path: UnitTests/TestResults/coverage.opencover.xml - gist-filename: code-coverage.json - gist-id: 90ef67a684cb71db1817921a970f8d27 - gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }} - - - name: Print Code Coverage - run: | - echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%" - echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}" + # - name: Test to generate Code Coverage Report + # run: | + # sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json + # dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings + # mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ + + # - name: Create Test Coverage Badge + # uses: simon-k/dotnet-code-coverage-badge@v1.0.0 + # id: create_coverage_badge + # with: + # label: Unit Test Coverage + # color: brightgreen + # path: UnitTests/TestResults/coverage.opencover.xml + # gist-filename: code-coverage.json + # gist-id: 90ef67a684cb71db1817921a970f8d27 + # gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }} + + # - name: Print Code Coverage + # run: | + # echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%" + # echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}" #- name: Prep GitHub Packages # run: dotnet nuget add source --username tig --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/tig/index.json" From 030fca374643649543b6a152d487987832a698e7 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:57:05 -0600 Subject: [PATCH 15/19] Added nuget.config --- Terminal.sln | 1 + nuget.config | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 nuget.config diff --git a/Terminal.sln b/Terminal.sln index 70bcb83432..5f66cd27c1 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml GitVersion.yml = GitVersion.yml global.json = global.json + nuget.config = nuget.config .github\workflows\publish.yml = .github\workflows\publish.yml README.md = README.md testenvironments.json = testenvironments.json diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000000..7d10988665 --- /dev/null +++ b/nuget.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 9a74d9a4a88838662b31217720fcd3cbcd1e74b3 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 10:03:51 -0600 Subject: [PATCH 16/19] tweaking nuget --- .github/workflows/publish.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e36382600d..158620a737 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -75,11 +75,5 @@ jobs: # echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%" # echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}" - #- name: Prep GitHub Packages - # run: dotnet nuget add source --username tig --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/tig/index.json" - - #- name: Publish to GitHub packages - # run: dotnet nuget push NStack/bin/Release/*.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source "github" - - name: Publish to NuGet.org - run: dotnet nuget push Terminal.Gui/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json + run: dotnet nuget push Terminal.Gui/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} From f47377ce8ba5a97f2f84c745eca04c336b094e96 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 10:13:13 -0600 Subject: [PATCH 17/19] publish on pr merge --- .github/workflows/publish.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 158620a737..33adfb0be9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,10 +10,19 @@ on: pull_request: branches: [ develop, v2_develop ] + types: + - closed paths-ignore: - '**.md' jobs: + if_merged: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - run: | + echo The PR was merged + publish: name: Build and Publish to Nuget.org runs-on: ubuntu-latest From eeb0e7d16f638bec23eb905f9625815e2c81ca43 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 10:19:08 -0600 Subject: [PATCH 18/19] Set version to v1.14.0 --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 4 ++-- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 99f36862e2..29a5d6b31a 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0135 - 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index ba9a78a10d..304775cced 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 - 1.14.0-v1-develop-branc0135 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 0afe0c66b5..b3d4925150 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0135 - 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 33e74d65b3..89a179f813 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -7,9 +7,9 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 $(Version) - 1.14.0-v1-develop-branc0135 + 1.14.0 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index e1522cc7bd..d82850d80c 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0135 - 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index daed1be9ad..0166d1158b 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -10,8 +10,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0-v1-develop-branc0135 - 1.14.0-v1-develop-branching-update.135+Branch.v1-develop-branching-update.Sha.53bf0d55cd2b04eebf52951c70970344df2fc339 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 TRACE From 4f379fd46583a3d3059d51166e275fb37f77e1bf Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 10:19:59 -0600 Subject: [PATCH 19/19] Removed nextversion from gitconfig --- GitVersion.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 4c910e91cb..9fa7b37949 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,3 @@ -next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: 'pre'