Merge pull request #9305 from NuGet/dev

[ReleasePrep][2022.11.09]RI of dev into main

Author: ryuyu

src/AccountDeleter/EmptyFeatureFlagService.cs

@@ -290,5 +290,10 @@ public bool ProxyGravatarEnSubdomain()
         {
             throw new NotImplementedException();
         }
+
+        public bool IsDisplayUploadWarningV2Enabled(User user)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs

@@ -130,6 +130,11 @@ public bool IsMarkdigMdSyntaxHighlightEnabled()
             throw new NotImplementedException();
         }
 
+        public bool IsDisplayUploadWarningV2Enabled(User user)
+        {
+            throw new NotImplementedException();
+        }
+
         public bool IsODataDatabaseReadOnlyEnabled()
         {
             throw new NotImplementedException();

src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj

@@ -94,9 +94,6 @@
       <Version>2.106.0</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Scripts\nssm.exe" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NuGet.Services.Entities\NuGet.Services.Entities.csproj">
       <Project>{6262f4fc-29be-4226-b676-db391c89d396}</Project>

src/NuGetGallery.Core/NuGetVersionExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Text.RegularExpressions;
+using NuGet.Services.Entities;
 using NuGet.Versioning;
 
 namespace NuGetGallery
@@ -31,6 +32,16 @@ public static string ToFullString(string version)
                 return version;
             }
         }
+
+        public static string GetNormalizedPackageVersion(Package package)
+        {
+            if (package == null)
+            {
+                return string.Empty;
+            }
+
+            return string.IsNullOrEmpty(package.NormalizedVersion) ? Normalize(package.Version) : package.NormalizedVersion;
+        }
     }
 
     public static class NuGetVersionExtensions

src/NuGetGallery.Core/Services/FIleNameHelper.cs

@@ -29,9 +29,8 @@ public  static string BuildFileName(Package package, string format, string exten
 
             return BuildFileName(
                 package.PackageRegistration.Id,
-                string.IsNullOrEmpty(package.NormalizedVersion) ?
-                    NuGetVersionFormatter.Normalize(package.Version) :
-                    package.NormalizedVersion, format, extension);
+                NuGetVersionFormatter.GetNormalizedPackageVersion(package),
+                format, extension);
         }
 
         public static string BuildFileName(string id, string version, string pathTemplate, string extension)

src/NuGetGallery.Services/Configuration/FeatureFlagService.cs

@@ -47,6 +47,7 @@ public class FeatureFlagService : IFeatureFlagService
         private const string LicenseMdRenderingFlightName = GalleryPrefix + "LicenseMdRendering";
         private const string MarkdigMdRenderingFlightName = GalleryPrefix + "MarkdigMdRendering";
         private const string MarkdigMdSyntaxHighlightFlightName = GalleryPrefix + "MarkdigMdSyntaxHighlight";
+        private const string DisplayUploadWarningV2FlightName = GalleryPrefix + "DisplayUploadWarningV2";
         private const string DeletePackageApiFlightName = GalleryPrefix + "DeletePackageApi";
         private const string ImageAllowlistFlightName = GalleryPrefix + "ImageAllowlist";
         private const string DisplayBannerFlightName = GalleryPrefix + "Banner";
@@ -341,6 +342,11 @@ public bool IsMarkdigMdSyntaxHighlightEnabled()
             return _client.IsEnabled(MarkdigMdSyntaxHighlightFlightName, defaultValue: false);
         }
 
+        public bool IsDisplayUploadWarningV2Enabled(User user)
+        {
+            return _client.IsEnabled(DisplayUploadWarningV2FlightName, user, defaultValue: false);
+        }
+
         public bool IsDeletePackageApiEnabled(User user)
         {
             return _client.IsEnabled(DeletePackageApiFlightName, user, defaultValue: false);

src/NuGetGallery.Services/Configuration/IFeatureFlagService.cs

@@ -268,6 +268,11 @@ public interface IFeatureFlagService
         /// </summary>
         bool IsMarkdigMdSyntaxHighlightEnabled();
 
+        /// <summary>
+        /// Whether the new warning of the verfiy metadata when upload package is enabled.
+        /// </summary>
+        bool IsDisplayUploadWarningV2Enabled(User user);
+
         /// <summary>
         /// Whether or not the user can delete a package through the API.
         /// </summary>

src/NuGetGallery.Services/SupportRequest/SupportRequestService.cs

@@ -201,7 +201,7 @@ public async Task<Issue> AddNewSupportRequestAsync(
                 newIssue.CreatedBy = loggedInUser;
                 newIssue.OwnerEmail = requestorEmailAddress;
                 newIssue.PackageId = package?.PackageRegistration.Id;
-                newIssue.PackageVersion = package?.Version;
+                newIssue.PackageVersion = NuGetVersionFormatter.GetNormalizedPackageVersion(package);
                 newIssue.Reason = reason;
                 newIssue.SiteRoot = _siteRoot;
                 newIssue.UserKey = user?.Key;

src/NuGetGallery/App_Data/Files/Content/flags.json

@@ -108,6 +108,12 @@
       "SiteAdmins": false,
       "Accounts": [],
       "Domains": []
+    },
+    "NuGetGallery.DisplayUploadWarningV2": {
+      "All": true,
+      "SiteAdmins": false,
+      "Accounts": [],
+      "Domains": []
     }
   }
 }

src/NuGetGallery/Controllers/OrganizationsController.cs

@@ -68,7 +68,7 @@ protected override Task SendNewAccountEmailAsync(User account)
             var message = new NewAccountMessage(
                 MessageServiceConfiguration,
                 account,
-                Url.ConfirmOrganizationEmail(account.Username, account.EmailConfirmationToken, relativeUrl: false));
+                Url.ConfirmOrganizationEmail(account.Username, account.EmailConfirmationToken, relativeUrl: false, supportEmail: true));
 
             return MessageService.SendMessageAsync(message);
         }
@@ -78,7 +78,7 @@ protected override Task SendEmailChangedConfirmationNoticeAsync(User account)
             var message = new EmailChangeConfirmationMessage(
                 MessageServiceConfiguration,
                 account,
-                Url.ConfirmOrganizationEmail(account.Username, account.EmailConfirmationToken, relativeUrl: false));
+                Url.ConfirmOrganizationEmail(account.Username, account.EmailConfirmationToken, relativeUrl: false, supportEmail: true));
 
             return MessageService.SendMessageAsync(message);
         }