Integrate code review remarks

HHobeck · HHobeck · commit 51558de42264 · 2023-12-18T14:33:39.000+01:00
diff --git a/src/GitVersion.Core/Extensions/VersionFieldExtensions.cs b/src/GitVersion.Core/Extensions/VersionFieldExtensions.cs
@@ -1,4 +1,4 @@
-namespace GitVersion;
+namespace GitVersion.Extensions;
 
 internal static class VersionFieldExtensions
 {
diff --git a/src/GitVersion.Core/Git/ICommit.cs b/src/GitVersion.Core/Git/ICommit.cs
@@ -2,8 +2,7 @@ namespace GitVersion;
 
 public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>, IGitObject
 {
-    public bool IsMergeCommit => Parents.Count() >= 2;
-
+    bool IsMergeCommit => Parents.Count() >= 2;
     IEnumerable<ICommit> Parents { get; }
     DateTimeOffset When { get; }
     string Message { get; }
diff --git a/src/GitVersion.Core/MergeMessage.cs b/src/GitVersion.Core/MergeMessage.cs
@@ -96,7 +96,7 @@ private ReferenceName GetMergedBranchName(string mergedBranch)
     }
 
     public static bool TryParse(
-        [NotNullWhen(true)] out MergeMessage? mergeMessage, ICommit mergeCommit, IGitVersionConfiguration configuration)
+        ICommit mergeCommit, IGitVersionConfiguration configuration, [NotNullWhen(true)] out MergeMessage? mergeMessage)
     {
         mergeCommit.NotNull();
         configuration.NotNull();
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -854,7 +854,7 @@ static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! lo
 static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object![]! args) -> void
 static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, string! format, params object![]! args) -> void
 static GitVersion.Logging.LogExtensions.Write(this GitVersion.Logging.ILog! log, GitVersion.Logging.LogLevel level, string! format, params object![]! args) -> void
-static GitVersion.MergeMessage.TryParse(out GitVersion.MergeMessage? mergeMessage, GitVersion.ICommit! mergeCommit, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> bool
+static GitVersion.MergeMessage.TryParse(GitVersion.ICommit! mergeCommit, GitVersion.Configuration.IGitVersionConfiguration! configuration, out GitVersion.MergeMessage? mergeMessage) -> bool
 static GitVersion.ReferenceName.FromBranchName(string! branchName) -> GitVersion.ReferenceName!
 static GitVersion.ReferenceName.Parse(string! canonicalName) -> GitVersion.ReferenceName!
 static GitVersion.ReferenceName.TryParse(out GitVersion.ReferenceName? value, string! canonicalName) -> bool
diff --git a/src/GitVersion.Core/SemVer/SemanticVersion.cs b/src/GitVersion.Core/SemVer/SemanticVersion.cs
@@ -33,7 +33,7 @@ public class SemanticVersion : IFormattable, IComparable<SemanticVersion>, IEqua
     public bool IsLabeledWith(string value) => PreReleaseTag.HasTag() && PreReleaseTag.Name.IsEquivalentTo(value);
 
     public bool IsMatchForBranchSpecificLabel(string? value)
-        => (PreReleaseTag.Name == string.Empty && PreReleaseTag.Number is null) || value is null || IsLabeledWith(value);
+        => (PreReleaseTag.Name.Length == 0 && PreReleaseTag.Number is null) || value is null || IsLabeledWith(value);
 
     public SemanticVersion(long major = 0, long minor = 0, long patch = 0)
     {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace GitVersion;`
	`1`	`+namespace GitVersion.Extensions;`
`2`	`2`
`3`	`3`	`internal static class VersionFieldExtensions`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@ namespace GitVersion;`
`2`	`2`
`3`	`3`	`public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>, IGitObject`
`4`	`4`	`{`
`5`		`- public bool IsMergeCommit => Parents.Count() >= 2;`
`6`		`-`
	`5`	`+ bool IsMergeCommit => Parents.Count() >= 2;`
`7`	`6`	`IEnumerable<ICommit> Parents { get; }`
`8`	`7`	`DateTimeOffset When { get; }`
`9`	`8`	`string Message { get; }`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private ReferenceName GetMergedBranchName(string mergedBranch)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public static bool TryParse(`
`99`		`- [NotNullWhen(true)] out MergeMessage? mergeMessage, ICommit mergeCommit, IGitVersionConfiguration configuration)`
	`99`	`+ ICommit mergeCommit, IGitVersionConfiguration configuration, [NotNullWhen(true)] out MergeMessage? mergeMessage)`
`100`	`100`	`{`
`101`	`101`	`mergeCommit.NotNull();`
`102`	`102`	`configuration.NotNull();`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class SemanticVersion : IFormattable, IComparable<SemanticVersion>, IEqua`
`33`	`33`	`public bool IsLabeledWith(string value) => PreReleaseTag.HasTag() && PreReleaseTag.Name.IsEquivalentTo(value);`
`34`	`34`
`35`	`35`	`public bool IsMatchForBranchSpecificLabel(string? value)`
`36`		`- => (PreReleaseTag.Name == string.Empty && PreReleaseTag.Number is null) \|\| value is null \|\| IsLabeledWith(value);`
	`36`	`+ => (PreReleaseTag.Name.Length == 0 && PreReleaseTag.Number is null) \|\| value is null \|\| IsLabeledWith(value);`
`37`	`37`
`38`	`38`	`public SemanticVersion(long major = 0, long minor = 0, long patch = 0)`
`39`	`39`	`{`