From 4b099aeb5fb5a0097e03031512677b0a24547bd4 Mon Sep 17 00:00:00 2001
From: Jeff Handley <jeff@jeffhandley.com>
Date: Tue, 8 Apr 2014 14:45:01 -0700
Subject: [PATCH 01/20] Change the sort text based on if there's a term or not

---
 src/NuGetGallery/Views/Shared/ListPackages.cshtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
index abb69c0384..be5ac125fe 100644
--- a/src/NuGetGallery/Views/Shared/ListPackages.cshtml
+++ b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -1,6 +1,7 @@
 @model PackageListViewModel
 @{
     ViewBag.Title = String.IsNullOrWhiteSpace(Model.SearchTerm) ? "Packages" : "Packages matching " + Model.SearchTerm;
+    ViewBag.SortText = String.IsNullOrWhiteSpace(Model.SearchTerm) ? "recent installs" : "relevance";
     ViewBag.Tab = "Packages";
 }
 
@@ -33,7 +34,7 @@
     }
 </div>
 
-<span class="sorted-by">Sorted by Recent Installs</span>
+<span class="sorted-by">sorted by @ViewBag.SortText</span>
 
 <ul id="searchResults">
     @foreach (var package in Model.Items)

From de922b567940677497f5c7755ca801a5168c6d8a Mon Sep 17 00:00:00 2001
From: Dan Liu <danliu@microsoft.com>
Date: Thu, 17 Apr 2014 15:44:15 -0700
Subject: [PATCH 02/20] remove duplicate entries from the .vsdmi file. These
 tests are being run twice.

---
 .../NuGetGallery.FunctionalTests.Fluent/TagSearchTest.cs | 5 ++++-
 tests/NuGetGallery.FunctionalTests.vsmdi                 | 9 ---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/NuGetGallery.FunctionalTests.Fluent/TagSearchTest.cs b/tests/NuGetGallery.FunctionalTests.Fluent/TagSearchTest.cs
index 445e6114dc..c6d52df0d3 100644
--- a/tests/NuGetGallery.FunctionalTests.Fluent/TagSearchTest.cs
+++ b/tests/NuGetGallery.FunctionalTests.Fluent/TagSearchTest.cs
@@ -24,7 +24,10 @@ public void TagSearch()
             string version = "1.0.0";
             string tagString = ";This,is a,;test,,package, created ;by ,the  NuGet;;;team.";
 
-            UploadPackageIfNecessary(packageName, version, null, null, tagString, "This is a test package created by the NuGet team.");
+            if (CheckForPackageExistence)
+            {
+                UploadPackageIfNecessary(packageName, version, null, null, tagString, "This is a test package created by the NuGet team.");
+            }
 
             // Go to the package page.
             I.Open(UrlHelper.BaseUrl + @"Packages/" + packageName + "/" + version);
diff --git a/tests/NuGetGallery.FunctionalTests.vsmdi b/tests/NuGetGallery.FunctionalTests.vsmdi
index 3b9374bf7e..c2d6229821 100644
--- a/tests/NuGetGallery.FunctionalTests.vsmdi
+++ b/tests/NuGetGallery.FunctionalTests.vsmdi
@@ -17,14 +17,9 @@
     <TestLinks>
       <TestLink id="a6f81ddd-4476-9109-b107-ff9673898e71" name="ContactOwnerTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="2a6c6363-3869-0c15-2d51-409738bef970" name="FindPackagesByIdTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="a1c602d9-292b-1042-380c-707cec091de9" name="LogonTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="916d542f-9953-383f-a9cc-e87980667cf3" name="RestorePackageFromV2Feed" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="baeffb56-e5a3-71a3-dcf4-ca714ba14856" name="UploadPackageWithNuGetCommandLineTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="f206f30d-af4b-ae66-9032-732bc03336c1" name="DownPackageWithNuGetCommandLineTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5ceca307-8fd2-e863-65bb-d8151e5dafba" name="PackagesPageTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="d527504e-456c-ed4a-8eba-7c20c18ba47d" name="HomePageValidationTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="80baf145-2a87-1c50-450f-57e4de9d3b4f" name="UploadPackageFromUI" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="cc44bdbd-ce3e-69f6-f020-1fcb65293738" name="DownloadPackageFromV2Feed" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="02d43bf4-c2fb-43fb-6999-a16887a86fa6" name="GetUpdatesTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5d62a4b0-dcba-4028-434b-2b747b4c411f" name="UploadMultipleVersionOfPackage" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="42a9bfc6-ed87-df50-c848-82aca2c8fd0d" name="ManagePackagesPageTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -37,11 +32,7 @@
   </TestList>
   <TestList name="ReadOnlyModeTests" id="f9b8ac1f-7978-4738-afc2-6918b063e5c3" parentListId="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
     <TestLinks>
-      <TestLink id="04cd200b-33df-3564-ded5-686cdfe44f77" name="DownloadPackageWithNuGetCoreTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="9ad6e2e2-a082-8088-00f6-e05079fd89a0" name="StatisticsPageTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="f206f30d-af4b-ae66-9032-732bc03336c1" name="DownPackageWithNuGetCommandLineTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="a1c602d9-292b-1042-380c-707cec091de9" name="LogonTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="d527504e-456c-ed4a-8eba-7c20c18ba47d" name="HomePageValidationTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="c320789f-a801-c187-e7d8-0f17b24ff835" name="ReadOnlyModeRegisterNewUserTest" storage="nugetgallery.functionaltests\bin\nugetgallery.functionaltests.dll" type="Microsoft.VisualStudio.TestTools.WebStress.CodedWebTestElement, Microsoft.VisualStudio.QualityTools.LoadTest,   PublicKeyToken=b03f5f7f11d50a3a" />
     </TestLinks>
   </TestList>

From 9fd3477b7ff5820e2a27b57edf50cf50560debc9 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 10:42:47 -0700
Subject: [PATCH 03/20] Added some more branch management tools

---
 tools/Get-BranchSummary.ps1  | 22 ++++++++++++++++++++++
 tools/Get-MergedBranches.ps1 |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tools/Get-BranchSummary.ps1

diff --git a/tools/Get-BranchSummary.ps1 b/tools/Get-BranchSummary.ps1
new file mode 100644
index 0000000000..54128223bc
--- /dev/null
+++ b/tools/Get-BranchSummary.ps1
@@ -0,0 +1,22 @@
+param([DateTime]$Before)
+Write-Host "Calculating summary, this may take a few seconds..."
+git branch -r | 
+    foreach { $_.Trim() } | 
+    where { ($_ -notlike "origin/pr/*") -and ($_ -notlike "origin/HEAD*") } |
+    foreach { $_.Substring("origin/".Length) } |
+    foreach { 
+        $log = (git log "origin/$_" -n1 --oneline)
+        $chunks = $log.Split(" ")
+        $commit = $chunks[0]
+        $comment = [String]::Join(" ", $chunks[1..($chunks.Length-1)])
+        $obj = New-Object PSCustomObject
+        Add-Member -InputObject $obj -NotePropertyMembers @{
+            "Name" = $_;
+            "Commit" = $commit;
+            "Comment" = $comment;
+            "Date" = [DateTime](@(git show -s --format=%ci $commit)[0]);
+        }
+        $obj
+    } | 
+    sort Date |
+    where { (!$Before) -or ($_.Date -lt $Before) }
diff --git a/tools/Get-MergedBranches.ps1 b/tools/Get-MergedBranches.ps1
index 62b482aef9..f539e50c59 100644
--- a/tools/Get-MergedBranches.ps1
+++ b/tools/Get-MergedBranches.ps1
@@ -1,4 +1,4 @@
-param([string]$ParentBranch = "prod")
+param([string]$ParentBranch = "master")
 
 git branch --merged "origin/$ParentBranch" -r | 
         foreach { $_.Trim() } | 
