move conditional to outer scope

DamianKedzior · DamianKedzior · commit baf4bd2a622c · 2020-06-13T11:07:44.000-07:00
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs
@@ -30,11 +30,13 @@ public BaseVersion GetBaseVersion()
                 var baseVersions = strategies
                     .SelectMany(s =>
                     {
+                        if (s is FallbackVersionStrategy)
+                            return s.GetVersions();
+
                         return s.GetVersions()
                             .Where(v =>
                             {
                                 if (v == null) return false;
-                                if (s is FallbackVersionStrategy) return true;
 
                                 log.Info(v.ToString());
 

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,13 @@ public BaseVersion GetBaseVersion()`
`30`	`30`	`var baseVersions = strategies`
`31`	`31`	`.SelectMany(s =>`
`32`	`32`	`{`
	`33`	`+ if (s is FallbackVersionStrategy)`
	`34`	`+ return s.GetVersions();`
	`35`	`+`
`33`	`36`	`return s.GetVersions()`
`34`	`37`	`.Where(v =>`
`35`	`38`	`{`
`36`	`39`	`if (v == null) return false;`
`37`		`- if (s is FallbackVersionStrategy) return true;`
`38`	`40`
`39`	`41`	`log.Info(v.ToString());`
`40`	`42`