touch-ups

Author: AArnott

src/NerdBank.GitVersioning/ReleaseManager.cs

@@ -104,6 +104,12 @@ public enum ReleaseManagerOutputMode
         Json = 1,
     }
 
+    public void WriteToOutput(ReleaseInfo releaseInfo)
+    {
+        string json = JsonConvert.SerializeObject(releaseInfo, Formatting.Indented, new SemanticVersionJsonConverter());
+        this.stdout.WriteLine(json);
+    }
+
     /// <summary>
     /// Prepares a release for the specified directory by creating a release branch and incrementing the version in the current branch.
     /// </summary>
@@ -142,6 +148,24 @@ public ReleaseInfo PrepareRelease(string projectDirectory, string releaseUnstabl
         return this.PrepareReleaseCore(projectDirectory, releaseUnstableTag, nextVersion, versionIncrement, outputMode, unformattedCommitMessage, whatIf);
     }
 
+    private static bool IsVersionDecrement(SemanticVersion oldVersion, SemanticVersion newVersion)
+    {
+        if (newVersion.Version > oldVersion.Version)
+        {
+            return false;
+        }
+        else if (newVersion.Version == oldVersion.Version)
+        {
+            return string.IsNullOrEmpty(oldVersion.Prerelease) &&
+                  !string.IsNullOrEmpty(newVersion.Prerelease);
+        }
+        else
+        {
+            // newVersion.Version < oldVersion.Version
+            return true;
+        }
+    }
+
     /// <summary>
     /// Core implementation of prepare-release functionality that can either simulate or execute the operation.
     /// </summary>
@@ -252,18 +276,10 @@ private ReleaseInfo PrepareReleaseCore(string projectDirectory, string releaseUn
             throw new ReleasePreparationException(ReleasePreparationError.BranchAlreadyExists);
         }
 
-        if (outputMode == ReleaseManagerOutputMode.Text)
+        if (outputMode == ReleaseManagerOutputMode.Text && whatIf)
         {
-            if (whatIf)
-            {
-                this.stdout.WriteLine($"What-if: {releaseBranchName} branch would track v{releaseVersion} stabilization and release.");
-                this.stdout.WriteLine($"What-if: {originalBranchName} branch would track v{nextDevVersion} development.");
-            }
-            else
-            {
-                this.stdout.WriteLine($"{releaseBranchName} branch now tracks v{releaseVersion} stabilization and release.");
-                this.stdout.WriteLine($"{originalBranchName} branch now tracks v{nextDevVersion} development.");
-            }
+            this.stdout.WriteLine($"What-if: {releaseBranchName} branch would track v{releaseVersion} stabilization and release.");
+            this.stdout.WriteLine($"What-if: {originalBranchName} branch would track v{nextDevVersion} development.");
         }
 
         var originalBranchInfo = new ReleaseBranchInfo(originalBranchName, repository.Head.Tip.Sha, nextDevVersion);
@@ -280,10 +296,20 @@ private ReleaseInfo PrepareReleaseCore(string projectDirectory, string releaseUn
         global::LibGit2Sharp.Commands.Checkout(repository, releaseBranch);
         this.UpdateVersion(context, versionOptions.Version, releaseVersion, unformattedCommitMessage);
 
+        if (outputMode == ReleaseManagerOutputMode.Text)
+        {
+            this.stdout.WriteLine($"{releaseBranchName} branch now tracks v{releaseVersion} stabilization and release.");
+        }
+
         // update version on main branch
         global::LibGit2Sharp.Commands.Checkout(repository, originalBranchName);
         this.UpdateVersion(context, versionOptions.Version, nextDevVersion, unformattedCommitMessage);
 
+        if (outputMode == ReleaseManagerOutputMode.Text)
+        {
+            this.stdout.WriteLine($"{originalBranchName} branch now tracks v{nextDevVersion} development.");
+        }
+
         // Merge release branch back to main branch
         var mergeOptions = new MergeOptions()
         {
@@ -298,37 +324,13 @@ private ReleaseInfo PrepareReleaseCore(string projectDirectory, string releaseUn
             var finalOriginalBranchInfo = new ReleaseBranchInfo(originalBranchName, repository.Head.Tip.Sha, nextDevVersion);
             var finalReleaseBranchInfo = new ReleaseBranchInfo(releaseBranchName, repository.Branches[releaseBranchName].Tip.Id.ToString(), releaseVersion);
             var finalReleaseInfo = new ReleaseInfo(finalOriginalBranchInfo, finalReleaseBranchInfo);
-            
+
             this.WriteToOutput(finalReleaseInfo);
         }
 
         return null;
     }
 
-    public void WriteToOutput(ReleaseInfo releaseInfo)
-    {
-        string json = JsonConvert.SerializeObject(releaseInfo, Formatting.Indented, new SemanticVersionJsonConverter());
-        this.stdout.WriteLine(json);
-    }
-
-    private static bool IsVersionDecrement(SemanticVersion oldVersion, SemanticVersion newVersion)
-    {
-        if (newVersion.Version > oldVersion.Version)
-        {
-            return false;
-        }
-        else if (newVersion.Version == oldVersion.Version)
-        {
-            return string.IsNullOrEmpty(oldVersion.Prerelease) &&
-                  !string.IsNullOrEmpty(newVersion.Prerelease);
-        }
-        else
-        {
-            // newVersion.Version < oldVersion.Version
-            return true;
-        }
-    }
-
     private string GetReleaseBranchName(VersionOptions versionOptions)
     {
         Requires.NotNull(versionOptions, nameof(versionOptions));

test/Nerdbank.GitVersioning.Tests/ReleaseManagerTests.cs

@@ -703,19 +703,6 @@ public void PrepareRelease_WithCustomCommitMessagePattern(string initialVersion,
         Assert.Equal(expectedCommitMessage, releaseBranchCommit.MessageShort);
     }
 
-    /// <inheritdoc/>
-    protected override void InitializeSourceControl(bool withInitialCommit = true)
-    {
-        base.InitializeSourceControl(withInitialCommit);
-        this.Ignore_git2_UntrackedFile();
-    }
-
-    private void AssertError(Action testCode, ReleasePreparationError expectedError)
-    {
-        ReleasePreparationException ex = Assert.Throws<ReleasePreparationException>(testCode);
-        Assert.Equal(expectedError, ex.Error);
-    }
-
     [Fact]
     public void SimulatePrepareRelease_BasicScenario()
     {
@@ -876,4 +863,17 @@ public void SimulatePrepareRelease_OnReleaseBranch()
         // When on release branch, no new branch is created
         Assert.Null(result.NewBranch);
     }
+
+    /// <inheritdoc/>
+    protected override void InitializeSourceControl(bool withInitialCommit = true)
+    {
+        base.InitializeSourceControl(withInitialCommit);
+        this.Ignore_git2_UntrackedFile();
+    }
+
+    private void AssertError(Action testCode, ReleasePreparationError expectedError)
+    {
+        ReleasePreparationException ex = Assert.Throws<ReleasePreparationException>(testCode);
+        Assert.Equal(expectedError, ex.Error);
+    }
 }