@@ -6,7 +6,7 @@ git branch --merged "origin/$ParentBranch" -r |
         where { 
             ($_ -notlike "origin/pr*") -and 
             ($_ -notlike "origin/HEAD*") -and 
-            (@("origin/master","origin/prod","origin/staging","origin/iter-start","origin/qa") -notcontains $_) 
+            (@("origin/master") -notcontains $_) 
         } | 
         foreach {
             $_.Substring("origin/".Length)

From 2461a622ad88f763307f3cff12e46d59641b3414 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 11:32:01 -0700
Subject: [PATCH 04/20] Added index timestamp

---
 src/NuGetGallery/Content/Site.css                     |  4 ++++
 .../Controllers/CuratedFeedsController.cs             |  1 +
 src/NuGetGallery/Controllers/PackagesController.cs    |  1 +
 src/NuGetGallery/ExtensionMethods.cs                  |  5 +++++
 .../Infrastructure/Lucene/ExternalSearchService.cs    |  3 ++-
 .../Infrastructure/Lucene/LuceneSearchService.cs      |  7 ++++++-
 src/NuGetGallery/NuGetGallery.csproj                  |  8 ++++----
 src/NuGetGallery/Services/ISearchService.cs           | 11 +++++++----
 src/NuGetGallery/ViewModels/PackageListViewModel.cs   |  7 ++++++-
 src/NuGetGallery/Views/Shared/ListPackages.cshtml     |  6 +++++-
 src/NuGetGallery/packages.config                      |  4 ++--
 .../Controllers/CuratedFeedsControllerFacts.cs        |  2 +-
 .../Controllers/PackagesControllerFacts.cs            |  4 ++--
 tests/NuGetGallery.Facts/Services/FeedServiceFacts.cs |  5 +++--
 14 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/NuGetGallery/Content/Site.css b/src/NuGetGallery/Content/Site.css
index 78e77706e7..97e0af77b5 100644
--- a/src/NuGetGallery/Content/Site.css
+++ b/src/NuGetGallery/Content/Site.css
@@ -476,6 +476,10 @@ fieldset.search {
 
 /* List Package */
 
+.package-list-lastupdated {
+    font-size: 14pt;
+}
+
 section.package {
     border-top: 1px solid #ccc;
     padding-top: 10px;
diff --git a/src/NuGetGallery/Controllers/CuratedFeedsController.cs b/src/NuGetGallery/Controllers/CuratedFeedsController.cs
index b4f5f21070..77a077a886 100644
--- a/src/NuGetGallery/Controllers/CuratedFeedsController.cs
+++ b/src/NuGetGallery/Controllers/CuratedFeedsController.cs
@@ -81,6 +81,7 @@ public virtual async Task<ActionResult> ListPackages(string curatedFeedName, str
 
             var viewModel = new PackageListViewModel(
                 results.Data,
+                results.IndexTimestampUtc,
                 q,
                 totalHits,
                 page - 1,
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
index ed27399c2f..bfc971aca6 100644
--- a/src/NuGetGallery/Controllers/PackagesController.cs
+++ b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -303,6 +303,7 @@ public virtual async Task<ActionResult> ListPackages(string q, int page = 1)
 
             var viewModel = new PackageListViewModel(
                 results.Data,
+                results.IndexTimestampUtc,
                 q,
                 totalHits,
                 page - 1,
diff --git a/src/NuGetGallery/ExtensionMethods.cs b/src/NuGetGallery/ExtensionMethods.cs
index 248875469c..c012c658f2 100644
--- a/src/NuGetGallery/ExtensionMethods.cs
+++ b/src/NuGetGallery/ExtensionMethods.cs
@@ -23,6 +23,11 @@ namespace NuGetGallery
 {
     public static class ExtensionMethods
     {
+        public static string ToJavaScriptUTC(this DateTime self)
+        {
+            return self.ToString("yyyy-MM-dd HH:mm:ss UTC", CultureInfo.CurrentCulture);
+        }
+
         public static string ToNuGetShortDateTimeString(this DateTime self)
         {
             return self.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.CurrentCulture);
diff --git a/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs b/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs
index 9cd6a327c1..23b4773811 100644
--- a/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs
+++ b/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs
@@ -111,12 +111,13 @@ private async Task<SearchResults> SearchCore(SearchFilter filter, bool raw)
                 var content = await result.ReadContent();
                 if (filter.CountOnly || content.TotalHits == 0)
                 {
-                    results = new SearchResults(content.TotalHits);
+                    results = new SearchResults(content.TotalHits, content.IndexTimestamp);
                 }
                 else
                 {
                     results = new SearchResults(
                         content.TotalHits,
+                        content.IndexTimestamp,
                         content.Data.Select(ReadPackage).AsQueryable());
                 }
             }
diff --git a/src/NuGetGallery/Infrastructure/Lucene/LuceneSearchService.cs b/src/NuGetGallery/Infrastructure/Lucene/LuceneSearchService.cs
index fbf95c8cfa..ee1f84715b 100644
--- a/src/NuGetGallery/Infrastructure/Lucene/LuceneSearchService.cs
+++ b/src/NuGetGallery/Infrastructure/Lucene/LuceneSearchService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Lucene.Net.Analysis;
@@ -49,6 +50,9 @@ public Task<SearchResults> Search(SearchFilter searchFilter)
 
         private SearchResults SearchCore(SearchFilter searchFilter)
         {
+            // Get index timestamp
+            DateTime timestamp = File.GetLastWriteTimeUtc(LuceneCommon.GetIndexMetadataPath());
+
             int numRecords = searchFilter.Skip + searchFilter.Take;
 
             var searcher = new IndexSearcher(_directory, readOnly: true);
@@ -77,7 +81,7 @@ private SearchResults SearchCore(SearchFilter searchFilter)
             
             if (results.TotalHits == 0 || searchFilter.CountOnly)
             {
-                return new SearchResults(results.TotalHits);
+                return new SearchResults(results.TotalHits, timestamp);
             }
 
             var packages = results.ScoreDocs
@@ -86,6 +90,7 @@ private SearchResults SearchCore(SearchFilter searchFilter)
                                   .ToList();
             return new SearchResults(
                 results.TotalHits,
+                timestamp,
                 packages.AsQueryable());
         }
 
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index 9d7fa48edb..c08ef77301 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -271,13 +271,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NuGet.Core.2.8.1\lib\net40-Client\NuGet.Core.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Services.Platform.Client, Version=3.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="NuGet.Services.Platform.Client, Version=3.0.11.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NuGet.Services.Platform.Client.3.0.3-rel-0008\lib\portable-net45+wp80+win\NuGet.Services.Platform.Client.dll</HintPath>
+      <HintPath>..\..\packages\NuGet.Services.Platform.Client.3.0.11-r-master\lib\portable-net45+wp80+win\NuGet.Services.Platform.Client.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Services.Search.Client, Version=3.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="NuGet.Services.Search.Client, Version=3.0.16.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NuGet.Services.Search.Client.3.0.3-rel-0015\lib\portable-net45+wp80+win\NuGet.Services.Search.Client.dll</HintPath>
+      <HintPath>..\..\packages\NuGet.Services.Search.Client.3.0.16-r-master\lib\portable-net45+wp80+win\NuGet.Services.Search.Client.dll</HintPath>
     </Reference>
     <Reference Include="ODataNullPropagationVisitor">
       <HintPath>..\..\packages\ODataNullPropagationVisitor.0.5.4237.2641\lib\net40\ODataNullPropagationVisitor.dll</HintPath>
diff --git a/src/NuGetGallery/Services/ISearchService.cs b/src/NuGetGallery/Services/ISearchService.cs
index 0b117355aa..f6a19d4489 100644
--- a/src/NuGetGallery/Services/ISearchService.cs
+++ b/src/NuGetGallery/Services/ISearchService.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace NuGetGallery
@@ -31,17 +32,19 @@ public interface IRawSearchService
     public class SearchResults
     {
         public int Hits { get; private set; }
+        public DateTime? IndexTimestampUtc { get; private set; }
         public IQueryable<Package> Data { get; private set; }
 
-        public SearchResults(int hits)
-            : this(hits, Enumerable.Empty<Package>().AsQueryable())
+        public SearchResults(int hits, DateTime? indexTimestampUtc)
+            : this(hits, indexTimestampUtc, Enumerable.Empty<Package>().AsQueryable())
         {
         }
 
-        public SearchResults(int hits, IQueryable<Package> data)
+        public SearchResults(int hits, DateTime? indexTimestampUtc, IQueryable<Package> data)
         {
             Hits = hits;
             Data = data;
+            IndexTimestampUtc = indexTimestampUtc;
         }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/ViewModels/PackageListViewModel.cs b/src/NuGetGallery/ViewModels/PackageListViewModel.cs
index 75b73935d2..7e6a2ee843 100644
--- a/src/NuGetGallery/ViewModels/PackageListViewModel.cs
+++ b/src/NuGetGallery/ViewModels/PackageListViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
 
@@ -8,6 +9,7 @@ public class PackageListViewModel
     {
         public PackageListViewModel(
             IQueryable<Package> packages,
+            DateTime? indexTimestampUtc,
             string searchTerm,
             int totalCount,
             int pageIndex,
@@ -17,6 +19,7 @@ public PackageListViewModel(
             // TODO: Implement actual sorting
             IEnumerable<ListPackageItemViewModel> items = packages.ToList().Select(pv => new ListPackageItemViewModel(pv));
             PageIndex = pageIndex;
+            IndexTimestampUtc = indexTimestampUtc;
             PageSize = pageSize;
             TotalCount = totalCount;
             SearchTerm = searchTerm;
@@ -49,5 +52,7 @@ public PackageListViewModel(
         public int PageIndex { get; private set; }
 
         public int PageSize { get; private set; }
+
+        public DateTime? IndexTimestampUtc { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
index abb69c0384..abdc9d1b8b 100644
--- a/src/NuGetGallery/Views/Shared/ListPackages.cshtml
+++ b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -27,10 +27,14 @@
                 <text>There are @Model.TotalCount packages</text>
             }</h1>
     }
-    @if (@Model.LastResultIndex > 0)
+    @if (Model.LastResultIndex > 0)
     {
         <h2>Displaying results @Model.FirstResultIndex - @Model.LastResultIndex.</h2>
     }
+    @if(Model.IndexTimestampUtc.HasValue) 
+    {
+        <h3 class="package-list-lastupdated">Search Index last updated <span class="s-localtime" data-utc="@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()">@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()</span></h3>
+    }
 </div>
 
 <span class="sorted-by">Sorted by Recent Installs</span>
diff --git a/src/NuGetGallery/packages.config b/src/NuGetGallery/packages.config
index 1282e84f26..ae23b8484b 100644
--- a/src/NuGetGallery/packages.config
+++ b/src/NuGetGallery/packages.config
@@ -51,8 +51,8 @@
   <package id="Ninject.Web.Common" version="3.0.0.7" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.1" targetFramework="net45" />
   <package id="NuGet.Services.Build" version="3.0.4-rel-4" targetFramework="net45" developmentDependency="true" />
-  <package id="NuGet.Services.Platform.Client" version="3.0.3-rel-0008" targetFramework="net45" />
-  <package id="NuGet.Services.Search.Client" version="3.0.3-rel-0015" targetFramework="net45" />
+  <package id="NuGet.Services.Platform.Client" version="3.0.11-r-master" targetFramework="net45" />
+  <package id="NuGet.Services.Search.Client" version="3.0.16-r-master" targetFramework="net45" />
   <package id="ODataNullPropagationVisitor" version="0.5.4237.2641" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="PoliteCaptcha" version="0.4.0.0" targetFramework="net45" />
diff --git a/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs
index 28d3cc01ae..54216cfef8 100644
--- a/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs
@@ -213,7 +213,7 @@ public async Task WillSearchForAPackage()
 
                 controller.StubSearchService
                     .Setup(stub => stub.Search(It.IsAny<SearchFilter>()))
-                    .Returns(Task.FromResult(new SearchResults(mockPackages.Count(), mockPackages)));
+                    .Returns(Task.FromResult(new SearchResults(mockPackages.Count(), DateTime.UtcNow, mockPackages)));
 
                 var mockHttpContext = new Mock<HttpContextBase>();
                 TestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
index 37576305d7..d9da6bc5dd 100644
--- a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
@@ -108,7 +108,7 @@ private static Mock<ISearchService> CreateSearchService()
         {
             var searchService = new Mock<ISearchService>();
             searchService.Setup(s => s.Search(It.IsAny<SearchFilter>())).Returns(
-                (IQueryable<Package> p, string searchTerm) => Task.FromResult(new SearchResults(p.Count(), p)));
+                (IQueryable<Package> p, string searchTerm) => Task.FromResult(new SearchResults(p.Count(), DateTime.UtcNow, p)));
 
             return searchService;
         }
@@ -574,7 +574,7 @@ public async Task TrimsSearchTerm()
             {
                 var searchService = new Mock<ISearchService>();
                 searchService.Setup(s => s.Search(It.IsAny<SearchFilter>())).Returns(
-                    Task.FromResult(new SearchResults(0)));
+                    Task.FromResult(new SearchResults(0, DateTime.UtcNow)));
                 var controller = CreateController(searchService: searchService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
diff --git a/tests/NuGetGallery.Facts/Services/FeedServiceFacts.cs b/tests/NuGetGallery.Facts/Services/FeedServiceFacts.cs
index 9a2d65a218..f93564645c 100644
--- a/tests/NuGetGallery.Facts/Services/FeedServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/FeedServiceFacts.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
@@ -83,7 +84,7 @@ public void V1FeedSearchDoesNotReturnPrereleasePackages()
                     configuration.Setup(c => c.GetSiteRoot(It.IsAny<bool>())).Returns("https://localhost:8081/");
                     var searchService = new Mock<ISearchService>(MockBehavior.Strict);
                     searchService.Setup(s => s.Search(It.IsAny<SearchFilter>())).Returns
-                        <IQueryable<Package>, string>((_, __) => Task.FromResult(new SearchResults(_.Count(), _)));
+                        <IQueryable<Package>, string>((_, __) => Task.FromResult(new SearchResults(_.Count(), DateTime.UtcNow, _)));
                     searchService.Setup(s => s.ContainsAllVersions).Returns(false);
                     var v1Service = new TestableV1Feed(repo.Object, configuration.Object, searchService.Object);
 

From 59a1ae9f481e1a577ca2106704e49b260875b41b Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 12:05:33 -0700
Subject: [PATCH 05/20] Patch up some layout stuff when zoomed slightly out

---
 src/NuGetGallery/Content/Layout.css | 211 ++++++++++++++--------------
 1 file changed, 109 insertions(+), 102 deletions(-)

diff --git a/src/NuGetGallery/Content/Layout.css b/src/NuGetGallery/Content/Layout.css
index 34335eaeb9..70efc67f7e 100644
--- a/src/NuGetGallery/Content/Layout.css
+++ b/src/NuGetGallery/Content/Layout.css
@@ -3,8 +3,7 @@
 
 /* Service Alert */
 
-#service-alert
-{
+#service-alert {
     display: none;
 }
 
@@ -35,15 +34,16 @@
     background-image: linear-gradient(to bottom, #ff0000, #e60000);
 }
 
-.banner-urgent a
-{
-    color: white;
-    text-decoration: underline;
-}
+    .banner-urgent a {
+        color: white;
+        text-decoration: underline;
+    }
 
 /* Header */
 
-header.main { height: 95px; }
+header.main {
+    height: 95px;
+}
 
 /* Site Logo */
 
@@ -52,15 +52,15 @@ header.main { height: 95px; }
     padding: 20px 20px 0 0;
 }
 
-#logo a {
-    background: url(../Content/Logos/nugetlogo.png) no-repeat;
-    display: block;
-    height: 75px;
-    margin: 0;
-    padding: 0;
-    text-indent: -9999px;
-    width: 225px;
-}
+    #logo a {
+        background: url(../Content/Logos/nugetlogo.png) no-repeat;
+        display: block;
+        height: 75px;
+        margin: 0;
+        padding: 0;
+        text-indent: -9999px;
+        width: 225px;
+    }
 
 /* Top Menu (Navigation) */
 
@@ -71,50 +71,49 @@ nav.main {
     margin-top: 10px;
 }
 
-nav.main ul {
-    margin: 0px;
-    padding: 0px;
-}
-
-nav.main ul li {
-    display: block;
-    float: left;
-    height: 42px;
-}
-
-nav.main ul li.current a {
-    background-color: #e4f1f7;
-    border: 1px solid #ebf2f5;
-    border-bottom: none;
-    border-top: 1px solid #fff;
-    color: #195670;
-    height: 46px;
-    line-height: 44px;
-    position: relative;
-    text-decoration: none;
-    top: -4px;
-}
-
-nav.main ul a {
-    -moz-border-radius: 4px 4px 0 0;
-    -webkit-border-radius: 4px 4px 0 0;
-    /*CSS3 properties*/
-    border-radius: 4px 4px 0 0;
-    color: #fff;
-    display: block;
-    font-size: 1.2em;
-    height: 42px;
-    line-height: 44px;
-            
-    margin: 0 5px;
-    padding: 0 10px;
-    text-decoration: none;
-}
-
-nav.main ul a:hover {
-    background-color: #3c3d44;
-    text-decoration: none;
-}
+    nav.main ul {
+        margin: 0px;
+        padding: 0px;
+    }
+
+        nav.main ul li {
+            display: block;
+            float: left;
+            height: 42px;
+        }
+
+            nav.main ul li.current a {
+                background-color: #e4f1f7;
+                border: 1px solid #ebf2f5;
+                border-bottom: none;
+                border-top: 1px solid #fff;
+                color: #195670;
+                height: 46px;
+                line-height: 44px;
+                position: relative;
+                text-decoration: none;
+                top: -4px;
+            }
+
+        nav.main ul a {
+            -moz-border-radius: 4px 4px 0 0;
+            -webkit-border-radius: 4px 4px 0 0;
+            /*CSS3 properties*/
+            border-radius: 4px 4px 0 0;
+            color: #fff;
+            display: block;
+            font-size: 1.2em;
+            height: 42px;
+            line-height: 44px;
+            margin: 0 5px;
+            padding: 0 10px;
+            text-decoration: none;
+        }
+
+            nav.main ul a:hover {
+                background-color: #3c3d44;
+                text-decoration: none;
+            }
 
 /* User Display (Sign-In Info) and search box */
 
@@ -131,12 +130,14 @@ nav.main ul a:hover {
     margin-top: 6px;
 }
 
-.user-display a {
-    color: #fff;
-    font-weight: 600;
-}
+    .user-display a {
+        color: #fff;
+        font-weight: 600;
+    }
 
-.user-display a:hover { text-decoration: underline; }
+        .user-display a:hover {
+            text-decoration: underline;
+        }
 
 #searchBox {
     background-color: #fff;
@@ -144,14 +145,14 @@ nav.main ul a:hover {
     /*CSS3 properties*/
     height: 32px;
     margin-top: 1px;
-    width: 704px;
-            
+    width: 690px;
     padding-left: 5px;
     padding-right: 4px;
     vertical-align: top;
 }
 
 #searchBoxInput {
+    width: 650px;
     border: 0px;
     color: #333;
     font-size: 20px;
@@ -159,7 +160,6 @@ nav.main ul a:hover {
     line-height: 30px;
     outline: none;
     padding: 0;
-    width: 673px;
 }
 
 #searchBoxSubmit {
@@ -173,7 +173,6 @@ nav.main ul a:hover {
     margin-left: 0;
     box-shadow: none;
     margin-top: 1px;
-    
     text-indent: -9999px;
     vertical-align: bottom;
     width: 27px;
@@ -192,7 +191,9 @@ nav.main ul a:hover {
 
 /* Footer */
 
-.clear-fix { clear: both; }
+.clear-fix {
+    clear: both;
+}
 
 #layout-footer {
     background: #e4f1f7;
@@ -210,44 +211,50 @@ footer#footer {
     display: table;
 }
 
-footer#footer a { color: #3e483c; }
+    footer#footer a {
+        color: #3e483c;
+    }
 
-footer#footer a:hover {
-    text-decoration: underline;
-}
+        footer#footer a:hover {
+            text-decoration: underline;
+        }
 
-footer#footer p {
-    margin: 0;
-    padding: 0;
-}
+    footer#footer p {
+        margin: 0;
+        padding: 0;
+    }
 
-footer#footer p#releaseTag { margin: 10px 0 0 0; }
+        footer#footer p#releaseTag {
+            margin: 10px 0 0 0;
+        }
 
-footer#footer ul.recommended {
-    list-style: none;
-    margin: 0 auto;
-    padding: 0;
-}
+    footer#footer ul.recommended {
+        list-style: none;
+        margin: 0 auto;
+        padding: 0;
+    }
 
-footer#footer ul.recommended li {
-    float: left;
-    margin-left: 0;
-    padding: 10px;
-    text-align: left;
-    width: 170px;
-}
+        footer#footer ul.recommended li {
+            float: left;
+            margin-left: 0;
+            padding: 10px;
+            text-align: left;
+            width: 170px;
+        }
 
