#5068 Fix inconsistency in keeping track of NuGetVersion.OriginalVers…

…ion (#1329)
NuGet · Apr 25, 2017 · da863e0 · da863e0
1 parent a15fd84
commit da863e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/NuGet.Core/NuGet.Versioning/NuGetVersion.cs b/src/NuGet.Core/NuGet.Versioning/NuGetVersion.cs
@@ -28,7 +28,7 @@ public NuGetVersion(string version)
         /// Creates a NuGetVersion from an existing NuGetVersion
         /// </summary>
         public NuGetVersion(NuGetVersion version)
-            : this(version.Version, version.ReleaseLabels, version.Metadata, version.ToString())
+            : this(version.Version, version.ReleaseLabels, version.Metadata, version.OriginalVersion)
         {
         }
 

diff --git a/test/NuGet.Core.Tests/NuGet.Versioning.Test/NuGetVersionTest.cs b/test/NuGet.Core.Tests/NuGet.Versioning.Test/NuGetVersionTest.cs
@@ -246,7 +246,7 @@ public void SemVerEqualityComparisonsWorkForNullValues()
         [InlineData("1.0.0-b")]
         [InlineData("3.0.1.2")]
         [InlineData("2.1.4.3-pre-1")]
-        public void ToStringReturnsOriginalValue(string version)
+        public void ToStringReturnsOriginalValueForNonSemVer2(string version)
         {
             // Act
             var semVer = NuGetVersion.Parse(version);
@@ -288,6 +288,20 @@ public void ToStringConstructedFromVersionAndSpecialVersionConstructor(string ve
             Assert.Equal(expected, semVer.ToString());
         }
 
+        [Theory]
+        [InlineData("01.42.0")]
+        [InlineData("01.0")]
+        [InlineData("01.42.0-alpha")]
+        [InlineData("01.42.0-alpha.1")]
+        [InlineData("01.42.0-alpha+metadata")]
+        [InlineData("01.42.0+metadata")]
+        public void NuGetVersionKeepsOriginalVersionString(string originalVersion)
+        {
+            var version = new NuGetVersion(originalVersion);
+
+            Assert.Equal(originalVersion, version.OriginalVersion);
+        }
+
         [Theory]
         [InlineData("1.0", null, "1.0")]
         [InlineData("1.0.3.120", "", "1.0.3.120")]