Post rebase cleanup

Author: Evangelink

src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs

@@ -28,7 +28,7 @@ public static class AssemblyVersionsGeneratorExtensions
                 AssemblyVersioningScheme.Major => $"{sv.Major}.0.0.0",
                 AssemblyVersioningScheme.MajorMinor => $"{sv.Major}.{sv.Minor}.0.0",
                 AssemblyVersioningScheme.MajorMinorPatch => $"{sv.Major}.{sv.Minor}.{sv.Patch}.0",
-                AssemblyVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag.Number ?? 0}",
+                AssemblyVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag?.Number ?? 0}",
                 AssemblyVersioningScheme.None => null,
                 _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
             };

src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs

@@ -59,9 +59,7 @@ public BaseVersion GetBaseVersion()
                 if (matchingVersionsOnceIncremented.Any())
                 {
                     var oldest = matchingVersionsOnceIncremented.Aggregate((v1, v2) =>
-                    {
-                        return v1.Version!.BaseVersionSource!.When < v2.Version!.BaseVersionSource!.When ? v1 : v2;
-                    });
+                        v1.Version!.BaseVersionSource!.When < v2.Version!.BaseVersionSource!.When ? v1 : v2);
                     baseVersionWithOldestSource = oldest!.Version!;
                     maxVersion = oldest;
                     this.log.Info($"Found multiple base versions which will produce the same SemVer ({maxVersion.IncrementedVersion}), taking oldest source for commit counting ({baseVersionWithOldestSource!.Source})");