Merge pull request #9839 from NuGet/zhhyu-safe-index-update

Revert "Downloads page changed"

Author: zhhyu

src/NuGetGallery/Scripts/gallery/page-downloads.js

@@ -7,16 +7,16 @@
 
     var chevronIcon;
     var olderVersionsElement;
-    
+
     function makeOlderVersionsCollapsible() {
-        const listContainer = document.getElementById('nuget-exe').children[1];   //children[0] is the headline, children[1] is the list of versions
-        const listContainerParent = document.getElementById('nuget-exe');
+        const listContainer = document.getElementById('win-x86-versions').children[1];   //children[0] is the headline, children[1] is the list of versions
+        const listContainerParent = document.getElementById('win-x86-versions');
         olderVersionsElement = document.createElement('div');
 
         // We want to display 2 versions to the users. Others should be collapsed.
         const allVersions = listContainer.querySelectorAll('li');
         var collapsedVersions = Array.from(allVersions).slice(2);
-        
+
         // If the first two versions in json file are the same, we only want to show the first.
         // The following code checks if they're the same, and if so, removes the second.
         // It checks if they're the same based on the last word, which is a version identifier.
@@ -33,7 +33,7 @@
         if (firstVersionLastWord === secondVersionLastWord) {
             listContainer.removeChild(secondElement);
         }
-        
+
         olderVersionsElement.setAttribute('class', 'older-versions-dropdown');
         olderVersionsElement.innerHTML = 'Older versions ' +
             '<button class="toggle-older-versions-button"' +
@@ -45,7 +45,8 @@
             'type="button">' +
             '<i class="ms-Icon ms-Icon--ChevronDown"' +
             'id="olderVersionsToggleChevron"></i>' +
-            '</button>';
+            '</button>' +
+            '<p> These versions are no longer supported and might have vulnerabilities. </p>';
 
         const versionsList = document.createElement('ul');
 

src/NuGetGallery/Views/Pages/Downloads.cshtml

@@ -11,28 +11,22 @@
     </div>
     <div class="row">
         <div class="col-md-4">
-            <h2 class="ms-fontSize-xxl">NuGet.exe</h2>
+            <h2 class="ms-fontSize-xxl">Windows x86 Commandline</h2>
             <ul class="list-unstyled list-tools">
                 <li><a href="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe">nuget.exe - recommended latest</a></li>
             </ul>
         </div>
         <div class="col-md-4">
-            <h2 class="ms-fontSize-xxl">Visual Studio</h2>
-            <p>
-                NuGet Package Manager (PM UI and PM Console) is included with Visual Studio. Latest NuGet releases are delivered as part of Visual Studio updates. Note: nuget.exe itself is not included with any version of Visual Studio.
-            </p>
+            <h2 class="ms-fontSize-xxl">Visual Studio 2015</h2>
             <ul class="list-unstyled list-tools">
-                <li><a href="https://visualstudio.microsoft.com/downloads/">Download Visual Studio</a></li>
+                <li><a href="https://dist.nuget.org/visualstudio-2015-vsix/latest/NuGet.Tools.vsix">VS 2015 VSIX - latest</a></li>
             </ul>
         </div>
         <div class="col-md-4">
-            <h2 class="ms-fontSize-xxl">.NET SDK</h2>
+            <h2 class="ms-fontSize-xxl">Visual Studio 2017</h2>
             <p>
-                The CLI tool for .NET Core and .NET Standard libraries, and for any SDK-style project such as one that targets the .NET Framework. This CLI tool is included with the .NET Core SDK and provides core NuGet features on all platforms.
+                NuGet 4.x is included in the Visual Studio 2017 installation. Latest NuGet releases are delivered as part of Visual Studio updates.
             </p>
-            <ul class="list-unstyled list-tools">
-                <li><a href="https://dotnet.microsoft.com/en-us/download">Download .NET SDK</a></li>
-            </ul>
         </div>
     </div>
 </section>
@@ -46,21 +40,21 @@
     <div class="row">
         <div class="col-md-4">
             <!-- ko foreach: artifacts -->
-            <!-- ko if: name == "nuget-exe" -->
-            <div id="nuget-exe" data-bind="template: { name: 'tool-list-template', data: $data }"></div>
+            <!-- ko if: name == "win-x86-commandline" -->
+            <div id="win-x86-versions" data-bind="template: { name: 'tool-list-template', data: $data }"></div>
             <!-- /ko -->
             <!-- /ko -->
         </div>
         <div class="col-md-4">
             <!-- ko foreach: artifacts -->
-            <!-- ko if: name == "visualstudio-vsix" -->
+            <!-- ko if: name == "visualstudio-2017-vsix" -->
             <div data-bind="template: { name: 'tool-list-template', data: $data }"></div>
             <!-- /ko -->
             <!-- /ko -->
         </div>
         <div class="col-md-4">
             <!-- ko foreach: artifacts -->
-            <!-- ko if: name != "nuget-exe" && name != "visualstudio-vsix" -->
+            <!-- ko if: name != "win-x86-commandline" && name != "visualstudio-2017-vsix" -->
             <div data-bind="template: { name: 'tool-list-template', data: $data }"></div>
             <!-- /ko -->
             <!-- /ko -->