From b8a0f415f2ae37bd95fb2c3cb1566f2898fe434d Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:44:01 -0600 Subject: [PATCH 01/30] Verifying builds --- 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, 14 insertions(+), 10 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 29a5d6b31..25912df88 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 304775cce..751c1640d 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+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 - 1.14.0 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 + 1.14.0-pre0001 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index b3d492515..b0170509d 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index fb2c6191a..566fc260f 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -10,6 +10,10 @@ 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 $(Version) 1.14.0--> + 1.14.0.0 + 1.14.0.0 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 + 1.14.0-pre0001 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index d82850d80..82edbd57f 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 0166d1158..5b169ff62 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -10,8 +10,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 TRACE From 1a17ecabdeb9f6df580e9700f157fcab2baae9e8 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:47:45 -0600 Subject: [PATCH 02/30] Commented version info --- Example/Example.csproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 5 +---- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 25912df88..31656bc28 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -4,10 +4,10 @@ net7.0 - 1.14.0.0 + diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index b0170509d..8e1fd42af 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -4,10 +4,10 @@ net7.0 - 1.14.0.0 + diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 566fc260f..e748e6653 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -10,10 +10,7 @@ 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 $(Version) 1.14.0--> - 1.14.0.0 - 1.14.0.0 - 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 - 1.14.0-pre0001 + diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 82edbd57f..3b68d0c27 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -7,10 +7,10 @@ Linux - 1.14.0.0 + TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 5b169ff62..634cb5429 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -8,10 +8,10 @@ - 1.14.0.0 + TRACE From 037e4bcf0d53734f32c8d65074eff7a462d41480 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:56:45 -0600 Subject: [PATCH 03/30] Tweaked yml for gitversion --- .github/workflows/dotnet-core.yml | 20 +++++++++++++++++--- .github/workflows/publish.yml | 8 ++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index ff23467b7..e8e8e6daa 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -12,24 +12,38 @@ on: jobs: build: - runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Install and calculate the new version with GitVersion + uses: gittools/actions/gitversion/setup@v0 + with: + versionSpec: '6.x' + includePrerelease: true + + - name: Determine Version + uses: gittools/actions/gitversion/execute@v0 + with: + useConfigFile: true + id: gitversion # step id used as reference for output values + - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0 + dotnet-quality: 'ga' - name: Install dependencies run: | dotnet restore - name: Build Debug - run: dotnet build --configuration Debug --no-restore - + run: | + dotnet-gitversion /updateprojectfiles + dotnet build --configuration Debug --no-restore + - name: Test run: | sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 568302dda..0fcbb059e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,17 +21,21 @@ jobs: - name: Install and calculate the new version with GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: 5.x + versionSpec: '6.x' + includePrerelease: true - name: Determine Version uses: gittools/actions/gitversion/execute@v0 + with: + useConfigFile: true id: gitversion # step id used as reference for output values - name: Setup dotnet uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0 - + dotnet-quality: 'ga' + - name: Install dependencies run: dotnet restore From 01a60f7c22190833b26103e00567e272137c4c0a Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:58:56 -0600 Subject: [PATCH 04/30] fetch-depth: 0 --- .github/workflows/dotnet-core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index e8e8e6daa..3e7ffef93 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -16,7 +16,9 @@ jobs: steps: - uses: actions/checkout@v3 - + with: + fetch-depth: 0 #fetch-depth is needed for GitVersion + - name: Install and calculate the new version with GitVersion uses: gittools/actions/gitversion/setup@v0 with: From ad28a475797defe21b05c3a1f9a247587409c02d Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:05:06 -0600 Subject: [PATCH 05/30] gitversion 6 --- .github/workflows/dotnet-core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 3e7ffef93..3297f6848 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -28,7 +28,9 @@ jobs: - name: Determine Version uses: gittools/actions/gitversion/execute@v0 with: - useConfigFile: true + versionSpec: '6.x' + includePrerelease: true + useConfigFile: true id: gitversion # step id used as reference for output values - name: Setup .NET Core From abc131cfc1dcddbaebe23485d4389e895bde385b Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:08:53 -0600 Subject: [PATCH 06/30] backed out gitversion from PR --- .github/workflows/dotnet-core.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 3297f6848..a163dc542 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -19,19 +19,17 @@ jobs: with: fetch-depth: 0 #fetch-depth is needed for GitVersion - - name: Install and calculate the new version with GitVersion - uses: gittools/actions/gitversion/setup@v0 - with: - versionSpec: '6.x' - includePrerelease: true + # - name: Install and calculate the new version with GitVersion + # uses: gittools/actions/gitversion/setup@v0 + # with: + # versionSpec: '6.x' + # includePrerelease: true - - name: Determine Version - uses: gittools/actions/gitversion/execute@v0 - with: - versionSpec: '6.x' - includePrerelease: true - useConfigFile: true - id: gitversion # step id used as reference for output values + # - name: Determine Version + # uses: gittools/actions/gitversion/execute@v0 + # with: + # useConfigFile: true + # id: gitversion # step id used as reference for output values - name: Setup .NET Core uses: actions/setup-dotnet@v3 From 207078594db51d78f459530e496e26edba69ead8 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:10:12 -0600 Subject: [PATCH 07/30] backed out gitversion from PR --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index a163dc542..9e1622caa 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -43,7 +43,7 @@ jobs: - name: Build Debug run: | - dotnet-gitversion /updateprojectfiles + #dotnet-gitversion /updateprojectfiles dotnet build --configuration Debug --no-restore - name: Test From 8795ebea3d08632125a11f91db02f7adc51a8df2 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:37:37 -0600 Subject: [PATCH 08/30] tweaking gitversion --- GitVersion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/GitVersion.yml b/GitVersion.yml index f9b784034..63cea9bf4 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -5,6 +5,7 @@ branches: develop: mode: ContinuousDeployment tag: pre + regex: ^develop$ main: tag: rc increment: Patch From a8ac0d98dee66a42f0a24da3e8fca5a1e0377c2f Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:43:50 -0600 Subject: [PATCH 09/30] tweaking gitversion. +semver:minor --- GitVersion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/GitVersion.yml b/GitVersion.yml index 63cea9bf4..6d2fa3668 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,3 +1,4 @@ +#next-version: 1.14 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: 'pre' From 7a0a80d4f9c33134211052640d457e6aa0a70514 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:52:53 -0600 Subject: [PATCH 10/30] gitversion diags --- .github/workflows/publish.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0fcbb059e..07e80f9f9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,7 +27,12 @@ jobs: - name: Determine Version uses: gittools/actions/gitversion/execute@v0 with: - useConfigFile: true + useConfigFile: true + additionalArguments: | + '/showConfig' + '/diag' + '/verbosity Verbose' + id: gitversion # step id used as reference for output values - name: Setup dotnet From ed7baa78fe8b9ad84cfeca06754198efb82b35ee Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:54:38 -0600 Subject: [PATCH 11/30] gitversion diags --- .github/workflows/publish.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 07e80f9f9..0fd8b6ebb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,10 +28,7 @@ jobs: uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: | - '/showConfig' - '/diag' - '/verbosity Verbose' + additionalArguments: /showConfig /diag /verbosity Verbose id: gitversion # step id used as reference for output values From ad11c1ab5debfe0e9df30ff967b819de37437e16 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:57:05 -0600 Subject: [PATCH 12/30] gitversion diags --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0fd8b6ebb..e78bc0cbd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: /showConfig /diag /verbosity Verbose + additionalArguments: /verbosity Verbose id: gitversion # step id used as reference for output values From 80358e1a3009514847d4877ed777e61ede95ad55 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:58:46 -0600 Subject: [PATCH 13/30] gitversion diags --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e78bc0cbd..a242d2d40 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: /verbosity Verbose + additionalArguments: /verbosity Diagnostic id: gitversion # step id used as reference for output values From d97ad11203ea7f4e99db87a66eebde7d3cac5e89 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:10:51 -0600 Subject: [PATCH 14/30] gitversion diags --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a242d2d40..74791e471 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: /verbosity Diagnostic + additionalArguments: /nofetch /verbosity Diagnostic id: gitversion # step id used as reference for output values From 87ef54230475f11cd1a693beb579d32b90ddcb0c Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:12:57 -0600 Subject: [PATCH 15/30] gitversion diags --- .github/workflows/publish.yml | 3 +-- GitVersion.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 74791e471..30658fac9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,8 +28,7 @@ jobs: uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: /nofetch /verbosity Diagnostic - + additionalArguments: /verbosity Diagnostic id: gitversion # step id used as reference for output values - name: Setup dotnet diff --git a/GitVersion.yml b/GitVersion.yml index 6d2fa3668..cb4800eaf 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -6,7 +6,7 @@ branches: develop: mode: ContinuousDeployment tag: pre - regex: ^develop$ + regex: ^develop?[/-] main: tag: rc increment: Patch From 2b591d8fd8125d556d84d1ed982ff0dcf519754a Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:22:45 -0600 Subject: [PATCH 16/30] incrementing --- .github/workflows/publish.yml | 2 +- GitVersion.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 30658fac9..ba93dae4e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: /verbosity Diagnostic + #additionalArguments: /verbosity Diagnostic id: gitversion # step id used as reference for output values - name: Setup dotnet diff --git a/GitVersion.yml b/GitVersion.yml index cb4800eaf..6e98ef71c 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -6,7 +6,7 @@ branches: develop: mode: ContinuousDeployment tag: pre - regex: ^develop?[/-] + regex: ^develop main: tag: rc increment: Patch From d9d65ccc6ec8b6eb4a2e1c33589a837f19201cb2 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:27:30 -0600 Subject: [PATCH 17/30] incrementing 2 --- .github/workflows/dotnet-core.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 9e1622caa..4774e5338 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -16,20 +16,6 @@ jobs: steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 #fetch-depth is needed for GitVersion - - # - name: Install and calculate the new version with GitVersion - # uses: gittools/actions/gitversion/setup@v0 - # with: - # versionSpec: '6.x' - # includePrerelease: true - - # - name: Determine Version - # uses: gittools/actions/gitversion/execute@v0 - # with: - # useConfigFile: true - # id: gitversion # step id used as reference for output values - name: Setup .NET Core uses: actions/setup-dotnet@v3 @@ -43,7 +29,6 @@ jobs: - name: Build Debug run: | - #dotnet-gitversion /updateprojectfiles dotnet build --configuration Debug --no-restore - name: Test From 1621d3308f3230a27953df597f1f6b9c6d272a1b Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:29:19 -0600 Subject: [PATCH 18/30] Removed next-version --- GitVersion.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 6e98ef71c..05bddc277 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,3 @@ -#next-version: 1.14 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: 'pre' From 915789d20d172c4ca4104eb5ad306ffb88cdf530 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:40:24 -0600 Subject: [PATCH 19/30] Fake commit 368 --- .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 ba93dae4e..0dbcde5f2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,9 +16,9 @@ jobs: steps: - uses: actions/checkout@v3 with: - fetch-depth: 0 #fetch-depth is needed for GitVersion + fetch-depth: 0 # fetch-depth is needed for GitVersion - - name: Install and calculate the new version with GitVersion + - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: versionSpec: '6.x' From 4cc591df50dad74e3cf35fd340ece9b38feb6d54 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:42:18 -0600 Subject: [PATCH 20/30] Fake commit 369 --- GitVersion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/GitVersion.yml b/GitVersion.yml index 05bddc277..3fba6572a 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,3 +1,4 @@ +next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: 'pre' From 12b4dc3f50cbd896ab95bb54ea9cf17efa47033b Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 08:47:10 -0600 Subject: [PATCH 21/30] Fake commit for pre.2 --- GitVersion.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/GitVersion.yml b/GitVersion.yml index 3fba6572a..0f9ad3113 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,27 +1,34 @@ next-version: 1.14.0 + mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: 'pre' + branches: develop: mode: ContinuousDeployment tag: pre regex: ^develop + main: tag: rc increment: Patch source-branches: - develop - main +- feature: tag: useBranchName regex: ^features?[/-] source-branches: - develop - main +- pull-request: tag: PullRequest.{BranchName} increment: Inherit + + ignore: sha: [] merge-message-formats: {} From a66f359bae007ccca94a40c72388d0c6884f1226 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Tue, 29 Aug 2023 06:23:32 -0600 Subject: [PATCH 22/30] regen .yml --- GitVersion.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 0f9ad3113..77322c4ef 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,34 +1,27 @@ -next-version: 1.14.0 - mode: ContinuousDeployment tag-prefix: '[vV]' -continuous-delivery-fallback-tag: 'pre' - +continuous-delivery-fallback-tag: pre +next-version: 1.14.0 branches: develop: mode: ContinuousDeployment tag: pre - regex: ^develop - + regex: ^develop?[/-] main: tag: rc increment: Patch source-branches: - develop - main -- feature: tag: useBranchName regex: ^features?[/-] source-branches: - develop - main -- pull-request: tag: PullRequest.{BranchName} increment: Inherit - - ignore: sha: [] merge-message-formats: {} From 16c272c891160769e4dcdf0e4cf76fb94cbd5aac Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:27:40 -0600 Subject: [PATCH 23/30] next version --- GitVersion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/GitVersion.yml b/GitVersion.yml index 77322c4ef..6aa4a88a0 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,3 +1,4 @@ +next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre From 1842cae74a6fbf3165b6411e2cd6085d65208e57 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:28:24 -0600 Subject: [PATCH 24/30] source-branch to develop --- GitVersion.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 6aa4a88a0..e36328d29 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,12 +2,13 @@ next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre -next-version: 1.14.0 branches: develop: mode: ContinuousDeployment tag: pre regex: ^develop?[/-] + source-branches: + - main main: tag: rc increment: Patch From 1407b803ed1684df3b89cccd8cc104f903df682c Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:38:36 -0600 Subject: [PATCH 25/30] /b ? --- .github/workflows/publish.yml | 4 ++-- GitVersion.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0dbcde5f2..79613b03a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,14 +21,14 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: '6.x' + versionSpec: '5.x' includePrerelease: true - name: Determine Version uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - #additionalArguments: /verbosity Diagnostic + additionalArguments: /b develop id: gitversion # step id used as reference for output values - name: Setup dotnet diff --git a/GitVersion.yml b/GitVersion.yml index e36328d29..f038b97e7 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -26,4 +26,3 @@ branches: increment: Inherit ignore: sha: [] -merge-message-formats: {} From ac5c23587508a749e9c3d614b7d2501f4a4bf680 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:42:21 -0600 Subject: [PATCH 26/30] back to 6.x --- .github/workflows/publish.yml | 2 +- GitVersion.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 79613b03a..add0ca6a1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: '5.x' + versionSpec: '6.x' includePrerelease: true - name: Determine Version diff --git a/GitVersion.yml b/GitVersion.yml index f038b97e7..37b879e91 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -6,9 +6,10 @@ branches: develop: mode: ContinuousDeployment tag: pre - regex: ^develop?[/-] + regex: develop source-branches: - main + pre-release-weight: 100 main: tag: rc increment: Patch From 0392d080987f9fa532d53de0416edddaaff0320f Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:43:39 -0600 Subject: [PATCH 27/30] back to 5.x --- .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 add0ca6a1..db34f23bb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,14 +21,14 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: '6.x' + versionSpec: '5.x' includePrerelease: true - name: Determine Version uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: /b develop + #additionalArguments: /b develop id: gitversion # step id used as reference for output values - name: Setup dotnet From f98721262fcf50331b90a4bd924b3423095f980f Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:45:57 -0600 Subject: [PATCH 28/30] testing without next-version --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 37b879e91..7898afc35 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 1.14.0 +#next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre From 4014b679fda56f8b894950a1048aa6c63ec469fa Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:47:51 -0600 Subject: [PATCH 29/30] develop now publishes --- GitVersion.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 7898afc35..f6ded5b00 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 From 17b4e3d56bde753f2524084afcf90e33a3fa1f01 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:49:34 -0600 Subject: [PATCH 30/30] cleaned out version info from csproj --- Example/Example.csproj | 6 ++---- Terminal.Gui/Terminal.Gui.csproj | 8 ++------ UICatalog/UICatalog.csproj | 6 ++---- UnitTests/UnitTests.csproj | 6 ++---- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 31656bc28..900d2a48c 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -4,10 +4,8 @@ net7.0 - + 1.0.0.0 + 1.0.0 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index e748e6653..10d5d70fa 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -5,12 +5,8 @@ - - + 1.0.0.0 + 1.0.0 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 3b68d0c27..5cefa2852 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -7,10 +7,8 @@ Linux - + 1.0.0.0 + 1.0.0 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 634cb5429..eaef38d35 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -8,10 +8,8 @@ - + 1.0.0.0 + 1.0.0 TRACE