Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bug] Mainline mode breaking change between 5.1.2 & 5.1.3 #2241

Closed
rducom opened this issue Apr 23, 2020 · 15 comments
Closed

[Bug] Mainline mode breaking change between 5.1.2 & 5.1.3 #2241

rducom opened this issue Apr 23, 2020 · 15 comments
Labels
bug missing-steps-to-reproduce

Comments

@rducom
Copy link

rducom commented Apr 23, 2020

Describe the bug

Breaking change in the version calculation on a tagged commit. The last working release is 5.1.2

Expected Behavior

{
  "Major":3,
  "Minor":1,
  "Patch":3,
  "PreReleaseTag":"",
  "PreReleaseTagWithDash":"",
  "PreReleaseLabel":"",
  "PreReleaseNumber":"",
  "WeightedPreReleaseNumber":"",
  "BuildMetaData":"",
  "BuildMetaDataPadded":"",
  "FullBuildMetaData":"Branch.master.Sha.517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "MajorMinorPatch":"3.1.3",
  "SemVer":"3.1.3",
  "LegacySemVer":"3.1.3",
  "LegacySemVerPadded":"3.1.3",
  "AssemblySemVer":"3.1.3.0",
  "AssemblySemFileVer":"3.1.3.0",
  "FullSemVer":"3.1.3",
  "InformationalVersion":"3.1.3+Branch.master.Sha.517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "BranchName":"master",
  "Sha":"517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "ShortSha":"517daf9",
  "NuGetVersionV2":"3.1.3",
  "NuGetVersion":"3.1.3",
  "NuGetPreReleaseTagV2":"",
  "NuGetPreReleaseTag":"",
  "VersionSourceSha":"517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "CommitsSinceVersionSource":0,
  "CommitsSinceVersionSourcePadded":"0000",
  "CommitDate":"2020-04-22"
}

Actual Behavior

{
  "Major":3,
  "Minor":1,
  "Patch":4,
  "PreReleaseTag":"beta.6",
  "PreReleaseTagWithDash":"-beta.6",
  "PreReleaseLabel":"beta",
  "PreReleaseNumber":6,
  "WeightedPreReleaseNumber":55006,
  "BuildMetaData":"",
  "BuildMetaDataPadded":"",
  "FullBuildMetaData":"Branch.master.Sha.517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "MajorMinorPatch":"3.1.4",
  "SemVer":"3.1.4-beta.6",
  "LegacySemVer":"3.1.4-beta6",
  "LegacySemVerPadded":"3.1.4-beta0006",
  "AssemblySemVer":"3.1.4.0",
  "AssemblySemFileVer":"3.1.4.0",
  "FullSemVer":"3.1.4-beta.6",
  "InformationalVersion":"3.1.4-beta.6+Branch.master.Sha.517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "BranchName":"master",
  "Sha":"517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "ShortSha":"517daf9",
  "NuGetVersionV2":"3.1.4-beta0006",
  "NuGetVersion":"3.1.4-beta0006",
  "NuGetPreReleaseTagV2":"beta0006",
  "NuGetPreReleaseTag":"beta0006",
  "VersionSourceSha":"33fb5feef4a83c079656dce3eac57b27f93bc39b",
  "CommitsSinceVersionSource":6,
  "CommitsSinceVersionSourcePadded":"0006",
  "CommitDate":"2020-04-22"
}

Both outputs are the dotnet gitversion call on the exact same commit, with just different GitVersion.Tool versions

Steps to Reproduce

Build a tag on Jenkins with 5.1.3, with the following Gitversion.yml

mode: Mainline
branches: 
  master:
    regex: ^master$
    tag: 'beta'
    is-release-branch: true
    is-mainline: true
  release:
    regex: releases?[/-]
    tag: ''
    is-release-branch: true
    is-mainline: true

Context

This bug breaks our release pipeline

Your Environment

Windows / Jenkins / dotnet core libs
Unfortunately, this happens on private projects, so can't link you to the git repo / CI
@rducom rducom added the bug label Apr 23, 2020
@asbjornu
Copy link
Member

Seems like there are many problems related to tagged builds, lately. Any ideas what the source of those problems may be, @arturcic? I had an impression that our tests around this were pretty solid?

@arturcic arturcic self-assigned this Apr 23, 2020
@arturcic
Copy link
Member

I will try to find some time to look at

@rducom
Copy link
Author

rducom commented Apr 23, 2020 •
edited
Loading

Here are the diags on my local machine, if this can help you.

For the 5.1.2 version : 
INFO [04/23/20 13:14:27:23] Dumping commit graph: 
INFO [04/23/20 13:14:27:34] *   517daf9 23 hours ago  (HEAD -> master, tag: v3.1.3, origin/master, origin/HEAD)
|\  
| * 994b7d6 25 hours ago  (ENH.TenantNotFoundException)
| * 752a504 25 hours ago 
| * 9e48cf2 26 hours ago 
|/  
*   dafcd95 3 weeks ago 
|\  
| * e86a825 3 weeks ago 
|/  
*   33fb5fe 4 weeks ago  (tag: v3.1.2)
|\  
| * f3ecbb9 4 weeks ago 
* |   e541809 4 weeks ago 
|\ \  
| |/  
|/|   
| * ae905fe 4 weeks ago 
| * 4accde1 4 weeks ago 
|/  
*   d1c8204 5 weeks ago 
|\  
| * 66d4f4f 5 weeks ago 
|/  
*   40afc7b 6 weeks ago 
|\  
| * 2e181ad 6 weeks ago  (sonarcloud)
| * a9a0460 6 weeks ago 
|/  
| * 8c073a6 6 weeks ago  (origin/no_controller_health)
|/  
| * 2f56edd 2 months ago  (origin/fix_cache_n_breaking_change)
| * 3c91252 2 months ago 
| * 0f1c0ec 2 months ago 
| * 9b579ff 2 months ago 
|/  
*   bc3317b 3 months ago  (tag: v3.1.1)
|\  
| * 60542e0 3 months ago 
|/  
* d477beb 3 months ago 
* 4ff8503 3 months ago 
*   c690b4a 3 months ago  (tag: v3.1.0)
|\  
| * deae123 3 months ago 
| * 0497cde 3 months ago 
| * b857c4b 3 months ago  (better.tenancy)
| * 3aa6867 3 months ago 
| * 511a208 3 months ago 
* | 9401ac2 3 months ago  (tag: v3.0.1)
|/  
*   0550b5f 4 months ago  (tag: v3.0.0)
|\  
| * 3aa5c29 4 months ago  (netcore3.1)
| * c03078e 4 months ago 
| * 3a6c5e7 5 months ago 
| * 269b0ba 5 months ago 
| * 5f14d42 5 months ago 
| * a9700d0 5 months ago 
|/  
| *   8a68299 3 months ago  (tag: v2.1.1, origin/release/2.0)
| |\  
| | * 4862bb9 3 months ago 
| | * d5c35f8 3 months ago 
| |/  
| *   5d06c44 3 months ago  (tag: v2.1.0)
| |\  
| | * b95e532 3 months ago 
| | * 2bdda47 3 months ago 
| | * 66e249e 3 months ago  (better.tenancy_2.0)
| | * f04640d 3 months ago 
| | * f2ce807 3 months ago 
| | * 0eef500 3 months ago 
| |/  
|/|   
| * 4f4875c 3 months ago  (tag: v2.0.7)
|/| 
| * aeaf683 3 months ago  (tryfix.concurrency.exception.for.2.0)
|/  
| * bfdc0e5 3 months ago  (backup/tryfix.concurrency.exception.for.2.0-15-44-25)
| * 3d4981b 3 months ago 
| * f52c8b1 3 months ago 
|/  
| * 10dd4ea 3 months ago  (ref_tenancy_comments)
| | * d3dbaa6 3 months ago  (origin/ref_tenancy_comments)
| |/  
| | * ac24afc 4 months ago  (origin/ref_tenancy)
| |/  
| | * a8da00a 5 months ago  (origin/tenancy_pooling_in_memory_cache)
| | * cc2f971 5 months ago  (origin/tenancy_pooling)
| | * 281b1ee 5 months ago 
| |/  
|/|   
| | *   7be18bd 5 months ago  (refs/stash)
| |/|\  
|/| | | 
| | | * 851e330 5 months ago 
| | * db92a6e 5 months ago 
| |/  
|/|   
* | 68e0eb0 5 months ago  (tag: v2.0.4, release/2.0)
|/  
| * dddcbfc 5 months ago  (ref_tenancy)
| * 694d95e 5 months ago 
| * f4d5d1d 5 months ago 
|/  
*   0cad4e2 5 months ago  (tag: v2.0.3)
|\  
| * 498eb3c 5 months ago 
|/  
*   44c10be 5 months ago  (tag: v2.0.2)
|\  
| * 02f0c58 6 months ago 
|/  
*   32fb736 6 months ago 
|\  
| * a4b072d 6 months ago 
|/  
*   4e1a1b1 6 months ago 
|\  
| * 3db0b48 6 months ago  (backporting.easy.customscope.registration)
| * 2192faf 6 months ago 
| * e747e67 6 months ago 
| * ef2757e 6 months ago 
| * f58d270 6 months ago 
| * 4a25a8a 6 months ago 
|/  
* cfd1401 6 months ago  (tag: v2.0.1)
| *   960f23f 6 months ago  (origin/release/1.4, release/1.4)
| |\  
| | * 918160b 6 months ago  (easy.customscope.registration)
| | * 7c6fd73 6 months ago 
| | * 8c25a4c 6 months ago 
| | * e9062cc 6 months ago 
| | * 9a8cf7b 6 months ago 
| | * 71c3b29 6 months ago 
| * |   c1c5bda 6 months ago  (tag: v1.4.1)
| |\ \  
| | |/  
| |/|   
| | * f86c44a 6 months ago  (try.fix.codetaskfactory.1.4)
| | * bf99eb0 6 months ago 
| * | a986db4 6 months ago 
| |/  
| | * 50bd308 6 months ago  (workaround.poltuu)
| |/  
|/|   
* |   2708f61 6 months ago  (tag: v2.0.0)
|\ \  
| |/  
|/|   
| * 9411b8b 6 months ago  (netcore3.support)
| * 51a6937 6 months ago 
| * 2a32d44 6 months ago 
|/  
* e2f6db6 6 months ago  (tag: v1.4.0)
*   d1d05db 6 months ago 
|\  
| * 11b1d4e 6 months ago  (error.page.v2)

