From 59e4d767f39c68e34c66bec1b9369794ef8bab7f Mon Sep 17 00:00:00 2001
From: Abudinka <58987278+Abudinka@users.noreply.github.com>
Date: Sat, 1 Oct 2022 04:18:15 +0200
Subject: [PATCH] fix: bump message shows same version for prev and next Issue
 #78  (#81)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: moved bump statement up before csproj are altered

* test: add test to validate fix #81

Co-authored-by: Christian Günther <christian.guenther@photon-energy.de>
Co-authored-by: cabauman <cab452005@gmail.com>
---
 Versionize.Tests/WorkingCopyTests.cs | 19 +++++++++++++++++++
 Versionize/WorkingCopy.cs            |  5 +++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Versionize.Tests/WorkingCopyTests.cs b/Versionize.Tests/WorkingCopyTests.cs
index 66b1f87..4c17af2 100644
--- a/Versionize.Tests/WorkingCopyTests.cs
+++ b/Versionize.Tests/WorkingCopyTests.cs
@@ -443,6 +443,25 @@ public void ShouldAggregatePrereleases()
         Assert.Equal(sb.Build(), changelogContents);
     }
 
+    [Fact]
+    public void ShouldDisplayExpectedMessage_BumpingVersionFromXToY()
+    {
+        TempProject.CreateCsharpProject(_testSetup.WorkingDirectory, "1.0.0");
+        var workingCopy = WorkingCopy.Discover(_testSetup.WorkingDirectory);
+
+        var fileCommitter = new FileCommitter(_testSetup);
+
+        // Release an initial version
+        fileCommitter.CommitChange("feat: initial commit");
+        workingCopy.Versionize(new VersionizeOptions());
+
+        // Patch release
+        fileCommitter.CommitChange("fix: a fix");
+        workingCopy.Versionize(new VersionizeOptions());
+
+        _testPlatformAbstractions.Messages.ShouldContain("√ bumping version from 1.0.0 to 1.0.1 in projects");
+    }
+
     private IEnumerable<string> VersionTagNames
     {
         get { return _testSetup.Repository.Tags.Select(t => t.FriendlyName); }
diff --git a/Versionize/WorkingCopy.cs b/Versionize/WorkingCopy.cs
index f9aa73d..d260dfe 100644
--- a/Versionize/WorkingCopy.cs
+++ b/Versionize/WorkingCopy.cs
@@ -136,6 +136,9 @@ public SemanticVersion Versionize(VersionizeOptions options)
 
         var versionTime = DateTimeOffset.Now;
 
+
+        Step($"bumping version from {projects.Version} to {nextVersion} in projects");
+       
         // Commit changelog and version source
         if (!options.DryRun && (nextVersion != projects.Version))
         {
@@ -147,8 +150,6 @@ public SemanticVersion Versionize(VersionizeOptions options)
             }
         }
 
-        Step($"bumping version from {projects.Version} to {nextVersion} in projects");
-
         var changelog = ChangelogBuilder.CreateForPath(workingDirectory);
         var changelogLinkBuilder = LinkBuilderFactory.CreateFor(repo);