Show full version on package details page (#3887)

NuGet · May 15, 2017 · 8354e23 · 8354e23
1 parent 837b9d3
commit 8354e23
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 16 deletions.
diff --git a/src/NuGetGallery.Core/Auditing/PackageAuditRecord.cs b/src/NuGetGallery.Core/Auditing/PackageAuditRecord.cs
@@ -49,7 +49,7 @@ public PackageAuditRecord(Package package, AuditedPackageAction action)
 
         public override string GetPath()
         {
-            return $"{Id}/{NuGetVersionNormalizer.Normalize(Version)}"
+            return $"{Id}/{NuGetVersionFormatter.Normalize(Version)}"
                 .ToLowerInvariant();
         }
     }

diff --git a/src/NuGetGallery.Core/NuGetVersionExtensions.cs b/src/NuGetGallery.Core/NuGetVersionExtensions.cs
@@ -7,7 +7,7 @@
 
 namespace NuGetGallery
 {
-    public static class NuGetVersionNormalizer
+    public static class NuGetVersionFormatter
     {
         public static string Normalize(string version)
         {
@@ -19,6 +19,19 @@ public static string Normalize(string version)
 
             return parsed.ToNormalizedString();
         }
+
+        public static string ToFullStringOrFallback(string version, string fallback = "")
+        {
+            NuGetVersion nugetVersion;
+            if (NuGetVersion.TryParse(version, out nugetVersion))
+            {
+                return nugetVersion.ToFullString();
+            }
+            else
+            {
+                return fallback;
+            }
+        }
     }
 
     public static class NuGetVersionExtensions

diff --git a/src/NuGetGallery/Controllers/ApiController.cs b/src/NuGetGallery/Controllers/ApiController.cs
@@ -136,7 +136,7 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)
                 }
 
                 // Normalize the version
