From 45e4c72ea07d37596d250b5ea32b33798bbcf920 Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 08:22:52 +0100 Subject: [PATCH 01/11] Change versioning mode to ContinuousDelivery --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 5daf696..29e4741 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -mode: Mainline +mode: ContinuousDelivery next-version: 8.0.0 branches: main: From 9916ff65ba0ed3cee09319c41ffa817f36e4c7e9 Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 08:30:52 +0100 Subject: [PATCH 02/11] Add NuGet version formatting to build workflow --- .github/workflows/build.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73e514c..687dcc3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,12 +33,17 @@ jobs: uses: gittools/actions/gitversion/execute@v4.1.0 id: gitversion + - name: Format NuGet version + run: echo "##[set-output name=nugetVersion;]${{ steps.gitversion.outputs.NuGetVersion | replace('-', '.') }}" + id: formatversion + - name: Display GitVersion outputs run: | echo "Version: ${{ steps.gitversion.outputs.semVer }}" echo "AssemblyVersion: ${{ steps.gitversion.outputs.assemblySemVer }}" echo "FileVersion: ${{ steps.gitversion.outputs.assemblySemFileVer }}" echo "NuGet Version: ${{ steps.gitversion.outputs.fullSemVer }}" + echo "NuGet Version: ${{ steps.formatversion.outputs.nugetVersion }}" - name: Setup .NET uses: actions/setup-dotnet@v5 @@ -47,7 +52,12 @@ jobs: - name: Build project working-directory: src - run: dotnet build --configuration Release /p:Version=${{ steps.gitversion.outputs.assemblySemVer }} /p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} /p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} /p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }} + run: >- + dotnet build --configuration Release + /p:Version=${{ steps.gitversion.outputs.assemblySemVer }} + /p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} + /p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} + /p:PackageVersion=${{ steps.formatversion.outputs.nugetVersion }} - name: Run tests with coverage working-directory: src From ee9a77cc87632f4d2423ebbfe462ff87936e87cb Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 08:42:14 +0100 Subject: [PATCH 03/11] Update NuGet version formatting in build.yml --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 687dcc3..59269fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,10 @@ jobs: id: gitversion - name: Format NuGet version - run: echo "##[set-output name=nugetVersion;]${{ steps.gitversion.outputs.NuGetVersion | replace('-', '.') }}" + run: | + nugetVersion="${{ steps.gitversion.outputs.NuGetVersion }}" + nugetVersion="${nugetVersion//-/.}" + echo "##[set-output name=nugetVersion;]$nugetVersion" id: formatversion - name: Display GitVersion outputs From f91c0a860cd08b43b5b24c177ba6a44c8069d445 Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 08:47:26 +0100 Subject: [PATCH 04/11] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59269fd..36723e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: run: | nugetVersion="${{ steps.gitversion.outputs.NuGetVersion }}" nugetVersion="${nugetVersion//-/.}" - echo "##[set-output name=nugetVersion;]$nugetVersion" + echo "nugetVersion=$nugetVersion" >> $NUGET_VERSION id: formatversion - name: Display GitVersion outputs From 4b029c281140cc4f5aea8520ddb7a6a470ba2449 Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 08:49:29 +0100 Subject: [PATCH 05/11] Update output variable for NuGet version formatting --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36723e2..625a50d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: run: | nugetVersion="${{ steps.gitversion.outputs.NuGetVersion }}" nugetVersion="${nugetVersion//-/.}" - echo "nugetVersion=$nugetVersion" >> $NUGET_VERSION + echo "nugetVersion=$nugetVersion" >> $GITHUB_OUTPUT id: formatversion - name: Display GitVersion outputs From d3f36e2fe2d182fa9a2d24c8c3a89a12ea43ab9b Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 08:55:24 +0100 Subject: [PATCH 06/11] Update NuGet version formatting in build workflow --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 625a50d..c35fb16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,9 +35,8 @@ jobs: - name: Format NuGet version run: | - nugetVersion="${{ steps.gitversion.outputs.NuGetVersion }}" - nugetVersion="${nugetVersion//-/.}" - echo "nugetVersion=$nugetVersion" >> $GITHUB_OUTPUT + nugetVersion="${{ steps.gitversion.outputs.majorMinorPatch }}${{steps.gitversion.outputs.buildMetaData}}" + echo "packageVersion=$packageVersion" >> $GITHUB_OUTPUT id: formatversion - name: Display GitVersion outputs @@ -46,7 +45,7 @@ jobs: echo "AssemblyVersion: ${{ steps.gitversion.outputs.assemblySemVer }}" echo "FileVersion: ${{ steps.gitversion.outputs.assemblySemFileVer }}" echo "NuGet Version: ${{ steps.gitversion.outputs.fullSemVer }}" - echo "NuGet Version: ${{ steps.formatversion.outputs.nugetVersion }}" + echo "Package Version: ${{ steps.formatversion.outputs.packageVersion }}" - name: Setup .NET uses: actions/setup-dotnet@v5 From fac44138848285e0b28d8063014e5c1b2f3f97cd Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 08:59:51 +0100 Subject: [PATCH 07/11] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c35fb16..6180784 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: - name: Format NuGet version run: | - nugetVersion="${{ steps.gitversion.outputs.majorMinorPatch }}${{steps.gitversion.outputs.buildMetaData}}" + packageVersion="${{ steps.gitversion.outputs.majorMinorPatch }}.${{steps.gitversion.outputs.buildMetaData}}" echo "packageVersion=$packageVersion" >> $GITHUB_OUTPUT id: formatversion From 98fde6f01d3dfd0c34db58746c6ac0971e43be74 Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 09:01:10 +0100 Subject: [PATCH 08/11] Update PackageVersion output in build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6180784..f808ade 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: /p:Version=${{ steps.gitversion.outputs.assemblySemVer }} /p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} /p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} - /p:PackageVersion=${{ steps.formatversion.outputs.nugetVersion }} + /p:PackageVersion=${{ steps.formatversion.outputs.packageVersion }} - name: Run tests with coverage working-directory: src From 18ec2466b77943fb09253c933ef712c9f4d40c1a Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 09:07:36 +0100 Subject: [PATCH 09/11] Change NuGet version formatting to include pre-release --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f808ade..634c1bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: - name: Format NuGet version run: | - packageVersion="${{ steps.gitversion.outputs.majorMinorPatch }}.${{steps.gitversion.outputs.buildMetaData}}" + packageVersion="${{ steps.gitversion.outputs.majorMinorPatch }}.${{steps.gitversion.outputs.preReleaseNumber}}" echo "packageVersion=$packageVersion" >> $GITHUB_OUTPUT id: formatversion From 0a6dd6488a142452a97f4b2890a161576dc2ac6f Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 09:11:41 +0100 Subject: [PATCH 10/11] Update build versioning in GitHub Actions workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 634c1bf..ce38626 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: working-directory: src run: >- dotnet build --configuration Release - /p:Version=${{ steps.gitversion.outputs.assemblySemVer }} + /p:Version=${{ steps.formatversion.outputs.packageVersion }} /p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} /p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} /p:PackageVersion=${{ steps.formatversion.outputs.packageVersion }} From 89a119726af6a8d95a62c6b9b26d7b1faf647335 Mon Sep 17 00:00:00 2001 From: Gurpreet Singh Date: Thu, 16 Oct 2025 09:16:02 +0100 Subject: [PATCH 11/11] Update build workflow to use new versioning outputs --- .github/workflows/build.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce38626..634f63b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,14 +56,18 @@ jobs: working-directory: src run: >- dotnet build --configuration Release - /p:Version=${{ steps.formatversion.outputs.packageVersion }} + /p:Version=${{ steps.gitversion.outputs.assemblySemVer }} /p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} /p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} /p:PackageVersion=${{ steps.formatversion.outputs.packageVersion }} - name: Run tests with coverage working-directory: src - run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --results-directory ../coverage + run: >- + dotnet test + --configuration Release + --collect:"XPlat Code Coverage" + --results-directory ../coverage - name: Generate coverage report uses: danielpalme/ReportGenerator-GitHub-Action@5.4.16 @@ -134,7 +138,12 @@ jobs: - name: Create NuGet package working-directory: src - run: dotnet pack --configuration Release --no-build /p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }} --output ../packages + run: >- + dotnet pack + --configuration Release + --no-build + /p:PackageVersion=${{ steps.formatversion.outputs.packageVersion }} + --output ../packages - name: Upload NuGet package as artifact uses: actions/upload-artifact@v4