Skip to content

Commit ac65151

Browse files
authored
make support request issues prioritize normalized version (#9285)
1 parent 502039e commit ac65151

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

src/NuGetGallery.Core/NuGetVersionExtensions.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Text.RegularExpressions;
5+
using NuGet.Services.Entities;
56
using NuGet.Versioning;
67

78
namespace NuGetGallery
@@ -31,6 +32,16 @@ public static string ToFullString(string version)
3132
return version;
3233
}
3334
}
35+
36+
public static string GetNormalizedPackageVersion(Package package)
37+
{
38+
if (package == null)
39+
{
40+
return string.Empty;
41+
}
42+
43+
return string.IsNullOrEmpty(package.NormalizedVersion) ? Normalize(package.Version) : package.NormalizedVersion;
44+
}
3445
}
3546

3647
public static class NuGetVersionExtensions

src/NuGetGallery.Core/Services/FIleNameHelper.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ public static string BuildFileName(Package package, string format, string exten
2929

3030
return BuildFileName(
3131
package.PackageRegistration.Id,
32-
string.IsNullOrEmpty(package.NormalizedVersion) ?
33-
NuGetVersionFormatter.Normalize(package.Version) :
34-
package.NormalizedVersion, format, extension);
32+
NuGetVersionFormatter.GetNormalizedPackageVersion(package),
33+
format, extension);
3534
}
3635

3736
public static string BuildFileName(string id, string version, string pathTemplate, string extension)

src/NuGetGallery.Services/SupportRequest/SupportRequestService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public async Task<Issue> AddNewSupportRequestAsync(
201201
newIssue.CreatedBy = loggedInUser;
202202
newIssue.OwnerEmail = requestorEmailAddress;
203203
newIssue.PackageId = package?.PackageRegistration.Id;
204-
newIssue.PackageVersion = package?.Version;
204+
newIssue.PackageVersion = NuGetVersionFormatter.GetNormalizedPackageVersion(package);
205205
newIssue.Reason = reason;
206206
newIssue.SiteRoot = _siteRoot;
207207
newIssue.UserKey = user?.Key;

0 commit comments

Comments
 (0)