-footer#footer ul.recommended li a {
-    display: block;
-    font-size: 1.3em;
-}
+            footer#footer ul.recommended li a {
+                display: block;
+                font-size: 1.3em;
+            }
 
-footer#footer ul.recommended li p { font-size: .9em; }
+            footer#footer ul.recommended li p {
+                font-size: .9em;
+            }
 
-footer#footer div.license {
-    clear: both;
-    font-size: .7em;
-}
+    footer#footer div.license {
+        clear: both;
+        font-size: .7em;
+    }
 
 /* Error Layout (with background image)*/
 
@@ -285,4 +292,4 @@ footer#footer div.license {
     float: right;
     margin-bottom: 20px;
     width: 75%;
-}
\ No newline at end of file
+}

From 42822d38fc91e8807dfd6d47edd1ea50632a2bae Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 12:51:59 -0700
Subject: [PATCH 06/20] Fixed #2016 by validating that the NuSpec exists in the
 root of the package

---
 src/NuGetGallery.Core/Packaging/Nupkg.cs      |  4 +-
 .../Controllers/PackagesController.cs         | 57 +++++++++++++----
 .../Infrastructure/UserSafeException.cs       | 63 +++++++++++++++++++
 src/NuGetGallery/NuGetGallery.csproj          |  1 +
 src/NuGetGallery/Strings.Designer.cs          | 11 +++-
 src/NuGetGallery/Strings.resx                 |  3 +
 6 files changed, 124 insertions(+), 15 deletions(-)
 create mode 100644 src/NuGetGallery/Infrastructure/UserSafeException.cs

diff --git a/src/NuGetGallery.Core/Packaging/Nupkg.cs b/src/NuGetGallery.Core/Packaging/Nupkg.cs
index 948c58a90e..f6fa189ea0 100644
--- a/src/NuGetGallery.Core/Packaging/Nupkg.cs
+++ b/src/NuGetGallery.Core/Packaging/Nupkg.cs
@@ -112,13 +112,13 @@ public static Manifest SafelyLoadManifest(Stream stream, bool leaveOpen)
         private static Manifest SafelyLoadManifest(ZipArchive archive)
         {
             var manifestEntry = archive.Entries.SingleOrDefault(entry =>
-                    entry.Name.IndexOf("/", StringComparison.Ordinal) == -1
+                    entry.FullName.IndexOf("/", StringComparison.Ordinal) == -1
                     && entry.Name.EndsWith(".nuspec", StringComparison.OrdinalIgnoreCase)
                 );
 
             if (manifestEntry == null)
             {
-                throw new InvalidOperationException("The package does not contain a manifest.");
+                throw new InvalidOperationException("The package does not contain a manifest, or the manifest is not in the root of the package.");
             }
 
             using (var safeStream = GetSizeVerifiedFileStream(manifestEntry, MaxManifestSize))
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
index ed27399c2f..c567252e65 100644
--- a/src/NuGetGallery/Controllers/PackagesController.cs
+++ b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -768,19 +768,13 @@ public virtual async Task<ActionResult> VerifyPackage()
                     return RedirectToRoute(RouteName.UploadPackage);
                 }
 
-                try
+                using (INupkg package = await SafeCreatePackage(currentUser, uploadFile))
                 {
-                    using (INupkg package = CreatePackage(uploadFile))
+                    if (package == null)
                     {
-                        packageMetadata = package.Metadata;
+                        return Redirect(Url.UploadPackage());
                     }
-                }
-                catch (InvalidDataException e)
-                {
-                    // Log the exception in case we get support requests about it.
-                    QuietLog.LogHandledException(e);
-
-                    return View("UnverifiablePackage");
+                    packageMetadata = package.Metadata;
                 }
             }
 
@@ -826,7 +820,13 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD
                     return new RedirectResult(Url.UploadPackage());
                 }
 
-                INupkg nugetPackage = CreatePackage(uploadFile);
+                INupkg nugetPackage = await SafeCreatePackage(currentUser, uploadFile);
+                if (nugetPackage == null)
+                {
+                    // Send the user back
+                    return new RedirectResult(Url.UploadPackage());
+                }
+                Debug.Assert(nugetPackage != null);
 
                 // Rule out problem scenario with multiple tabs - verification request (possibly with edits) was submitted by user 
                 // viewing a different package to what was actually most recently uploaded
@@ -903,6 +903,31 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD
             return RedirectToRoute(RouteName.DisplayPackage, new { package.PackageRegistration.Id, package.Version });
         }
 
+        private async Task<INupkg> SafeCreatePackage(NuGetGallery.User currentUser, Stream uploadFile)
+        {
+            Exception caught = null;
+            INupkg nugetPackage = null;
+            try
+            {
+                nugetPackage = CreatePackage(uploadFile);
+            }
+            catch (Exception ex)
+            {
+                // Can't wait for Roslyn to let us await in Catch blocks :(
+                caught = ex;
+                ex.Log();
+            }
+            if (caught != null)
+            {
+                // Report the error
+                TempData["Message"] = caught.GetUserSafeMessage();
+
+                // Clear the upload
+                await _uploadFileService.DeleteUploadFileAsync(currentUser.Key);
+            }
+            return nugetPackage;
+        }
+
         [Authorize]
         [HttpPost]
         [ValidateAntiForgeryToken]
