From daf4f6ac8ce68c48125513baa6475496f57e614d Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 18 Feb 2025 15:13:02 -0800 Subject: [PATCH] Trying to fix versrions (#3912) * Fixing versions * Fixing versions 2 --- GitVersion.yml | 16 ++++++++-------- Terminal.Gui/Terminal.Gui.csproj | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 09fb21bd2..78d807140 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,20 +2,20 @@ mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: dev branches: - v2_develop: + develop: mode: ContinuousDeployment - tag: v2_develop - regex: ^v2_develop?[/-] + tag: develop + regex: v2_develop tracks-release-branches: true - is-source-branch-for: ['v2_release'] + is-source-branch-for: ['main'] source-branches: [] - v2_release: + main: mode: ContinuousDeployment tag: prealpha regex: v2_release is-release-branch: true - source-branches: ['v2_develop'] + source-branches: ['develop'] v1_develop: mode: ContinuousDeployment @@ -38,8 +38,8 @@ branches: tag-number-pattern: '[/-](?\d+)' regex: ^(pull|pull\-requests|pr)[/-] source-branches: - - v2_develop - - v2_release + - develop + - main - feature - support - hotfix diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 8ef9dadbc..b13daec02 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -1,7 +1,7 @@  - +