Skip to content

Commit f7e30c4

Browse files
committed
Turned on new code
1 parent b7c090d commit f7e30c4

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

GitVersionCore/GitVersionFinder.cs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace GitVersion
33
using System;
44
using System.IO;
55
using System.Linq;
6+
using GitVersion.VersionCalculation;
67
using LibGit2Sharp;
78

89
public class GitVersionFinder
@@ -18,21 +19,21 @@ public SemanticVersion FindVersion(GitVersionContext context)
1819
throw new Exception("NextVersion.txt has been depreciated. See https://github.com/ParticularLabs/GitVersion/wiki/GitVersionConfig.yaml-Configuration-File for replacement");
1920
}
2021

21-
//return new NewNextVersionCalculator().FindVersion(context);
22-
if (ShouldGitHubFlowVersioningSchemeApply(context.Repository))
23-
{
24-
Logger.WriteInfo("GitHubFlow version strategy will be used");
25-
return new GitHubFlowVersionFinder().FindVersion(context);
26-
}
22+
return new NewNextVersionCalculator().FindVersion(context);
23+
//if (ShouldGitHubFlowVersioningSchemeApply(context.Repository))
24+
//{
25+
// Logger.WriteInfo("GitHubFlow version strategy will be used");
26+
// return new GitHubFlowVersionFinder().FindVersion(context);
27+
//}
2728

28-
Logger.WriteInfo("GitFlow version strategy will be used");
29-
return new GitFlowVersionFinder().FindVersion(context);
29+
//Logger.WriteInfo("GitFlow version strategy will be used");
30+
//return new GitFlowVersionFinder().FindVersion(context);
3031
}
3132

32-
static bool ShouldGitHubFlowVersioningSchemeApply(IRepository repo)
33-
{
34-
return repo.FindBranch("develop") == null;
35-
}
33+
//static bool ShouldGitHubFlowVersioningSchemeApply(IRepository repo)
34+
//{
35+
// return repo.FindBranch("develop") == null;
36+
//}
3637

3738
void EnsureMainTopologyConstraints(GitVersionContext context)
3839
{

0 commit comments

Comments
 (0)