@@ -950,7 +975,15 @@ internal virtual ActionResult SetLicenseReportVisibility(string id, string versi
         // this methods exist to make unit testing easier
         protected internal virtual INupkg CreatePackage(Stream stream)
         {
-            return new Nupkg(stream, leaveOpen: false);
+            try
+            {
+                return new Nupkg(stream, leaveOpen: false);
+            }
+            catch (Exception)
+            {
+                stream.Dispose();
+                throw;
+            }
         }
 
         private static string GetSortExpression(string sortOrder)
diff --git a/src/NuGetGallery/Infrastructure/UserSafeException.cs b/src/NuGetGallery/Infrastructure/UserSafeException.cs
new file mode 100644
index 0000000000..f156e4f570
--- /dev/null
+++ b/src/NuGetGallery/Infrastructure/UserSafeException.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace NuGetGallery
+{
+    // Marker interface to indicate that the exception has a message that can be shown to a user
+    public interface IUserSafeException
+    {
+        string UserMessage { get; }
+        Exception LoggedException { get; }
+    }
+
+    [Serializable]
+    public class UserSafeException : Exception, IUserSafeException
+    {
+        public string UserMessage
+        {
+            get { return Message; }
+        }
+
+        public Exception LoggedException
+        {
+            get { return InnerException == null ? this : InnerException; }
+        }
+
+        public UserSafeException() { }
+        public UserSafeException(string message) : base(message) { }
+        public UserSafeException(string message, Exception inner) : base(message, inner) { }
+        protected UserSafeException(
+          System.Runtime.Serialization.SerializationInfo info,
+          System.Runtime.Serialization.StreamingContext context)
+            : base(info, context) { }
+    }
+
+    public static class UserSafeExceptionExtensions
+    {
+        public static string GetUserSafeMessage(this Exception self)
+        {
+            IUserSafeException uvex = self as IUserSafeException;
+            if (uvex != null)
+            {
+                return uvex.UserMessage;
+            }
+            return Strings.DefaultUserSafeExceptionMessage;
+        }
+
+        public static void Log(this Exception self)
+        {
+            IUserSafeException uvex = self as IUserSafeException;
+            if (uvex != null)
+            {
+                // Log the exception that the User-Visible wrapper marked as to-be-logged
+                QuietLog.LogHandledException(uvex.LoggedException);
+            }
+            else
+            {
+                QuietLog.LogHandledException(self);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index 9d7fa48edb..832e1cae42 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -738,6 +738,7 @@
     <Compile Include="Infrastructure\Lucene\PerFieldAnalyzer.cs" />
     <Compile Include="Infrastructure\Lucene\NuGetSearchTerm.cs" />
     <Compile Include="Infrastructure\TracingHttpHandler.cs" />
+    <Compile Include="Infrastructure\UserSafeException.cs" />
     <Compile Include="Migrations\201110060711357_Initial.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/src/NuGetGallery/Strings.Designer.cs b/src/NuGetGallery/Strings.Designer.cs
index a5238bbae1..c469179db0 100644
--- a/src/NuGetGallery/Strings.Designer.cs
+++ b/src/NuGetGallery/Strings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34003
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -169,6 +169,15 @@ public static string DatabaseUnavailable_TrySpecificVersion {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to An unexpected error occurred. Contact support for assistance..
+        /// </summary>
+        public static string DefaultUserSafeExceptionMessage {
+            get {
+                return ResourceManager.GetString("DefaultUserSafeExceptionMessage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The email address &apos;{0}&apos; is being used..
         /// </summary>
diff --git a/src/NuGetGallery/Strings.resx b/src/NuGetGallery/Strings.resx
index 395a8c0ee2..e119c5e783 100644
--- a/src/NuGetGallery/Strings.resx
+++ b/src/NuGetGallery/Strings.resx
@@ -299,4 +299,7 @@ The {2} Team</value>
   <data name="UploadPackage_MinClientVersionOutOfRange" xml:space="preserve">
     <value>This package requires version '{0}' of NuGet, which this gallery does not currently support. Please contact us if you have questions.</value>
   </data>
+  <data name="DefaultUserSafeExceptionMessage" xml:space="preserve">
+    <value>An unexpected error occurred. Contact support for assistance.</value>
+  </data>
 </root>
\ No newline at end of file

From 563b7de606509fbb2366e9b291e97d990f8c071d Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 13:05:17 -0700
Subject: [PATCH 07/20] Added version to commit metadata

---
 src/NuGetGallery/App_Code/ViewHelpers.cshtml                | 5 ++++-
 src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/NuGetGallery/App_Code/ViewHelpers.cshtml b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
index ceb16a6e08..3936dd07a4 100644
--- a/src/NuGetGallery/App_Code/ViewHelpers.cshtml
+++ b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
@@ -129,9 +129,10 @@
     string brand = config == null ? "" : config.Current.Brand;
 
     <p id="releaseTag">
-        This is the @brand.
+        This is the @brand
         @if (ver.Present)
         {
+            @:, version @ver.Version.
             if(!String.IsNullOrEmpty(ver.ShortCommit)) {
                 <text>
                     Deployed from
@@ -157,6 +158,8 @@
             if(ver.BuildDateUtc != DateTime.MinValue) {
                 @: Built at <span class="s-localtime" data-utc="@ver.BuildDateUtc.ToString("O")">@ver.BuildDateUtc.ToNuGetShortDateString()</span>.
             }
+        } else {
+            @:.
         }
         
         @* A little quick-n-dirty code to display the current machine *@
diff --git a/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs b/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs
index b1dbc68e5c..652188fe32 100644
--- a/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs
+++ b/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs
@@ -41,7 +41,7 @@ public ApplicationVersion(Uri repositoryBase, string version, string branch, str
             Commit = commit;
             BuildDateUtc = buildDateUtc;
 
-            ShortCommit = String.IsNullOrEmpty(Commit) ? String.Empty : Commit.Substring(0, 10);
+            ShortCommit = String.IsNullOrEmpty(Commit) ? String.Empty : Commit.Substring(0, Math.Min(10, Commit.Length));
 
             if (repositoryBase != null)
             {

From c4182d0652bba9589540b38671cd83ac65a385d6 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 13:06:26 -0700
Subject: [PATCH 08/20] Grabbed ToJavaScriptUTC from anurse/2033-indextimestamp
 branch

---
 src/NuGetGallery/ExtensionMethods.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/NuGetGallery/ExtensionMethods.cs b/src/NuGetGallery/ExtensionMethods.cs
index 248875469c..c012c658f2 100644
--- a/src/NuGetGallery/ExtensionMethods.cs
+++ b/src/NuGetGallery/ExtensionMethods.cs
@@ -23,6 +23,11 @@ namespace NuGetGallery
 {
     public static class ExtensionMethods
     {
+        public static string ToJavaScriptUTC(this DateTime self)
+        {
+            return self.ToString("yyyy-MM-dd HH:mm:ss UTC", CultureInfo.CurrentCulture);
+        }
+
         public static string ToNuGetShortDateTimeString(this DateTime self)
         {
             return self.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.CurrentCulture);

From 4841fdc2e7846ebc8d300845bc1b5e265b3c156a Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 13:09:42 -0700
Subject: [PATCH 09/20] Fix #2008 by rendering the date in a more universal
 format

---
 src/NuGetGallery/App_Code/ViewHelpers.cshtml | 2 +-
 src/NuGetGallery/ExtensionMethods.cs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/NuGetGallery/App_Code/ViewHelpers.cshtml b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
index 3936dd07a4..87012a92a6 100644
--- a/src/NuGetGallery/App_Code/ViewHelpers.cshtml
+++ b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
@@ -156,7 +156,7 @@
             }
             
             if(ver.BuildDateUtc != DateTime.MinValue) {
-                @: Built at <span class="s-localtime" data-utc="@ver.BuildDateUtc.ToString("O")">@ver.BuildDateUtc.ToNuGetShortDateString()</span>.
+                @: Built at <span class="s-localtime" data-utc="@ver.BuildDateUtc.ToJavaScriptUTC()">@ver.BuildDateUtc.ToNuGetShortDateString()</span>.
             }
         } else {
             @:.
diff --git a/src/NuGetGallery/ExtensionMethods.cs b/src/NuGetGallery/ExtensionMethods.cs
index c012c658f2..9e8eaf568c 100644
--- a/src/NuGetGallery/ExtensionMethods.cs
+++ b/src/NuGetGallery/ExtensionMethods.cs
@@ -25,7 +25,7 @@ public static class ExtensionMethods
     {
         public static string ToJavaScriptUTC(this DateTime self)
         {
-            return self.ToString("yyyy-MM-dd HH:mm:ss UTC", CultureInfo.CurrentCulture);
+            return self.ToString("O", CultureInfo.CurrentCulture) + "Z";
         }
 
         public static string ToNuGetShortDateTimeString(this DateTime self)

From e463d75d310691a16c6698d76b9a6d3941310908 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Fri, 18 Apr 2014 13:18:55 -0700
Subject: [PATCH 10/20] Code Review Feedback

---
 .../NuGetGallery.Core.csproj                  |  1 +
 .../Packaging/InvalidPackageException.cs      | 20 +++++++++++++++++++
 src/NuGetGallery.Core/Packaging/Nupkg.cs      |  2 +-
 .../Controllers/PackagesController.cs         | 14 +++++++++++--
 .../Infrastructure/UserSafeException.cs       |  5 +++++
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 src/NuGetGallery.Core/Packaging/InvalidPackageException.cs

diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
index 9fc4be1489..fdc5726edf 100644
--- a/src/NuGetGallery.Core/NuGetGallery.Core.csproj
+++ b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
@@ -114,6 +114,7 @@
     <Compile Include="Entities\Role.cs" />
     <Compile Include="Entities\User.cs" />
     <Compile Include="Packaging\INupkg.cs" />
+    <Compile Include="Packaging\InvalidPackageException.cs" />
     <Compile Include="Packaging\ManifestValidator.cs" />
     <Compile Include="Packaging\Nupkg.cs" />
     <Compile Include="Packaging\NupkgRewriter.cs" />
diff --git a/src/NuGetGallery.Core/Packaging/InvalidPackageException.cs b/src/NuGetGallery.Core/Packaging/InvalidPackageException.cs
new file mode 100644
index 0000000000..0e5c10ef3f
--- /dev/null
+++ b/src/NuGetGallery.Core/Packaging/InvalidPackageException.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NuGetGallery.Packaging
+{
+    [Serializable]
+    public class InvalidPackageException : Exception
+    {
+        public InvalidPackageException() { }
+        public InvalidPackageException(string message) : base(message) { }
+        public InvalidPackageException(string message, Exception inner) : base(message, inner) { }
+        protected InvalidPackageException(
+          System.Runtime.Serialization.SerializationInfo info,
+          System.Runtime.Serialization.StreamingContext context)
+            : base(info, context) { }
+    }
+}
diff --git a/src/NuGetGallery.Core/Packaging/Nupkg.cs b/src/NuGetGallery.Core/Packaging/Nupkg.cs
index f6fa189ea0..ed70e34fa8 100644
--- a/src/NuGetGallery.Core/Packaging/Nupkg.cs
+++ b/src/NuGetGallery.Core/Packaging/Nupkg.cs
@@ -118,7 +118,7 @@ private static Manifest SafelyLoadManifest(ZipArchive archive)
 
             if (manifestEntry == null)
             {
-                throw new InvalidOperationException("The package does not contain a manifest, or the manifest is not in the root of the package.");
+                throw new InvalidPackageException("A manifest was not found at the root of the package.");
             }
 
             using (var safeStream = GetSizeVerifiedFileStream(manifestEntry, MaxManifestSize))
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
index c567252e65..cedf3b1bbf 100644
--- a/src/NuGetGallery/Controllers/PackagesController.cs
+++ b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -190,9 +190,15 @@ public virtual async Task<ActionResult> UploadPackage(HttpPostedFileBase uploadF
                 {
                     nuGetPackage = CreatePackage(uploadStream);
                 }
+                catch (InvalidPackageException ipex)
+                {
+                    ipex.Log();
+                    ModelState.AddModelError(String.Empty, ipex.Message);
+                    return View();
+                }
                 catch (Exception ex)
                 {
-                    QuietLog.LogHandledException(ex);
+                    ex.Log();
                     ModelState.AddModelError(String.Empty, Strings.FailedToReadUploadFile);
                     return View();
                 }
@@ -911,14 +917,18 @@ private async Task<INupkg> SafeCreatePackage(NuGetGallery.User currentUser, Stre
             {
                 nugetPackage = CreatePackage(uploadFile);
             }
+            catch (InvalidPackageException ipex)
+            {
+                caught = ipex.AsUserSafeException();
+            }
             catch (Exception ex)
             {
                 // Can't wait for Roslyn to let us await in Catch blocks :(
                 caught = ex;
-                ex.Log();
             }
             if (caught != null)
             {
+                caught.Log();
                 // Report the error
                 TempData["Message"] = caught.GetUserSafeMessage();
 
diff --git a/src/NuGetGallery/Infrastructure/UserSafeException.cs b/src/NuGetGallery/Infrastructure/UserSafeException.cs
index f156e4f570..50262b889f 100644
--- a/src/NuGetGallery/Infrastructure/UserSafeException.cs
+++ b/src/NuGetGallery/Infrastructure/UserSafeException.cs
@@ -36,6 +36,11 @@ protected UserSafeException(
 
     public static class UserSafeExceptionExtensions
     {
+        public static UserSafeException AsUserSafeException(this Exception self)
+        {
+            return new UserSafeException(self.Message, self.InnerException);
+        }
+
         public static string GetUserSafeMessage(this Exception self)
         {
             IUserSafeException uvex = self as IUserSafeException;

From 8b54bd706b5798c7153387b480584c3df15e3000 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Mon, 21 Apr 2014 11:05:45 -0700
Subject: [PATCH 11/20] Did that CSS-s-s-s-s-s up right.

---
 src/NuGetGallery/Content/Site.css             | 225 ++++++++++--------
 .../Views/Shared/ListPackages.cshtml          |   5 +-
 2 files changed, 125 insertions(+), 105 deletions(-)

diff --git a/src/NuGetGallery/Content/Site.css b/src/NuGetGallery/Content/Site.css
index 97e0af77b5..9ba2f6cadf 100644
--- a/src/NuGetGallery/Content/Site.css
+++ b/src/NuGetGallery/Content/Site.css
@@ -79,11 +79,11 @@ h6 {
     padding-bottom: 10px;
 }
 
-.page-heading h1,
-.page-heading h2 {
-    margin: 0;
-    padding: 0;
-}
+    .page-heading h1,
+    .page-heading h2 {
+        margin: 0;
+        padding: 0;
+    }
 
 /* Aside Headings */
 
@@ -226,15 +226,15 @@ nav, section {
     padding: 20px 20px 0 0;
 }
 
-#logo a {
-    background: url(../Content/Images/nugetlogo.png) no-repeat;
-    display: block;
-    height: 75px;
-    margin: 0;
-    padding: 0;
-    text-indent: -9999px;
-    width: 345px;
-}
+    #logo a {
+        background: url(../Content/Images/nugetlogo.png) no-repeat;
+        display: block;
+        height: 75px;
+        margin: 0;
+        padding: 0;
+        text-indent: -9999px;
+        width: 345px;
+    }
 
 /* Body */
 
@@ -248,9 +248,9 @@ nav, section {
     width: 25%;
 }
 
-    #pageSearchBox #searchBoxInput {
-        width: 265px;
-    }
+#pageSearchBox #searchBoxInput {
+    width: 265px;
+}
 
 
 /* Logo */
@@ -301,7 +301,9 @@ ul.owners {
     padding: 0;
 }
 
-ul.owners li { margin-bottom: 12px; }
+    ul.owners li {
+        margin-bottom: 12px;
+    }
 
 a.owner {
     font-size: 1.4em;
@@ -313,16 +315,20 @@ a.owner {
         top: -0.5em;
     }
 
-a.owner:hover {
-    text-decoration: none;
-    color: #333;
-}
+    a.owner:hover {
+        text-decoration: none;
+        color: #333;
+    }
 
-.owner-image { margin-right: 5px; }
+.owner-image {
+    margin-right: 5px;
+}
 
 /* Authors */
 
-p.authors { font-size: 1.25em; }
+p.authors {
+    font-size: 1.25em;
+}
 
 /* Large Package Icon - up to 128x128 */
 
@@ -465,6 +471,7 @@ fieldset.search {
     }
 
 #searchResults {
+    clear: both;
     list-style: none;
     margin: 0;
     padding: 0;
@@ -477,7 +484,9 @@ fieldset.search {
 /* List Package */
 
 .package-list-lastupdated {
-    font-size: 14pt;
+    float: left;
+    font-style: italic;
+    font-size: 8pt;
 }
 
 section.package {
@@ -517,7 +526,9 @@ section.package {
     }
 
     section.package ul,
-    section.package li { display: inline; }
+    section.package li {
+        display: inline;
+    }
 
     section.package h1 {
         font-size: 1.75em;
@@ -595,7 +606,9 @@ ul.pager {
             padding-right: 7px;
         }
 
-ul.pager li.next { padding-left: 10px; }
+        ul.pager li.next {
+            padding-left: 10px;
+        }
 
 /* Sexy Table */
 
@@ -641,9 +654,9 @@ ul.pager li.next { padding-left: 10px; }
             background-color: #f4f5f6;
         }
 
-.sexy-table tbody tr.recommended { 
-    font-weight: 800;
-}
+        .sexy-table tbody tr.recommended {
+            font-weight: 800;
+        }
 
     .sexy-table tbody td {
         padding: 5px 25px 5px 0;
@@ -864,9 +877,13 @@ fieldset.form {
         display: none;
     }
 
-.form-field p { margin-left: 10px; }
+.form-field p {
+    margin-left: 10px;
+}
 
-.form-field h3 { color: #52a4ca; }
+.form-field h3 {
+    color: #52a4ca;
+}
 
 .form-field {
     margin-bottom: 10px;
@@ -918,16 +935,21 @@ fieldset.form {
         padding-left: 6px;
     }
 
-.form-field input[type="checkbox"] { border-left: none; }
+    .form-field input[type="checkbox"] {
+        border-left: none;
+    }
+
+    .form-field input[type="url"] {
+        width: 100%;
+    }
 
-.form-field input[type="url"] { width: 100%; }
+    .form-field select {
+        color: #7f8c7d;
+        font-size: 1.25em;
+        padding: 2px;
+        margin: 0px 0px 10px 0;
+    }
 
-.form-field select {
-    color: #7f8c7d;
-    font-size: 1.25em;
-    padding: 2px;
-    margin: 0px 0px 10px 0;
-}
         .form-field select[data-edited=true] {
             border-left: solid 4px #2ef12e;
             padding-left: 0px;
@@ -949,31 +971,31 @@ fieldset.form {
         background-color: #e6e6e6;
     }
 
-.form-field select[data-edited=true] {
-    border-left: solid 4px #2ef12e;
-    padding-left: 0px;
-}
+    .form-field select[data-edited=true] {
+        border-left: solid 4px #2ef12e;
+        padding-left: 0px;
+    }
 
-.form-field textarea[disabled],
-.form-field input[type="email"][disabled],
-.form-field input[type="text"][disabled],
-.form-field input[type="file"][disabled],
-.form-field input[type="password"][disabled],
-.form input[type="submit"][disabled],
-.form input[type="submit"][disabled]:hover {
-    background: silver;
-    cursor: not-allowed;
-    border: none;
-    opacity: 0.65;
-    filter: alpha(opacity=65);
-    color: #333;
-    background-color: #e6e6e6;
-}
+    .form-field textarea[disabled],
+    .form-field input[type="email"][disabled],
+    .form-field input[type="text"][disabled],
+    .form-field input[type="file"][disabled],
+    .form-field input[type="password"][disabled],
+    .form input[type="submit"][disabled],
+    .form input[type="submit"][disabled]:hover {
+        background: silver;
+        cursor: not-allowed;
+        border: none;
+        opacity: 0.65;
+        filter: alpha(opacity=65);
+        color: #333;
+        background-color: #e6e6e6;
+    }
 
-.form-field input.input-validation-error,
-.form-field textarea.input-validation-error {
-    border-left: solid 5px #ca5252;
-}
+    .form-field input.input-validation-error,
+    .form-field textarea.input-validation-error {
+        border-left: solid 5px #ca5252;
+    }
 
 /* flyout Text */
 
@@ -1113,8 +1135,7 @@ button, input[type="submit"], .btn {
 }
 
 /* Last Updated Timestamp (in various places)*/
-.last-updated
-{
+.last-updated {
     margin-top: 1em;
     clear: both;
     color: grey;
@@ -1130,36 +1151,36 @@ button, input[type="submit"], .btn {
     padding: 0;
 }
 
-.sequence li {
-    border: solid 1px #333;
-    box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1), 1px 1px 1px rgba(0, 0, 0, 0.3);
-    color: #333;
-    float: left;
-    height: 35px;
-    line-height: 35px;
-    margin: 0 30px 20px 0;
-    padding: 0 20px;
-    width: auto;
-}
+    .sequence li {
+        border: solid 1px #333;
+        box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1), 1px 1px 1px rgba(0, 0, 0, 0.3);
+        color: #333;
+        float: left;
+        height: 35px;
+        line-height: 35px;
+        margin: 0 30px 20px 0;
+        padding: 0 20px;
+        width: auto;
+    }
 
-.sequence li.past,
-.sequence li.current {
-    background-color: #4585aa;
-    background-image: -ms-linear-gradient(top, #4585aa 0%, #376783 100%);
-    background-image: -o-linear-gradient(top, #4585aa 0%, #376783 100%);
-    background-image: -webkit-linear-gradient(top, #4585aa 0%, #376783 100%);
-    background-image: linear-gradient(top, #4585aa 0%, #376783 100%);
-    border-color: #376783;
-    color: #fff;
-}
+        .sequence li.past,
+        .sequence li.current {
+            background-color: #4585aa;
+            background-image: -ms-linear-gradient(top, #4585aa 0%, #376783 100%);
+            background-image: -o-linear-gradient(top, #4585aa 0%, #376783 100%);
+            background-image: -webkit-linear-gradient(top, #4585aa 0%, #376783 100%);
+            background-image: linear-gradient(top, #4585aa 0%, #376783 100%);
+            border-color: #376783;
+            color: #fff;
+        }
 
-.sequence li.current {
-    font-weight: 600;
-    height: 41px;
-    line-height: 41px;
-    margin-top: -3px;
-    text-decoration: underline;
-}
+        .sequence li.current {
+            font-weight: 600;
+            height: 41px;
+            line-height: 41px;
+            margin-top: -3px;
+            text-decoration: underline;
+        }
 
 .btn.btn-big {
     width: 100%;
@@ -1215,13 +1236,13 @@ ul.actionlist {
                 color: #0071bc;
             }
 
-                ul.actionlist li.actionlist-item a.actionlist-item-link:hover .actionlist-item-header .actionlist-item-header-text {
-                    text-decoration: underline;
-                }
+            ul.actionlist li.actionlist-item a.actionlist-item-link:hover .actionlist-item-header .actionlist-item-header-text {
+                text-decoration: underline;
+            }
 
-        ul.actionlist li.actionlist-item a.actionlist-item-link:hover {
-            text-decoration: none
-        }
+            ul.actionlist li.actionlist-item a.actionlist-item-link:hover {
+                text-decoration: none;
+            }
 
 ul.accordian {
     margin: 0;
@@ -1252,6 +1273,7 @@ ul.accordian {
             font-size: 12pt;
             margin-left: 1em;
         }
+
             ul.accordian li.accordian-item .accordian-item-subtitle .owner-image {
                 margin-bottom: -8px;
             }
@@ -1306,11 +1328,10 @@ ul.accordian {
 }
 
 span.sorted-by {
-    width: 100%;
-    text-align: right;
+    float: right;
     color: #52a4ca;
     display: block;
     font-size: 1.25em;
     margin: 0.5em;
     margin-left: 0;
-}
\ No newline at end of file
+}
diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
index abdc9d1b8b..b6f872728f 100644
--- a/src/NuGetGallery/Views/Shared/ListPackages.cshtml
+++ b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -27,18 +27,17 @@
                 <text>There are @Model.TotalCount packages</text>
             }</h1>
     }
+    <span class="sorted-by">Sorted by Recent Installs</span>
     @if (Model.LastResultIndex > 0)
     {
         <h2>Displaying results @Model.FirstResultIndex - @Model.LastResultIndex.</h2>
     }
     @if(Model.IndexTimestampUtc.HasValue) 
     {
-        <h3 class="package-list-lastupdated">Search Index last updated <span class="s-localtime" data-utc="@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()">@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()</span></h3>
+        <p class="package-list-lastupdated">Search Index last updated <span class="s-localtime" data-utc="@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()">@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()</span></p>
     }
 </div>
 
-<span class="sorted-by">Sorted by Recent Installs</span>
-
 <ul id="searchResults">
     @foreach (var package in Model.Items)
     {

From 2978eb6de7102b8ccfb32306d259513c62546a33 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Mon, 21 Apr 2014 12:34:49 -0700
Subject: [PATCH 12/20] Done that timeago o o o o up right?

---
 src/NuGetGallery/App_Start/AppActivator.cs    |   2 +-
 src/NuGetGallery/NuGetGallery.csproj          |   1 +
 src/NuGetGallery/Scripts/jquery.timeago.js    | 214 ++++++++++++++++++
 src/NuGetGallery/Scripts/nugetgallery.js      |   1 +
 .../Views/Shared/ListPackages.cshtml          |   2 +-
 5 files changed, 218 insertions(+), 2 deletions(-)
 create mode 100644 src/NuGetGallery/Scripts/jquery.timeago.js

diff --git a/src/NuGetGallery/App_Start/AppActivator.cs b/src/NuGetGallery/App_Start/AppActivator.cs
index 0dd7898e49..cc4d169d68 100644
--- a/src/NuGetGallery/App_Start/AppActivator.cs
+++ b/src/NuGetGallery/App_Start/AppActivator.cs
@@ -131,7 +131,7 @@ private static void BundlingPostStart()
                 .Include("~/Scripts/jquery-{version}.js")
                 .Include("~/Scripts/jquery.validate.js")
                 .Include("~/Scripts/jquery.validate.unobtrusive.js")
-                .Include("~/Scripts/typeahead.bundle.js")
+                .Include("~/Scripts/jquery.timeago.js")
                 .Include("~/Scripts/nugetgallery.js")
                 .Include("~/Scripts/stats.js");
             BundleTable.Bundles.Add(scriptBundle);
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index c08ef77301..3d3213b47f 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -1081,6 +1081,7 @@
     <Content Include="Branding\Views\web.config" />
     <Compile Include="Views\NuGetViewBase.cs" />
     <Content Include="Public\Blocked.html" />
+    <Content Include="Scripts\jquery.timeago.js" />
     <None Include="Scripts\jquery.validate-vsdoc.js" />
     <Content Include="Scripts\jquery.validate.js" />
     <Content Include="Scripts\jquery.validate.min.js" />
diff --git a/src/NuGetGallery/Scripts/jquery.timeago.js b/src/NuGetGallery/Scripts/jquery.timeago.js
new file mode 100644
index 0000000000..91fd28ab0f
--- /dev/null
+++ b/src/NuGetGallery/Scripts/jquery.timeago.js
@@ -0,0 +1,214 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 1.4.0
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ */
+
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function ($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) {
+      return inWords(timestamp);
+    } else if (typeof timestamp === "string") {
+      return inWords($.timeago.parse(timestamp));
+    } else if (typeof timestamp === "number") {
+      return inWords(new Date(timestamp));
+    } else {
+      return inWords($.timeago.datetime(timestamp));
+    }
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    settings: {
+      refreshMillis: 60000,
+      allowPast: true,
+      allowFuture: false,
+      localeTitle: false,
+      cutoff: 0,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        inPast: 'any moment now',
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        wordSeparator: " ",
+        numbers: []
+      }
+    },
+
+    inWords: function(distanceMillis) {
+      if(!this.settings.allowPast && ! this.settings.allowFuture) {
+          throw 'timeago allowPast and allowFuture settings can not both be set to false.';
+      }
+
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+      }
+
+      if(!this.settings.allowPast && distanceMillis >= 0) {
+        return this.settings.strings.inPast;
+      }
+
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 42 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 45 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        years < 1.5 && substitute($l.year, 1) ||
+        substitute($l.years, Math.round(years));
+
+      var separator = $l.wordSeparator || "";
+      if ($l.wordSeparator === undefined) { separator = " "; }
+      return $.trim([prefix, words, suffix].join(separator));
+    },
+
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    },
+    isTime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+    }
+  });
+
+  // functions that can be called via $(el).timeago('action')
+  // init is default when no action is given
+  // functions are called with context of a single element
+  var functions = {
+    init: function(){
+      var refresh_el = $.proxy(refresh, this);
+      refresh_el();
+      var $s = $t.settings;
+      if ($s.refreshMillis > 0) {
+        this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
+      }
+    },
+    update: function(time){
+      var parsedTime = $t.parse(time);
+      $(this).data('timeago', { datetime: parsedTime });
+      if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString());
+      refresh.apply(this);
+    },
+    updateFromDOM: function(){
+      $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) });
+      refresh.apply(this);
+    },
+    dispose: function () {
+      if (this._timeagoInterval) {
+        window.clearInterval(this._timeagoInterval);
+        this._timeagoInterval = null;
+      }
+    }
+  };
+
+  $.fn.timeago = function(action, options) {
+    var fn = action ? functions[action] : functions.init;
+    if(!fn){
+      throw new Error("Unknown function name '"+ action +"' for timeago");
+    }
+    // each over objects here and call the requested function
+    this.each(function(){
+      fn.call(this, options);
+    });
+    return this;
+  };
+
+  function refresh() {
+    var data = prepareData(this);
+    var $s = $t.settings;
+
+    if (!isNaN(data.datetime)) {
+      if ( $s.cutoff == 0 || distance(data.datetime) < $s.cutoff) {
+        $(this).text(inWords(data.datetime));
+      }
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
+      if ($t.settings.localeTitle) {
+        element.attr("title", element.data('timeago').datetime.toLocaleString());
+      } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
+        element.attr("title", text);
+      }
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+}));
\ No newline at end of file
diff --git a/src/NuGetGallery/Scripts/nugetgallery.js b/src/NuGetGallery/Scripts/nugetgallery.js
index a3c4d3f057..8399d2fc0b 100644
--- a/src/NuGetGallery/Scripts/nugetgallery.js
+++ b/src/NuGetGallery/Scripts/nugetgallery.js
@@ -86,5 +86,6 @@
             }
             $(this).text(utc.getFullYear() + "-" + padInt(utc.getMonth(), 2) + "-" + padInt(utc.getDate(), 2) + " " + hrs + ":" + padInt(utc.getMinutes(), 2) + " " + ampm + " Local Time");
         });
+        $('time.timeago').timeago();
     }
 })(window, jQuery);
diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
index b6f872728f..b86d79d9e6 100644
--- a/src/NuGetGallery/Views/Shared/ListPackages.cshtml
+++ b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -34,7 +34,7 @@
     }
     @if(Model.IndexTimestampUtc.HasValue) 
     {
-        <p class="package-list-lastupdated">Search Index last updated <span class="s-localtime" data-utc="@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()">@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()</span></p>
+        <p class="package-list-lastupdated">Search Index last updated <time class="timeago" datetime="@Model.IndexTimestampUtc.Value.ToString("O")">@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()</time></p>
     }
 </div>
 

From fb6b45f6368daad1629182e3c2df047bdfaf0ab8 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Mon, 21 Apr 2014 13:01:32 -0700
Subject: [PATCH 13/20] Some minor layout tweaks and IE-only-ficiation

---
 src/NuGetGallery/Content/Site.css             |  8 ++++++
 src/NuGetGallery/Scripts/nugetgallery.js      | 28 ++++++++++++++++++-
 src/NuGetGallery/UrlExtensions.cs             |  6 ++--
 .../Views/Packages/DisplayPackage.cshtml      |  4 ++-
 src/NuGetGallery/Views/Shared/Layout.cshtml   |  2 +-
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/NuGetGallery/Content/Site.css b/src/NuGetGallery/Content/Site.css
index 78e77706e7..d68d2a63d2 100644
--- a/src/NuGetGallery/Content/Site.css
+++ b/src/NuGetGallery/Content/Site.css
@@ -1030,6 +1030,10 @@ a.btn {
     box-sizing: border-box;
 }
 
+.btn.btn-small {
+    font-size: 10pt;
+}
+
 .btn.btn-inline {
     display: inline-block;
 }
@@ -1276,6 +1280,10 @@ ul.accordian {
     display: none;
 }
 
+body.s-noclickonce .s-clickonce {
+    display: none;
+}
+
 /* Icons */
 .nucon-nuget-w {
     background: url('images/icons/nuget_32_mono_w.png');
diff --git a/src/NuGetGallery/Scripts/nugetgallery.js b/src/NuGetGallery/Scripts/nugetgallery.js
index a3c4d3f057..ab9d31562a 100644
--- a/src/NuGetGallery/Scripts/nugetgallery.js
+++ b/src/NuGetGallery/Scripts/nugetgallery.js
@@ -26,6 +26,8 @@
         checkServiceStatus();
 
         attachPlugins();
+
+        sniffClickonce();
     });
 
 	// Add validator that ensures provided value is NOT equal to a specified value.
@@ -43,6 +45,21 @@
         return s;
     }
 
+    function hasMimeTypeSupport(desiredMime) {
+        var mimes = window.navigator.mimeTypes,
+            hasSupport = false;
+
+        for (var i = 0; i < mimes.length; i++) {
+            var mime = mimes[i];
+
+            if (mime.type == desiredMime) {
+                hasSupport = true;
+            }
+        }
+
+        return hasSupport;
+    };
+
     // Attach script plugins
     function attachPlugins() {
         $('.s-toggle[data-show][data-hide]').delegate('', 'click', function (evt) {
@@ -71,7 +88,7 @@
                 evt.preventDefault();
             }
         });
-        if(!navigator.mimeTypes["application/x-shockwave-flash"]) {
+        if (!hasMimeTypeSupport("application/x-shockwave-flash")) {
             $('.s-reqflash').remove();
         }
         $('.s-localtime[data-utc]').each(function () {
@@ -87,4 +104,13 @@
             $(this).text(utc.getFullYear() + "-" + padInt(utc.getMonth(), 2) + "-" + padInt(utc.getDate(), 2) + " " + hrs + ":" + padInt(utc.getMinutes(), 2) + " " + ampm + " Local Time");
         });
     }
+
+    function sniffClickonce() {
+        var userAgent = window.navigator.userAgent.toUpperCase(),
+            hasNativeDotNet = userAgent.indexOf('.NET CLR 3.5') >= 0;
+
+        if (hasNativeDotNet) {
+            $('body').removeClass('s-noclickonce');
+        }
+    }
 })(window, jQuery);
diff --git a/src/NuGetGallery/UrlExtensions.cs b/src/NuGetGallery/UrlExtensions.cs
index e128c4271e..f796e2dd14 100644
--- a/src/NuGetGallery/UrlExtensions.cs
+++ b/src/NuGetGallery/UrlExtensions.cs
@@ -7,6 +7,8 @@ namespace NuGetGallery
 {
     public static class UrlExtensions
     {
+        private const string PackageExplorerDeepLink = @"https://npe.codeplex.com/releases/clickonce/NuGetPackageExplorer.application?url={0}&id={1}&version={2}";
+
         // Shorthand for current url
         public static string Current(this UrlHelper url)
         {
@@ -140,9 +142,7 @@ public static string ExplorerDeepLink(this UrlHelper url, int feedVersion, strin
 
             urlResult = EnsureTrailingSlash(urlResult);
 
-            string explorerDeepLink = @"https://npe.codeplex.com/releases/clickonce/NuGetPackageExplorer.application?url={0}&id={1}&version={2}";
-
-            return string.Format(explorerDeepLink, urlResult, id, version);
+            return string.Format(PackageExplorerDeepLink, urlResult, id, version);
         }
 
         public static string LogOn(this UrlHelper url)
diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index f0baf1c883..e033df37d0 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -78,7 +78,6 @@
             @if (User.Identity.IsAuthenticated)
             {
                 <li><a href="@Url.PackageDownload(2, Model.Id, Model.Version)" title="Download the raw nupkg file.">Download</a></li>
-                <li><a href="@Url.ExplorerDeepLink(2, Model.Id, Model.Version)" title="Explore the nupkg with the NuGet Package Explorer (IE only)">Package Explorer</a></li>
             }
             else
             {
@@ -94,6 +93,9 @@
             {
                 <li><a href="@Url.StatisticsPackageDownloadByVersion(Model.Id)" title="Package Statistics">Package Statistics</a></li>
             }
+            @if(User.Identity.IsAuthenticated) {
+                <li><a class="s-clickonce" href="@Url.ExplorerDeepLink(2, Model.Id, Model.Version)" title="Explore the nupkg with the NuGet Package Explorer (IE only)">Open in NuGet Package Explorer</a></li>
+            }
         </ul>
     </nav>
 
diff --git a/src/NuGetGallery/Views/Shared/Layout.cshtml b/src/NuGetGallery/Views/Shared/Layout.cshtml
index 885e8a9465..93e30d7909 100644
--- a/src/NuGetGallery/Views/Shared/Layout.cshtml
+++ b/src/NuGetGallery/Views/Shared/Layout.cshtml
@@ -20,7 +20,7 @@
         @RenderSection("TopScripts", required: false)
         @ViewHelpers.ReleaseMeta()
     </head>
-    <body>
+    <body class="s-noclickonce">
         <div id="service-alert"></div>
         <div id="outer-wrapper">
             <div id="content-wrapper">

From a30d4f7ec2503ff2f3a475172e00d640095c3784 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Mon, 21 Apr 2014 13:09:42 -0700
Subject: [PATCH 14/20] Word wrap shmord shrap

---
 src/NuGetGallery/Content/Site.css             | 219 ++++++++++--------
 .../Views/Packages/DisplayPackage.cshtml      |   4 +-
 2 files changed, 120 insertions(+), 103 deletions(-)

diff --git a/src/NuGetGallery/Content/Site.css b/src/NuGetGallery/Content/Site.css
index d68d2a63d2..7e1e32b3c6 100644
--- a/src/NuGetGallery/Content/Site.css
+++ b/src/NuGetGallery/Content/Site.css
@@ -79,11 +79,11 @@ h6 {
     padding-bottom: 10px;
 }
 
-.page-heading h1,
-.page-heading h2 {
-    margin: 0;
-    padding: 0;
-}
+    .page-heading h1,
+    .page-heading h2 {
+        margin: 0;
+        padding: 0;
+    }
 
 /* Aside Headings */
 
@@ -226,15 +226,15 @@ nav, section {
     padding: 20px 20px 0 0;
 }
 
-#logo a {
-    background: url(../Content/Images/nugetlogo.png) no-repeat;
-    display: block;
-    height: 75px;
-    margin: 0;
-    padding: 0;
-    text-indent: -9999px;
-    width: 345px;
-}
+    #logo a {
+        background: url(../Content/Images/nugetlogo.png) no-repeat;
+        display: block;
+        height: 75px;
+        margin: 0;
+        padding: 0;
+        text-indent: -9999px;
+        width: 345px;
+    }
 
 /* Body */
 
@@ -248,9 +248,9 @@ nav, section {
     width: 25%;
 }
 
-    #pageSearchBox #searchBoxInput {
-        width: 265px;
-    }
+#pageSearchBox #searchBoxInput {
+    width: 265px;
+}
 
 
 /* Logo */
@@ -301,7 +301,9 @@ ul.owners {
     padding: 0;
 }
 
-ul.owners li { margin-bottom: 12px; }
+    ul.owners li {
+        margin-bottom: 12px;
+    }
 
 a.owner {
     font-size: 1.4em;
@@ -313,16 +315,20 @@ a.owner {
         top: -0.5em;
     }
 
-a.owner:hover {
-    text-decoration: none;
-    color: #333;
-}
+    a.owner:hover {
+        text-decoration: none;
+        color: #333;
+    }
 
-.owner-image { margin-right: 5px; }
+.owner-image {
+    margin-right: 5px;
+}
 
 /* Authors */
 
-p.authors { font-size: 1.25em; }
+p.authors {
+    font-size: 1.25em;
+}
 
 /* Large Package Icon - up to 128x128 */
 
@@ -436,7 +442,7 @@ p.authors { font-size: 1.25em; }
 }
 
     #sideColumn nav ul li {
-        margin: 0;
+        margin: 3px 0px 0px;
         padding: 0;
     }
 
@@ -513,7 +519,9 @@ section.package {
     }
 
     section.package ul,
-    section.package li { display: inline; }
+    section.package li {
+        display: inline;
+    }
 
     section.package h1 {
         font-size: 1.75em;
@@ -591,7 +599,9 @@ ul.pager {
             padding-right: 7px;
         }
 
-ul.pager li.next { padding-left: 10px; }
+        ul.pager li.next {
+            padding-left: 10px;
+        }
 
 /* Sexy Table */
 
@@ -637,9 +647,9 @@ ul.pager li.next { padding-left: 10px; }
             background-color: #f4f5f6;
         }
 
-.sexy-table tbody tr.recommended { 
-    font-weight: 800;
-}
+        .sexy-table tbody tr.recommended {
+            font-weight: 800;
+        }
 
     .sexy-table tbody td {
         padding: 5px 25px 5px 0;
@@ -860,9 +870,13 @@ fieldset.form {
         display: none;
     }
 
-.form-field p { margin-left: 10px; }
+.form-field p {
+    margin-left: 10px;
+}
 
-.form-field h3 { color: #52a4ca; }
+.form-field h3 {
+    color: #52a4ca;
+}
 
 .form-field {
     margin-bottom: 10px;
@@ -914,16 +928,21 @@ fieldset.form {
         padding-left: 6px;
     }
 
-.form-field input[type="checkbox"] { border-left: none; }
+    .form-field input[type="checkbox"] {
+        border-left: none;
+    }
+
+    .form-field input[type="url"] {
+        width: 100%;
+    }
 
-.form-field input[type="url"] { width: 100%; }
+    .form-field select {
+        color: #7f8c7d;
+        font-size: 1.25em;
+        padding: 2px;
+        margin: 0px 0px 10px 0;
+    }
 
-.form-field select {
-    color: #7f8c7d;
-    font-size: 1.25em;
-    padding: 2px;
-    margin: 0px 0px 10px 0;
-}
         .form-field select[data-edited=true] {
             border-left: solid 4px #2ef12e;
             padding-left: 0px;
@@ -945,31 +964,31 @@ fieldset.form {
         background-color: #e6e6e6;
     }
 
-.form-field select[data-edited=true] {
-    border-left: solid 4px #2ef12e;
-    padding-left: 0px;
-}
+    .form-field select[data-edited=true] {
+        border-left: solid 4px #2ef12e;
+        padding-left: 0px;
+    }
 
-.form-field textarea[disabled],
-.form-field input[type="email"][disabled],
-.form-field input[type="text"][disabled],
-.form-field input[type="file"][disabled],
-.form-field input[type="password"][disabled],
-.form input[type="submit"][disabled],
-.form input[type="submit"][disabled]:hover {
-    background: silver;
-    cursor: not-allowed;
-    border: none;
-    opacity: 0.65;
-    filter: alpha(opacity=65);
-    color: #333;
-    background-color: #e6e6e6;
-}
+    .form-field textarea[disabled],
+    .form-field input[type="email"][disabled],
+    .form-field input[type="text"][disabled],
+    .form-field input[type="file"][disabled],
+    .form-field input[type="password"][disabled],
+    .form input[type="submit"][disabled],
+    .form input[type="submit"][disabled]:hover {
+        background: silver;
+        cursor: not-allowed;
+        border: none;
+        opacity: 0.65;
+        filter: alpha(opacity=65);
+        color: #333;
+        background-color: #e6e6e6;
+    }
 
-.form-field input.input-validation-error,
-.form-field textarea.input-validation-error {
-    border-left: solid 5px #ca5252;
-}
+    .form-field input.input-validation-error,
+    .form-field textarea.input-validation-error {
+        border-left: solid 5px #ca5252;
+    }
 
 /* flyout Text */
 
@@ -1113,8 +1132,7 @@ button, input[type="submit"], .btn {
 }
 
 /* Last Updated Timestamp (in various places)*/
-.last-updated
-{
+.last-updated {
     margin-top: 1em;
     clear: both;
     color: grey;
@@ -1130,36 +1148,36 @@ button, input[type="submit"], .btn {
     padding: 0;
 }
 
-.sequence li {
-    border: solid 1px #333;
-    box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1), 1px 1px 1px rgba(0, 0, 0, 0.3);
-    color: #333;
-    float: left;
-    height: 35px;
-    line-height: 35px;
-    margin: 0 30px 20px 0;
-    padding: 0 20px;
-    width: auto;
-}
+    .sequence li {
+        border: solid 1px #333;
+        box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1), 1px 1px 1px rgba(0, 0, 0, 0.3);
+        color: #333;
+        float: left;
+        height: 35px;
+        line-height: 35px;
+        margin: 0 30px 20px 0;
+        padding: 0 20px;
+        width: auto;
+    }
 
-.sequence li.past,
-.sequence li.current {
-    background-color: #4585aa;
-    background-image: -ms-linear-gradient(top, #4585aa 0%, #376783 100%);
-    background-image: -o-linear-gradient(top, #4585aa 0%, #376783 100%);
-    background-image: -webkit-linear-gradient(top, #4585aa 0%, #376783 100%);
-    background-image: linear-gradient(top, #4585aa 0%, #376783 100%);
-    border-color: #376783;
-    color: #fff;
-}
+        .sequence li.past,
+        .sequence li.current {
+            background-color: #4585aa;
+            background-image: -ms-linear-gradient(top, #4585aa 0%, #376783 100%);
+            background-image: -o-linear-gradient(top, #4585aa 0%, #376783 100%);
+            background-image: -webkit-linear-gradient(top, #4585aa 0%, #376783 100%);
+            background-image: linear-gradient(top, #4585aa 0%, #376783 100%);
+            border-color: #376783;
+            color: #fff;
+        }
 
-.sequence li.current {
-    font-weight: 600;
-    height: 41px;
-    line-height: 41px;
-    margin-top: -3px;
-    text-decoration: underline;
-}
+        .sequence li.current {
+            font-weight: 600;
+            height: 41px;
+            line-height: 41px;
+            margin-top: -3px;
+            text-decoration: underline;
+        }
 
 .btn.btn-big {
     width: 100%;
@@ -1215,13 +1233,13 @@ ul.actionlist {
                 color: #0071bc;
             }
 
-                ul.actionlist li.actionlist-item a.actionlist-item-link:hover .actionlist-item-header .actionlist-item-header-text {
-                    text-decoration: underline;
-                }
+            ul.actionlist li.actionlist-item a.actionlist-item-link:hover .actionlist-item-header .actionlist-item-header-text {
+                text-decoration: underline;
+            }
 
-        ul.actionlist li.actionlist-item a.actionlist-item-link:hover {
-            text-decoration: none
-        }
+            ul.actionlist li.actionlist-item a.actionlist-item-link:hover {
+                text-decoration: none;
+            }
 
 ul.accordian {
     margin: 0;
@@ -1252,6 +1270,7 @@ ul.accordian {
             font-size: 12pt;
             margin-left: 1em;
         }
+
             ul.accordian li.accordian-item .accordian-item-subtitle .owner-image {
                 margin-bottom: -8px;
             }
@@ -1317,4 +1336,4 @@ span.sorted-by {
     font-size: 1.25em;
     margin: 0.5em;
     margin-left: 0;
-}
\ No newline at end of file
+}
diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index e033df37d0..201d1f850a 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -78,6 +78,7 @@
             @if (User.Identity.IsAuthenticated)
             {
                 <li><a href="@Url.PackageDownload(2, Model.Id, Model.Version)" title="Download the raw nupkg file.">Download</a></li>
+                <li><a class="s-clickonce" href="@Url.ExplorerDeepLink(2, Model.Id, Model.Version)" title="Explore the nupkg with the NuGet Package Explorer (IE only)">Open in Package Explorer</a></li>
             }
             else
             {
@@ -93,9 +94,6 @@
             {
                 <li><a href="@Url.StatisticsPackageDownloadByVersion(Model.Id)" title="Package Statistics">Package Statistics</a></li>
             }
-            @if(User.Identity.IsAuthenticated) {
-                <li><a class="s-clickonce" href="@Url.ExplorerDeepLink(2, Model.Id, Model.Version)" title="Explore the nupkg with the NuGet Package Explorer (IE only)">Open in NuGet Package Explorer</a></li>
-            }
         </ul>
     </nav>
 

From 009ac183fc2e06c153fda4fcda42b0e1197466d8 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Mon, 21 Apr 2014 13:10:22 -0700
Subject: [PATCH 15/20] Appease FxCop

---
 src/NuGetGallery/UrlExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/NuGetGallery/UrlExtensions.cs b/src/NuGetGallery/UrlExtensions.cs
index f796e2dd14..5eb8a4c40e 100644
--- a/src/NuGetGallery/UrlExtensions.cs
+++ b/src/NuGetGallery/UrlExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
@@ -142,7 +143,7 @@ public static string ExplorerDeepLink(this UrlHelper url, int feedVersion, strin
 
             urlResult = EnsureTrailingSlash(urlResult);
 
-            return string.Format(PackageExplorerDeepLink, urlResult, id, version);
+            return String.Format(CultureInfo.InvariantCulture, PackageExplorerDeepLink, urlResult, id, version);
         }
 
         public static string LogOn(this UrlHelper url)

From 6913d81bf573255c33fb46faf8e9f68da0b69b70 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Tue, 22 Apr 2014 10:15:02 -0700
Subject: [PATCH 16/20] Fix #2070 by fixing up more T4MVC cruft :(

---
 src/NuGetGallery/App_Start/Routes.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/NuGetGallery/App_Start/Routes.cs b/src/NuGetGallery/App_Start/Routes.cs
index 7728c6e6e4..7e165e42b8 100644
--- a/src/NuGetGallery/App_Start/Routes.cs
+++ b/src/NuGetGallery/App_Start/Routes.cs
@@ -315,12 +315,12 @@ public static void RegisterRoutes(RouteCollection routes)
             routes.MapRoute(
                 "v2PackageIds",
                 "api/v2/package-ids",
-                new { controller = "Api", action = "GetPackageIds" });
+                new { controller = "Api", action = "PackageIDs" });
 
             routes.MapRoute(
                 "v2PackageVersions",
                 "api/v2/package-versions/{id}",
-                new { controller = "Api", action = "GetPackageVersions" });
+                new { controller = "Api", action = "PackageVersions" });
 
             routes.MapRoute(
                 RouteName.StatisticsDownloadsApi,

From 6321a65aa5c1bbf1f5595ff012bf005c6987491a Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Tue, 22 Apr 2014 11:02:45 -0700
Subject: [PATCH 17/20] Fixed the JavaScript date format for good? I hope?

---
 src/NuGetGallery/ExtensionMethods.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGetGallery/ExtensionMethods.cs b/src/NuGetGallery/ExtensionMethods.cs
index 9e8eaf568c..efaf2ec15e 100644
--- a/src/NuGetGallery/ExtensionMethods.cs
+++ b/src/NuGetGallery/ExtensionMethods.cs
@@ -400,4 +400,4 @@ private static User LoadUser(IOwinContext context)
             return null; // No user logged in, or credentials could not be resolved
         }
     }
-}
\ No newline at end of file
+}

From c031ada2def2c41ce82c9212727483d511a945ad Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Tue, 22 Apr 2014 11:07:27 -0700
Subject: [PATCH 18/20] Fix #2008 for realz this time please!

---
 src/NuGetGallery/ExtensionMethods.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGetGallery/ExtensionMethods.cs b/src/NuGetGallery/ExtensionMethods.cs
index 0c9509a6db..efaf2ec15e 100644
--- a/src/NuGetGallery/ExtensionMethods.cs
+++ b/src/NuGetGallery/ExtensionMethods.cs
@@ -25,7 +25,7 @@ public static class ExtensionMethods
     {
         public static string ToJavaScriptUTC(this DateTime self)
         {
-            return self.ToString("yyyy-MM-dd HH:mm:ss UTC", CultureInfo.CurrentCulture);
+            return self.ToString("O", CultureInfo.CurrentCulture) + "Z";
         }
 
         public static string ToNuGetShortDateTimeString(this DateTime self)

From 3cc72e1c0ed61d9e2800ccb5450f72bae9c2af96 Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Tue, 22 Apr 2014 11:35:38 -0700
Subject: [PATCH 19/20] Fixed up the timestamp yet again

---
 src/NuGetGallery/ExtensionMethods.cs                        | 2 +-
 src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs | 3 ++-
 src/NuGetGallery/Views/Shared/ListPackages.cshtml           | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/NuGetGallery/ExtensionMethods.cs b/src/NuGetGallery/ExtensionMethods.cs
index efaf2ec15e..ce9f41565a 100644
--- a/src/NuGetGallery/ExtensionMethods.cs
+++ b/src/NuGetGallery/ExtensionMethods.cs
@@ -25,7 +25,7 @@ public static class ExtensionMethods
     {
         public static string ToJavaScriptUTC(this DateTime self)
         {
-            return self.ToString("O", CultureInfo.CurrentCulture) + "Z";
+            return self.ToUniversalTime().ToString("O", CultureInfo.CurrentCulture);
         }
 
         public static string ToNuGetShortDateTimeString(this DateTime self)
diff --git a/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs b/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs
index 652188fe32..f3e86f2090 100644
--- a/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs
+++ b/src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Web;
@@ -99,7 +100,7 @@ private static ApplicationVersion LoadVersion()
                 string repoUriString = TryGet(metadata, "RepositoryUrl");
 
                 DateTime buildDate;
-                if (!DateTime.TryParse(dateString, out buildDate))
+                if (!DateTime.TryParse(dateString, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out buildDate))
                 {
                     buildDate = DateTime.MinValue;
                 }
diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
index 899740ac13..fbc262fdc0 100644
--- a/src/NuGetGallery/Views/Shared/ListPackages.cshtml
+++ b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -33,9 +33,9 @@
     {
         <h2>Displaying results @Model.FirstResultIndex - @Model.LastResultIndex.</h2>
     }
-    @if(Model.IndexTimestampUtc.HasValue) 
+    @if(Model.IndexTimestampUtc.HasValue)
     {
-        <p class="package-list-lastupdated">Search Index last updated <time class="timeago" datetime="@Model.IndexTimestampUtc.Value.ToString("O")">@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()</time></p>
+        <p class="package-list-lastupdated" title="The time the Search Index was last modified to incorporate new packages.">Search Index last updated <time class="timeago" datetime="@Model.IndexTimestampUtc.Value.ToJavaScriptUTC()">@Model.IndexTimestampUtc.Value.ToNuGetShortDateTimeString() UTC</time></p>
     }
 </div>
 

From eddc0e53180cbce5df94f99bd982bf67c13afeee Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Tue, 22 Apr 2014 13:46:02 -0700
Subject: [PATCH 20/20] Fixed an off-by-one error :(

---
 src/NuGetGallery/Scripts/nugetgallery.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGetGallery/Scripts/nugetgallery.js b/src/NuGetGallery/Scripts/nugetgallery.js
index e5a9cce12d..87c1398f9c 100644
--- a/src/NuGetGallery/Scripts/nugetgallery.js
+++ b/src/NuGetGallery/Scripts/nugetgallery.js
@@ -101,7 +101,7 @@
                 }
                 ampm = "PM";
             }
-            $(this).text(utc.getFullYear() + "-" + padInt(utc.getMonth(), 2) + "-" + padInt(utc.getDate(), 2) + " " + hrs + ":" + padInt(utc.getMinutes(), 2) + " " + ampm + " Local Time");
+            $(this).text(utc.getFullYear() + "-" + padInt(utc.getMonth() + 1, 2) + "-" + padInt(utc.getDate(), 2) + " " + hrs + ":" + padInt(utc.getMinutes(), 2) + " " + ampm + " Local Time");
         });
         $('time.timeago').timeago();
     }