Clean

Author: stevencl840

.github/workflows/ci.yml

@@ -33,12 +33,17 @@ jobs:
       - name: Build
         run: |
           if ("${{ github.event_name }}" -eq "pull_request" -and "${{ github.head_ref }}" -ne "") {
-            $branchName = "${{ github.head_ref }}" -replace '[/\\]', '-' -replace '[^a-zA-Z0-9\-]', ''
-            $preReleaseIds = "octopus-$branchName.${{ github.run_number }}"
-            
-            Write-Host "PR build - setting default pre-release identifiers to: $preReleaseIds (height ignored)"
-            $env:MINVERDEFAULTPRERELEASEIDENTIFIERS = $preReleaseIds
-            $env:MINVERIGNOREHEIGHT = "true"
+            $gitDescribe = git describe --tags --abbrev=0 2>$null
+            # Extract the base version number if it exists, if not don't override
+            if ($gitDescribe -match '^v?(\d+\.\d+\.\d+)') {
+              $baseVersion = $matches[1]
+              
+              $branchName = "${{ github.head_ref }}" -replace '[/\\]', '-' -replace '[^a-zA-Z0-9\-]', ''
+              $version = "$baseVersion-octopus-$branchName.${{ github.run_number }}"
+              
+              Write-Host "PR build - overriding version to: $version"
+              $env:MINVERVERSIONOVERRIDE = $version
+            } 
           }
           
           dotnet build LibGit2Sharp.sln --configuration Release