INFO [04/23/20 13:14:27:34] Working directory: C:\Sources\Lucca.Core.AspNetCore
INFO [04/23/20 13:14:27:34] IsDynamicGitRepository: False
INFO [04/23/20 13:14:27:36] Returning Project Root from DotGitDirectory: C:\Sources\Lucca.Core.AspNetCore\.git\ - C:\Sources\Lucca.Core.AspNetCore\
INFO [04/23/20 13:14:27:37] Running on Windows.
INFO [04/23/20 13:14:27:37] Project root is: C:\Sources\Lucca.Core.AspNetCore\
INFO [04/23/20 13:14:27:37] DotGit directory is: C:\Sources\Lucca.Core.AspNetCore\.git
INFO [04/23/20 13:14:27:52] Using latest commit on specified branch
INFO [04/23/20 13:14:27:57] Running against branch: master (517daf9325182cf5bbf47fc1b23a4af6c590f72c)
INFO [04/23/20 13:14:27:57] Current commit is tagged with version 3.1.3, version calculation is for metadata only.
INFO [04/23/20 13:14:27:58] 0 commits found between 517daf9325182cf5bbf47fc1b23a4af6c590f72c and 517daf9325182cf5bbf47fc1b23a4af6c590f72c
INFO [04/23/20 13:14:27:59] Begin: Calculating base versions
  INFO [04/23/20 13:14:27:61] Fallback base version: 0.1.0 with commit count source ad24537d17d26abcf1a74abab49ed13fd49551cb (Incremented: None)
  INFO [04/23/20 13:14:27:69] Git tag 'v3.1.3': 3.1.3 with commit count source 517daf9325182cf5bbf47fc1b23a4af6c590f72c (Incremented: None)
  INFO [04/23/20 13:14:27:69] Git tag 'v3.1.2': 3.1.2 with commit count source 33fb5feef4a83c079656dce3eac57b27f93bc39b (Incremented: 3.1.3)
  INFO [04/23/20 13:14:27:69] Git tag 'v3.1.1': 3.1.1 with commit count source bc3317b513e3bf7404f4372fbff02d09c9df9b90 (Incremented: 3.1.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v3.1.0': 3.1.0 with commit count source c690b4ab979316fee933adcb6a119582d8dc5493 (Incremented: 3.1.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v3.0.1': 3.0.1 with commit count source 9401ac26449410431f59f12d45739c71cec5e94a (Incremented: 3.0.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v3.0.0': 3.0.0 with commit count source 0550b5fb84ae67f365f1578f514eca1a6df1b7ea (Incremented: 3.0.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v2.0.4': 2.0.4 with commit count source 68e0eb0354d25d7e653f63452c2329c6e3b622b0 (Incremented: 2.0.5)
  INFO [04/23/20 13:14:27:69] Git tag 'v2.0.3': 2.0.3 with commit count source 0cad4e2e712e905045c4aaed8edb38d111c4dbd1 (Incremented: 2.0.4)
  INFO [04/23/20 13:14:27:69] Git tag 'v2.0.2': 2.0.2 with commit count source 44c10be75abf7ca152f2f22093c14db4feb37d85 (Incremented: 2.0.3)
  INFO [04/23/20 13:14:27:69] Git tag 'v2.0.1': 2.0.1 with commit count source cfd1401c1215097199c17ac05acaa45bdc3fead4 (Incremented: 2.0.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v2.0.0': 2.0.0 with commit count source 2708f61be7b5bd156cebb3cffaf4e8d56520fa2e (Incremented: 2.0.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.4.0': 1.4.0 with commit count source e2f6db6042205578a56bcc0f1455394b04245e15 (Incremented: 1.4.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.3.3': 1.3.3 with commit count source 63ac4df415534b1c707210fc2975ee02688a982c (Incremented: 1.3.4)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.3.2': 1.3.2 with commit count source 6b7a53e406ae53128adf07becd0e4cfb41fac603 (Incremented: 1.3.3)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.3.1': 1.3.1 with commit count source b0d7bf91c2780b507752cbd80b17375f5f52baf6 (Incremented: 1.3.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.3.0': 1.3.0 with commit count source 23b921aa37d1e132a01c3d34c10f467416e4afaa (Incremented: 1.3.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.2.2': 1.2.2 with commit count source 7214c2c2306e049100f988ea5002654e92f83cba (Incremented: 1.2.3)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.2.1': 1.2.1 with commit count source b0f9d75890dfb8aea898340af820f188428c0c27 (Incremented: 1.2.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.2.0': 1.2.0 with commit count source 1de0ba793e5618c6cea2f366f18749d1ece5b609 (Incremented: 1.2.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.1.1': 1.1.1 with commit count source 73736a2da5e2e4aad6bcdc51a660ae5b570d996e (Incremented: 1.1.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.1.0': 1.1.0 with commit count source 5e1590dd876ccf6b9fb05cb075273d126bb81b54 (Incremented: 1.1.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.0.1': 1.0.1 with commit count source 25a34bbcb5d79f33070b0381202b53e7af8be819 (Incremented: 1.0.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v1.0.0': 1.0.0 with commit count source bb1a71397412e05ab141d38fccd9da15b1d91db8 (Incremented: 1.0.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.13.2': 0.13.2 with commit count source faaf531065e6735d3c3a60d6000674ec62e65ae5 (Incremented: 0.13.3)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.13.1': 0.13.1 with commit count source 9f9178c69de980ce6aa949f59346fafc7253f0be (Incremented: 0.13.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.13.0': 0.13.0 with commit count source da5823434800fbc019e70f49dd76aa5b6828a2aa (Incremented: 0.13.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.12.0': 0.12.0 with commit count source 3e17f5e2a113db1883a0369196c21be4cf9a7cea (Incremented: 0.12.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.11.4': 0.11.4 with commit count source 10081bd39e3186f45f9f3886384db9458a6c706e (Incremented: 0.11.5)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.11.3': 0.11.3 with commit count source 3a5deacdec81d1e62355c8c8313ab7e839a61a11 (Incremented: 0.11.4)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.11.2': 0.11.2 with commit count source 12f1fae271d4ac655e38d03e7c269711dc8abdea (Incremented: 0.11.3)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.11.1': 0.11.1 with commit count source 5d30580920012018bd51cd640bc695319ad348a5 (Incremented: 0.11.2)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.11.0': 0.11.0 with commit count source a6623300b68ec8b781e9a7d65167a92f59355120 (Incremented: 0.11.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.10.0': 0.10.0 with commit count source 1533f36a1d41733eb44bdb1e007877226f4e377c (Incremented: 0.10.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.9.0': 0.9.0 with commit count source 90f3f496c3f5472bc86138371f6943644b533909 (Incremented: 0.9.1)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.8.3': 0.8.3 with commit count source c5853b5b90eeea2fd2c5cbd5628ed8de3b151cca (Incremented: 0.8.4)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.8.2': 0.8.2 with commit count source 519d6ac120939a1744b2272ddcbeeaa503048f4f (Incremented: 0.8.3)
  INFO [04/23/20 13:14:27:69] Git tag 'v0.8.1': 0.8.1 with commit count source 6e2abbfb642ca6f65ef3bf097cbbac2e43426839 (Incremented: 0.8.2)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.8': 0.8.0 with commit count source 65e27c5449ae8d3a7cc22bcbd2aa735279a27e41 (Incremented: 0.8.1)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.7.1': 0.7.1 with commit count source 43b62f33496e50b82604ba531251ba7e82770496 (Incremented: 0.7.2)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.7': 0.7.0 with commit count source 594dee09549943587acbd11e204928b07040c973 (Incremented: 0.7.1)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.6': 0.6.0 with commit count source 51c491fb8ebc80c55c815ae3485a2183f6e3f7fe (Incremented: 0.6.1)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.5.1': 0.5.1 with commit count source 07817937c7fba48507cb7049604c2037b70b42d3 (Incremented: 0.5.2)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.5': 0.5.0 with commit count source 3ec6b8f14b34ff37cf6808524ce87d9e1965dc39 (Incremented: 0.5.1)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.4': 0.4.0 with commit count source ea16a111aba5bee97e6cf4424fec3a0c5be902df (Incremented: 0.4.1)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.3': 0.3.0 with commit count source fd3480b274f4f384a2ef66d9f2bf400b81a9c02a (Incremented: 0.3.1)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.2': 0.2.0 with commit count source e5b262fdfb0bc128ce517411d69169031b0ce0f8 (Incremented: 0.2.1)
  INFO [04/23/20 13:14:27:70] Git tag 'v0.1': 0.1.0 with commit count source 62d2110e41600fca5fde652293857017b5ce7010 (Incremented: 0.1.1)
  INFO [04/23/20 13:14:27:76] Found multiple base versions which will produce the same SemVer (3.1.3), taking oldest source for commit counting (Git tag 'v3.1.2')
  INFO [04/23/20 13:14:27:76] Base version used: Git tag 'v3.1.2': 3.1.2 with commit count source 33fb5feef4a83c079656dce3eac57b27f93bc39b (Incremented: 3.1.3)
  INFO [04/23/20 13:14:27:77] End: Calculating base versions (Took: 176.12ms)
  INFO [04/23/20 13:14:27:77] Begin: Using mainline development mode to calculate current version
    INFO [04/23/20 13:14:27:82] Found possible mainline branches: master, release/1.3, origin/release/1.3, release/1.4, origin/release/1.4, release/2.0, origin/release/2.0
    INFO [04/23/20 13:14:27:84] Mainline for current branch is master
    INFO [04/23/20 13:14:27:84] Merge commit dafcd956b32bf155b1b56ca26bdb55a34bdc1349 incremented base versions Patch, now 3.1.3
    INFO [04/23/20 13:14:27:85] Merge commit 517daf9325182cf5bbf47fc1b23a4af6c590f72c incremented base versions Patch, now 3.1.4
    INFO [04/23/20 13:14:27:85] 6 commits found between 33fb5feef4a83c079656dce3eac57b27f93bc39b and 517daf9325182cf5bbf47fc1b23a4af6c590f72c
  INFO [04/23/20 13:14:27:85] End: Using mainline development mode to calculate current version (Took: 81.60ms)
  INFO [04/23/20 13:14:27:85] Begin: Getting version tags from branch 'refs/heads/master'.
  INFO [04/23/20 13:14:27:88] End: Getting version tags from branch 'refs/heads/master'. (Took: 30.11ms)
For the 5.1.3 version : 
INFO [04/23/20 13:14:47:94] Dumping commit graph: 
INFO [04/23/20 13:14:48:05] *   517daf9 23 hours ago  (HEAD -> master, tag: v3.1.3, origin/master, origin/HEAD)
|\  
| * 994b7d6 25 hours ago  (ENH.TenantNotFoundException)
| * 752a504 25 hours ago 
| * 9e48cf2 26 hours ago 
|/  
*   dafcd95 3 weeks ago 
|\  
| * e86a825 3 weeks ago 
|/  
*   33fb5fe 4 weeks ago  (tag: v3.1.2)
|\  
| * f3ecbb9 4 weeks ago 
* |   e541809 4 weeks ago 
|\ \  
| |/  
|/|   
| * ae905fe 4 weeks ago 
| * 4accde1 4 weeks ago 
|/  
*   d1c8204 5 weeks ago 
|\  
| * 66d4f4f 5 weeks ago 
|/  
*   40afc7b 6 weeks ago 
|\  
| * 2e181ad 6 weeks ago  (sonarcloud)
| * a9a0460 6 weeks ago 
|/  
| * 8c073a6 6 weeks ago  (origin/no_controller_health)
|/  
| * 2f56edd 2 months ago  (origin/fix_cache_n_breaking_change)
| * 3c91252 2 months ago 
| * 0f1c0ec 2 months ago 
| * 9b579ff 2 months ago 
|/  
*   bc3317b 3 months ago  (tag: v3.1.1)
|\  
| * 60542e0 3 months ago 
|/  
* d477beb 3 months ago 
* 4ff8503 3 months ago 
*   c690b4a 3 months ago  (tag: v3.1.0)
|\  
| * deae123 3 months ago 
| * 0497cde 3 months ago 
| * b857c4b 3 months ago  (better.tenancy)
| * 3aa6867 3 months ago 
| * 511a208 3 months ago 
* | 9401ac2 3 months ago  (tag: v3.0.1)
|/  
*   0550b5f 4 months ago  (tag: v3.0.0)
|\  
| * 3aa5c29 4 months ago  (netcore3.1)
| * c03078e 4 months ago 
| * 3a6c5e7 5 months ago 
| * 269b0ba 5 months ago 
| * 5f14d42 5 months ago 
| * a9700d0 5 months ago 
|/  
| *   8a68299 3 months ago  (tag: v2.1.1, origin/release/2.0)
| |\  
| | * 4862bb9 3 months ago 
| | * d5c35f8 3 months ago 
| |/  
| *   5d06c44 3 months ago  (tag: v2.1.0)
| |\  
| | * b95e532 3 months ago 
| | * 2bdda47 3 months ago 
| | * 66e249e 3 months ago  (better.tenancy_2.0)
| | * f04640d 3 months ago 
| | * f2ce807 3 months ago 
| | * 0eef500 3 months ago 
| |/  
|/|   
| * 4f4875c 3 months ago  (tag: v2.0.7)
|/| 
| * aeaf683 3 months ago  (tryfix.concurrency.exception.for.2.0)
|/  
| * bfdc0e5 3 months ago  (backup/tryfix.concurrency.exception.for.2.0-15-44-25)
| * 3d4981b 3 months ago 
| * f52c8b1 3 months ago 
|/  
| * 10dd4ea 3 months ago  (ref_tenancy_comments)
| | * d3dbaa6 3 months ago  (origin/ref_tenancy_comments)
| |/  
| | * ac24afc 4 months ago  (origin/ref_tenancy)
| |/  
| | * a8da00a 5 months ago  (origin/tenancy_pooling_in_memory_cache)
| | * cc2f971 5 months ago  (origin/tenancy_pooling)
| | * 281b1ee 5 months ago 
| |/  
|/|   
| | *   7be18bd 5 months ago  (refs/stash)
| |/|\  
|/| | | 
| | | * 851e330 5 months ago 
| | * db92a6e 5 months ago 
| |/  
|/|   
* | 68e0eb0 5 months ago  (tag: v2.0.4, release/2.0)
|/  
| * dddcbfc 5 months ago  (ref_tenancy)
| * 694d95e 5 months ago 
| * f4d5d1d 5 months ago 
|/  
*   0cad4e2 5 months ago  (tag: v2.0.3)
|\  
| * 498eb3c 5 months ago 
|/  
*   44c10be 5 months ago  (tag: v2.0.2)
|\  
| * 02f0c58 6 months ago 
|/  
*   32fb736 6 months ago 
|\  
| * a4b072d 6 months ago 
|/  
*   4e1a1b1 6 months ago 
|\  
| * 3db0b48 6 months ago  (backporting.easy.customscope.registration)
| * 2192faf 6 months ago 
| * e747e67 6 months ago 
| * ef2757e 6 months ago 
| * f58d270 6 months ago 
| * 4a25a8a 6 months ago 
|/  
* cfd1401 6 months ago  (tag: v2.0.1)
| *   960f23f 6 months ago  (origin/release/1.4, release/1.4)
| |\  
| | * 918160b 6 months ago  (easy.customscope.registration)
| | * 7c6fd73 6 months ago 
| | * 8c25a4c 6 months ago 
| | * e9062cc 6 months ago 
| | * 9a8cf7b 6 months ago 
| | * 71c3b29 6 months ago 
| * |   c1c5bda 6 months ago  (tag: v1.4.1)
| |\ \  
| | |/  
| |/|   
| | * f86c44a 6 months ago  (try.fix.codetaskfactory.1.4)
| | * bf99eb0 6 months ago 
| * | a986db4 6 months ago 
| |/  
| | * 50bd308 6 months ago  (workaround.poltuu)
| |/  
|/|   
* |   2708f61 6 months ago  (tag: v2.0.0)
|\ \  
| |/  
|/|   
| * 9411b8b 6 months ago  (netcore3.support)
| * 51a6937 6 months ago 
| * 2a32d44 6 months ago 
|/  
* e2f6db6 6 months ago  (tag: v1.4.0)
*   d1d05db 6 months ago 
|\  
| * 11b1d4e 6 months ago  (error.page.v2)

INFO [04/23/20 13:14:48:05] Working directory: C:\Sources\Lucca.Core.AspNetCore
INFO [04/23/20 13:14:48:05] IsDynamicGitRepository: False
INFO [04/23/20 13:14:48:10] Returning Project Root from DotGitDirectory: C:\Sources\Lucca.Core.AspNetCore\.git\ - C:\Sources\Lucca.Core.AspNetCore\
INFO [04/23/20 13:14:48:10] Running on Windows.
INFO [04/23/20 13:14:48:10] Project root is: C:\Sources\Lucca.Core.AspNetCore\
INFO [04/23/20 13:14:48:10] DotGit directory is: C:\Sources\Lucca.Core.AspNetCore\.git
INFO [04/23/20 13:14:48:27] Using latest commit on specified branch
INFO [04/23/20 13:14:48:33] Running against branch: master (517daf9325182cf5bbf47fc1b23a4af6c590f72c)
INFO [04/23/20 13:14:48:33] Current commit is tagged with version 3.1.3, version calculation is for metadata only.
INFO [04/23/20 13:14:48:34] 0 commits found between 517daf9325182cf5bbf47fc1b23a4af6c590f72c and 517daf9325182cf5bbf47fc1b23a4af6c590f72c
INFO [04/23/20 13:14:48:35] Begin: Calculating base versions
  INFO [04/23/20 13:14:48:37] Fallback base version: 0.1.0 with commit count source ad24537d17d26abcf1a74abab49ed13fd49551cb (Incremented: None)
  INFO [04/23/20 13:14:48:45] Git tag 'v3.1.3': 3.1.3 with commit count source 517daf9325182cf5bbf47fc1b23a4af6c590f72c (Incremented: None)
  INFO [04/23/20 13:14:48:45] Git tag 'v3.1.2': 3.1.2 with commit count source 33fb5feef4a83c079656dce3eac57b27f93bc39b (Incremented: 3.1.3)
  INFO [04/23/20 13:14:48:45] Git tag 'v3.1.1': 3.1.1 with commit count source bc3317b513e3bf7404f4372fbff02d09c9df9b90 (Incremented: 3.1.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v3.1.0': 3.1.0 with commit count source c690b4ab979316fee933adcb6a119582d8dc5493 (Incremented: 3.1.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v3.0.1': 3.0.1 with commit count source 9401ac26449410431f59f12d45739c71cec5e94a (Incremented: 3.0.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v3.0.0': 3.0.0 with commit count source 0550b5fb84ae67f365f1578f514eca1a6df1b7ea (Incremented: 3.0.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v2.0.4': 2.0.4 with commit count source 68e0eb0354d25d7e653f63452c2329c6e3b622b0 (Incremented: 2.0.5)
  INFO [04/23/20 13:14:48:45] Git tag 'v2.0.3': 2.0.3 with commit count source 0cad4e2e712e905045c4aaed8edb38d111c4dbd1 (Incremented: 2.0.4)
  INFO [04/23/20 13:14:48:45] Git tag 'v2.0.2': 2.0.2 with commit count source 44c10be75abf7ca152f2f22093c14db4feb37d85 (Incremented: 2.0.3)
  INFO [04/23/20 13:14:48:45] Git tag 'v2.0.1': 2.0.1 with commit count source cfd1401c1215097199c17ac05acaa45bdc3fead4 (Incremented: 2.0.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v2.0.0': 2.0.0 with commit count source 2708f61be7b5bd156cebb3cffaf4e8d56520fa2e (Incremented: 2.0.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.4.0': 1.4.0 with commit count source e2f6db6042205578a56bcc0f1455394b04245e15 (Incremented: 1.4.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.3.3': 1.3.3 with commit count source 63ac4df415534b1c707210fc2975ee02688a982c (Incremented: 1.3.4)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.3.2': 1.3.2 with commit count source 6b7a53e406ae53128adf07becd0e4cfb41fac603 (Incremented: 1.3.3)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.3.1': 1.3.1 with commit count source b0d7bf91c2780b507752cbd80b17375f5f52baf6 (Incremented: 1.3.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.3.0': 1.3.0 with commit count source 23b921aa37d1e132a01c3d34c10f467416e4afaa (Incremented: 1.3.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.2.2': 1.2.2 with commit count source 7214c2c2306e049100f988ea5002654e92f83cba (Incremented: 1.2.3)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.2.1': 1.2.1 with commit count source b0f9d75890dfb8aea898340af820f188428c0c27 (Incremented: 1.2.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.2.0': 1.2.0 with commit count source 1de0ba793e5618c6cea2f366f18749d1ece5b609 (Incremented: 1.2.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.1.1': 1.1.1 with commit count source 73736a2da5e2e4aad6bcdc51a660ae5b570d996e (Incremented: 1.1.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.1.0': 1.1.0 with commit count source 5e1590dd876ccf6b9fb05cb075273d126bb81b54 (Incremented: 1.1.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.0.1': 1.0.1 with commit count source 25a34bbcb5d79f33070b0381202b53e7af8be819 (Incremented: 1.0.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v1.0.0': 1.0.0 with commit count source bb1a71397412e05ab141d38fccd9da15b1d91db8 (Incremented: 1.0.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.13.2': 0.13.2 with commit count source faaf531065e6735d3c3a60d6000674ec62e65ae5 (Incremented: 0.13.3)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.13.1': 0.13.1 with commit count source 9f9178c69de980ce6aa949f59346fafc7253f0be (Incremented: 0.13.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.13.0': 0.13.0 with commit count source da5823434800fbc019e70f49dd76aa5b6828a2aa (Incremented: 0.13.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.12.0': 0.12.0 with commit count source 3e17f5e2a113db1883a0369196c21be4cf9a7cea (Incremented: 0.12.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.11.4': 0.11.4 with commit count source 10081bd39e3186f45f9f3886384db9458a6c706e (Incremented: 0.11.5)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.11.3': 0.11.3 with commit count source 3a5deacdec81d1e62355c8c8313ab7e839a61a11 (Incremented: 0.11.4)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.11.2': 0.11.2 with commit count source 12f1fae271d4ac655e38d03e7c269711dc8abdea (Incremented: 0.11.3)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.11.1': 0.11.1 with commit count source 5d30580920012018bd51cd640bc695319ad348a5 (Incremented: 0.11.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.11.0': 0.11.0 with commit count source a6623300b68ec8b781e9a7d65167a92f59355120 (Incremented: 0.11.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.10.0': 0.10.0 with commit count source 1533f36a1d41733eb44bdb1e007877226f4e377c (Incremented: 0.10.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.9.0': 0.9.0 with commit count source 90f3f496c3f5472bc86138371f6943644b533909 (Incremented: 0.9.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.8.3': 0.8.3 with commit count source c5853b5b90eeea2fd2c5cbd5628ed8de3b151cca (Incremented: 0.8.4)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.8.2': 0.8.2 with commit count source 519d6ac120939a1744b2272ddcbeeaa503048f4f (Incremented: 0.8.3)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.8.1': 0.8.1 with commit count source 6e2abbfb642ca6f65ef3bf097cbbac2e43426839 (Incremented: 0.8.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.8': 0.8.0 with commit count source 65e27c5449ae8d3a7cc22bcbd2aa735279a27e41 (Incremented: 0.8.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.7.1': 0.7.1 with commit count source 43b62f33496e50b82604ba531251ba7e82770496 (Incremented: 0.7.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.7': 0.7.0 with commit count source 594dee09549943587acbd11e204928b07040c973 (Incremented: 0.7.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.6': 0.6.0 with commit count source 51c491fb8ebc80c55c815ae3485a2183f6e3f7fe (Incremented: 0.6.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.5.1': 0.5.1 with commit count source 07817937c7fba48507cb7049604c2037b70b42d3 (Incremented: 0.5.2)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.5': 0.5.0 with commit count source 3ec6b8f14b34ff37cf6808524ce87d9e1965dc39 (Incremented: 0.5.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.4': 0.4.0 with commit count source ea16a111aba5bee97e6cf4424fec3a0c5be902df (Incremented: 0.4.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.3': 0.3.0 with commit count source fd3480b274f4f384a2ef66d9f2bf400b81a9c02a (Incremented: 0.3.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.2': 0.2.0 with commit count source e5b262fdfb0bc128ce517411d69169031b0ce0f8 (Incremented: 0.2.1)
  INFO [04/23/20 13:14:48:45] Git tag 'v0.1': 0.1.0 with commit count source 62d2110e41600fca5fde652293857017b5ce7010 (Incremented: 0.1.1)
  INFO [04/23/20 13:14:48:52] Found multiple base versions which will produce the same SemVer (3.1.3), taking oldest source for commit counting (Git tag 'v3.1.2')
  INFO [04/23/20 13:14:48:52] Base version used: Git tag 'v3.1.2': 3.1.2 with commit count source 33fb5feef4a83c079656dce3eac57b27f93bc39b (Incremented: 3.1.3)
  INFO [04/23/20 13:14:48:52] End: Calculating base versions (Took: 174.08ms)
  INFO [04/23/20 13:14:48:52] Begin: Using mainline development mode to calculate current version
    INFO [04/23/20 13:14:48:58] Found possible mainline branches: master, release/1.3, origin/release/1.3, release/1.4, origin/release/1.4, release/2.0, origin/release/2.0
    INFO [04/23/20 13:14:48:59] Mainline for current branch is master
    INFO [04/23/20 13:14:48:60] Merge commit dafcd956b32bf155b1b56ca26bdb55a34bdc1349 incremented base versions Patch, now 3.1.3
    INFO [04/23/20 13:14:48:60] Merge commit 517daf9325182cf5bbf47fc1b23a4af6c590f72c incremented base versions Patch, now 3.1.4
    INFO [04/23/20 13:14:48:60] 6 commits found between 33fb5feef4a83c079656dce3eac57b27f93bc39b and 517daf9325182cf5bbf47fc1b23a4af6c590f72c
  INFO [04/23/20 13:14:48:60] End: Using mainline development mode to calculate current version (Took: 79.15ms)
  INFO [04/23/20 13:14:48:60] Begin: Getting version tags from branch 'refs/heads/master'.
  INFO [04/23/20 13:14:48:64] End: Getting version tags from branch 'refs/heads/master'. (Took: 30.80ms)

@asbjornu
Copy link
Member

asbjornu commented Apr 23, 2020 •
edited
Loading

This seems related to #2239, #2206 and #2074 at least.

@rducom
Copy link
Author

rducom commented Apr 23, 2020 •
edited
Loading

On our Jenkins CI, we are building on merged branch (from source branch).
Things are getting worse, since the calculated semver2 is "NuGetVersionV2":"3.1.5-v3-1-3-0000" instead of "NuGetVersionV2":"3.1.3"

For the 5.2.4 version on Jenkins : 
INFO [04/23/20 13:33:34:89] Dumping commit graph: 
INFO [04/23/20 13:33:34:93] *   517daf9 24 hours ago  (HEAD -> v3.1.3, tag: v3.1.3, origin/master, master)
|\  
| * 994b7d6 26 hours ago 
| * 752a504 26 hours ago 
| * 9e48cf2 26 hours ago 
|/  
*   dafcd95 3 weeks ago 
|\  
| * e86a825 3 weeks ago 
|/  
*   33fb5fe 4 weeks ago  (tag: v3.1.2)
|\  
| * f3ecbb9 4 weeks ago 
* |   e541809 4 weeks ago 
|\ \  
| |/  
|/|   
| * ae905fe 4 weeks ago 
| * 4accde1 4 weeks ago 
|/  
*   d1c8204 5 weeks ago 
|\  
| * 66d4f4f 5 weeks ago 
|/  
*   40afc7b 6 weeks ago 
|\  
| * 2e181ad 6 weeks ago 
| * a9a0460 6 weeks ago 
|/  
| * 8c073a6 6 weeks ago  (origin/no_controller_health, no_controller_health)
|/  
| * 2f56edd 2 months ago  (origin/fix_cache_n_breaking_change, fix_cache_n_breaking_change)
| * 3c91252 2 months ago 
| * 0f1c0ec 2 months ago 
| * 9b579ff 2 months ago 
|/  
*   bc3317b 3 months ago  (tag: v3.1.1)
|\  
| * 60542e0 3 months ago 
|/  
* d477beb 3 months ago 
* 4ff8503 3 months ago 
*   c690b4a 3 months ago  (tag: v3.1.0)
|\  
| * deae123 3 months ago 
| * 0497cde 3 months ago 
| * b857c4b 3 months ago 
| * 3aa6867 3 months ago 
| * 511a208 3 months ago 
* | 9401ac2 3 months ago  (tag: v3.0.1)
|/  
*   0550b5f 4 months ago  (tag: v3.0.0)
|\  
| * 3aa5c29 4 months ago 
| * c03078e 4 months ago 
| * 3a6c5e7 5 months ago 
| * 269b0ba 5 months ago 
| * 5f14d42 5 months ago 
| * a9700d0 5 months ago 
|/  
| *   8a68299 3 months ago  (tag: v2.1.1, origin/release/2.0, release/2.0)
| |\  
| | * 4862bb9 3 months ago 
| | * d5c35f8 3 months ago 
| |/  
| *   5d06c44 3 months ago  (tag: v2.1.0)
| |\  
| | * b95e532 3 months ago 
| | * 2bdda47 3 months ago 
| | * 66e249e 3 months ago 
| | * f04640d 3 months ago 
| | * f2ce807 3 months ago 
| | * 0eef500 3 months ago 
| |/  
|/|   
| *   4f4875c 3 months ago  (tag: v2.0.7)
| |\  
|/ /  
| * aeaf683 3 months ago 
|/  
| * d3dbaa6 3 months ago  (origin/ref_tenancy_comments, ref_tenancy_comments)
| | * ac24afc 4 months ago  (origin/ref_tenancy, ref_tenancy)
| |/  
| | * a8da00a 5 months ago  (origin/tenancy_pooling_in_memory_cache, tenancy_pooling_in_memory_cache)
| | * cc2f971 5 months ago  (origin/tenancy_pooling, tenancy_pooling)
| | * 281b1ee 5 months ago 
| |/  
|/|   
* | 68e0eb0 5 months ago  (tag: v2.0.4)
|/  
*   0cad4e2 5 months ago  (tag: v2.0.3)
|\  
| * 498eb3c 5 months ago 
|/  
*   44c10be 5 months ago  (tag: v2.0.2)
|\  
| * 02f0c58 6 months ago 
|/  
*   32fb736 6 months ago 
|\  
| * a4b072d 6 months ago 
|/  
*   4e1a1b1 6 months ago 
|\  
| * 3db0b48 6 months ago 
| * 2192faf 6 months ago 
| * e747e67 6 months ago 
| * ef2757e 6 months ago 
| * f58d270 6 months ago 
| * 4a25a8a 6 months ago 
|/  
* cfd1401 6 months ago  (tag: v2.0.1)
*   2708f61 6 months ago  (tag: v2.0.0)
|\  
| * 9411b8b 6 months ago 
| * 51a6937 6 months ago 
| * 2a32d44 6 months ago 
|/  
| *   960f23f 6 months ago  (origin/release/1.4, release/1.4)
| |\  
| | * 918160b 6 months ago 
| | * 7c6fd73 6 months ago 
| | * 8c25a4c 6 months ago 
| | * e9062cc 6 months ago 
| | * 9a8cf7b 6 months ago 
| | * 71c3b29 6 months ago 
| * |   c1c5bda 6 months ago  (tag: v1.4.1)
| |\ \  
| | |/  
| |/|   
| | * f86c44a 6 months ago 
| | * bf99eb0 6 months ago 
| |/  
|/|   
| * a986db4 6 months ago 
|/  
* e2f6db6 6 months ago  (tag: v1.4.0)
*   d1d05db 6 months ago 
|\  
| * 11b1d4e 6 months ago 
| * da0e497 6 months ago 
| * 0f00fc1 6 months ago 
| * 3e98296 6 months ago 
| * e2936df 6 months ago 
| * 542b14a 6 months ago 
| * b75bbd9 6 months ago 
| * 3347800 6 months ago 
| * 3a43b30 6 months ago 
| * a5278b8 6 months ago 
| * 6fa5161 6 months ago 
| * 27186b8 6 months ago 

INFO [04/23/20 13:33:34:93] Working directory: D:\workspace\v3.1.36560a448
INFO [04/23/20 13:33:34:94] Project root is: D:\workspace\v3.1.36560a448\
INFO [04/23/20 13:33:34:94] DotGit directory is: D:\workspace\v3.1.36560a448\.git
INFO [04/23/20 13:33:35:01] Using latest commit on specified branch
INFO [04/23/20 13:33:35:01] No branch configuration found for branch v3.1.3, falling back to default configuration
INFO [04/23/20 13:33:35:02] Begin: Attempting to inherit branch configuration from parent branch
  INFO [04/23/20 13:33:35:02] HEAD is merge commit, this is likely a pull request using v3.1.3 as base
  INFO [04/23/20 13:33:35:03] Begin: Finding branch source of 'v3.1.3'
    INFO [04/23/20 13:33:35:04] Begin: Finding merge base between 'v3.1.3' and 'master'.
      INFO [04/23/20 13:33:35:04] Found merge base of 517daf9325182cf5bbf47fc1b23a4af6c590f72c
      INFO [04/23/20 13:33:35:04] Merge base of v3.1.3' and 'master is 517daf9325182cf5bbf47fc1b23a4af6c590f72c
    INFO [04/23/20 13:33:35:04] End: Finding merge base between 'v3.1.3' and 'master'. (Took: 5.78ms)
    INFO [04/23/20 13:33:35:04] Begin: Finding merge base between 'v3.1.3' and 'release/1.3'.
      INFO [04/23/20 13:33:35:04] Found merge base of 63ac4df415534b1c707210fc2975ee02688a982c
      INFO [04/23/20 13:33:35:04] Merge base of v3.1.3' and 'release/1.3 is 63ac4df415534b1c707210fc2975ee02688a982c
    INFO [04/23/20 13:33:35:04] End: Finding merge base between 'v3.1.3' and 'release/1.3'. (Took: 1.17ms)
    INFO [04/23/20 13:33:35:05] Begin: Finding merge base between 'v3.1.3' and 'release/1.4'.
      INFO [04/23/20 13:33:35:05] Found merge base of e2f6db6042205578a56bcc0f1455394b04245e15
      INFO [04/23/20 13:33:35:05] Merge base of v3.1.3' and 'release/1.4 is e2f6db6042205578a56bcc0f1455394b04245e15
    INFO [04/23/20 13:33:35:05] End: Finding merge base between 'v3.1.3' and 'release/1.4'. (Took: 0.88ms)
    INFO [04/23/20 13:33:35:05] Begin: Finding merge base between 'v3.1.3' and 'release/2.0'.
      INFO [04/23/20 13:33:35:05] Found merge base of 68e0eb0354d25d7e653f63452c2329c6e3b622b0
      INFO [04/23/20 13:33:35:05] Merge base of v3.1.3' and 'release/2.0 is 68e0eb0354d25d7e653f63452c2329c6e3b622b0
    INFO [04/23/20 13:33:35:05] End: Finding merge base between 'v3.1.3' and 'release/2.0'. (Took: 0.40ms)
    INFO [04/23/20 13:33:35:05] Begin: Finding merge base between 'v3.1.3' and 'origin/master'.
      INFO [04/23/20 13:33:35:05] Found merge base of 517daf9325182cf5bbf47fc1b23a4af6c590f72c
      INFO [04/23/20 13:33:35:05] Merge base of v3.1.3' and 'origin/master is 517daf9325182cf5bbf47fc1b23a4af6c590f72c
    INFO [04/23/20 13:33:35:05] End: Finding merge base between 'v3.1.3' and 'origin/master'. (Took: 0.14ms)
    INFO [04/23/20 13:33:35:05] Begin: Finding merge base between 'v3.1.3' and 'origin/release/1.3'.
      INFO [04/23/20 13:33:35:05] Found merge base of 63ac4df415534b1c707210fc2975ee02688a982c
      INFO [04/23/20 13:33:35:05] Merge base of v3.1.3' and 'origin/release/1.3 is 63ac4df415534b1c707210fc2975ee02688a982c
    INFO [04/23/20 13:33:35:05] End: Finding merge base between 'v3.1.3' and 'origin/release/1.3'. (Took: 0.20ms)
    INFO [04/23/20 13:33:35:05] Begin: Finding merge base between 'v3.1.3' and 'origin/release/1.4'.
      INFO [04/23/20 13:33:35:05] Found merge base of e2f6db6042205578a56bcc0f1455394b04245e15
      INFO [04/23/20 13:33:35:05] Merge base of v3.1.3' and 'origin/release/1.4 is e2f6db6042205578a56bcc0f1455394b04245e15
    INFO [04/23/20 13:33:35:05] End: Finding merge base between 'v3.1.3' and 'origin/release/1.4'. (Took: 0.38ms)
    INFO [04/23/20 13:33:35:05] Begin: Finding merge base between 'v3.1.3' and 'origin/release/2.0'.
      INFO [04/23/20 13:33:35:05] Found merge base of 68e0eb0354d25d7e653f63452c2329c6e3b622b0
      INFO [04/23/20 13:33:35:05] Merge base of v3.1.3' and 'origin/release/2.0 is 68e0eb0354d25d7e653f63452c2329c6e3b622b0
    INFO [04/23/20 13:33:35:05] End: Finding merge base between 'v3.1.3' and 'origin/release/2.0'. (Took: 0.32ms)
    INFO [04/23/20 13:33:35:05] Multiple source branches have been found, picking the first one (master).
This may result in incorrect commit counting.
Options were:
master, origin/master, release/2.0, origin/release/2.0, release/1.4, origin/release/1.4, release/1.3, origin/release/1.3
  INFO [04/23/20 13:33:35:05] End: Finding branch source of 'v3.1.3' (Took: 21.47ms)
  INFO [04/23/20 13:33:35:05] Begin: Getting branches containing the commit '517daf9325182cf5bbf47fc1b23a4af6c590f72c'.
    INFO [04/23/20 13:33:35:05] Trying to find direct branches.
    INFO [04/23/20 13:33:35:05] No direct branches found, searching through all branches.
    INFO [04/23/20 13:33:35:05] Searching for commits reachable from 'master'.
    INFO [04/23/20 13:33:35:06] The branch 'master' has a matching commit.
    INFO [04/23/20 13:33:35:06] Searching for commits reachable from 'release/1.3'.
    INFO [04/23/20 13:33:35:06] The branch 'release/1.3' has no matching commits.
    INFO [04/23/20 13:33:35:06] Searching for commits reachable from 'release/1.4'.
    INFO [04/23/20 13:33:35:06] The branch 'release/1.4' has no matching commits.
    INFO [04/23/20 13:33:35:06] Searching for commits reachable from 'release/2.0'.
    INFO [04/23/20 13:33:35:06] The branch 'release/2.0' has no matching commits.
    INFO [04/23/20 13:33:35:06] Searching for commits reachable from 'origin/master'.
    INFO [04/23/20 13:33:35:07] The branch 'origin/master' has a matching commit.
    INFO [04/23/20 13:33:35:07] Searching for commits reachable from 'origin/release/1.3'.
    INFO [04/23/20 13:33:35:07] The branch 'origin/release/1.3' has no matching commits.
    INFO [04/23/20 13:33:35:07] Searching for commits reachable from 'origin/release/1.4'.
    INFO [04/23/20 13:33:35:07] The branch 'origin/release/1.4' has no matching commits.
    INFO [04/23/20 13:33:35:07] Searching for commits reachable from 'origin/release/2.0'.
    INFO [04/23/20 13:33:35:07] The branch 'origin/release/2.0' has no matching commits.
  INFO [04/23/20 13:33:35:07] End: Getting branches containing the commit '517daf9325182cf5bbf47fc1b23a4af6c590f72c'. (Took: 19.70ms)
  INFO [04/23/20 13:33:35:07] Begin: Getting branches containing the commit '517daf9325182cf5bbf47fc1b23a4af6c590f72c'.
    INFO [04/23/20 13:33:35:07] Trying to find direct branches.
    INFO [04/23/20 13:33:35:07] No direct branches found, searching through all branches.
    INFO [04/23/20 13:33:35:07] Searching for commits reachable from 'master'.
    INFO [04/23/20 13:33:35:08] The branch 'master' has a matching commit.
    INFO [04/23/20 13:33:35:08] Searching for commits reachable from 'release/1.3'.
    INFO [04/23/20 13:33:35:08] The branch 'release/1.3' has no matching commits.
    INFO [04/23/20 13:33:35:08] Searching for commits reachable from 'release/1.4'.
    INFO [04/23/20 13:33:35:08] The branch 'release/1.4' has no matching commits.
    INFO [04/23/20 13:33:35:08] Searching for commits reachable from 'release/2.0'.
    INFO [04/23/20 13:33:35:08] The branch 'release/2.0' has no matching commits.
    INFO [04/23/20 13:33:35:08] Searching for commits reachable from 'origin/master'.
    INFO [04/23/20 13:33:35:09] The branch 'origin/master' has a matching commit.
    INFO [04/23/20 13:33:35:09] Searching for commits reachable from 'origin/release/1.3'.
    INFO [04/23/20 13:33:35:09] The branch 'origin/release/1.3' has no matching commits.
    INFO [04/23/20 13:33:35:09] Searching for commits reachable from 'origin/release/1.4'.
    INFO [04/23/20 13:33:35:09] The branch 'origin/release/1.4' has no matching commits.
    INFO [04/23/20 13:33:35:09] Searching for commits reachable from 'origin/release/2.0'.
    INFO [04/23/20 13:33:35:09] The branch 'origin/release/2.0' has no matching commits.
  INFO [04/23/20 13:33:35:09] End: Getting branches containing the commit '517daf9325182cf5bbf47fc1b23a4af6c590f72c'. (Took: 20.54ms)
  INFO [04/23/20 13:33:35:09] Found possible parent branches: 
  WARN [04/23/20 13:33:35:10] Failed to inherit Increment branch configuration, no branches found.
Falling back to master branch config
  INFO [04/23/20 13:33:35:10] End: Attempting to inherit branch configuration from parent branch (Took: 80.16ms)
  INFO [04/23/20 13:33:35:11] Running against branch: v3.1.3 (517daf9325182cf5bbf47fc1b23a4af6c590f72c)
  INFO [04/23/20 13:33:35:11] Current commit is tagged with version 3.1.3, version calculation is for metadata only.
  INFO [04/23/20 13:33:35:11] 0 commits found between 517daf9325182cf5bbf47fc1b23a4af6c590f72c and 517daf9325182cf5bbf47fc1b23a4af6c590f72c
  INFO [04/23/20 13:33:35:12] Begin: Calculating base versions
    INFO [04/23/20 13:33:35:12] Fallback base version: 0.1.0 with commit count source ad24537d17d26abcf1a74abab49ed13fd49551cb (Incremented: None)
    INFO [04/23/20 13:33:35:17] Git tag 'v3.1.3': 3.1.3 with commit count source 517daf9325182cf5bbf47fc1b23a4af6c590f72c (Incremented: None)
    INFO [04/23/20 13:33:35:17] Git tag 'v3.1.2': 3.1.2 with commit count source 33fb5feef4a83c079656dce3eac57b27f93bc39b (Incremented: 3.1.3)
    INFO [04/23/20 13:33:35:17] Git tag 'v3.1.1': 3.1.1 with commit count source bc3317b513e3bf7404f4372fbff02d09c9df9b90 (Incremented: 3.1.2)
    INFO [04/23/20 13:33:35:17] Git tag 'v3.1.0': 3.1.0 with commit count source c690b4ab979316fee933adcb6a119582d8dc5493 (Incremented: 3.1.1)
    INFO [04/23/20 13:33:35:17] Git tag 'v3.0.1': 3.0.1 with commit count source 9401ac26449410431f59f12d45739c71cec5e94a (Incremented: 3.0.2)
    INFO [04/23/20 13:33:35:18] Found multiple base versions which will produce the same SemVer (3.1.3), taking oldest source for commit counting (Git tag 'v3.1.2')
    INFO [04/23/20 13:33:35:18] Base version used: Git tag 'v3.1.2': 3.1.2 with commit count source 33fb5feef4a83c079656dce3eac57b27f93bc39b (Incremented: 3.1.3)
  INFO [04/23/20 13:33:35:18] End: Calculating base versions (Took: 61.58ms)
  INFO [04/23/20 13:33:35:18] Begin: Using mainline development mode to calculate current version
    INFO [04/23/20 13:33:35:18] Found possible mainline branches: master, release/1.3, origin/release/1.3, release/1.4, origin/release/1.4, release/2.0, origin/release/2.0
    INFO [04/23/20 13:33:35:19] Mainline for current branch is master
    INFO [04/23/20 13:33:35:19] Found branch merge point; choosing 517daf9325182cf5bbf47fc1b23a4af6c590f72c as effective mainline tip
    INFO [04/23/20 13:33:35:19] Current branch (v3.1.3) was branch from 517daf9325182cf5bbf47fc1b23a4af6c590f72c
    INFO [04/23/20 13:33:35:19] Merge commit dafcd956b32bf155b1b56ca26bdb55a34bdc1349 incremented base versions Patch, now 3.1.3
    INFO [04/23/20 13:33:35:19] Merge commit 517daf9325182cf5bbf47fc1b23a4af6c590f72c incremented base versions Patch, now 3.1.4
    INFO [04/23/20 13:33:35:19] 0 commits found between 517daf9325182cf5bbf47fc1b23a4af6c590f72c and 517daf9325182cf5bbf47fc1b23a4af6c590f72c
    INFO [04/23/20 13:33:35:19] Performing Patch increment for current branch 
  INFO [04/23/20 13:33:35:19] End: Using mainline development mode to calculate current version (Took: 11.71ms)
  INFO [04/23/20 13:33:35:19] Using branch name to calculate version tag
  INFO [04/23/20 13:33:35:19] Begin: Getting version tags from branch 'refs/heads/v3.1.3'.
  INFO [04/23/20 13:33:35:20] End: Getting version tags from branch 'refs/heads/v3.1.3'. (Took: 11.70ms)
  INFO [04/23/20 13:33:35:21] Running on Windows.
{
  "Major":3,
  "Minor":1,
  "Patch":5,
  "PreReleaseTag":"v3-1-3.0",
  "PreReleaseTagWithDash":"-v3-1-3.0",
  "PreReleaseLabel":"v3-1-3",
  "PreReleaseNumber":0,
  "WeightedPreReleaseNumber":0,
  "BuildMetaData":"",
  "BuildMetaDataPadded":"",
  "FullBuildMetaData":"Branch.v3.1.3.Sha.517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "MajorMinorPatch":"3.1.5",
  "SemVer":"3.1.5-v3-1-3.0",
  "LegacySemVer":"3.1.5-v3-1-3-0",
  "LegacySemVerPadded":"3.1.5-v3-1-3-0000",
  "AssemblySemVer":"3.1.5.0",
  "AssemblySemFileVer":"3.1.5.0",
  "FullSemVer":"3.1.5-v3-1-3.0",
  "InformationalVersion":"3.1.5-v3-1-3.0+Branch.v3.1.3.Sha.517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "BranchName":"v3.1.3",
  "EscapedBranchName":"v3-1-3",
  "Sha":"517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "ShortSha":"517daf9",
  "NuGetVersionV2":"3.1.5-v3-1-3-0000",
  "NuGetVersion":"3.1.5-v3-1-3-0000",
  "NuGetPreReleaseTagV2":"v3-1-3-0000",
  "NuGetPreReleaseTag":"v3-1-3-0000",
  "VersionSourceSha":"517daf9325182cf5bbf47fc1b23a4af6c590f72c",
  "CommitsSinceVersionSource":0,
  "CommitsSinceVersionSourcePadded":"0000",
  "CommitDate":"2020-04-22"
}

@arturcic arturcic added this to the 5.3.x milestone May 3, 2020
@arturcic
Copy link
Member

I think this commit is the cause, at least this is the only one that makes sense 495ba8a

@arturcic
Copy link
Member

This is the PR that introduced the change, #1743 @asbjornu

@asbjornu
Copy link
Member

Thanks for the investigation, @arturcic. I suppose these are the problematic lines of code?

GitVersion/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

Lines 75 to 87 in 5e9c79c

if (taggedSemanticVersion != null)
{
// replace calculated version with tagged version only if tagged version greater or equal to calculated version
if (semver.CompareTo(taggedSemanticVersion, false) > 0)
{
taggedSemanticVersion = null;
}
else
{
// set the commit count on the tagged ver
taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData.CommitsSinceVersionSource;
}
}

If I'm not mistaken, this is how those lines of code looked before #1743 was merged:

GitVersion/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

Lines 66 to 70 in 8219706

if (taggedSemanticVersion != null)
{
// set the commit count on the tagged ver
taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData.CommitsSinceVersionSource;
}

In that case, we need to figure out why semver.CompareTo(taggedSemanticVersion, false) returns 1 for certain (but not all, mysteriously) tags.

@arturcic
Copy link
Member

yes, would be handy to have some tests to cover that

@asbjornu
Copy link
Member

Indeed, that piece of logic right there is a prime candidate for some rigid unit tests.

@jjwilliams42 jjwilliams42 mentioned this issue May 14, 2020
Closed
@arturcic arturcic removed their assignment Jun 15, 2020
@arturcic arturcic removed this from the 5.3.x milestone Jun 15, 2020
@jjwilliams42
Copy link

Any idea what the status on this is? Our builds still generate numbers with +1 (5.6.2 tag generates 5.6.3 builds)

@asbjornu
Copy link
Member

Sorry, but I don't think there's any news to report, @jackjwilliams. Unless we receive a pull request fixing this, I doubt it will be fixed. I'm not using Mainline, so I have no incentive to fix it myself.

@jjwilliams42
Copy link

Ok, I will try to dedicate some time this weekend to look at it.

@asbjornu asbjornu mentioned this issue Mar 8, 2022
Closed
@HHobeck
Copy link
Contributor

HHobeck commented Mar 20, 2023

Is this problem still existing with version 6.0.0-beta.1? Could you please provide steps to reproduce?

@HHobeck
Copy link
Contributor

HHobeck commented Mar 21, 2023 •
edited
Loading

A lot of work has been done and it's not clear for me if this issue persists. I'm going to close it because there are no steps to reproduce. Please use the latest pre-release version and verify your scenario again... it might be solved. If not please re-open this issue or create a new bug. Thank you very much.

@HHobeck HHobeck closed this as completed Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug missing-steps-to-reproduce
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
5 participants
@asbjornu @jjwilliams42 @arturcic @rducom @HHobeck