diff --git a/AcceptanceTests/MsBuildProjectArgTest.cs b/AcceptanceTests/MsBuildProjectArgTest.cs
index 202df096ab..cd142e7f81 100644
--- a/AcceptanceTests/MsBuildProjectArgTest.cs
+++ b/AcceptanceTests/MsBuildProjectArgTest.cs
@@ -1,6 +1,4 @@
-
-
-namespace GitHubFlowVersion.AcceptanceTests
+namespace GitHubFlowVersion.AcceptanceTests
{
using System.IO;
using global::AcceptanceTests;
@@ -11,7 +9,6 @@ namespace GitHubFlowVersion.AcceptanceTests
public class MsBuildProjectArgTest
{
-
[Fact]
public void RunsMsBuildProvideViaCommandLineArg()
{
@@ -25,7 +22,7 @@ public void RunsMsBuildProvideViaCommandLineArg()
var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, projectFile: "TestBuildFile.proj", projectArgs: "/target:OutputResults");
result.ExitCode.ShouldBe(0);
- result.Log.ShouldContain("FullSemVer: 1.2.4+0");
+ result.Log.ShouldContain("FullSemVer: 1.2.3+0");
}
}
}
diff --git a/GitVersionCore/GitHubFlow/NextSemverCalculator.cs b/GitVersionCore/GitHubFlow/NextSemverCalculator.cs
index 47c46998c7..02f0bda892 100644
--- a/GitVersionCore/GitHubFlow/NextSemverCalculator.cs
+++ b/GitVersionCore/GitHubFlow/NextSemverCalculator.cs
@@ -25,16 +25,16 @@ public NextSemverCalculator(
public SemanticVersion NextVersion()
{
var versionZero = new SemanticVersion();
- var lastRelease = lastTaggedReleaseFinder.GetVersion().SemVer;
+ var lastRelease = lastTaggedReleaseFinder.GetVersion();
var fileVersion = nextVersionTxtFileFinder.GetNextVersion();
var mergedBranchVersion = mergedBranchesWithVersionFinder.GetVersion();
var otherBranchVersion = unknownBranchFinder.FindVersion(context);
if (otherBranchVersion != null && otherBranchVersion.PreReleaseTag != null && otherBranchVersion.PreReleaseTag.Name == "release")
otherBranchVersion.PreReleaseTag.Name = "beta";
- var maxCalculated = new[]{ fileVersion, otherBranchVersion, mergedBranchVersion }.Max();
+ var maxCalculated = new[] { fileVersion, otherBranchVersion, mergedBranchVersion }.Max();
- if (lastRelease == versionZero && maxCalculated == versionZero)
+ if (lastRelease.SemVer == versionZero && maxCalculated == versionZero)
{
return new SemanticVersion
{
@@ -42,13 +42,18 @@ public SemanticVersion NextVersion()
};
}
- if (maxCalculated <= lastRelease)
+ if (string.Equals(context.CurrentCommit.Sha, lastRelease.Commit.Sha))
+ {
+ return lastRelease.SemVer;
+ }
+
+ if (maxCalculated <= lastRelease.SemVer)
{
return new SemanticVersion
{
- Major = lastRelease.Major,
- Minor = lastRelease.Minor,
- Patch = lastRelease.Patch + 1
+ Major = lastRelease.SemVer.Major,
+ Minor = lastRelease.SemVer.Minor,
+ Patch = lastRelease.SemVer.Patch + 1
};
}
diff --git a/GitVersionCore/GitVersionCore.csproj b/GitVersionCore/GitVersionCore.csproj
index a723a5a53a..c4e033bbaa 100644
--- a/GitVersionCore/GitVersionCore.csproj
+++ b/GitVersionCore/GitVersionCore.csproj
@@ -49,8 +49,7 @@
- ..\packages\Visualize.Fody.0.3.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll
- False
+ ..\packages\Visualize.Fody.0.4.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll