Merge branch "dev" into main

.eslintignore

@@ -5,4 +5,4 @@
 # on specific relative paths.
 **/Scripts/gallery/jquery-3.4.1.js
 **/Scripts/gallery/knockout-3.5.1.js
-**/Scripts/gallery/moment-2.29.2.js
+**/Scripts/gallery/moment-2.29.4.js

src/NuGetGallery/App_Start/AppActivator.cs

@@ -134,7 +134,7 @@ private static void BundlingPostStart()
                 .Include("~/Scripts/gallery/jquery.validate.unobtrusive-3.2.6.js")
                 .Include("~/Scripts/gallery/knockout-3.5.1.js")
                 .Include("~/Scripts/gallery/bootstrap.js")
-                .Include("~/Scripts/gallery/moment-2.29.2.js")
+                .Include("~/Scripts/gallery/moment-2.29.4.js")
                 .Include("~/Scripts/gallery/common.js")
                 .Include("~/Scripts/gallery/autocomplete.js");
             BundleTable.Bundles.Add(scriptBundle);

src/NuGetGallery/NuGetGallery.csproj

@@ -1706,6 +1706,7 @@
     <Content Include="App_Data\Files\Content\Symbols-Configuration.json" />
     <Content Include="Scripts\gallery\instrumentation.js" />
     <Content Include="Scripts\gallery\knockout-3.5.1.js" />
+    <Content Include="Scripts\gallery\moment-2.29.4.js" />
     <Content Include="Scripts\gallery\page-list-packages.js" />
     <Content Include="Scripts\gallery\syntaxhighlight.js" />
     <Content Include="Views\Shared\SiteMenu.cshtml">
@@ -1863,7 +1864,6 @@
     <Content Include="Scripts\gallery\jquery.validate.unobtrusive-3.2.6.js" />
     <Content Include="Scripts\gallery\knockout-projections.js" />
     <Content Include="Scripts\gallery\md5.js" />
-    <Content Include="Scripts\gallery\moment-2.29.2.js" />
     <Content Include="Scripts\gallery\page-about.js" />
     <Content Include="Scripts\gallery\page-account.js" />
     <Content Include="Scripts\gallery\page-add-organization.js" />
@@ -2271,7 +2271,7 @@
       <Version>2.8.3</Version>
     </PackageReference>
     <PackageReference Include="Moment.js">
-      <Version>2.29.2</Version>
+      <Version>2.29.4</Version>
     </PackageReference>
     <PackageReference Include="MvcTreeView">
       <Version>1.4.0</Version>

src/NuGetGallery/Scripts/gallery/moment-2.29.2.js → src/NuGetGallery/Scripts/gallery/moment-2.29.4.js

@@ -1,5 +1,5 @@
 //! moment.js
-//! version : 2.29.2
+//! version : 2.29.4
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
@@ -2454,7 +2454,7 @@
     function preprocessRFC2822(s) {
         // Remove comments and folding whitespace and replace multiple-spaces with a single space
         return s
-            .replace(/\([^)]*\)|[\n\t]/g, ' ')
+            .replace(/\([^()]*\)|[\n\t]/g, ' ')
             .replace(/(\s\s+)/g, ' ')
             .replace(/^\s\s*/, '')
             .replace(/\s\s*$/, '');
@@ -5635,7 +5635,7 @@
 
     //! moment.js
 
-    hooks.version = '2.29.2';
+    hooks.version = '2.29.4';
 
     setHookCallback(createLocal);
 

src/NuGetGallery/Services/MarkdownService.cs

@@ -208,6 +208,7 @@ private RenderedMarkdownResult GetHtmlFromMarkdownMarkdig(string markdownString,
                 .UseEmojiAndSmiley()
                 .UseAutoLinks()
                 .UseReferralLinks("noopener noreferrer nofollow")
+                .UseAutoIdentifiers()
                 .UseEmphasisExtras(EmphasisExtraOptions.Strikethrough)
                 .DisableHtml() //block inline html
                 .UseBootstrap()
@@ -267,7 +268,10 @@ private RenderedMarkdownResult GetHtmlFromMarkdownMarkdig(string markdownString,
                                 // Allow only http or https links in markdown. Transform link to https for known domains.
                                 if (!PackageHelper.TryPrepareUrlForRendering(linkInline.Url, out string readyUriString))
                                 {
-                                    linkInline.Url = string.Empty;
+                                    if (!linkInline.Url.StartsWith("#")) //allow internal section links
+                                    {
+                                        linkInline.Url = string.Empty;
+                                    }
                                 }
                                 else
                                 {

src/NuGetGallery/Views/Organizations/DeleteAccount.cshtml

@@ -15,7 +15,7 @@
                 @<text>Delete</text>)
 
             @ViewHelpers.AlertWarning(@<text><strong class="keywords">Important</strong>
-                Once your organization is deleted you cannot undo it. <a href="https://go.microsoft.com/fwlink/?linkid=862770">Read more.</a>
+                Once your organization is deleted you cannot undo it. <b>The organization name will be reserved and it will not be able to be reused.</b> <a href="https://go.microsoft.com/fwlink/?linkid=862770">Read more.</a>
                 </text>)
             <p>
                 When your organization is deleted we will:<br />

src/NuGetGallery/Views/Packages/DisplayPackage.cshtml

@@ -86,7 +86,10 @@
             {
                 Id = "package-manager",
                 CommandPrefix = "PM> ",
-                InstallPackageCommands = new [] { string.Format("Install-Package {0} -Version {1}", Model.Id, Model.Version) },
+                InstallPackageCommands = new [] { string.Format("NuGet\\Install-Package {0} -Version {1}", Model.Id, Model.Version) },
+                AlertLevel = AlertLevel.Info,
+                AlertMessage = "This command is intended to be used within the Package Manager Console in Visual Studio, as it uses the NuGet module's version of <a href='https://docs.microsoft.com/en-us/nuget/reference/ps-reference/ps-ref-install-package'>Install-Package</a>."
+
             },
 
             new PackageManagerViewModel(".NET CLI")
@@ -208,7 +211,7 @@
                 @ViewHelpers.AlertWarning(
                     @<text>
                         @Html.Raw(packageManager.AlertMessage)
-                    </text>);
+                    </text>, true);
                 break;
             default:
                 break;
@@ -1342,14 +1345,14 @@
 
     @if (Model.IsMarkdigMdSyntaxHighlightEnabled) 
     { 
-        @ViewHelpers.IncludeSyntaxHighlightScript();
-
-        <script>
-        document.addEventListener('DOMContentLoaded', (event) => {
-            document.querySelectorAll('pre code').forEach((el) => {
-                hljs.highlightElement(el);
-            });
-        });
+        @ViewHelpers.IncludeSyntaxHighlightScript();
+
+        <script>
+        document.addEventListener('DOMContentLoaded', (event) => {
+            document.querySelectorAll('pre code').forEach((el) => {
+                hljs.highlightElement(el);
+            });
+        });
         </script>
     }
 

src/NuGetGallery/Views/Users/DeleteAccount.cshtml

@@ -26,12 +26,12 @@
                 else
                 {
                     @ViewHelpers.AlertWarning(@<text><strong class="keywords">Important</strong>
-                        Once your account is deleted you cannot undo it. <a href="https://go.microsoft.com/fwlink/?linkid=862770">Read more.</a>
+                        Once your account is deleted you cannot undo it. <b>The account name will be reserved and it will not be able to be reused.</b> <a href="https://go.microsoft.com/fwlink/?linkid=862770">Read more.</a>
                     </text>)
                     <p>
                         When you account is deleted we will:<br />
                         <ul>
-                            <li>Revoke your api key(s).</li>
+                            <li>Revoke your API key(s).</li>
                             <li>Remove you as the owner for any packages you own.</li>
                             <li>Remove your ownership from any ID prefix reservations and delete any ID prefix reservations that you were the only owner of.</li>
                             <li>Remove you from any organizations that you are a member of.</li>

tests/NuGetGallery.Facts/Services/MarkdownServiceFacts.cs

@@ -54,15 +54,15 @@ public void EncodesHtmlInMarkdown(string originalMd, string expectedHtml, bool i
             }
 
             [Theory]
-            [InlineData("# Heading", "<h1>Heading</h1>", true, 0)]
+            [InlineData("# Heading", "<h1 id=\"heading\">Heading</h1>", true, 0)]
             [InlineData("# Heading", "<h1>Heading</h1>", false, 0)]
-            [InlineData("# Heading", "<h2>Heading</h2>", true, 1)]
+            [InlineData("# Heading", "<h2 id=\"heading\">Heading</h2>", true, 1)]
             [InlineData("# Heading", "<h2>Heading</h2>", false, 1)]
-            [InlineData("# Heading", "<h6>Heading</h6>", true, 6)]
+            [InlineData("# Heading", "<h6 id=\"heading\">Heading</h6>", true, 6)]
             [InlineData("# Heading", "<h6>Heading</h6>", false, 6)]
-            [InlineData("# Heading", "<h6>Heading</h6>", true, 7)]
+            [InlineData("# Heading", "<h6 id=\"heading\">Heading</h6>", true, 7)]
             [InlineData("# Heading", "<h6>Heading</h6>", false, 7)]
-            [InlineData("# Heading", "<h6>Heading</h6>", true, 5)]
+            [InlineData("# Heading", "<h6 id=\"heading\">Heading</h6>", true, 5)]
             [InlineData("# Heading", "<h6>Heading</h6>", false, 5)]
             public void EncodesHtmlInMarkdownWithAdaptiveHeader(string originalMd, string expectedHtml, bool isMarkdigMdRenderingEnabled, int incrementHeadersBy)
             {
@@ -71,11 +71,11 @@ public void EncodesHtmlInMarkdownWithAdaptiveHeader(string originalMd, string ex
             }
 
             [Theory]
-            [InlineData("# Heading", "<h2>Heading</h2>", false, true)]
+            [InlineData("# Heading", "<h2 id=\"heading\">Heading</h2>", false, true)]
             [InlineData("# Heading", "<h2>Heading</h2>", false, false)]
             [InlineData("<!-- foo --> <!-- foo \n bar --> baz", "<p>baz</p>", false, true)]
             [InlineData("<!-- foo --> <!-- foo \n bar --> baz", "<p>baz</p>", false, false)]
-            [InlineData("\ufeff# Heading with BOM", "<h2>Heading with BOM</h2>", false, true)]
+            [InlineData("\ufeff# Heading with BOM", "<h2 id=\"heading-with-bom\">Heading with BOM</h2>", false, true)]
             [InlineData("\ufeff# Heading with BOM", "<h2>Heading with BOM</h2>", false, false)]
             [InlineData("- List", "<ul>\n<li>List</li>\n</ul>", false, true)]
             [InlineData("- List", "<ul>\r\n<li>List</li>\r\n</ul>", false, false)]
@@ -103,8 +103,8 @@ public void EncodesHtmlInMarkdownWithAdaptiveHeader(string originalMd, string ex
             [InlineData("![image](https://www.asp.net/fake.jpg)", "<p><img src=\"https://www.asp.net/fake.jpg\" alt=\"image\" /></p>", false, false)]
             [InlineData("![image](http://www.otherurl.net/fake.jpg)", "<p><img src=\"https://www.otherurl.net/fake.jpg\" class=\"img-fluid\" alt=\"image\" /></p>", true, true)]
             [InlineData("![image](http://www.otherurl.net/fake.jpg)", "<p><img src=\"https://www.otherurl.net/fake.jpg\" alt=\"image\" /></p>", true, false)]
-            [InlineData("## License\n\tLicensed under the Apache License, Version 2.0 (the \"License\");", "<h3>License</h3>\n<pre><code>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);\n</code></pre>", false, true)]
-            [InlineData("## License\n\tLicensed under the Apache License, Version 2.0 (the \"License\");", "<h3>License</h3>\n<pre><code>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);\n</code></pre>", false, true)]
+            [InlineData("## License\n\tLicensed under the Apache License, Version 2.0 (the \"License\");", "<h3 id=\"license\">License</h3>\n<pre><code>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);\n</code></pre>", false, true)]
+            [InlineData("## License\n\tLicensed under the Apache License, Version 2.0 (the \"License\");", "<h3 id=\"license\">License</h3>\n<pre><code>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);\n</code></pre>", false, true)]
             public void ConvertsMarkdownToHtml(string originalMd, string expectedHtml, bool imageRewriteExpected, bool isMarkdigMdRenderingEnabled)
             {
                 _featureFlagService.Setup(x => x.IsMarkdigMdRenderingEnabled()).Returns(isMarkdigMdRenderingEnabled);
@@ -223,12 +223,11 @@ Some text
                 Assert.False(readMeResult.ImagesRewritten);
             }
 
-            [Fact]
-            public void TestToHtmlWithAutoLinks()
+            [Theory]
+            [InlineData("This is a http://www.google.com URL and https://www.google.com", "<p>This is a <a href=\"http://www.google.com/\" rel=\"noopener noreferrer nofollow\">http://www.google.com</a> URL and <a href=\"https://www.google.com/\" rel=\"noopener noreferrer nofollow\">https://www.google.com</a></p>")]
+            [InlineData("# This is a heading\n[Link](#this-is-a-heading)", "<h2 id=\"this-is-a-heading\">This is a heading</h2>\n<p><a href=\"#this-is-a-heading\" rel=\"noopener noreferrer nofollow\">Link</a></p>")]
+            public void TestToHtmlWithAutoLinks(string originalMd, string expectedHtml)
             {
-                var originalMd = "This is a http://www.google.com URL and https://www.google.com";
-
-                var expectedHtml = "<p>This is a <a href=\"http://www.google.com/\" rel=\"noopener noreferrer nofollow\">http://www.google.com</a> URL and <a href=\"https://www.google.com/\" rel=\"noopener noreferrer nofollow\">https://www.google.com</a></p>";
                 _featureFlagService.Setup(x => x.IsMarkdigMdRenderingEnabled()).Returns(true);
                 var readMeResult = _markdownService.GetHtmlFromMarkdown(originalMd);
                 Assert.Equal(expectedHtml, readMeResult.Content);
@@ -244,6 +243,22 @@ public void TestToHtmlWithStrikethrough(string originalMd, string expectedHtml)
                 Assert.Equal(expectedHtml, readMeResult.Content);
                 Assert.False(readMeResult.ImagesRewritten);
             }
+
+            [Theory]
+            [InlineData("# Heading", "<h2 id=\"heading\">Heading</h2>")]
+            [InlineData("# This is a heading", "<h2 id=\"this-is-a-heading\">This is a heading</h2>")]
+            [InlineData("# This - is a &@! heading _ with . and ! -", "<h2 id=\"this-is-a-heading_with.and\">This - is a &amp;@! heading _ with . and ! -</h2>")]
+            [InlineData("# This is a *heading*", "<h2 id=\"this-is-a-heading\">This is a <em>heading</em></h2>")]
+            [InlineData("# This is a [heading](https://www.google.com)", "<h2 id=\"this-is-a-heading\">This is a <a href=\"https://www.google.com/\" rel=\"noopener noreferrer nofollow\">heading</a></h2>")]
+            [InlineData("# Heading\n# Heading", "<h2 id=\"heading\">Heading</h2>\n<h2 id=\"heading-1\">Heading</h2>")]
+            [InlineData("# 1.0 This is a heading", "<h2 id=\"this-is-a-heading\">1.0 This is a heading</h2>")]
+            [InlineData("# 1.0 & ^ % *\n# 1.0 & ^ % *", "<h2 id=\"section\">1.0 &amp; ^ % *</h2>\n<h2 id=\"section-1\">1.0 &amp; ^ % *</h2>")]
+            public void TestToHtmlWithAutoIdentifiers(string originalMd, string expectedHtml)
+            {
+                _featureFlagService.Setup(x => x.IsMarkdigMdRenderingEnabled()).Returns(true);
+                var readMeResult = _markdownService.GetHtmlFromMarkdown(originalMd);
+                Assert.Equal(expectedHtml, readMeResult.Content);
+            }
         }
     }
 }

tests/NuGetGallery.FunctionalTests/StaticAssets/StaticAssetsTests.cs

@@ -67,7 +67,7 @@ public StaticAssetsTests(ITestOutputHelper testOutputHelper) : base(testOutputHe
                     "Scripts/gallery/jquery.validate.unobtrusive-3.2.6.js",
                     "Scripts/gallery/knockout-3.4.2.js",
                     "Scripts/gallery/bootstrap.js",
-                    "Scripts/gallery/moment-2.29.2.js",
+                    "Scripts/gallery/moment-2.29.4.js",
                     "Scripts/gallery/common.js",
                     "Scripts/gallery/autocomplete.js",
                 }