Clean up

Author: stevencl840

.github/workflows/ci.yml

@@ -33,17 +33,12 @@ jobs:
       - name: Build
         run: |
           if ("${{ github.event_name }}" -eq "pull_request" -and "${{ github.head_ref }}" -ne "") {
-            $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
-            } 
+            $branchName = "${{ github.head_ref }}" -replace '[/\\]', '-' -replace '[^a-zA-Z0-9\-]', ''
+            $preReleaseId = "$branchName.${{ github.run_number }}"
+            
+            Write-Host "PR build - setting pre-release identifiers to: $preReleaseId (height ignored)"
+            $env:IS_BRANCH_BUILD = "true"
+            $env:BRANCH_PRE_RELEASE_ID = $preReleaseId
           }
           
           dotnet build LibGit2Sharp.sln --configuration Release

LibGit2Sharp/LibGit2Sharp.csproj

@@ -29,6 +29,11 @@
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(IS_BRANCH_BUILD)' == 'true'">
+    <MinVerDefaultPreReleaseIdentifiers>octopus-$(BRANCH_PRE_RELEASE_ID)</MinVerDefaultPreReleaseIdentifiers>
+    <MinVerIgnoreHeight>true</MinVerIgnoreHeight>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.323]" PrivateAssets="none" />
     <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />