Merge pull request #176 from AshleighAdams/fix-min-ver-with-post-release

Fixed min versions not working correctly with post releases

Author: AshleighAdams

src/Verlite.Core/VersionCalculator.cs

@@ -77,7 +77,24 @@ public static SemVer FromTagInfomation(SemVer? lastTag, VersionCalculationOption
 			bool directTag = height == 0;
 			if (directTag)
 			{
-				if (options.MinimumVersion > lastTag.Value.CoreVersion)
+				// check the tag is valid:
+				// min: 1.0.0, tag: 1.0.0-rc.1: allowed
+				// min: 1.0.0-rc.2, tag: 1.0.0-rc.1: not allowed
+				// min: 1.0.0+rev.2, tag: 1.0.0+rev.3: allowed
+				// min: 1.0.0+rev.2, tag: 1.0.0+rev.1: not allowed
+				// min: 1.0.0-rc.2+rev.2, tag: 1.0.0-rc.1+rev.3: not allowed
+				// min: 1.0.0-rc.2+rev.2, tag: 1.0.0-rc.2+rev.1: not allowed
+				SemVer targetVersion, minVersion;
+				if (options.MinimumVersion.Prerelease is not null)
+					(targetVersion, minVersion) = (lastTag.Value, options.MinimumVersion);
+				else
+				{
+					(targetVersion, minVersion) = (lastTag.Value, options.MinimumVersion);
+					if (targetVersion.CoreVersion > targetVersion) // allow prereleases to be considered a core release
+						targetVersion = targetVersion.CoreVersion;
+				}
+
+				if (targetVersion < options.MinimumVersion)
 					throw new VersionCalculationException($"Direct tag ({lastTag.Value}) destined version ({lastTag.Value.CoreVersion}) is below the minimum version ({options.MinimumVersion}).");
 
 				var directVersion = lastTag.Value;

tests/UnitTests/VersionTests.cs

@@ -95,6 +95,42 @@ public void CoreVersionFunctions()
 			new SemVer(2, 0, 0).CoreVersion.Should().Be(new SemVer(2, 0, 0));
 		}
 
+		[Fact]
+		public void CoreVersionFunctionsWithPostTag()
+		{
+			var opts = new VersionCalculationOptions()
+			{
+				MinimumVersion = SemVer.Parse("1.0.0+rev.12"),
+			};
+			var directTag = SemVer.Parse("1.0.0+rev.500");
+			var version = VersionCalculator.FromTagInfomation(directTag, opts, 0);
+			version.Should().Be(directTag);
+		}
+
+		[Fact]
+		public void PrereleaseVersionFunctionsWithPostTag()
+		{
+			var opts = new VersionCalculationOptions()
+			{
+				MinimumVersion = SemVer.Parse("1.0.0-rc.2+rev.12"),
+			};
+			var directTag = SemVer.Parse("1.0.0-rc.2+rev.500");
+			var version = VersionCalculator.FromTagInfomation(directTag, opts, 0);
+			version.Should().Be(directTag);
+		}
+
+		[Fact]
+		public void InvalidPrereleaseVersionThrowsWithPostTag()
+		{
+			var opts = new VersionCalculationOptions()
+			{
+				MinimumVersion = SemVer.Parse("1.0.0-rc.2+rev.12"),
+			};
+
+			Assert.Throws<VersionCalculationException>(() => VersionCalculator.FromTagInfomation(SemVer.Parse("1.0.0-rc.1+rev.501"), opts, 0));
+			Assert.Throws<VersionCalculationException>(() => VersionCalculator.FromTagInfomation(SemVer.Parse("1.0.0-rc.2+rev.1"), opts, 0));
+		}
+
 		[Fact]
 		[Obsolete("Function tested is obsolete.")]
 		public void DestinedVersionFunctions()