From 6bf2ed25dbb0aa789094be68ff3248b2d627bd81 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 09:35:00 -0600 Subject: [PATCH] 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 dcd2406e4..dd4be72ba 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 d2aebe34e..1a33ac3eb 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 03a4ad20b..76dc2d77f 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 d28a602ea..0f6617f4d 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 baaa1c999..ed1402fe7 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 a56d52f91..f6c591fcc 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 85f8453b6..b58ca4dbf 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