minor changes based on review

arturcic · arturcic · commit 6392cd90882b · 2021-01-19T17:12:49.000+02:00
diff --git a/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -27,7 +27,7 @@ public static class GitToolsTestingExtensions
         public static ICommit CreateMockCommit()
         {
             var objectId = Substitute.For<IObjectId>();
-            objectId.Sha.Returns(Guid.NewGuid().ToString().Replace("-", "") + "00000000");
+            objectId.Sha.Returns(Guid.NewGuid().ToString("n") + "00000000");
 
             var commit = Substitute.For<ICommit>();
             commit.Id.Returns(objectId);
diff --git a/src/GitVersionCore/Git/ReferenceName.cs b/src/GitVersionCore/Git/ReferenceName.cs
@@ -14,7 +14,7 @@ public class ReferenceName : IEquatable<ReferenceName>, IComparable<ReferenceNam
 
         public ReferenceName(string canonical)
         {
-            Canonical = canonical;
+            Canonical = canonical ?? throw new ArgumentNullException(nameof(canonical));
             Friendly = Shorten();
             WithoutRemote = RemoveRemote();
         }
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -29,7 +29,7 @@ public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalcula
 
         public SemanticVersion FindVersion()
         {
-            log.Info($"Running against branch: {context.CurrentBranch} ({(context.CurrentCommit != null ? context.CurrentCommit.ToString() : "-")})");
+            log.Info($"Running against branch: {context.CurrentBranch} ({context.CurrentCommit?.ToString() ?? "-"})");
             if (context.IsCurrentCommitTagged)
             {
                 log.Info($"Current commit is tagged with version {context.CurrentCommitTaggedVersion}, " +

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static class GitToolsTestingExtensions`
`27`	`27`	`public static ICommit CreateMockCommit()`
`28`	`28`	`{`
`29`	`29`	`var objectId = Substitute.For<IObjectId>();`
`30`		`- objectId.Sha.Returns(Guid.NewGuid().ToString().Replace("-", "") + "00000000");`
	`30`	`+ objectId.Sha.Returns(Guid.NewGuid().ToString("n") + "00000000");`
`31`	`31`
`32`	`32`	`var commit = Substitute.For<ICommit>();`
`33`	`33`	`commit.Id.Returns(objectId);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class ReferenceName : IEquatable<ReferenceName>, IComparable<ReferenceNam`
`14`	`14`
`15`	`15`	`public ReferenceName(string canonical)`
`16`	`16`	`{`
`17`		`- Canonical = canonical;`
	`17`	`+ Canonical = canonical ?? throw new ArgumentNullException(nameof(canonical));`
`18`	`18`	`Friendly = Shorten();`
`19`	`19`	`WithoutRemote = RemoveRemote();`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalcula`
`29`	`29`
`30`	`30`	`public SemanticVersion FindVersion()`
`31`	`31`	`{`
`32`		`- log.Info($"Running against branch: {context.CurrentBranch} ({(context.CurrentCommit != null ? context.CurrentCommit.ToString() : "-")})");`
	`32`	`+ log.Info($"Running against branch: {context.CurrentBranch} ({context.CurrentCommit?.ToString() ?? "-"})");`
`33`	`33`	`if (context.IsCurrentCommitTagged)`
`34`	`34`	`{`
`35`	`35`	`log.Info($"Current commit is tagged with version {context.CurrentCommitTaggedVersion}, " +`