@@ -244,35 +244,36 @@ IEnumerable<NextVersion> GetNextVersionsInternal()
244
244
var effectiveBranchConfigurations = this . effectiveBranchConfigurationFinder . GetConfigurations ( branch , configuration ) . ToArray ( ) ;
245
245
foreach ( var effectiveBranchConfiguration in effectiveBranchConfigurations )
246
246
{
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 } '") )
259
248
{
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
+ }
261
256
262
- using ( this . log . IndentLog ( $ "[Using '{ versionStrategy . GetType ( ) . Name } ' strategy]") )
257
+ var atLeastOneBaseVersionReturned = false ;
258
+ foreach ( var versionStrategy in strategies )
263
259
{
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]") )
265
263
{
266
- log . Info ( baseVersion . ToString ( ) ) ;
267
- if ( IncludeVersion ( baseVersion , configuration . Ignore ) )
264
+ foreach ( var baseVersion in versionStrategy . GetBaseVersions ( effectiveBranchConfiguration ) )
268
265
{
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
+ }
276
277
}
277
278
}
278
279
}
0 commit comments