@@ -31,35 +31,26 @@ public override BaseVersion GetVersion(GitVersionContext context)
31
31
32
32
static bool TryParse ( Commit mergeCommit , EffectiveConfiguration configuration , out SemanticVersion semanticVersion )
33
33
{
34
- string versionPart ;
35
- if ( Inner ( mergeCommit , out versionPart ) )
36
- {
37
- return SemanticVersion . TryParse ( versionPart , configuration . GitTagPrefix , out semanticVersion ) ;
38
- }
39
- semanticVersion = null ;
40
- return false ;
34
+ semanticVersion = Inner ( mergeCommit , configuration ) ;
35
+ return semanticVersion != null ;
41
36
}
42
37
43
- static bool Inner ( Commit mergeCommit , out string versionPart )
38
+ private static SemanticVersion Inner ( Commit mergeCommit , EffectiveConfiguration configuration )
44
39
{
45
40
if ( mergeCommit . Parents . Count ( ) < 2 )
46
41
{
47
- versionPart = null ;
48
- return false ;
42
+ return null ;
49
43
}
50
44
51
- var version = mergeCommit
45
+ return mergeCommit
52
46
. Message . Split ( '/' , '-' , '\' ' , '"' , ' ' )
53
47
. Select ( part =>
54
48
{
55
49
SemanticVersion v ;
56
- return SemanticVersion . TryParse ( part , "" , out v ) ? v : null ;
50
+ return SemanticVersion . TryParse ( part , configuration . GitTagPrefix , out v ) ? v : null ;
57
51
} ) . FirstOrDefault ( v => v != null )
58
52
;
59
53
60
- versionPart = version != null ? version . ToString ( ) : null ;
61
-
62
- return versionPart != null ;
63
54
}
64
55
65
56
static bool TryGetPrefix ( string target , out string result , string splitter )
0 commit comments