From 6febd0b356d9d403923c198e45460f2504aaf80b Mon Sep 17 00:00:00 2001 From: Alessandro Giorgetti Date: Thu, 26 Feb 2026 15:03:24 +0100 Subject: [PATCH 1/3] Refs: #3 Update GitVersion configuration for improved branch management and versioning --- .config/dotnet-tools.json | 5 ++-- GitVersion.yml | 56 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 32dd9fd..ec5f748 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,10 +3,11 @@ "isRoot": true, "tools": { "gitversion.tool": { - "version": "5.12.0", + "version": "6.6.0", "commands": [ "dotnet-gitversion" - ] + ], + "rollForward": false } } } \ No newline at end of file diff --git a/GitVersion.yml b/GitVersion.yml index 27f681d..9c2afcc 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,59 @@ +# GitVersion configuration for GitFlow workflow +# Uses semantic versioning with GitFlow branch conventions + mode: ContinuousDeployment -branches: {} + +# Branch-specific configuration +branches: + main: + # Main branch produces stable releases without pre-release labels + label: '' + increment: Patch + prevent-increment: + of-merged-branch: true + + develop: + # Develop branch produces alpha pre-releases + mode: ContinuousDelivery + label: alpha + increment: Minor + tracks-release-branches: true + + release: + # Release branches produce beta pre-releases + mode: ContinuousDelivery + label: beta + increment: None + prevent-increment: + of-merged-branch: true + + feature: + # Feature branches use the branch name as label + mode: ContinuousDelivery + label: '{BranchName}' + increment: Inherit + + hotfix: + # Hotfix branches produce beta pre-releases + mode: ContinuousDelivery + label: beta + increment: Patch + + support: + # Support branches behave like main branches + label: '' + increment: Patch + prevent-increment: + of-merged-branch: true + +# Commit message patterns for version bumping +major-version-bump-message: '\+semver:\s?(breaking|major)' +minor-version-bump-message: '\+semver:\s?(feature|minor)' +patch-version-bump-message: '\+semver:\s?(fix|patch)' +no-bump-message: '\+semver:\s?(none|skip)' + +# Ignore configuration ignore: sha: [] + merge-message-formats: {} From 331e881111a8f29c0f6af8decdbe9ce9063e4a53 Mon Sep 17 00:00:00 2001 From: Alessandro Giorgetti Date: Thu, 26 Feb 2026 15:13:52 +0100 Subject: [PATCH 2/3] Update GitHub Actions to use latest action versions for checkout and setup-dotnet --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 6c78c77..4cc3af0 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -23,11 +23,11 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v6.0.0 + - uses: actions/checkout@v6 with: fetch-depth: 0 - name: Setup .NET - uses: actions/setup-dotnet@v5.0.0 + uses: actions/setup-dotnet@v5 with: dotnet-version: 10.0.x - name: Install GitVersion From 734b7df1a39a04cf14608c1eab8c547161aefaa3 Mon Sep 17 00:00:00 2001 From: Alessandro Giorgetti Date: Thu, 26 Feb 2026 15:34:47 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .config/dotnet-tools.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ec5f748..7110687 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -6,8 +6,7 @@ "version": "6.6.0", "commands": [ "dotnet-gitversion" - ], - "rollForward": false + ] } } } \ No newline at end of file