Skip to content

Commit d44fb2d

Browse files
committed
indent base version calculation
1 parent e9f553c commit d44fb2d

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -244,35 +244,36 @@ IEnumerable<NextVersion> GetNextVersionsInternal()
244244
var effectiveBranchConfigurations = this.effectiveBranchConfigurationFinder.GetConfigurations(branch, configuration).ToArray();
245245
foreach (var effectiveBranchConfiguration in effectiveBranchConfigurations)
246246
{
247-
this.log.Info($"Calculating base versions for '{effectiveBranchConfiguration.Branch.Name}'");
248-
249-
var strategies = this.versionStrategies.ToList();
250-
var fallbackVersionStrategy = strategies.Find(element => element is FallbackVersionStrategy);
251-
if (fallbackVersionStrategy is not null)
252-
{
253-
strategies.Remove(fallbackVersionStrategy);
254-
strategies.Add(fallbackVersionStrategy);
255-
}
256-
257-
var atLeastOneBaseVersionReturned = false;
258-
foreach (var versionStrategy in strategies)
247+
using (this.log.IndentLog($"Calculating base versions for '{effectiveBranchConfiguration.Branch.Name}'"))
259248
{
260-
if (atLeastOneBaseVersionReturned && versionStrategy is FallbackVersionStrategy) continue;
249+
var strategies = this.versionStrategies.ToList();
250+
var fallbackVersionStrategy = strategies.Find(element => element is FallbackVersionStrategy);
251+
if (fallbackVersionStrategy is not null)
252+
{
253+
strategies.Remove(fallbackVersionStrategy);
254+
strategies.Add(fallbackVersionStrategy);
255+
}
261256

262-
using (this.log.IndentLog($"[Using '{versionStrategy.GetType().Name}' strategy]"))
257+
var atLeastOneBaseVersionReturned = false;
258+
foreach (var versionStrategy in strategies)
263259
{
264-
foreach (var baseVersion in versionStrategy.GetBaseVersions(effectiveBranchConfiguration))
260+
if (atLeastOneBaseVersionReturned && versionStrategy is FallbackVersionStrategy) continue;
261+
262+
using (this.log.IndentLog($"[Using '{versionStrategy.GetType().Name}' strategy]"))
265263
{
266-
log.Info(baseVersion.ToString());
267-
if (IncludeVersion(baseVersion, configuration.Ignore))
264+
foreach (var baseVersion in versionStrategy.GetBaseVersions(effectiveBranchConfiguration))
268265
{
269-
atLeastOneBaseVersionReturned = true;
270-
271-
yield return new NextVersion(
272-
incrementedVersion: baseVersion.GetIncrementedVersion(),
273-
baseVersion: baseVersion,
274-
configuration: effectiveBranchConfiguration
275-
);
266+
log.Info(baseVersion.ToString());
267+
if (IncludeVersion(baseVersion, configuration.Ignore))
268+
{
269+
atLeastOneBaseVersionReturned = true;
270+
271+
yield return new NextVersion(
272+
incrementedVersion: baseVersion.GetIncrementedVersion(),
273+
baseVersion: baseVersion,
274+
configuration: effectiveBranchConfiguration
275+
);
276+
}
276277
}
277278
}
278279
}

0 commit comments

Comments
 (0)