-                version = NuGetVersionNormalizer.Normalize(version);
+                version = NuGetVersionFormatter.Normalize(version);
             }
             else
             {

diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -300,7 +300,7 @@ public virtual async Task<ActionResult> UploadPackage(HttpPostedFileBase uploadF
 
         public virtual async Task<ActionResult> DisplayPackage(string id, string version)
         {
-            string normalized = NuGetVersionNormalizer.Normalize(version);
+            string normalized = NuGetVersionFormatter.Normalize(version);
             if (!string.Equals(version, normalized))
             {
                 // Permanent redirect to the normalized one (to avoid multiple URLs for the same content)

diff --git a/src/NuGetGallery/Infrastructure/PackageIndexEntity.cs b/src/NuGetGallery/Infrastructure/PackageIndexEntity.cs
@@ -136,7 +136,7 @@ public Document ToDocument()
             document.Add(new Field("Version", Package.Version.ToStringSafe(), Field.Store.YES, Field.Index.NO));
 
             string normalizedVersion = String.IsNullOrEmpty(Package.NormalizedVersion) ? 
-                NuGetVersionNormalizer.Normalize(Package.Version) : 
+                NuGetVersionFormatter.Normalize(Package.Version) : 
                 Package.NormalizedVersion;
             document.Add(new Field("NormalizedVersion", normalizedVersion.ToStringSafe(), Field.Store.YES, Field.Index.NO));
 

diff --git a/src/NuGetGallery/OData/QueryInterceptors/NormalizeVersionInterceptor.cs b/src/NuGetGallery/OData/QueryInterceptors/NormalizeVersionInterceptor.cs
@@ -26,7 +26,7 @@ protected override Expression VisitBinary(BinaryExpression node)
                         // We have a "Package.Version == <constant>" expression!
 
                         // Transform the constant version into a normalized version
-                        string newVersion = NuGetVersionNormalizer.Normalize((string)constSide.Value);
+                        string newVersion = NuGetVersionFormatter.Normalize((string)constSide.Value);
 
                         // Create a new expression that checks the new constant against NormalizedVersion instead
                         return Expression.MakeBinary(

diff --git a/src/NuGetGallery/OData/SearchService/SearchHijacker.cs b/src/NuGetGallery/OData/SearchService/SearchHijacker.cs
@@ -216,7 +216,7 @@ private static Tuple<Target, string> ExtractComparison(BinaryExpression binExpr)
             }
             else if (memberSide.Member == VersionMember)
             {
-                return Tuple.Create(Target.Version, NuGetVersionNormalizer.Normalize((string)constSide.Value));
+                return Tuple.Create(Target.Version, NuGetVersionFormatter.Normalize((string)constSide.Value));
             }
             else if (memberSide.Member == IdMember)
             {

diff --git a/src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs b/src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs
@@ -25,7 +25,7 @@ public override void Annotate(HttpRequestMessage request, ODataEntry entry, obje
             }
 
             // Patch links to use normalized versions
-            var normalizedVersion = NuGetVersionNormalizer.Normalize(feedPackage.Version);
+            var normalizedVersion = NuGetVersionFormatter.Normalize(feedPackage.Version);
             NormalizeNavigationLinks(entry, request, feedPackage, normalizedVersion);
 
             // Set Atom entry metadata

diff --git a/src/NuGetGallery/Services/DownloadCountObjectMaterializedInterceptor.cs b/src/NuGetGallery/Services/DownloadCountObjectMaterializedInterceptor.cs
@@ -29,7 +29,7 @@ protected void InterceptPackageMaterialized(Package package)
             }
 
             var packageNormalizedVersion = String.IsNullOrEmpty(package.NormalizedVersion)
-                ? NuGetVersionNormalizer.Normalize(package.Version)
+                ? NuGetVersionFormatter.Normalize(package.Version)
                 : package.NormalizedVersion;
 
             int downloadCount;

diff --git a/src/NuGetGallery/Services/PackageFileService.cs b/src/NuGetGallery/Services/PackageFileService.cs
@@ -131,7 +131,7 @@ private static string BuildFileName(Package package)
             return BuildFileName(
                 package.PackageRegistration.Id, 
                 String.IsNullOrEmpty(package.NormalizedVersion) ?
-                    NuGetVersionNormalizer.Normalize(package.Version) :
+                    NuGetVersionFormatter.Normalize(package.Version) :
                     package.NormalizedVersion);
         }
 

diff --git a/src/NuGetGallery/Services/PackageService.cs b/src/NuGetGallery/Services/PackageService.cs
@@ -244,7 +244,7 @@ public virtual Package FindPackageByIdAndVersionStrict(string id, string version
                 throw new ArgumentException(nameof(version));
             }
 
-            var normalizedVersion = NuGetVersionNormalizer.Normalize(version);
+            var normalizedVersion = NuGetVersionFormatter.Normalize(version);
 
             // These string comparisons are case-(in)sensitive depending on SQLServer collation.
             // Case-insensitive collation is recommended, e.g. SQL_Latin1_General_CP1_CI_AS.

diff --git a/src/NuGetGallery/ViewModels/PackageViewModel.cs b/src/NuGetGallery/ViewModels/PackageViewModel.cs
@@ -3,20 +3,26 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using NuGet.Versioning;
 
 namespace NuGetGallery
 {
     public class PackageViewModel : IPackageVersionModel
     {
         private readonly Package _package;
         private string _pendingTitle;
+        private string _fullVersion;
 
         public PackageViewModel(Package package)
         {
             _package = package;
+
+            _fullVersion = NuGetVersionFormatter.ToFullStringOrFallback(package.Version, fallback: package.Version);
+
             Version = String.IsNullOrEmpty(package.NormalizedVersion) ?
-                NuGetVersionNormalizer.Normalize(package.Version) :
+                NuGetVersionFormatter.Normalize(package.Version) :
                 package.NormalizedVersion;
+
             Description = package.Description;
             ReleaseNotes = package.ReleaseNotes;
             IconUrl = package.IconUrl;
@@ -40,6 +46,7 @@ public PackageViewModel(Package package)
                 LicenseNames = licenseNames.Split(',').Select(l => l.Trim());
             }
         }
+
         public string Description { get; set; }
         public string ReleaseNotes { get; set; }
         public string IconUrl { get; set; }
@@ -69,6 +76,7 @@ public string Id
         }
 
         public string Version { get; set; }
+        public string FullVersion => _fullVersion;
 
         public string Title
         {

diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -219,7 +219,7 @@
 
     <div class="package-page-heading">
         <h1 title="@Model.Title">@Model.Title.Abbreviate(40)</h1>
-        <h2>@Model.Version</h2>
+        <h2>@Model.FullVersion</h2>
     </div>
     @foreach (var line in Model.Description.ToStringSafe().Split('\n'))
     {
@@ -354,7 +354,7 @@
                         <td class="version" title="@cellTitle">
                             @if (!packageVersion.IsCurrent(Model))
                             {
-                                <a title="@packageVersion.Title @packageVersion.Version" href="@Url.Package(packageVersion) ">
+                                <a title="@packageVersion.Title @packageVersion.FullVersion" href="@Url.Package(packageVersion) ">
                                     @packageVersion.Title.Abbreviate(20)
                                     @packageVersion.Version
                                     @if (packageVersion.LatestStableVersion)
@@ -365,7 +365,7 @@
                             }
                             else
                             {
-                                <a href="@Url.Package(packageVersion)" title="@packageVersion.Title @packageVersion.Version (this version)">
+                                <a href="@Url.Package(packageVersion)" title="@packageVersion.Title @packageVersion.FullVersion (this version)">
                                     @packageVersion.Title.Abbreviate(20) @packageVersion.Version (this version)
                                 </a>
                             }

diff --git a/tests/NuGetGallery.Facts/Services/PackageFileServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageFileServiceFacts.cs
@@ -439,7 +439,7 @@ static string BuildFileName(
             return string.Format(
                 Constants.PackageFileSavePathTemplate,
                 id.ToLowerInvariant(),
-                NuGetVersionNormalizer.Normalize(version).ToLowerInvariant(), // No matter what ends up getting passed in, the version should be normalized
+                NuGetVersionFormatter.Normalize(version).ToLowerInvariant(), // No matter what ends up getting passed in, the version should be normalized
                 Constants.NuGetPackageFileExtension);
         }