From 5ca56edcc99e340948cb8acc596eeda5d67dcdce Mon Sep 17 00:00:00 2001
From: cmanu <cristina.manu@microsoft.com>
Date: Tue, 5 Sep 2017 14:04:05 -0700
Subject: [PATCH 01/19] deletesnapshots (#4613)

---
 src/NuGetGallery/Services/CloudBlobWrapper.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/NuGetGallery/Services/CloudBlobWrapper.cs b/src/NuGetGallery/Services/CloudBlobWrapper.cs
index fa0176fb6f..8dbb649671 100644
--- a/src/NuGetGallery/Services/CloudBlobWrapper.cs
+++ b/src/NuGetGallery/Services/CloudBlobWrapper.cs
@@ -47,9 +47,14 @@ public string ETag
         public Task DeleteIfExistsAsync()
         {
             return Task.Factory.FromAsync<bool>(
-                (cb, state) => _blob.BeginDeleteIfExists(cb, state), 
-                ar => _blob.EndDeleteIfExists(ar),
-                state: null);
+                    (cb, state) => _blob.BeginDeleteIfExists(deleteSnapshotsOption: DeleteSnapshotsOption.IncludeSnapshots,
+                    accessCondition: null,
+                    options: null,
+                    operationContext: null,
+                    callback: cb,
+                    state: state),
+                    ar => _blob.EndDeleteIfExists(ar),
+                    state: null);
         }
 
         public Task DownloadToStreamAsync(Stream target)

From b988fa6989c5ad426fa320e98c1d3289ef279608 Mon Sep 17 00:00:00 2001
From: Robert Muehsig <robert.muehsig@codeinside.eu>
Date: Tue, 5 Sep 2017 23:46:16 +0200
Subject: [PATCH 02/19] adding a search hint if query results in no items

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

diff --git a/src/NuGetGallery/Views/Shared/ListPackages.cshtml b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
index 7c830f68ce..af814cee54 100644
--- a/src/NuGetGallery/Views/Shared/ListPackages.cshtml
+++ b/src/NuGetGallery/Views/Shared/ListPackages.cshtml
@@ -48,6 +48,20 @@
         </div>
     </div>
 
+    @if (!Model.Items.Any())
+    {
+        <div class="row">
+            <div class="col-xs-12 clearfix">
+                <div class="panel panel-default" aria-expanded="true" >
+                    <div class="panel-body">
+                        NuGet package search works the same on nuget.org, from the NuGet CLI, and within the NuGet Package Manager extension in Visual Studio. <br />
+                        Check out our <strong><a href="https://docs.microsoft.com/nuget/consume-packages/finding-and-choosing-packages#search-syntax">Search Syntax</a></strong>.
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
     <div class="list-packages" role="list">
         @foreach (var package in Model.Items)
         {

From 6c7b87b06aad9c7af0dd78e40caf6b9ce5e82537 Mon Sep 17 00:00:00 2001
From: Andrei Grigorev <andrey.grigoriev@gmail.com>
Date: Tue, 5 Sep 2017 17:10:34 -0700
Subject: [PATCH 03/19] Drop everything related to the ForceSSL cookie. (#4617)

We now always force SSL (if set up in configuration). So no need to have code specific for the authentication.
Addresses #4132.
---
 .../Services/FormsAuthenticationService.cs    | 33 -------------------
 .../Services/IFormsAuthenticationService.cs   |  2 --
 2 files changed, 35 deletions(-)

diff --git a/src/NuGetGallery/Services/FormsAuthenticationService.cs b/src/NuGetGallery/Services/FormsAuthenticationService.cs
index d07fa1682e..98f91117d5 100644
--- a/src/NuGetGallery/Services/FormsAuthenticationService.cs
+++ b/src/NuGetGallery/Services/FormsAuthenticationService.cs
@@ -17,8 +17,6 @@ public FormsAuthenticationService(IAppConfiguration configuration)
             _configuration = configuration;
         }
 
-        private const string ForceSSLCookieName = "ForceSSL";
-
         public void SetAuthCookie(
             string userName,
             bool createPersistentCookie,
@@ -48,42 +46,11 @@ public void SetAuthCookie(
                 Secure = _configuration.RequireSSL
             };
             context.Response.Cookies.Add(formsCookie);
-
-            if (_configuration.RequireSSL)
-            {
-                // Drop a second cookie indicating that the user is logged in via SSL (no secret data, just tells us to redirect them to SSL)
-                HttpCookie responseCookie = new HttpCookie(ForceSSLCookieName, "true");
-                responseCookie.HttpOnly = true;
-                context.Response.Cookies.Add(responseCookie);
-            }
         }
 
         public void SignOut()
         {
             FormsAuthentication.SignOut();
-
-            // Delete the "LoggedIn" cookie
-            HttpContext context = HttpContext.Current;
-            var cookie = context.Request.Cookies[ForceSSLCookieName];
-            if (cookie != null)
-            {
-                cookie.Expires = DateTime.UtcNow.AddDays(-1d);
-                context.Response.Cookies.Add(cookie);
-            }
-        }
-
-
-        public bool ShouldForceSSL(HttpContextBase context)
-        {
-            var cookie = context.Request.Cookies[ForceSSLCookieName];
-            
-            bool value;
-            if (cookie != null && Boolean.TryParse(cookie.Value, out value))
-            {
-                return value;
-            }
-            
-            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/Services/IFormsAuthenticationService.cs b/src/NuGetGallery/Services/IFormsAuthenticationService.cs
index 2f8548f116..5880d38a80 100644
--- a/src/NuGetGallery/Services/IFormsAuthenticationService.cs
+++ b/src/NuGetGallery/Services/IFormsAuthenticationService.cs
@@ -13,7 +13,5 @@ void SetAuthCookie(
             IEnumerable<string> roles);
 
         void SignOut();
-
-        bool ShouldForceSSL(HttpContextBase context);
     }
 }
\ No newline at end of file

From adf19db0e79119ac94eeb542786c1c9a83eeda4c Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavierdecoster@users.noreply.github.com>
Date: Wed, 6 Sep 2017 08:44:39 +0200
Subject: [PATCH 04/19] Package details page warning for SemVer is inconsistent
 with other places. (#4611)

Fixes #4552
---
 src/NuGetGallery/App_Code/ViewHelpers.cshtml  | 27 +++++++++++++++++++
 .../ViewModels/PackageViewModel.cs            | 11 +++++++-
 .../Views/Packages/DisplayPackage.cshtml      |  7 +----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/NuGetGallery/App_Code/ViewHelpers.cshtml b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
index 2e8b3747a1..ad6b4ab002 100644
--- a/src/NuGetGallery/App_Code/ViewHelpers.cshtml
+++ b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
@@ -61,6 +61,33 @@
     @Alert(htmlContent, "danger", "ErrorBadge", isAlertRole)
 }
 
+@helper AlertIsSemVer2Package(bool hasSemVer2Version, bool hasSemVer2Dependency)
+{
+    string warningHeader = null;
+    if (hasSemVer2Version)
+    {
+        warningHeader = "This package has a SemVer 2.0.0 package version.";
+    }
+    else if (hasSemVer2Dependency)
+    {
+        warningHeader = "This package is considered a SemVer 2.0.0 package as it has a package dependency on SemVer 2.0.0 package(s).";
+    }
+
+    if (warningHeader != null)
+    {
+        @AlertWarning(
+            @<text>
+                @warningHeader<br />
+                <em>
+                    This package will only be available to download with SemVer 2.0.0 compatible NuGet clients, such as Visual
+                    Studio 2017 (version 15.3) and above or NuGet client 4.3.0 and above.
+                    <a href="https://go.microsoft.com/fwlink/?linkid=852248" alt="Read more">Read more</a><br />
+                </em>
+            </text>
+        )
+    }
+}
+
 @helper ErrorPage(UrlHelper url, System.Web.Mvc.HtmlHelper html, string errorNumber, string errorName, Func<MvcHtmlString, HelperResult> errorTextMain, Func<MvcHtmlString, HelperResult> errorTextSub = null)
 {
     <section role="main" class="container main-container">
diff --git a/src/NuGetGallery/ViewModels/PackageViewModel.cs b/src/NuGetGallery/ViewModels/PackageViewModel.cs
index 36f741057d..4fb3ff0017 100644
--- a/src/NuGetGallery/ViewModels/PackageViewModel.cs
+++ b/src/NuGetGallery/ViewModels/PackageViewModel.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using NuGet.Versioning;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,7 +25,13 @@ public PackageViewModel(Package package)
             Version = String.IsNullOrEmpty(package.NormalizedVersion) ?
                 NuGetVersionFormatter.Normalize(package.Version) :
                 package.NormalizedVersion;
-            
+
+            HasSemVer2Version = NuGetVersion.Parse(_fullVersion).IsSemVer2;
+            HasSemVer2Dependency = package.Dependencies.ToList()
+                .Where(pd => pd.VersionSpec != null)
+                .Select(pd => VersionRange.Parse(pd.VersionSpec))
+                .Any(p => (p.HasUpperBound && p.MaxVersion.IsSemVer2) || (p.HasLowerBound && p.MinVersion.IsSemVer2));
+
             Description = package.Description;
             ReleaseNotes = package.ReleaseNotes;
             IconUrl = package.IconUrl;
@@ -80,6 +87,8 @@ public string Id
         public string Version { get; set; }
         public string FullVersion => _fullVersion;
         public bool IsSemVer2 => _isSemVer2;
+        public bool HasSemVer2Version { get; }
+        public bool HasSemVer2Dependency { get; }
 
         public string Title
         {
diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index 569e3f7d5d..6339952245 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -209,12 +209,7 @@
 
             @if (Model.IsSemVer2)
             {
-                @ViewHelpers.AlertWarning(
-                    @<text>
-                        This package is only available for download with Visual Studio 2017 (version 15.3) and above or with NuGet client 4.3.0 and above.
-                        Reach out to support if you have more questions.
-                    </text>
-                )
+                @ViewHelpers.AlertIsSemVer2Package(Model.HasSemVer2Version, Model.HasSemVer2Dependency)
             }
 
             @if (!Model.Listed && !Model.Deleted)

From 93901d101fa7e54995b4ece62488ce6a91c5119d Mon Sep 17 00:00:00 2001
From: Joel Verhagen <jver@microsoft.com>
Date: Wed, 6 Sep 2017 08:21:10 -0700
Subject: [PATCH 05/19] Use JsonRequestBehavior.AllowGet on endpoints that both
 return JSON and support GET (#4618)

Fix https://github.com/NuGet/NuGetGallery/issues/4597
---
 src/NuGetGallery/Controllers/AppController.cs |  8 +++--
 .../Controllers/PackagesController.cs         | 12 +++++--
 .../Controllers/AppControllerFacts.cs         | 32 +++++++++++++++++--
 .../Controllers/PackagesControllerFacts.cs    |  3 +-
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/NuGetGallery/Controllers/AppController.cs b/src/NuGetGallery/Controllers/AppController.cs
index cf19c822f9..a0c8cb722b 100644
--- a/src/NuGetGallery/Controllers/AppController.cs
+++ b/src/NuGetGallery/Controllers/AppController.cs
@@ -54,7 +54,7 @@ protected internal virtual ActionResult SafeRedirect(string returnUrl)
         /// <param name="statusCode">HTTP status code for response</param>
         /// <param name="obj">Object to Jsonify and return</param>
         /// <returns></returns>
-        protected internal JsonResult Json(int statusCode, object obj)
+        protected internal JsonResult Json(int statusCode, object obj, JsonRequestBehavior jsonRequestBehavior)
         {
             Response.StatusCode = statusCode;
             if (statusCode >= 400)
@@ -62,9 +62,13 @@ protected internal JsonResult Json(int statusCode, object obj)
                 Response.TrySkipIisCustomErrors = true;
             }
 
-            return Json(obj);
+            return Json(obj, jsonRequestBehavior);
         }
 
+        protected internal JsonResult Json(int statusCode, object obj)
+        {
+            return Json(statusCode, obj, JsonRequestBehavior.DenyGet);
+        }
 
         /// <summary>
         /// Called before the action method is invoked.
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
index 267dca1fb0..cd064a7d03 100644
--- a/src/NuGetGallery/Controllers/PackagesController.cs
+++ b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -102,7 +102,7 @@ public virtual JsonResult UploadPackageProgress()
             AsyncFileUploadProgress progress = _cacheService.GetProgress(username);
             if (progress == null)
             {
-                return Json(404, null);
+                return Json(404, null, JsonRequestBehavior.AllowGet);
             }
 
             return Json(progress, JsonRequestBehavior.AllowGet);
@@ -1001,12 +1001,18 @@ public virtual ActionResult Edit(string id, string version)
             var package = _packageService.FindPackageByIdAndVersion(id, version);
             if (package == null)
             {
-                return Json(404, new string[] { string.Format(Strings.PackageWithIdAndVersionNotFound, id, version) });
+                return Json(
+                    404,
+                    new string[]
+                    {
+                        string.Format(Strings.PackageWithIdAndVersionNotFound, id, version)
+                    },
+                    JsonRequestBehavior.AllowGet);
             }
 
             if (!package.IsOwner(User))
             {
-                return Json(403, new string[] { Strings.Unauthorized });
+                return Json(403, new string[] { Strings.Unauthorized }, JsonRequestBehavior.AllowGet);
             }
 
             var packageRegistration = _packageService.FindPackageRegistrationById(id);
diff --git a/tests/NuGetGallery.Facts/Controllers/AppControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/AppControllerFacts.cs
index 4ed73119d8..721f67878a 100644
--- a/tests/NuGetGallery.Facts/Controllers/AppControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/AppControllerFacts.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Web.Mvc;
 using NuGetGallery.Framework;
 using Xunit;
 
@@ -25,10 +26,37 @@ public void GivenNoActiveUserPrincipal_ItReturnsNull()
             }
         }
 
-        public class TestableAppController : AppController
+        public class TheJsonMethod : TestContainer
         {
-            // Nothing but a concrete class to test an abstract class :)
+            [Fact]
+            public void AllowsJsonRequestBehaviorToBeSpecified()
+            {
+                // Arrange
+                var controller = GetController<TestableAppController>();
+
+                // Act
+                var output = controller.Json(400, null, JsonRequestBehavior.AllowGet);
 
+                // Assert
+                Assert.Equal(JsonRequestBehavior.AllowGet, output.JsonRequestBehavior);
+            }
+
+            [Fact]
+            public void DefaultsToDenyGet()
+            {
+                // Arrange
+                var controller = GetController<TestableAppController>();
+
+                // Act
+                var output = controller.Json(400, null);
+
+                // Assert
+                Assert.Equal(JsonRequestBehavior.DenyGet, output.JsonRequestBehavior);
+            }
+        }
+
+        public class TestableAppController : AppController
+        {
             public User InvokeGetCurrentUser()
             {
                 return GetCurrentUser();
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
index c86875142c..bf4169070d 100644
--- a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
@@ -1923,7 +1923,8 @@ public void WillReturnHttpNotFoundForUnknownUser()
                 var result = controller.UploadPackageProgress();
 
                 // Assert
-                Assert.IsType<JsonResult>(result);
+                var jsonResult = Assert.IsType<JsonResult>(result);
+                Assert.Equal(JsonRequestBehavior.AllowGet, jsonResult.JsonRequestBehavior);
             }
 
             [Fact]

From b979bf7e7f4d94e82aa2ba094bed282a020d84d6 Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavierdecoster@users.noreply.github.com>
Date: Wed, 6 Sep 2017 20:42:35 +0200
Subject: [PATCH 06/19] Fix incorrect test setup (#4622)

---
 .../Controllers/CuratedFeedsControllerFacts.cs  |  9 +++++----
 .../Controllers/PackagesControllerFacts.cs      |  6 +++---
 .../ViewModels/DisplayPackageViewModelFacts.cs  | 15 ++++++++-------
 .../ViewModels/ListPackageItemViewModelFacts.cs | 17 ++++++++++++++++-
 .../ViewModels/PackageViewModelFacts.cs         |  5 +++++
 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs
index f9460598fb..84b2880d1a 100644
--- a/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs
@@ -24,7 +24,7 @@ public TestableCuratedFeedsController()
                 Fakes = new Fakes();
 
                 StubCuratedFeed = new CuratedFeed
-                    { Key = 0, Name = "aName", Managers = new HashSet<User>(new[] { Fakes.User }) };
+                { Key = 0, Name = "aName", Managers = new HashSet<User>(new[] { Fakes.User }) };
                 StubCuratedFeedService = new Mock<ICuratedFeedService>();
 
                 SetOwinContextOverride(Fakes.CreateOwinContext());
@@ -189,14 +189,15 @@ public async Task WillSearchForAPackage()
                     Id = "RedPill",
                     Key = 2,
                     DownloadCount = 0,
-                    Packages = new []
+                    Packages = new[]
                     {
                         new Package
                         {
+                            Version = "1.0.0",
                             Key = 89932,
                         }
                     },
-                    Owners = new []
+                    Owners = new[]
                     {
                         new User
                         {
@@ -208,7 +209,7 @@ public async Task WillSearchForAPackage()
 
                 redPill.Packages.ElementAt(0).PackageRegistration = redPill;
 
-                var mockPackageRegistrations = new [] { redPill }.AsQueryable();
+                var mockPackageRegistrations = new[] { redPill }.AsQueryable();
                 var mockPackages = new[] { redPill.Packages.ElementAt(0) }.AsQueryable();
 
                 controller.StubCuratedFeedService
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
index bf4169070d..270f1bf71f 100644
--- a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
@@ -399,8 +399,8 @@ public async Task GivenAnAbsoluteLatestVersionItQueriesTheCorrectVersion()
                             Id = "Foo",
                             Owners = new List<User>()
                         },
-                        Version = "2.0.0a",
-                        NormalizedVersion = "2.0.0a",
+                        Version = "2.0.0",
+                        NormalizedVersion = "2.0.0",
                         IsLatest = true,
                         Title = "A test package!"
                     });
@@ -414,7 +414,7 @@ public async Task GivenAnAbsoluteLatestVersionItQueriesTheCorrectVersion()
                 // Assert
                 var model = ResultAssert.IsView<DisplayPackageViewModel>(result);
                 Assert.Equal("Foo", model.Id);
-                Assert.Equal("2.0.0a", model.Version);
+                Assert.Equal("2.0.0", model.Version);
                 Assert.Equal("A test package!", model.Title);
                 Assert.True(model.LatestVersion);
             }
diff --git a/tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs b/tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs
index 403ba09dd1..26a46618c1 100644
--- a/tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs
+++ b/tests/NuGetGallery.Facts/ViewModels/DisplayPackageViewModelFacts.cs
@@ -14,13 +14,14 @@ public class DisplayPackageViewModelFacts
         public void TheCtorSortsPackageVersionsProperly()
         {
             var package = new Package
+            {
+                Version = "1.0.0",
+                Dependencies = Enumerable.Empty<PackageDependency>().ToList(),
+                PackageRegistration = new PackageRegistration
                 {
-                    Dependencies = Enumerable.Empty<PackageDependency>().ToList(),
-                    PackageRegistration = new PackageRegistration
-                        {
-                            Owners = Enumerable.Empty<User>().ToList(),
-                        }
-                };
+                    Owners = Enumerable.Empty<User>().ToList(),
+                }
+            };
 
             package.PackageRegistration.Packages = new[]
                 {
@@ -82,7 +83,7 @@ public void AvgDownloadsPerDayConsidersOldestPackageVersionInHistory()
 
             // Act
             var viewModel = new DisplayPackageViewModel(package, packageHistory);
-            
+
             // Assert
             Assert.Equal(daysSinceFirstPackageCreated, viewModel.TotalDaysSinceCreated);
             Assert.Equal(totalDownloadCount / daysSinceFirstPackageCreated, viewModel.DownloadsPerDay);
diff --git a/tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs b/tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs
index b496a8e89a..171c3448c4 100644
--- a/tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs
+++ b/tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs
@@ -40,6 +40,7 @@ public void LicenseNamesAreParsedByCommas()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 LicenseNames = "l1,l2, l3 ,l4  ,  l5 ",
             };
             var packageViewModel = new ListPackageItemViewModel(package);
@@ -51,6 +52,7 @@ public void LicenseReportFieldsKeptWhenLicenseReportDisabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = true,
                 LicenseNames = "l1",
                 LicenseReportUrl = "url"
@@ -65,6 +67,7 @@ public void LicenseReportUrlKeptWhenLicenseReportEnabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = false,
                 LicenseReportUrl = "url"
             };
@@ -77,6 +80,7 @@ public void LicenseNamesKeptWhenLicenseReportEnabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = false,
                 LicenseNames = "l1"
             };
@@ -89,6 +93,7 @@ public void LicenseUrlKeptWhenLicenseReportDisabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = true,
                 LicenseUrl = "url"
             };
@@ -103,6 +108,7 @@ public void ShortDescriptionsNotTruncated()
             var description = "A Short Description";
             var package = new Package()
             {
+                Version = "1.0.0",
                 Description = description
             };
 
@@ -122,6 +128,7 @@ public void LongDescriptionsTruncated()
 
             var package = new Package()
             {
+                Version = "1.0.0",
                 Description = description
             };
 
@@ -142,6 +149,7 @@ public void LongDescriptionsSingleWordTruncatedToLimit()
 
             var package = new Package()
             {
+                Version = "1.0.0",
                 Description = description
             };
 
@@ -155,7 +163,10 @@ public void LongDescriptionsSingleWordTruncatedToLimit()
         [Fact]
         public void EmptyTagsAreParsedEmpty()
         {
-            var package = new Package() { };
+            var package = new Package()
+            {
+                Version = "1.0.0"
+            };
 
             var listPackageItemViewModel = new ListPackageItemViewModel(package);
 
@@ -167,6 +178,7 @@ public void TagsAreParsed()
         {
             var package = new Package()
             {
+                Version = "1.0.0",
                 Tags = "tag1 tag2 tag3"
             };
 
@@ -198,6 +210,7 @@ public void AuthorsIsFlattenedAuthors()
 
             var package = new Package()
             {
+                Version = "1.0.0",
                 Authors = authors,
                 FlattenedAuthors = flattenedAuthors
             };
@@ -212,6 +225,7 @@ public void UseVersionIfLatestAndStableNotSame()
         {
             var package = new Package()
             {
+                Version = "1.0.0",
                 IsLatest = true,
                 IsLatestStable = false
             };
@@ -237,6 +251,7 @@ public void UseVersionIfLatestSemVer2AndStableSemVer2NotSame()
         {
             var package = new Package()
             {
+                Version = "1.0.0",
                 SemVerLevelKey = SemVerLevelKey.SemVer2,
                 IsLatestSemVer2 = true,
                 IsLatestStableSemVer2 = false
diff --git a/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs b/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs
index 2f0009ae0f..db96ca16c9 100644
--- a/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs
+++ b/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs
@@ -35,6 +35,7 @@ public void LicenseNamesAreParsedByCommas()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 LicenseNames = "l1,l2, l3 ,l4  ,  l5 ",
             };
             var packageViewModel = new PackageViewModel(package);
@@ -46,6 +47,7 @@ public void LicenseReportFieldsKeptWhenLicenseReportDisabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = true,
                 LicenseNames = "l1",
                 LicenseReportUrl = "url"
@@ -60,6 +62,7 @@ public void LicenseReportUrlKeptWhenLicenseReportEnabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = false,
                 LicenseReportUrl = "url"
             };
@@ -72,6 +75,7 @@ public void LicenseNamesKeptWhenLicenseReportEnabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = false,
                 LicenseNames = "l1"
             };
@@ -84,6 +88,7 @@ public void LicenseUrlKeptWhenLicenseReportDisabled()
         {
             var package = new Package
             {
+                Version = "1.0.0",
                 HideLicenseReport = true,
                 LicenseUrl = "url"
             };

From f62358a7e012db3ad3d08a16775ebb032563890d Mon Sep 17 00:00:00 2001
From: Kristian Hellang <kristian@hellang.com>
Date: Tue, 29 Aug 2017 13:06:26 +0200
Subject: [PATCH 07/19] Move pager to center of the page (#4599)

---
 src/Bootstrap/dist/css/bootstrap-theme.css               | 1 -
 src/Bootstrap/less/theme/common-list-packages.less       | 3 +--
 src/NuGetGallery/Content/gallery/css/bootstrap-theme.css | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Bootstrap/dist/css/bootstrap-theme.css b/src/Bootstrap/dist/css/bootstrap-theme.css
index 90895d6318..51ccdaf91a 100644
--- a/src/Bootstrap/dist/css/bootstrap-theme.css
+++ b/src/Bootstrap/dist/css/bootstrap-theme.css
@@ -374,7 +374,6 @@ img.package-icon {
   }
 }
 .pager {
-  float: right;
   margin-top: 75px;
   margin-bottom: 0;
 }
diff --git a/src/Bootstrap/less/theme/common-list-packages.less b/src/Bootstrap/less/theme/common-list-packages.less
index 643e5b575d..6c79dfec6d 100644
--- a/src/Bootstrap/less/theme/common-list-packages.less
+++ b/src/Bootstrap/less/theme/common-list-packages.less
@@ -66,5 +66,4 @@
 .pager {
   margin-top: 75px;
   margin-bottom: 0px;
-  float: right;
-}
\ No newline at end of file
+}
diff --git a/src/NuGetGallery/Content/gallery/css/bootstrap-theme.css b/src/NuGetGallery/Content/gallery/css/bootstrap-theme.css
index 90895d6318..51ccdaf91a 100644
--- a/src/NuGetGallery/Content/gallery/css/bootstrap-theme.css
+++ b/src/NuGetGallery/Content/gallery/css/bootstrap-theme.css
@@ -374,7 +374,6 @@ img.package-icon {
   }
 }
 .pager {
-  float: right;
   margin-top: 75px;
   margin-bottom: 0;
 }

From 86ef41479f38508131c47e2f7de918caac301ec5 Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavierdecoster@users.noreply.github.com>
Date: Thu, 7 Sep 2017 18:14:03 +0200
Subject: [PATCH 08/19] Fix versionspec parsing in PackageViewModel + test
 coverage. (#4629)

---
 src/NuGetGallery/UrlExtensions.cs             |   2 -
 .../ViewModels/PackageViewModel.cs            |   2 +-
 .../ViewModels/PackageViewModelFacts.cs       | 107 ++++++++++++++++++
 3 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/src/NuGetGallery/UrlExtensions.cs b/src/NuGetGallery/UrlExtensions.cs
index da51bd4d1b..c0fed5a7f9 100644
--- a/src/NuGetGallery/UrlExtensions.cs
+++ b/src/NuGetGallery/UrlExtensions.cs
@@ -86,8 +86,6 @@ public static string PackageList(this UrlHelper url, int page, string q, bool in
             return url.Action("ListPackages", "Packages", routeValues);
         }
 
-
-
         public static string CuratedPackageList(this UrlHelper url, int page, string q, string curatedFeedName)
         {
             return url.Action("ListPackages", "CuratedFeeds", new
diff --git a/src/NuGetGallery/ViewModels/PackageViewModel.cs b/src/NuGetGallery/ViewModels/PackageViewModel.cs
index 4fb3ff0017..b5387132c4 100644
--- a/src/NuGetGallery/ViewModels/PackageViewModel.cs
+++ b/src/NuGetGallery/ViewModels/PackageViewModel.cs
@@ -28,7 +28,7 @@ public PackageViewModel(Package package)
 
             HasSemVer2Version = NuGetVersion.Parse(_fullVersion).IsSemVer2;
             HasSemVer2Dependency = package.Dependencies.ToList()
-                .Where(pd => pd.VersionSpec != null)
+                .Where(pd => !string.IsNullOrEmpty(pd.VersionSpec))
                 .Select(pd => VersionRange.Parse(pd.VersionSpec))
                 .Any(p => (p.HasUpperBound && p.MaxVersion.IsSemVer2) || (p.HasLowerBound && p.MinVersion.IsSemVer2));
 
diff --git a/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs b/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs
index db96ca16c9..32a29241d1 100644
--- a/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs
+++ b/tests/NuGetGallery.Facts/ViewModels/PackageViewModelFacts.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Collections.Generic;
 using Xunit;
 
 namespace NuGetGallery.ViewModels
@@ -95,5 +96,111 @@ public void LicenseUrlKeptWhenLicenseReportDisabled()
             var packageViewModel = new PackageViewModel(package);
             Assert.NotNull(packageViewModel.LicenseUrl);
         }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void HasSemVer2DependencyIsFalseWhenInvalidDependencyVersionRange(string versionSpec)
+        {
+            // Arrange
+            var package = new Package
+            {
+                Version = "1.0.0",
+                Dependencies = new List<PackageDependency>
+                {
+                    new PackageDependency { VersionSpec = versionSpec}
+                }
+            };
+
+            // Act
+            var viewModel = new PackageViewModel(package);
+
+            // Assert
+            Assert.False(viewModel.HasSemVer2Dependency);
+        }
+
+        [Theory]
+        [InlineData("2.0.0-alpha.1")]
+        [InlineData("2.0.0+metadata")]
+        [InlineData("2.0.0-alpha+metadata")]
+        public void HasSemVer2DependencyWhenSemVer2DependencyVersionSpec(string versionSpec)
+        {
+            // Arrange
+            var package = new Package
+            {
+                Version = "1.0.0",
+                Dependencies = new List<PackageDependency>
+                {
+                    new PackageDependency { VersionSpec = versionSpec}
+                }
+            };
+
+            // Act
+            var viewModel = new PackageViewModel(package);
+
+            // Assert
+            Assert.True(viewModel.HasSemVer2Dependency);
+        }
+
+        [Theory]
+        [InlineData("2.0.0-alpha")]
+        [InlineData("2.0.0")]
+        [InlineData("2.0.0.0")]
+        public void HasSemVer2DependencyIsFalseWhenNonSemVer2DependencyVersionSpec(string versionSpec)
+        {
+            // Arrange
+            var package = new Package
+            {
+                Version = "1.0.0",
+                Dependencies = new List<PackageDependency>
+                {
+                    new PackageDependency { VersionSpec = versionSpec}
+                }
+            };
+
+            // Act
+            var viewModel = new PackageViewModel(package);
+
+            // Assert
+            Assert.False(viewModel.HasSemVer2Dependency);
+        }
+        
+        [Theory]
+        [InlineData("2.0.0-alpha")]
+        [InlineData("2.0.0")]
+        [InlineData("2.0.0.0")]
+        public void HasSemVer2VersionIsFalseWhenNonSemVer2Version(string version)
+        {
+            // Arrange
+            var package = new Package
+            {
+                Version = version
+            };
+
+            // Act
+            var viewModel = new PackageViewModel(package);
+
+            // Assert
+            Assert.False(viewModel.HasSemVer2Version);
+        }
+
+        [Theory]
+        [InlineData("2.0.0-alpha.1")]
+        [InlineData("2.0.0+metadata")]
+        [InlineData("2.0.0-alpha+metadata")]
+        public void HasSemVer2VersionIsTrueWhenSemVer2Version(string version)
+        {
+            // Arrange
+            var package = new Package
+            {
+                Version = version
+            };
+
+            // Act
+            var viewModel = new PackageViewModel(package);
+
+            // Assert
+            Assert.True(viewModel.HasSemVer2Version);
+        }
     }
 }

From e7831a472f8ebed354d59383eeb31a9186d98fb8 Mon Sep 17 00:00:00 2001
From: Joel Verhagen <jver@microsoft.com>
Date: Thu, 7 Sep 2017 10:43:09 -0700
Subject: [PATCH 09/19] Use TotalDownloadCount sum for total on user packages
 list instead of DownloadCount (#4630)

Fix https://github.com/NuGet/NuGetGallery/issues/4607
---
 src/NuGetGallery/Views/Users/_UserPackagesList.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGetGallery/Views/Users/_UserPackagesList.cshtml b/src/NuGetGallery/Views/Users/_UserPackagesList.cshtml
index f53fb878b7..1d03467227 100644
--- a/src/NuGetGallery/Views/Users/_UserPackagesList.cshtml
+++ b/src/NuGetGallery/Views/Users/_UserPackagesList.cshtml
@@ -2,7 +2,7 @@
 @{
     var packagesString = "package" + (Model.Packages.Count() != 1 ? "s" : "");
     
-    var numDownloads = Model.Packages.Sum(p => p.DownloadCount);
+    var numDownloads = Model.Packages.Sum(p => p.TotalDownloadCount);
     var downloadsString = "download" + (numDownloads != 1 ? "s" : "");
 }
 

From af0c618b9e58764464e59502991e47839e75b066 Mon Sep 17 00:00:00 2001
From: Loic Sharma <sharma.loic@gmail.com>
Date: Thu, 7 Sep 2017 13:33:54 -0700
Subject: [PATCH 10/19] Updated third-party tabs' support notice (#4631)

---
 src/NuGetGallery/Views/Packages/DisplayPackage.cshtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index 6339952245..ff1e7f0b07 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -92,8 +92,8 @@
         {
             @ViewHelpers.AlertWarning(
                 @<text>
-                    This client is not supported by the NuGet team.
-                    <a href="@thirdPartyPackageManager.ContactUrl">Contact its maintainers for support</a>.
+                    The NuGet Team does not provide support for this client.
+                    Please contact its <a href="@thirdPartyPackageManager.ContactUrl">maintainers</a> for support.
                 </text>)
         }
     </div>

From 3b6070f22deef845c2e09b7c6eb4134706a655a9 Mon Sep 17 00:00:00 2001
From: Joel Verhagen <jver@microsoft.com>
Date: Fri, 8 Sep 2017 10:33:09 -0700
Subject: [PATCH 11/19] Add AddPackageLicenseReport2 which supports a larger
 Value field (#4633)

Progress on https://github.com/NuGet/Engineering/issues/743
---
 .../AddPackageLicenseReport2.Down.sql         |   6 +
 .../AddPackageLicenseReport2.Up.sql           | 133 ++++++++++++++++++
 ..._AddPackageLicenseReport2Sproc.Designer.cs |  29 ++++
 ...072246362_AddPackageLicenseReport2Sproc.cs |  13 ++
 ...2246362_AddPackageLicenseReport2Sproc.resx | 126 +++++++++++++++++
 .../Migrations/SqlResourceMigration.cs        |  42 ++++--
 src/NuGetGallery/NuGetGallery.csproj          |   9 ++
 7 files changed, 349 insertions(+), 9 deletions(-)
 create mode 100644 src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Down.sql
 create mode 100644 src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Up.sql
 create mode 100644 src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.Designer.cs
 create mode 100644 src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.cs
 create mode 100644 src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.resx

diff --git a/src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Down.sql b/src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Down.sql
new file mode 100644
index 0000000000..b8a399f074
--- /dev/null
+++ b/src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Down.sql
@@ -0,0 +1,6 @@
+SET ANSI_NULLS ON
+
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AddPackageLicenseReport2]') AND type IN (N'P', N'PC'))
+BEGIN
+    DROP PROCEDURE [dbo].[AddPackageLicenseReport2]
+END
diff --git a/src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Up.sql b/src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Up.sql
new file mode 100644
index 0000000000..8fb5e2a85a
--- /dev/null
+++ b/src/NuGetGallery/Infrastructure/AddPackageLicenseReport2.Up.sql
@@ -0,0 +1,133 @@
+SET ANSI_NULLS ON
+
+IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AddPackageLicenseReport2]') AND type IN (N'P', N'PC'))
+BEGIN
+    DROP PROCEDURE [dbo].[AddPackageLicenseReport2]
+END
+GO
+
+CREATE PROCEDURE [dbo].[AddPackageLicenseReport2]
+(
+     @sequence INT,
+     @packageId NVARCHAR(128),
+     @version NVARCHAR(64),
+     @reportUrl NVARCHAR(256) = NULL,
+     @licenseNames LicenseNamesList READONLY,
+     @comment NVARCHAR(256) = NULL,
+     @whatIf BIT = 0
+ )
+ AS
+ BEGIN
+    
+    SET NOCOUNT ON
+
+    DECLARE @reportKey       INT
+    DECLARE @packageKey      INT
+    DECLARE @licenseNamesStr VARCHAR(MAX)
+    DECLARE @licenseKeys     TABLE
+    (
+        [Key] INT NOT NULL PRIMARY KEY
+    )
+
+    -- Check input
+
+    IF @sequence  IS NULL RETURN
+    IF @packageId IS NULL RETURN
+    IF @version   IS NULL RETURN
+
+    DECLARE @returnTable TABLE
+    (
+        [Action] nvarchar(128),
+        [Table] nvarchar(128),
+        [Value] nvarchar(max)
+    )
+ 
+    -- Get package key
+    
+    SET @packageKey =
+    (
+        SELECT P.[Key]
+        FROM   PackageRegistrations AS R
+        JOIN   Packages AS P 
+        ON     R.[Key] = P.PackageRegistrationKey
+        WHERE  (R.Id = @packageId) AND (P.Version = @version)
+    )
+
+    IF @packageKey IS NULL
+    BEGIN
+        INSERT INTO @returnTable([Action], [Table], [Value]) VALUES('Error', 'Packages', 'Package not found: ' + @packageId + ' ' + @version)
+        
+        -- Return results
+        SELECT -1 AS 'ReturnCode'
+        SELECT * FROM @returnTable
+    END
+    ELSE
+    BEGIN
+    
+        BEGIN TRANSACTION
+
+            -- Add non-existing license names 
+            MERGE PackageLicenses
+            USING @licenseNames l
+            ON    PackageLicenses.Name = l.Name
+            WHEN NOT MATCHED THEN
+                INSERT (Name) VALUES (l.Name)
+            OUTPUT $action AS 'Action', 'PackageLicenses' AS 'Table', INSERTED.Name AS 'Value' 
+                INTO @returnTable([Action], [Table], Value);
+    
+            -- Get license names keys
+ 
+            INSERT @licenseKeys
+            SELECT PackageLicenses.[Key] FROM PackageLicenses 
+            JOIN   @licenseNames l
+            ON     PackageLicenses.Name = l.Name
+
+            -- Is there already a report for this ID Version Sequence tuple? If so, delete it
+            DELETE FROM PackageLicenseReports
+                OUTPUT 'DELETE' AS 'Action', 'PackageLicenseReports' AS 'Table', deleted.[Key] AS 'Value'
+                    INTO @returnTable([Action], [Table], Value)
+            WHERE PackageKey = @packageKey AND Sequence = @sequence
+
+            -- Add report
+            INSERT PackageLicenseReports (PackageKey, CreatedUtc, Sequence, ReportUrl, Comment)
+                OUTPUT 'INSERT' AS 'Action', 'PackageLicenseReports' AS 'Table', CONVERT(nvarchar(64), INSERTED.[Key]) + ' URL:' + INSERTED.ReportUrl AS 'Value' 
+                    INTO @returnTable([Action], [Table], Value)
+            VALUES (@packageKey, GETDATE(), @sequence, @reportUrl, @Comment)
+
+            SELECT @reportKey = SCOPE_IDENTITY()
+ 
+            -- Create relationship between report and licenses names 
+ 
+            -- INSERT PackageLicenseReportLicenses (ReportKey, LicenseKey)
+            INSERT PackageLicenseReportLicenses
+            SELECT @reportKey AS ReportKey, [Key] FROM @licenseKeys
+
+            -- Add denormalized data for optimization 
+    
+            -- Creates a comma-separated list
+            SELECT @licenseNamesStr = COALESCE(@licenseNamesStr + ',', '') + Name 
+            FROM   @licenseNames
+ 
+            DECLARE @pid TABLE (PackageKey INT NOT NULL PRIMARY KEY)
+            UPDATE Packages
+            SET    Packages.LicenseNames = @licenseNamesStr,
+                    Packages.LicenseReportUrl = @reportUrl
+            OUTPUT INSERTED.[Key]
+                INTO @pid(PackageKey)
+            FROM   Packages p
+                INNER JOIN PackageRegistrations pr ON p.PackageRegistrationKey = pr.[Key]
+            WHERE  p.[Key] = @packageKey
+
+            INSERT INTO @returnTable([Action], [Table], [Value])
+            SELECT 'UPDATE' AS 'Action', 'Packages' AS 'Table', pr.Id + ' ' + p.[Version] + ': Report=' + p.LicenseReportUrl + ' Names=' + p.LicenseNames
+            FROM @pid pid
+                INNER JOIN Packages p ON pid.PackageKey = p.[Key]
+                INNER JOIN PackageRegistrations pr ON p.PackageRegistrationKey = pr.[Key]
+
+            -- Return results
+            SELECT 0 AS 'ReturnCode'
+            SELECT * FROM @returnTable
+       
+        IF @whatIf <> 1 COMMIT TRANSACTION ELSE ROLLBACK TRANSACTION
+    END
+END
\ No newline at end of file
diff --git a/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.Designer.cs b/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.Designer.cs
new file mode 100644
index 0000000000..cb8f82c1eb
--- /dev/null
+++ b/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.Designer.cs
@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace NuGetGallery.Migrations
+{
+    using System.CodeDom.Compiler;
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
+    public sealed partial class AddPackageLicenseReport2Sproc : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(AddPackageLicenseReport2Sproc));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "201709072246362_AddPackageLicenseReport2Sproc"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}
diff --git a/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.cs b/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.cs
new file mode 100644
index 0000000000..3505e84256
--- /dev/null
+++ b/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace NuGetGallery.Migrations
+{
+    public partial class AddPackageLicenseReport2Sproc : SqlResourceMigration
+    {
+        public AddPackageLicenseReport2Sproc()
+            : base("NuGetGallery.Infrastructure.AddPackageLicenseReport2.Up.sql", "NuGetGallery.Infrastructure.AddPackageLicenseReport2.Down.sql")
+        {
+        }
+    }
+}
diff --git a/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.resx b/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.resx
new file mode 100644
index 0000000000..92152e09ba
--- /dev/null
+++ b/src/NuGetGallery/Migrations/201709072246362_AddPackageLicenseReport2Sproc.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Target" xml:space="preserve">
+    <value>H4sIAAAAAAAEAO1d247cOJJ9X2D/IZFPu4Mep+3uacwYVTOoLtvdxrpsw2k39q0gp1hVmlZK2ZLSrprFftk+7CftLyx15yWCF4m61SQMGJUiGSSDh0EyGBH8v//537O/3e/D1VeSpEEcna+fPXm6XpFoF/tBdHu+PmY3f/zz+m9//dd/OXvl7+9Xv9b5vs/z0ZJRer6+y7LDi80m3d2RvZc+2Qe7JE7jm+zJLt5vPD/ePH/69C+bZ882hJJYU1qr1dnHY5QFe1L8oD8v42hHDtnRC69in4Rp9Z2mbAuqq3fenqQHb0fO1++OP5PsZy8MSfKwXl2EgUfbsCXhzXrlRVGceRlt4YvPKdlmSRzdbg/0gxd+ejgQmu/GC1NStfxFm920E0+f553YtAVrUrtjmsV7S4LPvq+4shGLd+LtuuEa5dsryt/sIe91wbvz9WVCfBLlrFivxOpeXIZJnpVn7pO2yHcrPiFOyHcNGChm8n/frS6PYXZMyHlEjlmSF/pw/BIGu/8gD5/i30h0Hh3DkG0kbSZN4z7QTx+S+ECS7OEjuamaTjOtVxu+4EYs2ZRjC5WdehNl3z9f0y6EofclJA0KGAZsM9qln0lEEi8j/gcvy0hCB/FN0f9Mrl6ojKItMahQTSQvW1Og2KUTcL268u7fkug2uztf//jDevU6uCd+/aEi+jkK6HSlZbLkSKwr/dULj6pan//pxyGqfUnSXRIcSqz3rlxdVzuIA1dE50uOnrqel/THJyrkOiHvMt4fjgUxdZ2v7g9BQlK5ToNiRQM+BbvfUga4OczUZd96aUYBD/RTKPfO+xrcFpUIFLY7+pNW+pGERXJ6FxxKGf6kSLpmhdXrJN5/jMO6GJN2/clLbklG2xEjGbbxMdlZNCyfx2CzGJplnrZVQlJTZ90oMb1uNNums00rr5VSvOihsQAvcp9kt3bWVuPTW4Jvj1/+TnaZQtDQPx0ImoswjL8R/2KnkZ+mtem6ic4Xdp72nczivEFne6eJU85aw3mTZz5NG80KsveC8ML36eKTDr6yfqYnkugmSPbEH7deCoTI24+/LSt7WU7zuvKfYjovvMia1rs4C24ePni737xb8uGY3vUnWTTvshyScheRo13BpRyMvUfjg5em3+LE/0hSkk1UY7txyrc9ttuuaof4OdvZlsw3Xa8p02l/4tsg6kCBKX0Z0+O35VJnsAbAOzqLrZO4n8O2VqZNu6IygmIebldBsc3RtopLkJYlPhVak1QtyoGUfCV+o8+A2yZlu37/jQpqrplYHomLaEZbdubkFLyskgVGFl9hLpZJtizckt0xoQvUh5gutIGiQVzGBwl8SBaJfVg+iHvG25FCgFYoMt6WsIVO2xO1tPsp9lUHfjf78BxMsOpHc04grfjtugSPddb4FHdTbqHzt2YaOG9ZiF+3OdtZC2aQxAucy1bSlF3vs3hAskReWjpJEEmqG4sRqeRJlvTTkT57/uchzgBv0u2dl3Aj3E9kvEk/JOQmuLemg86QelfiegsjzmftXse0wdUp6CO5DdKs3MebNh8uquoMVMKga2CxXsoPgKKxtADKnuSF7sJhfGHxMv4WhbHndznaSWKCjmVwE3RQE3QRFADAAFGB55JmlCJrR3Fh3vC2gLrpdT6jxjeZRzttOpJ1+pOoUkT2kXW28u0k03SaMGmgel+XXMaHhyS4vRv+EDPFzazZFbeb/tFJTbyUvIszolKKu6nM4VLz6j7nqRdW6PqchIO3/hcvvbsIb+MkyO72qnX6qaPKxjeueLOLozFY+SZ9S2dG2luVUdPZZnkhZ9TInsrv524b54hoYUJx8EeXSXm9r/wArFZTMtiRKB1nhgY+qar7SA5x0htfb73o9ljsCfCZ6GK2F5sB9nptlDGtZOfrgKIz+AdhBHJ+NWnJKvoz1yqOMcz52KYB7fvDSGL/I/H8K1m86Fr5+zE3sKoAebHL7VS9qL8yZnvc771keB31J+92+C3BpyALldPLyW18tR0f/TL+XZzsvZDOLd9ZC3T3A/kq85Z8JYBNkpGcLk5Ygw87J6XHmMVv6eGjv/VCoQdNyi1zX1qvw1xeR8S/OGZ3cTI8z5sKX5IDiejprbwDHavWarUpzOkHr/UqiC7DgB5Q9fPuBxfzrstd3kuKoy6YRJU2DZBwldN1k0fSMtVJmGKpSbfVJfFwU7SNzyg3kE1HW8llsm0qJ5aUjeVyXjeqI6nRYD5JvaXMbGtsUZXLd+vKLuQZFC1nk7EGc3k6tvMXKpnpmVqNjTLTg6K5Qg6sxWK2jo3mL0SGUvEifVDrgy17UsljxbTkM8rTkk1HpyWXydpw53jIZwTxXyf097c4+U3Z4iaXAi5SHozZckZnrgE1QdFSgf2OMrS/R0BFqRTrtlrvstRJ9210wu6t736ntiTuuGfSiYa+GwlkRkkbjT7obZb7B1sEtyVPKB4HxU5ut40O+tsD2Q2uVCjh3awP7uvrNT+tNtPYTAV33H2mq6CdtZuxXOHTpB1n0qocD2wVl+T3I2EUoN0aZKIzGuh67DLe7xkD3BFmegV5i6NoW0JzFq0zYjtMJHdHQ5jhztJGzRc3+Q5kWEfpdZJbvba6rozgFJZPlrof+wlnpP2RpmcfyOZ6Glu85mVOYB1nkXUTBYSuyWnm7Q+9F+pPSUBcGOkURgNJkmsXHsU14lg3NeOZt41pajaWcdGIBieP1uihtHjYZoyn8uMwQTxZZThXNdjcIyGbdfCuyZV+vSCO6NibNGXLnOnaq9sn261YVey0G5tyNzba5uu0lTltZU5bmdP24hFtL4ZxbpiRu4ZTU2o7G393luUO94T29jrI/gsz63G1OazpI/tDNlnXRGe7xPyL7RYxTzntD5dsjWFtsj6F1YeVLRh2qwwajPWZMMwdvN2saQqeps6CbR262fsh0hw3DOyE0Jy2eXwdmvmExFmZwuWLesfIdWAIJz6oXSdIyWHlrMLT8kVPcBvhZk6D2YGsVbbHLy5D5Tt+HmCIieo6oCMUe1IV+LHTdL48Fsh8TfIzmun7Gm2Z0wSe1Xpx5UV0z4AsGcywXbcZmai2QLr8KgCUyWl4IrYGyGcFSlc2U3Jo6TNRmj2e3Vypip2mi0Zf3w5b72UPcFfqTfPimI95FuzoAD5Uje3t1RvtwqPvJFz6ECpmPH42u3K4msdSJG3VZHftNcfPVSjGF9B+RW5MKqmK9JJRlVzZkiwrRt9QRvHFTjJKM8/IfQaGeXE052zVT0WIwPzmp4hoZKeBYsuexn389eQd+VYMQW9C1RhS/Lmhx76RcUmBOsrVJe0A/DhF57uimr8q/R07B67bApIOD8yH6fHgzPZxMLlRNe6FVE7dGSG7UZ/EMi5unsqQFPaelHmpk/TS2acU4T7eR/azC6b004MDoeWlo7wDJqqmgtvIy3EwQtWKuCQVG1Wzusx0zeSVZrKYBZu9Ur4hYgpXlUDbfTiHprWdju4XaRrvgqKF9YCL77nxXX4V+Svd424lTprH4ShWqCgJDvlTLtnD+foPEh8VRJtDTkuUfWuOp/xsLYqf91HJnVX5jh5drL105/ky9ih/fP4LlVgkKeuhK3y+jQmiTBZvQbQLDl6oab9QzlQw5g1rqhBTapffTDMgJnULDyTKrWgqE9im49LZhoGYGnnwuyAYUjSPhLRw4Z/hMYei+n0RpoJSR80TfvrkyTOJdidEKZsxBqyUjDZpAPeCziTI4l9ywQYceRNMPdBORQ7WFgB0dqjuhDyQH2MgDuy8ScXMO0aT4Ax9DwUbZv3jKO2IA48BmQsz/UNyapj/QdxOGPMEUtxpuIIXgfgCqh7NOaOobCzeNBF6NG2U4/5JXBhJPKHxg6QG1TGrBpFQCF/GkFEIB0yqZo0bJxFTYOAZ3VDDIR2nBiAcG0dqFRt7alAkQlwaE44QP5aESSRggwYGunApEh6EOwnr1UIXLgKr0PnSAQdksWq9ZGU5MLdEY82RZUif6a3syIjTXDmAS5runEOyBkWwd7IEnjKAijVG4Ri6y4Em1P4REQkNzuKAqNQ3SV7mw0DQRsnkSMOEVT82fGz1StOe9RH3Oc0Yo750EoiaAATWOELjay9HmiFdGBGRyEAtSaZxDpOGmNFItv6gnEaJrmjEBJhapKDjHQp153I283y0BVyrcLFYevUOqieA+DOmngDixJJkm+xIqBl7hVehNP6M86S1nFO8VqBFvyzvOkxTE2mvE/Md+j2tYJ9Koi9TlMNPnWgGWPO0tdV9zLBiXvNCSwe094Gmkm8jQlXJFQvRL9n0zuSmFWiezb0rVHyEW1iwWhyqFpectuYRpX801nLAI9ruVhSjBvS1dMR32TnIqVTVNqWHKd9t0b3bjgkqF9UxDU8624coOjCGbNMM1vxXZMZaT4lKIR+ERtwsUoVCkfBi0Ic0fAzUIYOxALRBXs0oMpQuzgzuWN9GC+CpnKMHs7gxcFvUNFhRVMGdDgcrCwfICXff3eaucddGmc7GA7u4bTLoV2wyI1UHPMWEH+hgp3Z/7j7Z+oAXZNOIcAWZYVK/GDdgSk0E7E+oOd9rnAslWcg7/VprttTuibPfJ5n0YkQ1hHLwTNrBuQHPBruiF6kNplCX0kGRjDmlLhLQSGemwjUyoibNgZzTp0S55FWpwRjuYgkY5ZYuzNY4Rt0zl4JdrAMj4hUbJ5Mm8F7NM0Cn6R0G6lBriE3w3kpbS+ebB5QfpS8v5WFGOUiS2n8y/xqQNP9O7qH4JnRSVOEB0sonW+xKTndLMkk7la5XrQMxoHCSeMITKlxTIRqVg7CmeBXaUypdTnJNYdZTDiLCe9JpiEkafIgicEegIQteXsiEwcO9GWkFOVMSzUMkGKHa18eMHP/sMUaT9dwwo8sZRysoC1btVsT1ZE0J5paPCmqlKakZqdK8SMnNxn7LjGJp64NSK+1kzEg1dhEKeozdhW4alsF85ZlXXB0ZSBPu0gBmGXS7o6HMHK1BgckqTsxIKWavqOzQEOQDl0EExYhoZgPLbnwVY8sfXUwlRL6QKoVDuUoL5JhVU1iC2LgWKyYbuxqhsS+4tR6NftH0pV31pB2SQbwLhgy3Cov7Ur6vBnyAoywAzDAIx8B1RR2QgemPsCAruKMOwcCQrDYIvZnDBwoAmKKIJMC1HI4loGuxggTQaSUfO3Qe9V4H+GDm6c71R+vrznQN2mYpWKX1bh8AKtA1Ac4vRW68W3ghiGfwHlLBNQX54fnW+LzjzILd4qEuSI7xMluMWCH5s8t0mmY7YwS/D8a5gXtrg10B/bW78gV0s5aJ8V1xxSHsEXeUVSZOxFA3NW7Ecn/Fo4aekxrHYbSKwdjZbB8NuVnnt+xpDaTheFnXgLPSIQ/5h3RR1uHurVB/QAdXuRvViVHPH9CldXi2YPtJKY9ZB7BdZCduDL1/5I/ZBghRug9C3cAcCGXOMOoAPXcwn8FB4cK/6KflkRloQE82R9wZCT7C2234loDLp1/F2ey9twQcMRwuVR9csQZ4QAxlj8ZHCOoV7iUk94zVaOn5hfsFDTrFdHPLcFLpZpMZZEaaPrB7i+GhrMlvd25qLnuGOpg1FQwLG0O/CiONAFjS5hAPERhEWwBWhDNaOZJdtU6VShtROQHeGbKyiPfPsFc28R4ZLIPLtjnpKPjAF9xrrduG1AWV44bAD/kGQMMela/GAMJM9AwAeKR0HuDaj7kPmGmZlaSGZAH4CBfAB61ZO98DlWE7yxHuNkfFEpUp+3B8EXZi/K0wyiVVKW0XFYUVHDTaJFiYuw8vkeH3mNTIM9g5KC2s+yJPtUPQDET3vRbyIAi61zIw+IW2QmqTXxkPwqWkfq+lNvIdbq+qforEjI1K21NtZzHrU9dMxexNh+Ot/CAEyk+1lSPUN9TOEdKKV9fYeo6hlo2Dc8ngnKQ0tlP0xuBsZM8ix+eh+n2MxqauSTvbbHd3ZO9VH842NMuOHLKjF17FPgnTOuHKOxxyy4q2ZPVltc0PGVQI/3G7Xt3vwyg9X99l2eHFZpMWpNMn+2CXxGl8kz3ZxfuN58eb50+f/mXz7NlmX9LY7Dh+ixaATU1ZnOS6Tj41f6LKJ6+DpHgzyvvi5eZJl/5eyiZaECJWGnVtspGgPHq14UZdJv+7MuTn3iBCbS5aPr6mXdvnhqzF8z7g1lUuTItvd17oJdCDQpdxeNxHCrtavHzjyMnSQL07cTqlDRVLBLKqUlGonm9mSVSfzGm8JMz70ywlLsGcXvvSEksMe39JRYmObflwKEuo+WhO59X9IUhykcDSaT5a0ikEyKdg9xtEj000p/vWSzMKH6Gj7VeZ0tlGmBfi5NtIs0+QhuKENprulVFT55leWvzaT3Kk3FDzW3gQR0Cf6q0cnOb2+OXvZJfx1JqP5nQuwjD+RvzSZ4GnJiTNBjXlpqUzaCD1hgFm4GJDQaawx7rwfSpRRLnApVgsMtGufFuS+DhxNJPdYhZ5eyKvZuVXWx6UIIR4UKeYU3wXZ8HNQ7Wl+3BM70TCYAbLFrNPeBavGwJtB/KY1/LBS9NvceLnuucMqAFK70O9XYnKV0LVdYm5rZfnz9kOXKGL73aL4GvKauK/jW+DSKIKpZtTZ0pexsdIkMNy6myEJ2/o2VmIco4u9sJUXXwoofpT7AsEyi8Ww84+P8aNuOpdMpzelojQKb+Mvw9gnrviDhD4K1iTQRi4ouuMY9m9yh7MBjSGQrSL89qbdHvnJZyHGXfQkpNtaH9IyE1wL5Ksv84GU4b3y4aoMrgPMcCVEZWhkPXGF8/bVjqA+FsUxp4PrI1Ckg2WfiVJcBOIezb2+9zw1B9D3XEzHlYAoEoksTwW28P48JAEt3cCnpjP42uCXOu6PpKQeCmhxxBRvcSnTDsTX93nb6B7YTWmn5NQVF3J6ebUf/HSu4vwNk6C7G7PExaS7GjKpKykDz0YSx1tPtpIsbcUZGkmyrD6qz2lbZa/gw7Tq9M6UCV7KlafI2TrxK6tVVPns1jqPQ++PLO5BDt6uak3RK7+bkGtdDGQQMR+t0B04Ite5xy85WSbfke3x8Ielu91/dViZTh+CQNZzcJ8tl5lXtOj9Tb4h6SHEBIt6CZxfliSxoX9biPBD3Ea5BbeEkEhyUp6fSSef0UkEVZ/tmnf78f8nqICx8Uuv3/0InHXr8hmczbd771E2Ag0Hy3Opt6tsBqWXywoBJkoIqtPFmctkqTSOt98tFFCJnsvpCD1QYpAso0+IReab8lXIl81iGnWkqs4AYKyq0qxpliKJkwiMqk2lFNZXlffLM+tSbnlAs6uTYqF5ij0soxExG+cPjn1kZTagTLvMQmSVzlVGtXBe2KAdaicNVR1XAXRZRjQAw04LeTU8e/XK1MacadffZzb2RP3eLY7gVaReDqfQ7HyA59GsROoJbX8f0FAe/A11rSjrfHothtyJlBS52FX0VjG0PdTgVVyansgO3DLUCbYbIJy2zQmrBG/HxIS5wZPwSO7L0D5o01njGrILAOmbq9Nt7lprXQcaL/anYSAzV2nXd1lvN9LV2XNx5mC3RnMewN8PGgvZbksXf37jk8RUa/z4MCllyF0nJmsBvTkmHn7g3g4bz5b0EoCAum52e+Wyr8kyWNQSrq/8vO46gfw3NjhuOjyGsW5qa8jJbtbVev8FYSlGnCbSeZZXMKU11CPW+047VrWhh/pu57VIV07L2kogdOq1nlVO60dRvROa0fXteMk611cMfU3MRjC8GGoS1PXV+1dLoqnXXWxQFl2K27hoNd5uYVLL2OtNdcUuLqQnRYvTIivvqBp9bydkaMgMRR8FqrAxqIlmRqY568I2A8TXOyfVmsHBlnqPCbAawz2I2RCZKjxcnVO6S+Dt8cvyDaeTxnGpWEiNHIhdTqjkH3Bwx5+ytL/tHJCjE3Ud3C6G+HrCAw1ROKLrNw5XfNaK051HAv/i2P+xFgW0LTwoWqspLMAclgoCaJdePQlD5Lmq40Vn3ReRg/KE00G8ZWezpNBeMzHfjLoCAwmr8h9pjCSBpJnM3hgnKy+Bwfu4aTOZwc1lYFPnwOLIO5FYB4riqeCcXrQE6yiEkz3RCtOnQ0jkIdlEtWyYqp1u2WHfy5hbrOlDv3Vd55Ub4F1niFY+aHmRmWD+l7SpDefrWlVD7IC5JCnWlVY8lLxdFB/szhpBLeRlx0T0TKp/Tw+GvkQcBov9eZFJ1NX9KaA1uEci9grDYT61SyZf2Zolegib/kyLerRWPR9Y7PGosdkvH1irD9rLEABaDVoUBUxcBQ3RAReS19MmC7FlqhQNHi5uMAepbKwgWVKmdi6qs0Dcb6rX7XqLj9ycg7hoX4Zq2szKzoTgQR4rcTwlqAtYHsZgHMYfYKkp7y4dogC9AGWrm20bxvdgvtBPqqrN+m7Yxier2+8UHQpU3S9N3hM3+Aw3pPAxbU7FINYJkZ7AKj6hWxfwKa7mTU9VtneCGMfHFHct9RZoGsU6LILYKn8LsmIa72uRT0HMicy9sjBT2LobyuYzIpbCcMdqOoBja7M1Om5LUdZ9STHAnebUpB2E10Ik90w3BC+LiOh3HvKwIqqw/0DEh1+nrsHvPt63EgB68UsjR6l+tL8bgLWV8HiuSj2BWfymPSrZhEEoseXWdYryoSvgZ9Hjt8+pBnZP8kzPNn+HpZu320GOgWDG5KW0UbP18+fPnu+Xl2EgZeWTwxUcfFf7I5pflkURXFWPUBgECj/2fd5oHzi7zdicftw+zmVNPW5QPKMKrKWLkjA+TM6lCIgaqB8JDcrFFRnG7HkGQTNvAnn6yDnbDGjfyZ04MsryywP38SGWM/Bl8fkaQC4UdJvhBtTh8jOF28in9yfr/+rKPNi9eY/r6ti363eJ3SYX6yerv7buuoy4H1Zb/TVS3Z3XrJeXXn3b0l0m92dr3/8wZpmZX6gIPr8Tz9aU+XMnM1pZ4lsCiGSbgfOLd0mQFpJNjfyzII9QQF0Ge8Px6KAJW+aWPpiRXbtlULol+S+BLcFJO2IteHzbRrFapiVYgAISb9gCSCEtbeTA1zhXtKgiYPLz4N/23v3/247/kI0fA1FoHnGUJB3zgtGAh9G3q08QqPVO66miV3vdl3ho9jXsimzpgMGre9ODgtQr+j8989teQrFqB+4AjEwfb+1hY2u0I8SFIi+H0U5/Dwzwd3IKDyA+4JlVRkN3sFawUWDt1v8mKLY0mfSgjKMfHch4HLlZGLI2/GiKWixCTBGsCZq+4JhrD+vPHv+Z2uqQBz47vBqI8Cb0jAeV+1Nw4JH9o3vfFiFINCmCwU0pG0Y9qEG9dEMJHZvYycfYSq9TkyMK7cDyT+awkChTOnUcN712QFBZ9MMiq3uoH2Cg7FKyDztQtu5+qzx7HfQ+Tb6ep8VjY+47oBSHQDdVaMcEOS8u4ee1GyY9Z5HLCZ2g4vJIgdX78PSOqy6aoZYTzrGc37ocZLCCGBqVjNqTGQMJ5Kci4vhRlTWYdfBUTdrFRr7os+ZrQp74eLMVkS/cEGojFXjViPXOPm7VcgBodeNKzA7lPMR2MFdgIU8K45iTkZJjrjuhGia9VNF8sHWu9ORw6u7UPLAQdVdUuZDqTugLEdRVwD8B2uAD3Pxa7S/rqOwdwcJYEjR6TjWEjDvkO1BGIqpvvzjcHee9z32vgOudwwmmO2wYTHRT0PXfejsdGIWu4syQLvbjYsU5qYPeVv0KaKdnwDYQ2VmdBNotoNvwqx3VxChe7jeKpcm3voEoH00cIVWGkslvi0L5TjjC+bf5NN9SuPGNn5sT0HDhkTvLmqYWOhz1RS4PPC5vRtxfWXhUiHuWF86e5UeFyZ9jtdHj1VfaLuUgfHFT6vZ3FYzM3HvbDE7LRynhWOqheMk6HtYHLietENaMbi95VRepNsuIvhVr9NzZP7ltPJOrHI2vgwdYPeFxAlZMAqc6mNRkPW4TBroGkmOuLDgQRz68kYX6XvBrJtQmaVVhHZRUfNBxx0TB+3qXQINjem9YIQNPTlVcbYXzDYxhInd/ORL95qms7VUh0OB97A1aoKAd6fR9RxojHZVIO0Fox0IxD34ZhaPYr1gRhrMVuuhYeJe2016pmivmQ7FyLZriUyhp5OMGFjbkeanCaw96Dkeik69YMwzUa57KlL4ANd2EGPL9kR7GRlbAymz7XAbHNueXHdP2q4BLAwDMcoFkWhqemzCNdoKF5nGDO9kHPvUdh1j44iVDkd5tnvY2Y60cbBo04mNB3iWc+Nxlk0mdFOT7SyuCvYaULbpdvW3JUcJduDIS76zxDYTAwsV4DORN1YKzq4aYTyQKYAWOMitfpQnVFM2bbbEVFlsiNFSxtg1GzRtgFyHi+9sNFmTL7ZMGNZ6f54H/btGI4C+ivxVDiQuSGjV/DzS6RP289UxzIJD/jRq9nC+fiaF430flUeUVRnBjtL00p0nvwpVRKTF2lFGKWSbUH3ha/+DRJQCiSRlU+npOZdngfwaz4ckiHbBwQvlXgtZTU+neXcaqmJK7Y2TcZ0zqUkIbyjX2ZAWWKtjAxerV40dNgJXEzUKBVCRyI5b+YEftqdPnjyTRq6lwcX8YmnxCYNAAYomPggI8MBmSIVcrK9JkFBEoa+anPZDwEBi44QcqEImLtokuLF6DowZTTlyGjukQOooGIO1UMqWQTPAEeo00eUGgqDRw3B9DnKTwhKKvz8TATcv8I0m8rrjbVrJZ/nsHTPQkN6EHWYwfRQIYjpaTesGhKHBm0+DoNLwOcR+6umJYTpjWTg/II4mD/sgbxYS8bp2e9EMLjSY48KrioACtKNOGVKmjYkmKNYLUiNr1D4pjLiQSLPHEhOWBWgLm/pYMIUFopk5riyen5VHGTQwYwdayDAmAlX3rbqWitmHxKgihMywgLV4vRg53yqeGJ4cwJrdnDEgTqBVgHZJcFU/NT0VXmEj+xku6P1E/XKXdXvxPJeVPY9RtBx8FRGVgFaU3x8LmuS4UUsAUf9rUNUd6HQAGFuJYTz6s1BcVIFhliNC6kg2QEOapMciSMCoPUiVc5ElNaAGt6qYGg9jyxUbMMxCtNQyJR+YBSiziigdQCvK749FpMixSJD65iJPmhgTLpcoM9EihbdgSTKJjwUbSJgSNUCuJ0fIaEuNCbIWurgsZ1XhLnWrb9rVZb5mByNiamKzguWZEcgGVUDzHovVn26mmBV4zDaBXefPrE0EQUSbXavMUKguCdVTiWNnuJ6VrC5s+fMOauXxlCZejcOgWH/5cdlbSdgbEqlsBp4fJVo0sk4aLWikHhFajAdwVLQgDrAjooWPY+jksmQwzAgxF8WWiMnLlzqqIJNItdPKn9YPcr5IsnadXRpyLL1kJ0ZM6899feVFdN+l97lgw2JyQ8h+HwdLgus90poBTdnREKFDgUsVbACpUxtdYDKgzdhrYnpojSewOmBqFlJLuBBUBM9ZgpJBiJwLAO5x6nFVEYORKmelImAlm/biYHZr52Rwm2jltIHZLBbOqsFseNwmkussV06gwZCE5dOXvYJCXTKplwvmOxt0CdF5TyBbNsigcM1TYq0c/TZA75zxVYVmBr0Qy5RHgSkoAjVSIx+TeQY4MrXVsB3K2dnu2I/VBBYW1aCMBY5XRWA/WiajJUhS79tin7wOkiJ4u/fFk2LklqW2JJPUpuvVqyZUIKCY3O7uyN47X/tfYjrwZcDBNj0F4MJXVAXnk+qovkPkiyQ95VI0SoTLzxDdPEVPlo8HJpHnk6Fq2Bz66gCrFalOIA9UsZRNXzt49JfqB3NBLYBMIEzbgNerrMuYfh2TAaulTlfU1TzIalYj67WP1crmUdTMBTMwrF5wMMRaIGRTNILLadsMbQNMqjautHSCwmosUxXV5RmM62p8I7DqmgyKGss8FqNb2tJjVZapivpKTwLDuhgDbaxCJoui1iaXgVwsLuZlUVh8BqVfboNgtGiIt7bgEiJmwhYULp/J+HFqL3npZVPBtbfNYFwXLmHFDIoajeWt8ECUXKmYAaqUz2OMVP7wi4GVz6XAK5vRQuyXe2tc5JfpSnGfZ+mweUD2REg+o01EGe2ry04CaQya03BHYdcgZcgHozXRfpkqyxmvWWaWk/pBNd6mSSXtNmyt3RQoOXERXadaCUkERVIOjbCsL2ClqpljlnBqYaOir5hs7AkGjZzOXzxIpy1aFf9ZOjm2pbkjVFGw+iIqd/iuGHQTDuAN9NUg0jegx2JaXH5QdBI6dhUl+YTeXeYjVQNdVYSyXkgXdUGVgU5bxWHmOoWeX4ueAakKBimXM5gexHSXLKvMNWxYBll49ETOdIwB1hQ9mvSF8K4q1r6io2C6gnWafQlGc3j24cjSF3KJrVkwqAn6ibMDjgsKK6jlppuwgNcQsaXrFGfd5fU5eJ/xIJYuOy4rqlgKbKorBqijKOIMsYi+CHUUVImxfRUy6FlncLxA6YvZB2auVuBYRAZUsELR7cfB0GZiGTISuVJyN337obo7W7iAaTg38LhqLpnAanzZsuV3p13GDklSngGW6XG6KYaywjurDHrlcnwFLTtbvEly3X3NQOPxmdyM9Zhd5iMMKXYkXL7BRpu93WDLlt9ddVoOiIN3XBM8x2XnpesWlgCT6GzsNTgfDOAmDHJ06GpvL8zOW03+0U+qAzHFLgKHkb5DRWAihZFuTMwKjMVsG+WSisB4GJ0rw+WYBZhmFw9s0FOmibciTanyo8su4rjReOPzYyk2Fmro6F2EvMORjmodyR2MKGwr0JQXk3uzQHRnBrqu9Hju2WXri6ouXVT430LdNXXX5TsiW1mUPWG/qxgBX0CKNBxpQVWeoqYsGUA1PAkThIMGv1CgvFCVGm95hO1tWH6529CBPngasBjsah1NnFFYUFGC/cTwjb6BX5mb8w1kjcTiik8fhB2iY5MhV5T+UEtmjuSJgzNE7bTjhgm8rRh/61KmOO64wTlY6WTiohMDnHpzxybOLaJJO9uUhkHVB/ozixNK/Cr2SZgWX882H4+09J6Uv16SNLhtSZxRmhEp/KpaonWeN9FNXDuGCC2qs9TJ1XBckczzvcy7SLLgxttlNHlH0rQwhPzVC4+FncgX4r+J3h+zwzGjXSb7LyG3t8y9SlT1n22kNp+9PxRHRhddoM0MaBfI++inYxD6Tbtfe6F464KRyN1Vfib0ezmW+dpKbh8aSu/iyJBQxb7Gy+YT2R9CSix9H229r6RL2+jcfUtuvd0D/f418POJjBHRDwTP9rOXgXebePu0otGWpz8phv39/V//H8wmXOXhEgIA</value>
+  </data>
+  <data name="DefaultSchema" xml:space="preserve">
+    <value>dbo</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/NuGetGallery/Migrations/SqlResourceMigration.cs b/src/NuGetGallery/Migrations/SqlResourceMigration.cs
index f7ee699b9b..0c22214582 100644
--- a/src/NuGetGallery/Migrations/SqlResourceMigration.cs
+++ b/src/NuGetGallery/Migrations/SqlResourceMigration.cs
@@ -1,27 +1,55 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Data.Entity.Migrations;
 using System.IO;
+using System.Text.RegularExpressions;
 
 namespace NuGetGallery.Migrations
 {
     public class SqlResourceMigration : DbMigration
     {
-        private static readonly string[] Go = new[] { "GO" };
-        private readonly string _sqlFile;
+        /// <summary>
+        /// Note that this delimiter is not perfect. It does not account for multi-line string literals in T-SQL. For
+        /// now, the delimiter is sufficient.
+        /// </summary>
+        private static readonly Regex Go = new Regex(@"(\n|\r\n)GO;?(\n|\r\n)", RegexOptions.Multiline | RegexOptions.IgnoreCase);
+        private readonly string _sqlFileUp;
+        private readonly string _sqlFileDown;
 
         public SqlResourceMigration(string embeddedResourceSqlFile)
+            : this(embeddedResourceSqlFile, embeddedResourceSqlFileDown: null)
         {
-            _sqlFile = embeddedResourceSqlFile;
+        }
+
+        public SqlResourceMigration(string embeddedResourceSqlFileUp, string embeddedResourceSqlFileDown)
+        {
+            _sqlFileUp = embeddedResourceSqlFileUp;
+            _sqlFileDown = embeddedResourceSqlFileDown;
         }
 
         public override void Up()
         {
-            Stream stream = typeof(ExecuteELMAHSql).Assembly.GetManifestResourceStream(_sqlFile);
+            ExecuteSqlFile(_sqlFileUp);
+        }
+
+        public override void Down()
+        {
+            ExecuteSqlFile(_sqlFileDown);
+        }
+
+        private void ExecuteSqlFile(string sqlFile)
+        {
+            if (sqlFile == null)
+            {
+                return;
+            }
+
+            var stream = typeof(SqlResourceMigration).Assembly.GetManifestResourceStream(sqlFile);
             using (var streamReader = new StreamReader(stream))
             {
-                var statements = streamReader.ReadToEnd().Split(Go, StringSplitOptions.RemoveEmptyEntries);
+                var statements = Go.Split(streamReader.ReadToEnd());
 
                 foreach (var statement in statements)
                 {
@@ -34,9 +62,5 @@ public override void Up()
                 }
             }
         }
-
-        public override void Down()
-        {
-        }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index 44f7cb3386..ba0663622b 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -789,6 +789,10 @@
     <Compile Include="Migrations\201708241907124_PrefixReservation.Designer.cs">
       <DependentUpon>201708241907124_PrefixReservation.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\201709072246362_AddPackageLicenseReport2Sproc.cs" />
+    <Compile Include="Migrations\201709072246362_AddPackageLicenseReport2Sproc.Designer.cs">
+      <DependentUpon>201709072246362_AddPackageLicenseReport2Sproc.cs</DependentUpon>
+    </Compile>
     <Compile Include="Security\RequireSecurePushForCoOwnersPolicy.cs" />
     <Compile Include="Security\SecurePushSubscription.cs" />
     <Compile Include="Security\IUserSecurityPolicySubscription.cs" />
@@ -1607,6 +1611,8 @@
     <Content Include="Content\themes\custom\images\ui-icons_888888_256x240.png" />
     <Content Include="Content\themes\custom\images\ui-icons_cd0a0a_256x240.png" />
     <Content Include="D3 LICENSE.txt" />
+    <EmbeddedResource Include="Infrastructure\AddPackageLicenseReport2.Up.sql" />
+    <EmbeddedResource Include="Infrastructure\AddPackageLicenseReport2.Down.sql" />
     <Content Include="NuGetGallery.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -1788,6 +1794,9 @@
     <EmbeddedResource Include="Migrations\201708241907124_PrefixReservation.resx">
       <DependentUpon>201708241907124_PrefixReservation.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\201709072246362_AddPackageLicenseReport2Sproc.resx">
+      <DependentUpon>201709072246362_AddPackageLicenseReport2Sproc.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="OData\QueryAllowed\Data\apiv1packages.json" />
     <EmbeddedResource Include="OData\QueryAllowed\Data\apiv1search.json" />
     <EmbeddedResource Include="OData\QueryAllowed\Data\apiv2getupdates.json" />

From 3721f01bbfeeca40971c8f4f7bc2f0e42021bf38 Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavierdecoster@users.noreply.github.com>
Date: Mon, 11 Sep 2017 10:17:04 +0200
Subject: [PATCH 12/19] Use SiteRoot config setting for generated URLs (#4612)

---
 .../App_Start/DefaultDependenciesModule.cs    |   2 +
 .../Configuration/ConfigurationService.cs     |  17 +-
 src/NuGetGallery/Controllers/ApiController.cs |  44 +-
 .../Controllers/AuthenticationController.cs   |   6 +-
 .../Controllers/PackagesController.cs         |  72 +--
 .../Services/ReportPackageRequest.cs          |   8 +-
 src/NuGetGallery/UrlExtensions.cs             | 564 +++++++++++++++---
 .../Views/Authentication/Register.cshtml      |   2 +-
 .../Views/Authentication/SignIn.cshtml        |   2 +-
 .../Views/Authentication/_Register.cshtml     |   2 +-
 .../Views/CuratedFeeds/CuratedFeed.cshtml     |   2 +-
 src/NuGetGallery/Views/Packages/Delete.cshtml |   2 +-
 .../Views/Packages/DisplayPackage.cshtml      |   6 +-
 .../Views/Packages/ManagePackageOwners.cshtml |   8 +-
 .../Views/Packages/ReportAbuse.cshtml         |   2 +-
 .../Views/Packages/UploadPackage.cshtml       |   8 +-
 .../Views/Shared/Gallery/Header.cshtml        |   4 +-
 .../Views/Shared/LayoutFooter.cshtml          |   6 +-
 src/NuGetGallery/Views/Shared/SiteMenu.cshtml |   6 +-
 .../Views/Shared/UserDisplay.cshtml           |   2 +-
 .../PackageDownloadsByVersion.cshtml          |   2 +-
 .../Statistics/PackageDownloadsDetail.cshtml  |   2 +-
 src/NuGetGallery/Views/Users/Account.cshtml   |   2 +-
 .../App_Start/ConfigurationServiceFacts.cs    |  21 +-
 .../NuGetGallery.Facts.csproj                 |   1 +
 .../TestUtils/TestUtility.cs                  |  14 +-
 .../Views/UrlHelperFacts.cs                   | 101 ++++
 27 files changed, 699 insertions(+), 209 deletions(-)
 create mode 100644 tests/NuGetGallery.Facts/Views/UrlHelperFacts.cs

diff --git a/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs b/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
index 0fd606311b..43735bd4ce 100644
--- a/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
+++ b/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
@@ -44,6 +44,8 @@ protected override void Load(ContainerBuilder builder)
 
             var configuration = new ConfigurationService(new SecretReaderFactory(diagnosticsService));
 
+            UrlExtensions.SetConfigurationService(configuration);
+
             builder.RegisterInstance(configuration)
                 .AsSelf()
                 .As<PoliteCaptcha.IConfigurationSource>();
diff --git a/src/NuGetGallery/Configuration/ConfigurationService.cs b/src/NuGetGallery/Configuration/ConfigurationService.cs
index eed59228af..94968edbeb 100644
--- a/src/NuGetGallery/Configuration/ConfigurationService.cs
+++ b/src/NuGetGallery/Configuration/ConfigurationService.cs
@@ -122,7 +122,7 @@ public async Task<T> ResolveConfigObject<T>(T instance, string prefix)
             }
             return instance;
         }
-        
+
         public async Task<string> ReadSetting(string settingName)
         {
             string value;
@@ -152,7 +152,6 @@ protected virtual HttpRequestBase GetCurrentRequest()
             return new HttpRequestWrapper(HttpContext.Current.Request);
         }
 
-
         private ISecretInjector InitSecretInjector()
         {
             return _secretReaderFactory.CreateSecretInjector(_secretReaderFactory.CreateSecretReader(new ConfigurationService(new EmptySecretReaderFactory())));
@@ -210,20 +209,18 @@ protected virtual ConnectionStringSettings GetConnectionString(string settingNam
         {
             return WebConfigurationManager.ConnectionStrings[settingName];
         }
-      
+
         private string GetHttpSiteRoot()
         {
-            var request = GetCurrentRequest();
-            string siteRoot;
+            var siteRoot = Current.SiteRoot;
 
-            if (request.IsLocal)
+            if (siteRoot == null)
             {
+                // No SiteRoot configured in settings.
+                // Fallback to detected site root.
+                var request = GetCurrentRequest();
                 siteRoot = request.Url.GetLeftPart(UriPartial.Authority) + '/';
             }
-            else
-            {
-                siteRoot = Current.SiteRoot;
-            }
 
             if (!siteRoot.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
                 && !siteRoot.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
diff --git a/src/NuGetGallery/Controllers/ApiController.cs b/src/NuGetGallery/Controllers/ApiController.cs
index 693cb673b6..b5b8f6ba9f 100644
--- a/src/NuGetGallery/Controllers/ApiController.cs
+++ b/src/NuGetGallery/Controllers/ApiController.cs
@@ -151,14 +151,14 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)
                 try
                 {
                     var package = PackageService.FindPackageByIdAndVersion(
-                        id, 
-                        version, 
-                        SemVerLevelKey.SemVer2, 
+                        id,
+                        version,
+                        SemVerLevelKey.SemVer2,
                         allowPrerelease: false);
 
                     if (package == null)
                     {
-                       return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, String.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));
+                        return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, String.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));
                     }
                     version = package.NormalizedVersion;
 
@@ -174,7 +174,7 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)
                 {
                     QuietLog.LogHandledException(e);
 
-			        // Database was unavailable and we don't have a version, return a 503
+                    // Database was unavailable and we don't have a version, return a 503
                     return new HttpStatusCodeWithBodyResult(HttpStatusCode.ServiceUnavailable, Strings.DatabaseUnavailable_TrySpecificVersion);
                 }
             }
@@ -261,7 +261,7 @@ public async virtual Task<ActionResult> VerifyPackageKeyAsync(string id, string
             {
                 await AuthenticationService.RemoveCredential(user, credential);
             }
-            
+
             TelemetryService.TrackVerifyPackageKeyEvent(id, version, user, User.Identity, result?.StatusCode ?? 200);
 
             return (ActionResult)result ?? new EmptyResult();
@@ -285,7 +285,7 @@ await AuditingService.SaveAuditRecordAsync(
             {
                 return new HttpStatusCodeWithBodyResult(HttpStatusCode.Forbidden, Strings.ApiKeyNotAuthorized);
             }
-            
+
             if (CredentialTypes.IsPackageVerificationApiKey(credential.Type))
             {
                 // Secure path: verify that verification key matches package scope.
@@ -370,7 +370,7 @@ private async Task<ActionResult> CreatePackageInternal()
                             {
                                 message = ex.Message;
                             }
-                            
+
                             return new HttpStatusCodeWithBodyResult(HttpStatusCode.BadRequest, message);
                         }
 
@@ -399,7 +399,7 @@ private async Task<ActionResult> CreatePackageInternal()
                         {
                             // Check if API key allows pushing a new package id
                             if (!ApiKeyScopeAllows(
-                                subject: nuspec.GetId(), 
+                                subject: nuspec.GetId(),
                                 requestedActions: NuGetScopes.PackagePush))
                             {
                                 // User cannot push a new package ID as the API key scope does not allow it
@@ -414,8 +414,8 @@ private async Task<ActionResult> CreatePackageInternal()
                                 // Audit that a non-owner tried to push the package
                                 await AuditingService.SaveAuditRecordAsync(
                                     new FailedAuthenticatedOperationAuditRecord(
-                                        user.Username, 
-                                        AuditedAuthenticatedOperationAction.PackagePushAttemptByNonOwner, 
+                                        user.Username,
+                                        AuditedAuthenticatedOperationAction.PackagePushAttemptByNonOwner,
                                         attemptedPackage: new AuditedPackageIdentifier(
                                             nuspec.GetId(), nuspec.GetVersion().ToNormalizedStringSafe())));
 
@@ -427,7 +427,7 @@ await AuditingService.SaveAuditRecordAsync(
 
                             // Check if API key allows pushing the current package id
                             if (!ApiKeyScopeAllows(
-                                packageRegistration.Id, 
+                                packageRegistration.Id,
                                 NuGetScopes.PackagePushVersion, NuGetScopes.PackagePush))
                             {
                                 // User cannot push a package as the API key scope does not allow it
@@ -460,7 +460,7 @@ await AuditingService.SaveAuditRecordAsync(
                         };
 
                         var package = await PackageService.CreatePackageAsync(
-                            packageToPush, 
+                            packageToPush,
                             packageStreamMetadata,
                             user,
                             commitChanges: false);
@@ -495,16 +495,16 @@ await AuditingService.SaveAuditRecordAsync(
                         }
 
                         IndexingService.UpdatePackage(package);
-                        
+
                         // Write an audit record
                         await AuditingService.SaveAuditRecordAsync(
                             new PackageAuditRecord(package, AuditedPackageAction.Create, PackageCreatedVia.Api));
 
                         // Notify user of push
                         MessageService.SendPackageAddedNotice(package,
-                            Url.Action("DisplayPackage", "Packages", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),
-                            Url.Action("ReportMyPackage", "Packages", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),
-                            Url.Action("Account", "Users", routeValues: null, protocol: Request.Url.Scheme));
+                            Url.Package(package.PackageRegistration.Id, package.NormalizedVersion, Request.Url.Scheme),
+                            Url.ReportPackage(package.PackageRegistration.Id, package.NormalizedVersion, Request.Url.Scheme),
+                            Url.AccountSettings(Request.Url.Scheme));
 
                         TelemetryService.TrackPackagePushEvent(package, user, User.Identity);
 
@@ -570,7 +570,7 @@ public virtual async Task<ActionResult> DeletePackage(string id, string version)
 
             // Check if API key allows listing/unlisting the current package id
             if (!ApiKeyScopeAllows(
-                subject: id, 
+                subject: id,
                 requestedActions: NuGetScopes.PackageUnlist))
             {
                 return new HttpStatusCodeWithBodyResult(HttpStatusCode.Forbidden, Strings.ApiKeyNotAuthorized);
@@ -602,7 +602,7 @@ public virtual async Task<ActionResult> PublishPackage(string id, string version
 
             // Check if API key allows listing/unlisting the current package id
             if (!ApiKeyScopeAllows(
-                subject: id, 
+                subject: id,
                 requestedActions: NuGetScopes.PackageUnlist))
             {
                 return new HttpStatusCodeWithBodyResult(HttpStatusCode.Forbidden, Strings.ApiKeyNotAuthorized);
@@ -657,7 +657,7 @@ protected internal virtual Stream ReadPackageFromRequest()
         [HttpGet]
         [ActionName("PackageIDs")]
         public virtual async Task<ActionResult> GetPackageIds(
-            string partialId, 
+            string partialId,
             bool? includePrerelease,
             string semVerLevel = null)
         {
@@ -672,7 +672,7 @@ public virtual async Task<ActionResult> GetPackageIds(
         [HttpGet]
         [ActionName("PackageVersions")]
         public virtual async Task<ActionResult> GetPackageVersions(
-            string id, 
+            string id,
             bool? includePrerelease,
             string semVerLevel = null)
         {
@@ -701,7 +701,7 @@ public virtual async Task<ActionResult> GetStatsDownloads(int? count)
 
                     item.Add("PackageId", row.PackageId);
                     item.Add("PackageVersion", row.PackageVersion);
-                    item.Add("Gallery", Url.PackageGallery(row.PackageId, row.PackageVersion));
+                    item.Add("Gallery", Url.Package(row.PackageId, row.PackageVersion));
                     item.Add("PackageTitle", row.PackageTitle ?? row.PackageId);
                     item.Add("PackageDescription", row.PackageDescription);
                     item.Add("PackageIconUrl", row.PackageIconUrl ?? Url.PackageDefaultIcon());
diff --git a/src/NuGetGallery/Controllers/AuthenticationController.cs b/src/NuGetGallery/Controllers/AuthenticationController.cs
index dbb1c1654f..f6ff74796a 100644
--- a/src/NuGetGallery/Controllers/AuthenticationController.cs
+++ b/src/NuGetGallery/Controllers/AuthenticationController.cs
@@ -180,7 +180,7 @@ internal bool ShouldChallengeEnforcedProvider(string enforcedProviders, Authenti
                     // Challenge authentication using the first required authentication provider
                     challenge = _authService.Challenge(
                         providers.First(),
-                        Url.Action("LinkExternalAccount", "Authentication", new { ReturnUrl = returnUrl }));
+                        Url.LinkExternalAccount(returnUrl));
 
                     return true;
                 }
@@ -308,9 +308,7 @@ public virtual ActionResult AuthenticatePost(string returnUrl, string provider)
         [NonAction]
         public ActionResult ChallengeAuthentication(string returnUrl, string provider)
         {
-            return _authService.Challenge(
-                provider,
-                Url.Action("LinkExternalAccount", "Authentication", new { ReturnUrl = returnUrl }));
+            return _authService.Challenge(provider, Url.LinkExternalAccount(returnUrl));
         }
 
         public virtual async Task<ActionResult> LinkExternalAccount(string returnUrl)
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
index cd064a7d03..5aa429d796 100644
--- a/src/NuGetGallery/Controllers/PackagesController.cs
+++ b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -226,13 +226,13 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
             if (uploadFile == null)
             {
                 ModelState.AddModelError(String.Empty, Strings.UploadFileIsRequired);
-                return Json(400, new string [] { Strings.UploadFileIsRequired });
+                return Json(400, new string[] { Strings.UploadFileIsRequired });
             }
 
             if (!Path.GetExtension(uploadFile.FileName).Equals(Constants.NuGetPackageFileExtension, StringComparison.OrdinalIgnoreCase))
             {
                 ModelState.AddModelError(String.Empty, Strings.UploadFileMustBeNuGetPackage);
-                return Json(400, new string [] { Strings.UploadFileMustBeNuGetPackage });
+                return Json(400, new string[] { Strings.UploadFileMustBeNuGetPackage });
             }
 
             using (var uploadStream = uploadFile.InputStream)
@@ -250,8 +250,8 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                            CultureInfo.CurrentCulture,
                            Strings.PackageEntryFromTheFuture,
                            entryInTheFuture.Name));
-                        
-                        return Json(400, new string [] { string.Format(
+
+                        return Json(400, new string[] { string.Format(
                            CultureInfo.CurrentCulture,
                            Strings.PackageEntryFromTheFuture,
                            entryInTheFuture.Name) });
@@ -277,7 +277,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
 
                     ModelState.AddModelError(String.Empty, message);
 
-                    return Json(400, new string [] { message });
+                    return Json(400, new string[] { message });
                 }
                 finally
                 {
@@ -294,7 +294,7 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                         errorStrings.Add(error.ErrorMessage);
                         ModelState.AddModelError(String.Empty, error.ErrorMessage);
                     }
-                    
+
                     return Json(400, errorStrings);
                 }
 
@@ -307,8 +307,8 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                             CultureInfo.CurrentCulture,
                             Strings.UploadPackage_MinClientVersionOutOfRange,
                             nuspec.GetMinClientVersion()));
-                    
-                    return Json(400, new string [] {
+
+                    return Json(400, new string[] {
                         string.Format(
                             CultureInfo.CurrentCulture,
                             Strings.UploadPackage_MinClientVersionOutOfRange,
@@ -320,8 +320,8 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                 {
                     ModelState.AddModelError(
                         string.Empty, string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable, packageRegistration.Id));
-                    
-                    return Json(409, new string [] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable, packageRegistration.Id) });
+
+                    return Json(409, new string[] { string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable, packageRegistration.Id) });
                 }
 
                 var nuspecVersion = nuspec.GetVersion();
@@ -353,8 +353,8 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                     ModelState.AddModelError(
                         string.Empty,
                         message);
-                    
-                    return Json(409, new string [] { message });
+
+                    return Json(409, new string[] { message });
                 }
 
                 await _uploadFileService.SaveUploadFileAsync(currentUser.Key, uploadStream);
@@ -366,13 +366,13 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                 if (uploadedFile == null)
                 {
                     ModelState.AddModelError(String.Empty, Strings.UploadFileIsRequired);
-                    return Json(400, new string [] { Strings.UploadFileIsRequired });
+                    return Json(400, new string[] { Strings.UploadFileIsRequired });
                 }
 
                 var package = await SafeCreatePackage(currentUser, uploadedFile);
                 if (package == null)
                 {
-                    return Json(400, new string [] { Strings.UploadFileIsRequired });
+                    return Json(400, new string[] { Strings.UploadFileIsRequired });
                 }
 
                 try
@@ -383,8 +383,8 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                 catch (Exception ex)
                 {
                     TempData["Message"] = ex.GetUserSafeMessage();
-                    
-                    return Json(400, new string [] { ex.GetUserSafeMessage() });
+
+                    return Json(400, new string[] { ex.GetUserSafeMessage() });
                 }
             }
 
@@ -457,7 +457,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version
                         sortOrder: null,
                         context: SearchFilter.ODataSearchContext,
                         semVerLevel: SemVerLevelKey.SemVerLevel2);
-                    
+
                     searchFilter.IncludeAllVersions = true;
 
                     var results = await externalSearchService.RawSearch(searchFilter);
@@ -637,7 +637,7 @@ public virtual ActionResult ReportAbuse(string id, string version)
                 }
             }
 
-            ViewData[Constants.ReturnUrlViewDataKey] = Url.Action("ReportMyPackage", new { id, version });
+            ViewData[Constants.ReturnUrlViewDataKey] = Url.ReportPackage(id, version);
             return View(model);
         }
 
@@ -837,11 +837,7 @@ public virtual ActionResult ContactOwners(string id, ContactOwnersViewModel cont
                 fromAddress,
                 package,
                 contactForm.Message,
-                Url.Action(
-                    actionName: "Account",
-                    controllerName: "Users",
-                    routeValues: null,
-                    protocol: Request.Url.Scheme),
+                Url.AccountSettings(),
                 contactForm.CopySender);
 
             string message = String.Format(CultureInfo.CurrentCulture, "Your message has been sent to the owners of {0}.", id);
@@ -1267,15 +1263,15 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
                 if (uploadFile == null)
                 {
                     TempData["Message"] = Strings.VerifyPackage_UploadNotFound;
-                    
-                    return Json(400, new string [] { Strings.VerifyPackage_UploadNotFound });
+
+                    return Json(400, new string[] { Strings.VerifyPackage_UploadNotFound });
                 }
 
                 var nugetPackage = await SafeCreatePackage(currentUser, uploadFile);
                 if (nugetPackage == null)
                 {
                     // Send the user back
-                    return Json(400, new string [] { Strings.VerifyPackage_UnexpectedError });
+                    return Json(400, new string[] { Strings.VerifyPackage_UnexpectedError });
                 }
 
                 Debug.Assert(nugetPackage != null);
@@ -1292,8 +1288,8 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
                         && String.Equals(packageMetadata.Version.OriginalVersion, formData.OriginalVersion, StringComparison.OrdinalIgnoreCase)))
                     {
                         TempData["Message"] = Strings.VerifyPackage_PackageFileModified;
-                        
-                        return Json(400, new string [] { Strings.VerifyPackage_PackageFileModified });
+
+                        return Json(400, new string[] { Strings.VerifyPackage_PackageFileModified });
                     }
                 }
 
@@ -1330,8 +1326,8 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
                 catch (InvalidPackageException ex)
                 {
                     TempData["Message"] = ex.Message;
-                    
-                    return Json(400, new string [] { ex.GetUserSafeMessage() });
+
+                    return Json(400, new string[] { ex.GetUserSafeMessage() });
                 }
 
                 await _packageService.PublishPackageAsync(package, commitChanges: false);
@@ -1359,8 +1355,8 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
                 {
                     ex.Log();
                     TempData["Message"] = Strings.UploadPackage_IdVersionConflict;
-                    
-                    return Json(409, new string [] { Strings.UploadPackage_IdVersionConflict });
+
+                    return Json(409, new string[] { Strings.UploadPackage_IdVersionConflict });
                 }
 
                 try
@@ -1384,9 +1380,9 @@ await _auditingService.SaveAuditRecordAsync(
 
                 // notify user
                 _messageService.SendPackageAddedNotice(package,
-                    Url.Action("DisplayPackage", "Packages", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),
-                    Url.Action("ReportMyPackage", "Packages", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),
-                    Url.Action("Account", "Users", routeValues: null, protocol: Request.Url.Scheme));
+                    Url.Package(package.PackageRegistration.Id, package.NormalizedVersion, Request.Url.Scheme),
+                    Url.ReportPackage(package.PackageRegistration.Id, package.NormalizedVersion, Request.Url.Scheme),
+                    Url.AccountSettings(Request.Url.Scheme));
             }
 
             // delete the uploaded binary in the Uploads container
@@ -1399,11 +1395,7 @@ await _auditingService.SaveAuditRecordAsync(
 
             return Json(new
             {
-                location = Url.RouteUrl(RouteName.DisplayPackage, new
-                {
-                    id = package.PackageRegistration.Id,
-                    version = package.NormalizedVersion
-                })
+                location = Url.Package(package.PackageRegistration.Id, package.NormalizedVersion, Request.Url.Scheme)
             });
         }
 
diff --git a/src/NuGetGallery/Services/ReportPackageRequest.cs b/src/NuGetGallery/Services/ReportPackageRequest.cs
index d390b10e02..40eef1b0e7 100644
--- a/src/NuGetGallery/Services/ReportPackageRequest.cs
+++ b/src/NuGetGallery/Services/ReportPackageRequest.cs
@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Globalization;
 using System.Net.Mail;
@@ -25,6 +26,7 @@ internal string FillIn(string subject, IAppConfiguration config)
         {
             // note, format blocks {xxx} are matched by ordinal-case-sensitive comparison
             var builder = new StringBuilder(subject);
+            var protocol = config.RequireSSL ? Uri.UriSchemeHttps: Uri.UriSchemeHttp;
 
             Substitute(builder, "{GalleryOwnerName}", config.GalleryOwner.DisplayName);
             Substitute(builder, "{Id}", Package.PackageRegistration.Id);
@@ -38,7 +40,7 @@ internal string FillIn(string subject, IAppConfiguration config)
                     RequestingUser.Username,
                     RequestingUser.EmailAddress,
                     Environment.NewLine,
-                    Url.User(RequestingUser, scheme: "http")));
+                    Url.User(RequestingUser, scheme: protocol)));
             }
             else
             {
@@ -47,8 +49,8 @@ internal string FillIn(string subject, IAppConfiguration config)
             Substitute(builder, "{Name}", FromAddress.DisplayName);
             Substitute(builder, "{Address}", FromAddress.Address);
             Substitute(builder, "{AlreadyContactedOwners}", AlreadyContactedOwners ? "Yes" : "No");
-            Substitute(builder, "{PackageUrl}", Url.Package(Package.PackageRegistration.Id, null, scheme: "http"));
-            Substitute(builder, "{VersionUrl}", Url.Package(Package.PackageRegistration.Id, Package.Version, scheme: "http"));
+            Substitute(builder, "{PackageUrl}", Url.Package(Package.PackageRegistration.Id, version: null, scheme: protocol));
+            Substitute(builder, "{VersionUrl}", Url.Package(Package.PackageRegistration.Id, Package.Version, protocol));
             Substitute(builder, "{Reason}", Reason);
             Substitute(builder, "{Signature}", Signature);
             Substitute(builder, "{Message}", Message);
diff --git a/src/NuGetGallery/UrlExtensions.cs b/src/NuGetGallery/UrlExtensions.cs
index c0fed5a7f9..249f9c35b7 100644
--- a/src/NuGetGallery/UrlExtensions.cs
+++ b/src/NuGetGallery/UrlExtensions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using NuGetGallery.Configuration;
 using System;
 using System.Globalization;
 using System.Web;
@@ -11,6 +12,7 @@ namespace NuGetGallery
 {
     public static class UrlExtensions
     {
+        private static ConfigurationService _configuration;
         private const string PackageExplorerDeepLink = @"https://npe.codeplex.com/releases/clickonce/NuGetPackageExplorer.application?url={0}&id={1}&version={2}";
 
         // Shorthand for current url
@@ -30,40 +32,105 @@ public static string Absolute(this UrlHelper url, string path)
             return builder.Uri.AbsoluteUri;
         }
 
+        private static string GetProtocol(UrlHelper url)
+        {
+            return url.RequestContext.HttpContext.Request.IsSecureConnection ? Uri.UriSchemeHttps : Uri.UriSchemeHttp;
+        }
+                
+        internal static void SetConfigurationService(ConfigurationService configurationService)
+        {
+            _configuration = configurationService;
+        }
+
+        private static string GetConfiguredSiteHostName(UrlHelper url)
+        {
+            var siteRoot = _configuration.GetSiteRoot(useHttps: url.RequestContext.HttpContext.Request.IsSecureConnection);
+            return new Uri(siteRoot).Host;
+        }
+
         public static string Home(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.Home);
+            return url.RouteUrl(
+                RouteName.Home,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Statistics(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.StatisticsHome);
+            return url.RouteUrl(
+                RouteName.StatisticsHome,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string StatisticsAllPackageDownloads(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.StatisticsPackages);
+            return url.RouteUrl(
+                RouteName.StatisticsPackages,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string StatisticsAllPackageVersionDownloads(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.StatisticsPackageVersions);
+            return url.RouteUrl(
+                RouteName.StatisticsPackageVersions,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string StatisticsPackageDownloadByVersion(this UrlHelper url, string id)
         {
-            string result = url.RouteUrl(RouteName.StatisticsPackageDownloadsByVersion, new { id });
+            string result = url.RouteUrl(
+                RouteName.StatisticsPackageDownloadsByVersion,
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", id }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
 
             return result + "?groupby=Version";
         }
 
+        public static string StatisticsPackageDownloadByVersionReport(this UrlHelper url)
+        {
+            return url.RouteUrl(
+                RouteName.StatisticsPackageDownloadsByVersionReport,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
         public static string StatisticsPackageDownloadsDetail(this UrlHelper url, string id, string version)
         {
-            string result = url.RouteUrl(RouteName.StatisticsPackageDownloadsDetail, new { id, version });
+            string result = url.RouteUrl(
+                RouteName.StatisticsPackageDownloadsDetail,
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", id },
+                    { "version", version }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
 
             return result + "?groupby=ClientName";
         }
 
+        public static string StatisticsPackageDownloadsDetailReport(this UrlHelper url)
+        {
+            return url.RouteUrl(
+                RouteName.StatisticsPackageDownloadsDetailReport,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
         public static string PackageList(this UrlHelper url, int page, string q, bool includePrerelease)
         {
             var routeValues = new RouteValueDictionary();
@@ -83,28 +150,76 @@ public static string PackageList(this UrlHelper url, int page, string q, bool in
                 routeValues["prerel"] = "false";
             }
 
-            return url.Action("ListPackages", "Packages", routeValues);
+            return url.Action(
+                actionName: "ListPackages",
+                controllerName: "Packages",
+                routeValues: routeValues,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string CuratedPackage(this UrlHelper url, string curatedFeedName, string id, string scheme = null)
+        {
+            return url.RouteUrl(
+                RouteName.CuratedPackage,
+                new RouteValueDictionary
+                {
+                    { "curatedFeedName", curatedFeedName },
+                    { "curatedPackageId", id }
+                },
+                protocol: scheme ?? GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string CuratedPackageList(this UrlHelper url, int page, string q, string curatedFeedName)
         {
-            return url.Action("ListPackages", "CuratedFeeds", new
-            {
-                q,
-                page,
-                curatedFeedName
-            });
+            return url.Action(
+                actionName: "ListPackages",
+                controllerName: "CuratedFeeds",
+                routeValues: new RouteValueDictionary
+                {
+                    { "q", q },
+                    { "page", page },
+                    { "curatedFeedName", curatedFeedName }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
 
         }
 
+        public static string CuratedFeed(this UrlHelper url, string curatedFeedName)
+        {
+            return url.RouteUrl(
+                RouteName.CuratedFeed,
+                routeValues: new RouteValueDictionary
+                {
+                    { "name", curatedFeedName }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
         public static string PackageList(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.ListPackages);
+            return url.RouteUrl(
+                RouteName.ListPackages,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string UndoPendingEdits(this UrlHelper url, IPackageVersionModel package)
         {
-            return url.Action(actionName: "UndoPendingEdits", controllerName: "Packages", routeValues: new { id = package.Id, version = package.Version });
+            return url.Action(
+                actionName: "UndoPendingEdits",
+                controllerName: "Packages",
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", package.Id },
+                    { "version", package.Version }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Package(this UrlHelper url, string id)
@@ -114,7 +229,15 @@ public static string Package(this UrlHelper url, string id)
 
         public static string Package(this UrlHelper url, string id, string version, string scheme = null)
         {
-            string result = url.RouteUrl(RouteName.DisplayPackage, new { id, version }, protocol: scheme);
+            string result = url.RouteUrl(
+                RouteName.DisplayPackage,
+                new RouteValueDictionary
+                {
+                    { "id", id },
+                    { "version", version }
+                },
+                protocol: scheme ?? GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
 
             // Ensure trailing slashes for versionless package URLs, as a fix for package filenames that look like known file extensions
             return version == null ? EnsureTrailingSlash(result) : result;
@@ -135,28 +258,22 @@ public static string Package(this UrlHelper url, PackageRegistration package)
             return url.Package(package.Id);
         }
 
-        public static string PackageGallery(this UrlHelper url, string id, string version)
-        {
-            string protocol = url.RequestContext.HttpContext.Request.IsSecureConnection ? "https" : "http";
-            string result = url.RouteUrl(RouteName.DisplayPackage, new { Id = id, Version = version }, protocol: protocol);
-
-            // Ensure trailing slashes for versionless package URLs, as a fix for package filenames that look like known file extensions
-            return version == null ? EnsureTrailingSlash(result) : result;
-        }
-
         public static string PackageDefaultIcon(this UrlHelper url)
         {
-            string protocol = url.RequestContext.HttpContext.Request.IsSecureConnection ? "https" : "http";
-            string result = url.RouteUrl(RouteName.Home, null, protocol: protocol);
-            result = result.TrimEnd('/') + VirtualPathUtility.ToAbsolute("~/Content/Images/packageDefaultIcon-50x50.png", url.RequestContext.HttpContext.Request.ApplicationPath);
-            return result;
+            return url.Home().TrimEnd('/') + VirtualPathUtility.ToAbsolute("~/Content/Images/packageDefaultIcon-50x50.png", url.RequestContext.HttpContext.Request.ApplicationPath);
         }
 
         public static string PackageDownload(this UrlHelper url, int feedVersion, string id, string version)
         {
-            string routeName = "v" + feedVersion + RouteName.DownloadPackage;
-            string protocol = url.RequestContext.HttpContext.Request.IsSecureConnection ? "https" : "http";
-            string result = url.RouteUrl(routeName, new { Id = id, Version = version }, protocol: protocol);
+            string result = url.RouteUrl(
+                routeName: $"v{feedVersion}{RouteName.DownloadPackage}",
+                routeValues: new RouteValueDictionary
+                {
+                    { "Id", id },
+                    { "Version", version }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
 
             // Ensure trailing slashes for versionless package URLs, as a fix for package filenames that look like known file extensions
             return version == null ? EnsureTrailingSlash(result) : result;
@@ -164,9 +281,14 @@ public static string PackageDownload(this UrlHelper url, int feedVersion, string
 
         public static string ExplorerDeepLink(this UrlHelper url, int feedVersion, string id, string version)
         {
-            string routeName = "v" + feedVersion + RouteName.DownloadPackage;
-            string protocol = url.RequestContext.HttpContext.Request.IsSecureConnection ? "https" : "http";
-            string urlResult = url.RouteUrl(routeName, new { Id = id }, protocol: protocol);
+            string urlResult = url.RouteUrl(
+                routeName: $"v{feedVersion}{RouteName.DownloadPackage}",
+                routeValues: new RouteValueDictionary
+                {
+                    { "Id", id }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
 
             urlResult = EnsureTrailingSlash(urlResult);
 
@@ -175,27 +297,62 @@ public static string ExplorerDeepLink(this UrlHelper url, int feedVersion, strin
 
         public static string LogOn(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.Authentication, new { action = "LogOn" });
+            return url.RouteUrl(
+                RouteName.Authentication,
+                routeValues: new RouteValueDictionary
+                {
+                    { "action", "LogOn" }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string LogOn(this UrlHelper url, string returnUrl)
         {
-            return url.RouteUrl(RouteName.Authentication, new { action = "LogOn", returnUrl = returnUrl });
+            return url.RouteUrl(
+                RouteName.Authentication,
+                routeValues: new RouteValueDictionary
+                {
+                    { "action", "LogOn" },
+                    { "returnUrl", returnUrl }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string SignUp(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.Authentication, new { action = "SignUp" });
+            return url.RouteUrl(
+                RouteName.Authentication,
+                routeValues: new RouteValueDictionary
+                {
+                    { "action", "SignUp" }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string SignUp(this UrlHelper url, string returnUrl)
         {
-            return url.RouteUrl(RouteName.Authentication, new { action = "SignUp", returnUrl = returnUrl });
+            return url.RouteUrl(
+                RouteName.Authentication,
+                routeValues: new RouteValueDictionary
+                {
+                    { "action", "SignUp" },
+                    { "returnUrl", returnUrl }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string ConfirmationRequired(this UrlHelper url)
         {
-            return url.Action("ConfirmationRequired", controllerName: "Users");
+            return url.Action(
+                "ConfirmationRequired",
+                controllerName: "Users",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string LogOff(this UrlHelper url)
@@ -206,58 +363,127 @@ public static string LogOff(this UrlHelper url)
             {
                 returnUrl = String.Empty;
             }
-            return url.Action("LogOff", "Authentication", new { returnUrl, area = "" });
+            return url.Action(
+                "LogOff",
+                "Authentication",
+                routeValues: new RouteValueDictionary
+                {
+                    { "returnUrl", returnUrl },
+                    { "area", string.Empty }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Register(this UrlHelper url)
         {
-            return url.Action(actionName: "LogOn", controllerName: "Authentication");
+            return url.Action(
+                actionName: "LogOn",
+                controllerName: "Authentication",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Search(this UrlHelper url, string searchTerm)
         {
-            return url.RouteUrl(RouteName.ListPackages, new { q = searchTerm });
+            return url.RouteUrl(
+                RouteName.ListPackages,
+                routeValues: new RouteValueDictionary
+                {
+                    { "q", searchTerm }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string UploadPackage(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.UploadPackage);
+            return url.RouteUrl(
+                RouteName.UploadPackage,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string UploadPackageProgress(this UrlHelper url)
+        {
+            return url.RouteUrl(
+                RouteName.UploadPackageProgress,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string User(this UrlHelper url, User user, int page = 1, string scheme = null)
         {
+            var configuredSiteHostName = GetConfiguredSiteHostName(url);
             if (page == 1)
             {
-                return url.Action(actionName: "Profiles",
-                                    controllerName: "Users",
-                                    routeValues: new { username = user.Username.TrimEnd() },
-                                    protocol: scheme);
+                return url.Action(
+                    actionName: "Profiles",
+                    controllerName: "Users",
+                    routeValues: new RouteValueDictionary
+                    {
+                        { "username", user.Username.TrimEnd() }
+                    },
+                    protocol: scheme ?? GetProtocol(url),
+                    hostName: configuredSiteHostName);
             }
             else
             {
-                return url.Action(actionName: "Profiles",
-                                    controllerName: "Users",
-                                    routeValues: new { username = user.Username.TrimEnd(), page = page },
-                                    protocol: scheme);
+                return url.Action(
+                    actionName: "Profiles",
+                    controllerName: "Users",
+                    routeValues: new RouteValueDictionary
+                    {
+                        { "username", user.Username.TrimEnd() },
+                        { "page", page }
+                    },
+                    protocol: scheme ?? GetProtocol(url),
+                    hostName: configuredSiteHostName);
             }
         }
 
         public static string User(this UrlHelper url, string username, string scheme = null)
         {
-            return url.Action(actionName: "Profiles",
-                                    controllerName: "Users",
-                                    routeValues: new { username = username },
-                                    protocol: scheme);
+            return url.Action(
+                actionName: "Profiles",
+                controllerName: "Users",
+                routeValues: new RouteValueDictionary
+                {
+                    { "username", username }
+                },
+                protocol: scheme ?? GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string EditPackage(this UrlHelper url, string id, string version)
         {
             if (String.IsNullOrEmpty(version))
             {
-                return EnsureTrailingSlash(url.RouteUrl(RouteName.PackageAction, new { action = "Edit", id }));
+                return EnsureTrailingSlash(
+                    url.RouteUrl(
+                        RouteName.PackageAction,
+                        routeValues: new RouteValueDictionary
+                        {
+                            { "action", "Edit" },
+                            { "id", id }
+                        },
+                        protocol: GetProtocol(url),
+                        hostName: GetConfiguredSiteHostName(url)));
             }
 
-            return url.RouteUrl(RouteName.PackageVersionAction, new { action = "Edit", id, version });
+            return url.RouteUrl(
+                RouteName.PackageVersionAction,
+                routeValues: new RouteValueDictionary
+                {
+                    { "action", "Edit" },
+                    { "id", id },
+                    { "version", version }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string ReflowPackage(this UrlHelper url, IPackageVersionModel package)
@@ -265,11 +491,13 @@ public static string ReflowPackage(this UrlHelper url, IPackageVersionModel pack
             return url.Action(
                 actionName: "Reflow",
                 controllerName: "Packages",
-                routeValues: new
+                routeValues: new RouteValueDictionary
                 {
-                    id = package.Id,
-                    version = package.Version
-                });
+                    { "id", package.Id },
+                    { "version", package.Version }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string DeletePackage(this UrlHelper url, IPackageVersionModel package)
@@ -277,26 +505,84 @@ public static string DeletePackage(this UrlHelper url, IPackageVersionModel pack
             return url.Action(
                 actionName: "Delete",
                 controllerName: "Packages",
-                routeValues: new
+                routeValues: new RouteValueDictionary
                 {
-                    id = package.Id,
-                    version = package.Version
-                });
+                    { "id", package.Id },
+                    { "version", package.Version }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
-        public static string AccountSettings(this UrlHelper url)
+        public static string AccountSettings(this UrlHelper url, string scheme = null)
         {
-            return url.Action(actionName: "Account", controllerName: "Users");
+            return url.Action(
+                actionName: "Account",
+                controllerName: "Users",
+                routeValues: null,
+                protocol: scheme ?? GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string ReportPackage(this UrlHelper url, string id, string version, string scheme = null)
+        {
+            return url.Action(
+                actionName: "ReportMyPackage",
+                controllerName: "Packages",
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", id },
+                    { "version", version }
+                },
+                protocol: scheme ?? GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string ReportAbuse(this UrlHelper url, string id, string version, string scheme = null)
+        {
+            return url.Action(
+                actionName: "ReportAbuse",
+                controllerName: "Packages",
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", id },
+                    { "version", version }
+                },
+                protocol: scheme ?? GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string LinkExternalAccount(this UrlHelper url, string returnUrl)
+        {
+            return url.Action(
+                actionName: "LinkExternalAccount",
+                controllerName: "Authentication",
+                routeValues: new RouteValueDictionary
+                {
+                    { "ReturnUrl", returnUrl }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string ManageMyApiKeys(this UrlHelper url)
         {
-            return url.Action(actionName: "ApiKeys", controllerName: "Users");
+            return url.Action(
+                actionName: "ApiKeys",
+                controllerName: "Users",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string ManageMyPackages(this UrlHelper url)
         {
-            return url.Action(actionName: "Packages", controllerName: "Users");
+            return url.Action(
+                actionName: "Packages",
+                controllerName: "Users",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string ManagePackageOwners(this UrlHelper url, IPackageVersionModel package)
@@ -304,10 +590,52 @@ public static string ManagePackageOwners(this UrlHelper url, IPackageVersionMode
             return url.Action(
                 actionName: "ManagePackageOwners",
                 controllerName: "Packages",
-                routeValues: new
+                routeValues: new RouteValueDictionary
                 {
-                    id = package.Id
-                });
+                    { "id", package.Id}
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string GetAddPackageOwnerConfirmation(this UrlHelper url)
+        {
+            return url.Action(
+                "GetAddPackageOwnerConfirmation", 
+                "JsonApi",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string GetPackageOwners(this UrlHelper url)
+        {
+            return url.Action(
+                "GetPackageOwners",                 
+                "JsonApi",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string AddPackageOwner(this UrlHelper url)
+        {
+            return url.Action(
+                "AddPackageOwner", 
+                "JsonApi",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string RemovePackageOwner(this UrlHelper url)
+        {
+            return url.Action(
+                "RemovePackageOwner", 
+                "JsonApi",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string ConfirmationUrl(this UrlHelper url, string action, string controller, string username, string token)
@@ -325,44 +653,118 @@ public static string ConfirmationUrl(this UrlHelper url, string action, string c
                 controller,
                 rvd,
                 url.RequestContext.HttpContext.Request.Url.Scheme,
-                url.RequestContext.HttpContext.Request.Url.Host);
+                GetConfiguredSiteHostName(url));
         }
 
         public static string VerifyPackage(this UrlHelper url)
         {
-            return url.Action(actionName: "VerifyPackage", controllerName: "Packages");
+            return url.Action(
+                actionName: "VerifyPackage",
+                controllerName: "Packages",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string CancelUpload(this UrlHelper url)
         {
-            return url.Action(actionName: "CancelUpload", controllerName: "Packages");
+            return url.Action(
+                actionName: "CancelUpload",
+                controllerName: "Packages",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Downloads(this UrlHelper url)
         {
-            return url.RouteUrl(RouteName.Downloads);
+            return url.RouteUrl(
+                RouteName.Downloads,
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Contact(this UrlHelper url)
         {
-            return url.Action(actionName: "Contact", controllerName: "Pages");
+            return url.Action(
+                actionName: "Contact",
+                controllerName: "Pages",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string ContactOwners(this UrlHelper url, string id)
+        {
+            return url.Action(
+                actionName: "ContactOwners",
+                controllerName: "Packages",
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", id }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Terms(this UrlHelper url)
         {
-            return url.Action(actionName: "Terms", controllerName: "Pages");
+            return url.Action(
+                actionName: "Terms",
+                controllerName: "Pages",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string Privacy(this UrlHelper url)
         {
-            return url.Action(actionName: "Privacy", controllerName: "Pages");
+            return url.Action(
+                actionName: "Privacy",
+                controllerName: "Pages",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
         public static string About(this UrlHelper url)
         {
-            return url.Action(actionName: "About", controllerName: "Pages");
+            return url.Action(
+                actionName: "About",
+                controllerName: "Pages",
+                routeValues: null,
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+
+        public static string Admin(this UrlHelper url)
+        {
+            return url.Action(
+                "Index",
+                "Home",
+                routeValues: new RouteValueDictionary
+                {
+                    { "area", "Admin" }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
         }
 
+        public static string Authenticate(this UrlHelper url, string providerName, string returnUrl)
+        {
+            return url.Action(
+                actionName: "Authenticate",
+                controllerName: "Authentication",
+                routeValues: new RouteValueDictionary
+                {
+                    { "provider", providerName },
+                    { "returnUrl", returnUrl }
+                },
+                protocol: GetProtocol(url),
+                hostName: GetConfiguredSiteHostName(url));
+        }
+        
         private static UriBuilder GetCanonicalUrl(UrlHelper url)
         {
             UriBuilder builder = new UriBuilder(url.RequestContext.HttpContext.Request.Url);
diff --git a/src/NuGetGallery/Views/Authentication/Register.cshtml b/src/NuGetGallery/Views/Authentication/Register.cshtml
index 7d5d5de026..8bcc1874ab 100644
--- a/src/NuGetGallery/Views/Authentication/Register.cshtml
+++ b/src/NuGetGallery/Views/Authentication/Register.cshtml
@@ -19,7 +19,7 @@
         <div class="row">
             <div class="@ViewHelpers.GetColumnClasses(ViewBag) text-center">
                 <a role="button" class="btn btn-default btn-block provider-button"
-                   href="@Url.Action("Authenticate", new {provider = provider.ProviderName, returnUrl = ViewData[Constants.ReturnUrlViewDataKey]})">
+                   href="@Url.Authenticate(provider.ProviderName, (string)ViewData[Constants.ReturnUrlViewDataKey])">
                     @if (!string.IsNullOrEmpty(@provider.UI.IconImagePath))
                     {
                         <img height="24" width="24" alt="" aria-hidden="true"
diff --git a/src/NuGetGallery/Views/Authentication/SignIn.cshtml b/src/NuGetGallery/Views/Authentication/SignIn.cshtml
index ca0c33af11..1fec48a528 100644
--- a/src/NuGetGallery/Views/Authentication/SignIn.cshtml
+++ b/src/NuGetGallery/Views/Authentication/SignIn.cshtml
@@ -19,7 +19,7 @@
         <div class="row">
             <div class="@ViewHelpers.GetColumnClasses(ViewBag) text-center">
                 <a role="button" class="btn btn-default btn-block provider-button"
-                   href="@Url.Action("Authenticate", new {provider = provider.ProviderName, returnUrl = ViewData[Constants.ReturnUrlViewDataKey]})">
+                   href="@Url.Authenticate(provider.ProviderName, (string)ViewData[Constants.ReturnUrlViewDataKey])">
                     @if (!string.IsNullOrEmpty(@provider.UI.IconImagePath))
                     {
                         <img height="24" width="24" alt="" aria-hidden="true"
diff --git a/src/NuGetGallery/Views/Authentication/_Register.cshtml b/src/NuGetGallery/Views/Authentication/_Register.cshtml
index ce793f448d..81d46ef4d0 100644
--- a/src/NuGetGallery/Views/Authentication/_Register.cshtml
+++ b/src/NuGetGallery/Views/Authentication/_Register.cshtml
@@ -39,7 +39,7 @@
     <div class="panel panel-default text-center">
         <div class="panel-body">
             By clicking Register you agree that you have read and accept our
-            <a href="@Url.Action("Terms", "Pages")">Terms of Use</a> and <a href="@Url.Action("Privacy", "Pages")">Privacy Policy</a>.
+            <a href="@Url.Terms()">Terms of Use</a> and <a href="@Url.Privacy()">Privacy Policy</a>.
         </div>
     </div>
     if (Model.External != null)
diff --git a/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml b/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml
index 616618b9ec..bd4ff7ce4c 100644
--- a/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml
+++ b/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml
@@ -127,7 +127,7 @@
 
 @section BottomScripts {
     <script>
-        var urlFormat = "@Url.RouteUrl(RouteName.CuratedPackage, new { curatedFeedName = Model.Name, curatedPackageId = "PACKAGE_ID" })";
+        var urlFormat = "@Url.CuratedPackage(curatedFeedName: Model.Name, id: "PACKAGE_ID" })";
 
         function deleteCuratedPackage(packageId) {
             $.ajax({
diff --git a/src/NuGetGallery/Views/Packages/Delete.cshtml b/src/NuGetGallery/Views/Packages/Delete.cshtml
index 8e3f997a53..d565d5f5b8 100644
--- a/src/NuGetGallery/Views/Packages/Delete.cshtml
+++ b/src/NuGetGallery/Views/Packages/Delete.cshtml
@@ -74,7 +74,7 @@
                         However, the package will still be available for download through <a href="https://docs.nuget.org/docs/reference/package-restore">NuGet Package Restore</a> so that existing projects referencing the package don't become broken.
                     </p>
                     <p>
-                        If you need the package permanently removed, click on the <a href="@Url.Action(actionName: "ReportAbuse", controllerName: "Packages", routeValues: new {id = Model.Id, version = Model.Version})" title="Contact Support">Contact Support</a> link and we'll take care
+                        If you need the package permanently removed, click on the <a href="@Url.ReportAbuse(Model.Id, Model.Version)" title="Contact Support">Contact Support</a> link and we'll take care
                         of it for you. <b>PLEASE ONLY DO THIS IF THERE IS AN URGENT PROBLEM WITH THE PACKAGE.</b>
                         (Passwords, malicious code, etc). Even if you remove it, it's prudent to immediately
                         reset any passwords/sensitive data you accidentally pushed instead of waiting for us to delete
diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index ff1e7f0b07..163067f7af 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -472,13 +472,13 @@
                 }
                 <li>
                     <i class="ms-Icon ms-Icon--Mail" aria-hidden="true"></i>
-                    <a href="@Url.Action(actionName: "ContactOwners", controllerName: "Packages", routeValues: new { id = Model.Id })" title="Ask the package owners a question">Contact owners</a>
+                    <a href="@Url.ContactOwners(Model.Id)" title="Ask the package owners a question">Contact owners</a>
                 </li>
                 @if ((Model.IsOwner(User) || User.IsAdministrator()))
                 {
                     <li>
                         <i class="ms-Icon ms-Icon--Help" aria-hidden="true"></i>
-                        <a href="@Url.Action(actionName: "ReportMyPackage", controllerName: "Packages", routeValues: new { id = Model.Id, version = Model.Version })" title="Contact the NuGet team for help with your package">
+                        <a href="@Url.ReportPackage(Model.Id, Model.Version)" title="Contact the NuGet team for help with your package">
                             Contact support
                         </a>
                     </li>
@@ -487,7 +487,7 @@
                 {
                     <li>
                         <i class="ms-Icon ms-Icon--Flag" aria-hidden="true"></i>
-                        <a href="@Url.Action(actionName: "ReportAbuse", controllerName: "Packages", routeValues: new { id = Model.Id, version = Model.Version })" title="Report the package as abusive">
+                        <a href="@Url.ReportAbuse(Model.Id, Model.Version)" title="Report the package as abusive">
                             Report
                         </a>
                     </li>
diff --git a/src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml b/src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml
index 11e132998c..1c4c8a3973 100644
--- a/src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml
+++ b/src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml
@@ -127,10 +127,10 @@
     <script type="text/javascript">
         var packageId = "@Model.Id";
         var packageUrl = "@Url.Package(Model.Id)";
-        var getPackageOwnersUrl = "@Url.Action("GetPackageOwners", "JsonApi")";
-        var getAddPackageOwnerConfirmationUrl = "@Url.Action("GetAddPackageOwnerConfirmation", "JsonApi")";
-        var addPackageOwnerUrl = "@Url.Action("AddPackageOwner", "JsonApi")";
-        var removePackageOwnerUrl = "@Url.Action("RemovePackageOwner", "JsonApi")";
+        var getPackageOwnersUrl = "@Url.GetPackageOwners()";
+        var getAddPackageOwnerConfirmationUrl = "@Url.GetAddPackageOwnerConfirmation()";
+        var addPackageOwnerUrl = "@Url.AddPackageOwner()";
+        var removePackageOwnerUrl = "@Url.RemovePackageOwner()";
     </script>
 
     @Scripts.Render("~/Scripts/gallery/page-manage-owners.min.js")
diff --git a/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml b/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
index 2455723657..0290425ad4 100644
--- a/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
+++ b/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
@@ -25,7 +25,7 @@
                     This form is for reporting abusive packages such as
                     packages containing malicious code or spam. If "@Model.PackageId" simply doesn't
                     work, or if you need help getting the package installed, please
-                    <a href="@Url.Action(actionName: "ContactOwners", controllerName: "Packages", routeValues: new { id = Model.PackageId })" title="contact the owners">contact the owners instead.</a>
+                    <a href="@Url.ContactOwners(Model.PackageId)" title="contact the owners">contact the owners instead.</a>
                 </text>
             )
 
diff --git a/src/NuGetGallery/Views/Packages/UploadPackage.cshtml b/src/NuGetGallery/Views/Packages/UploadPackage.cshtml
index 0456b19154..d80f2cc345 100644
--- a/src/NuGetGallery/Views/Packages/UploadPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/UploadPackage.cshtml
@@ -92,12 +92,12 @@
             });
 
             AsyncFileUploadManager.init(
-                '@Url.Action(actionName: "UploadPackageProgress", controllerName: "Packages")',
+                '@Url.UploadPackageProgress()',
                 'uploadForm',
                 '@Scripts.Url("~/Scripts/jquery")',
-                '@Url.Action(actionName: "UploadPackage", controllerName: "Packages")',
-                '@Url.Action(actionName: "CancelUpload", controllerName: "Packages")',
-                '@Url.Action(actionName: "VerifyPackage", controllerName: "Packages")');
+                '@Url.UploadPackage()',
+                '@Url.CancelUpload()',
+                '@Url.VerifyPackage()');
         });
     </script>
 }
diff --git a/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml b/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
index 29af09c565..cb947cd7e5 100644
--- a/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
+++ b/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
@@ -83,7 +83,7 @@
                             @DisplayNavigationItem("Admin", Url.Action("Index", "Home", new { area = "Admin" }))
                         }
                         @DisplayNavigationItem("Documentation", "https://docs.microsoft.com/en-us/nuget/")
-                        @DisplayNavigationItem("Downloads", Url.RouteUrl(RouteName.Downloads))
+                        @DisplayNavigationItem("Downloads", Url.Downloads())
                         @DisplayNavigationItem("Blog", "http://blog.nuget.org/")
                     </ul>
                     <ul class="nav navbar-nav navbar-right navbar-seperated" role="menu">
@@ -116,7 +116,7 @@
                                     @if (Request.IsAuthenticated && User.IsInRole(Constants.AdminRoleName))
                                     {
                                         <li class="divider"></li>
-                                        <li role="presentation"><a href="@Url.Action("Index", "Home", new { area = "Admin" })" role="menuitem">Admin</a></li>
+                                        <li role="presentation"><a href="@Url.Admin()" role="menuitem">Admin</a></li>
                                     }
                                     <li class="divider"></li>
                                     <li role="presentation"><a href="@Url.User(CurrentUser.Username)" role="menuitem">View Profile</a></li>
diff --git a/src/NuGetGallery/Views/Shared/LayoutFooter.cshtml b/src/NuGetGallery/Views/Shared/LayoutFooter.cshtml
index 35cca3a447..c755e9cc1f 100644
--- a/src/NuGetGallery/Views/Shared/LayoutFooter.cshtml
+++ b/src/NuGetGallery/Views/Shared/LayoutFooter.cshtml
@@ -24,9 +24,9 @@
     <a title=".NET Foundation" href="https://www.dotnetfoundation.org"><img src="@Href("~/Content/Logos/dnf.png")" alt=".NET Foundation" /></a>
     <p>
         &copy; @DateTime.UtcNow.Year .NET Foundation -
-        <a href="@Url.Action("About", "Pages")">About</a> -
-        <a href="@Url.Action("Terms", "Pages")">Terms of Use</a> -
-        <a href="@Url.Action("Privacy", "Pages")">Privacy Policy</a> -
+        <a href="@Url.About()">About</a> -
+        <a href="@Url.Terms()">Terms of Use</a> -
+        <a href="@Url.Privacy()">Privacy Policy</a> -
         <a href="https://status.nuget.org">Service status</a>
     </p>
     <p>
diff --git a/src/NuGetGallery/Views/Shared/SiteMenu.cshtml b/src/NuGetGallery/Views/Shared/SiteMenu.cshtml
index 104bb2b3ec..0fc06844cc 100644
--- a/src/NuGetGallery/Views/Shared/SiteMenu.cshtml
+++ b/src/NuGetGallery/Views/Shared/SiteMenu.cshtml
@@ -16,9 +16,9 @@
     }
     @if (Request.IsAuthenticated && User.IsInRole(Constants.AdminRoleName))
     {
-        <li class="@classes["Admin"]"><a href="@Url.Action("Index", "Home", new { area="Admin" })">Admin</a></li>
+        <li class="@classes["Admin"]"><a href="@Url.Admin()">Admin</a></li>
     }
     <li><a href="https://docs.nuget.org">Documentation</a></li>
-    <li><a href="@Url.RouteUrl(RouteName.Downloads)">Downloads</a></li>
-    <li><a href="http://blog.nuget.org">Blog</a></li>
+    <li><a href="@Url.Downloads()">Downloads</a></li>
+    <li><a href="https://blog.nuget.org">Blog</a></li>
 </ul>
\ No newline at end of file
diff --git a/src/NuGetGallery/Views/Shared/UserDisplay.cshtml b/src/NuGetGallery/Views/Shared/UserDisplay.cshtml
index fe65efadbe..fd53f17ae8 100644
--- a/src/NuGetGallery/Views/Shared/UserDisplay.cshtml
+++ b/src/NuGetGallery/Views/Shared/UserDisplay.cshtml
@@ -8,7 +8,7 @@
     }
     else
     {
-        <span class="welcome"><a href="@Url.Action("Account", "Users", new { area = "" })">@(User.Identity.Name)</a></span>
+        <span class="welcome"><a href="@Url.AccountSettings()">@(User.Identity.Name)</a></span>
         <text>/</text>
         <span class="user-actions">
             <a href="@Url.LogOff()">Sign out</a>
diff --git a/src/NuGetGallery/Views/Statistics/PackageDownloadsByVersion.cshtml b/src/NuGetGallery/Views/Statistics/PackageDownloadsByVersion.cshtml
index 08af85ceb9..f559a169bb 100644
--- a/src/NuGetGallery/Views/Statistics/PackageDownloadsByVersion.cshtml
+++ b/src/NuGetGallery/Views/Statistics/PackageDownloadsByVersion.cshtml
@@ -21,7 +21,7 @@
     <script>
         $(document)
             .ready(function () {
-                renderGraph('@Url.Action("PackageDownloadsByVersionReport", "Statistics")', location.search);
+                renderGraph('@Url.StatisticsPackageDownloadByVersionReport()', location.search);
             });
     </script>
 }
diff --git a/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml b/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml
index 18b9b825b7..8a9b77bff7 100644
--- a/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml
+++ b/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml
@@ -21,7 +21,7 @@
     <script>
         $(document)
             .ready(function () {
-                renderGraph('@Url.Action("PackageDownloadsDetailReport", "Statistics")', location.search);
+                renderGraph('@Url.PackageDownloadsDetailReport()', location.search);
             });
     </script>
 }
diff --git a/src/NuGetGallery/Views/Users/Account.cshtml b/src/NuGetGallery/Views/Users/Account.cshtml
index 82e61e0a9d..a704b31a1b 100644
--- a/src/NuGetGallery/Views/Users/Account.cshtml
+++ b/src/NuGetGallery/Views/Users/Account.cshtml
@@ -336,7 +336,7 @@
                     @<text>
                         <div class="row form-group">
                             <div class="col-sm-6">
-                                <a role="button" href="@Url.RouteUrl(RouteName.CuratedFeed, new {name = curatedFeed})"
+                                <a role="button" href="@Url.CuratedFeed(curatedFeed)"
                                    class="btn btn-primary form-control">Manage</a>
                             </div>
                             <div class="col-sm-6">
diff --git a/tests/NuGetGallery.Facts/App_Start/ConfigurationServiceFacts.cs b/tests/NuGetGallery.Facts/App_Start/ConfigurationServiceFacts.cs
index a55b15d70b..a5454a1eb3 100644
--- a/tests/NuGetGallery.Facts/App_Start/ConfigurationServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/App_Start/ConfigurationServiceFacts.cs
@@ -40,11 +40,6 @@ protected override string GetAppSetting(string settingName)
 
                     return string.Empty;
                 }
-
-                protected override HttpRequestBase GetCurrentRequest()
-                {
-                    return StubRequest.Object;
-                }
             }
 
             [Fact]
@@ -70,15 +65,16 @@ public void WillGetTheConfiguredHttpsSiteRoot()
             }
 
             [Fact]
-            public void WillUseTheActualRootWhenTheRequestIsLocal()
+            public void WillUseTheConfiguredSiteRootWhenTheRequestIsLocal()
             {
                 var configuration = new TestableConfigurationService();
+                configuration.StubConfiguredSiteRoot = "https://theSiteRoot/";
                 configuration.StubRequest.Setup(stub => stub.IsLocal).Returns(true);
                 configuration.StubRequest.Setup(stub => stub.Url).Returns(new Uri("http://theLocalSiteRoot/aPath"));
 
                 var siteRoot = configuration.GetSiteRoot(useHttps: true);
 
-                Assert.Equal("https://thelocalsiteroot/", siteRoot);
+                Assert.Equal("https://theSiteRoot/", siteRoot);
             }
 
             [Fact]
@@ -100,17 +96,6 @@ public void WillThrowIfConfiguredSiteRootIsNotHttpOrHttps()
 
                 Assert.Throws<InvalidOperationException>(() => configuration.GetSiteRoot(useHttps: false));
             }
-
-            [Fact]
-            public void WillCacheTheSiteRootLookup()
-            {
-                var configuration = new TestableConfigurationService();
-                configuration.GetSiteRoot(useHttps: false);
-
-                configuration.GetSiteRoot(useHttps: true);
-
-                configuration.StubRequest.Verify(stub => stub.IsLocal, Times.Once());
-            }
         }
 
         public class TheReadSettingMethod
diff --git a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
index dc98320067..dce4d0fa3b 100644
--- a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
+++ b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
@@ -504,6 +504,7 @@
     <Compile Include="ViewModels\ListPackageItemViewModelFacts.cs" />
     <Compile Include="ViewModels\PackageViewModelFacts.cs" />
     <Compile Include="ViewModels\PreviousNextPagerViewModelFacts.cs" />
+    <Compile Include="Views\UrlHelperFacts.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">
diff --git a/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs b/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs
index 8e4035089e..17943a1a20 100644
--- a/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs
+++ b/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs
@@ -14,6 +14,7 @@
 using System.Web.Routing;
 using Moq;
 using NuGet;
+using NuGetGallery.Framework;
 
 namespace NuGetGallery
 {
@@ -51,14 +52,17 @@ public static void SetupUrlHelper(Controller controller, Mock<HttpContextBase> m
 
         public static UrlHelper MockUrlHelper()
         {
+            var siteRoot = "http://unittest.nuget.org/";
+
             var mockHttpContext = new Mock<HttpContextBase>(MockBehavior.Loose);
             var mockHttpRequest = new Mock<HttpRequestBase>(MockBehavior.Strict);
             var mockHttpResponse = new Mock<HttpResponseBase>(MockBehavior.Strict);
             mockHttpContext.Setup(httpContext => httpContext.Request).Returns(mockHttpRequest.Object);
             mockHttpContext.Setup(httpContext => httpContext.Response).Returns(mockHttpResponse.Object);
-            mockHttpRequest.Setup(httpRequest => httpRequest.Url).Returns(new Uri("http://unittest.nuget.org/"));
-            mockHttpRequest.Setup(httpRequest => httpRequest.ApplicationPath).Returns("http://unittest.nuget.org/");
+            mockHttpRequest.Setup(httpRequest => httpRequest.Url).Returns(new Uri(siteRoot));
+            mockHttpRequest.Setup(httpRequest => httpRequest.ApplicationPath).Returns(siteRoot);
             mockHttpRequest.Setup(httpRequest => httpRequest.ServerVariables).Returns(new NameValueCollection());
+            mockHttpRequest.Setup(httpRequest => httpRequest.IsSecureConnection).Returns(false);
 
             string value = null;
             Action<string> saveValue = x =>
@@ -71,6 +75,12 @@ public static UrlHelper MockUrlHelper()
             var requestContext = new RequestContext(mockHttpContext.Object, new RouteData());
             var routes = new RouteCollection();
             Routes.RegisterRoutes(routes);
+
+            var configurationService = new TestGalleryConfigurationService();
+            configurationService.Current.SiteRoot = siteRoot;
+
+            UrlExtensions.SetConfigurationService(configurationService);
+
             return new UrlHelper(requestContext, routes);
         }
 
diff --git a/tests/NuGetGallery.Facts/Views/UrlHelperFacts.cs b/tests/NuGetGallery.Facts/Views/UrlHelperFacts.cs
new file mode 100644
index 0000000000..0803977da2
--- /dev/null
+++ b/tests/NuGetGallery.Facts/Views/UrlHelperFacts.cs
@@ -0,0 +1,101 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace NuGetGallery.Views
+{
+    public class UrlHelperFacts
+    {
+        private readonly ITestOutputHelper _testOutputHelper;
+
+        public UrlHelperFacts(ITestOutputHelper testOutputHelper)
+        {
+            _testOutputHelper = testOutputHelper;
+        }
+
+        [Theory]
+        [InlineData("@Url.Action")]
+        [InlineData("@Url.Route")]
+        public void ViewsDoNotUseDefaultUrlHelperRoutes(string unsupportedTerm)
+        {
+            // We should not use Url.Action or Url.Route in our views as the gallery
+            // may be deployed behind a proxy (such as APIM),
+            // in which case the resolved host name would not match the
+            // DNS record pointing to the proxy.
+            // 
+            // To assert that, we look for textual occurrences of Url.Action or Url.Route
+            // in all razor files of the NuGetGallery web project.
+            AssertNoViolationsOfUnsupportedTermInRazorFiles(unsupportedTerm);
+        }
+
+        private void AssertNoViolationsOfUnsupportedTermInRazorFiles(string unsupportedTerm)
+        {
+            var violations = new ConcurrentBag<Tuple<int, string, string>>();
+            var razorFiles = GetRazorFiles();
+
+            // Catch working directory issues.
+            Assert.NotEmpty(razorFiles);
+
+            Parallel.ForEach(
+                razorFiles,
+                file =>
+                {
+                    var lineNumber = 0;
+                    foreach (var line in File.ReadLines(file))
+                    {
+                        lineNumber++;
+
+                        if (line.Contains(unsupportedTerm))
+                        {
+                            violations.Add(Tuple.Create(lineNumber, file, line.TrimStart(' ').TrimEnd(' ')));
+                        }
+                    }
+                });
+
+            if (violations.Any())
+            {
+                _testOutputHelper.WriteLine(
+                    $"Avoid usage of '{unsupportedTerm}' in .cshtml files! Consider using a method from 'UrlExtensions.cs' to ensure usage of configured 'SiteRoot' setting.");
+
+                // Pretty-print any violations: group by file
+                foreach (var violationsInFile in violations.GroupBy(t => t.Item2).OrderBy(g => g.Key))
+                {
+                    _testOutputHelper.WriteLine($"Violation(s) in file '{violationsInFile.Key}':");
+
+                    // Order by line number
+                    foreach (var violation in violationsInFile.OrderBy(v => v.Item1))
+                    {
+                        _testOutputHelper.WriteLine(
+                            $"  Line #{violation.Item1}: \"{violation.Item3}\"");
+                    }
+                }
+
+                // Fail the test
+                Assert.Empty(violations);
+            }
+        }
+
+        private static IReadOnlyCollection<string> GetRazorFiles()
+        {
+            // $(SolutionDir)\tests\NuGetGallery.Facts\bin\Debug
+            var pathToViewsFolder = Path.Combine(
+                Directory.GetCurrentDirectory(),
+                @"..\..\..\..\src\NuGetGallery\Views");
+
+            return Directory.GetFiles(
+                pathToViewsFolder,
+                "*.cshtml",
+                SearchOption.AllDirectories)
+                .Select(f => Path.GetFullPath(f))
+                .ToList();
+        }
+    }
+}

From 0e0ed75fd908ff1c039e23efeaf79edb32259144 Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavier.decoster@outlook.com>
Date: Mon, 11 Sep 2017 11:13:27 +0200
Subject: [PATCH 13/19] Fix MvcBuildViews failure due to Razor syntax error

---
 src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml b/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml
index bd4ff7ce4c..33c0ebab78 100644
--- a/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml
+++ b/src/NuGetGallery/Views/CuratedFeeds/CuratedFeed.cshtml
@@ -127,7 +127,7 @@
 
 @section BottomScripts {
     <script>
-        var urlFormat = "@Url.CuratedPackage(curatedFeedName: Model.Name, id: "PACKAGE_ID" })";
+        var urlFormat = "@Url.CuratedPackage(curatedFeedName: Model.Name, id: "PACKAGE_ID")";
 
         function deleteCuratedPackage(packageId) {
             $.ajax({

From 257e552352143da026c9248b802b9c16b46d35f7 Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavier.decoster@outlook.com>
Date: Mon, 11 Sep 2017 11:22:32 +0200
Subject: [PATCH 14/19] Fix MvcBuildViews for PackageDownloadsDetails.cshtml

---
 src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml b/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml
index 8a9b77bff7..2ed8ba42f2 100644
--- a/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml
+++ b/src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml
@@ -21,7 +21,7 @@
     <script>
         $(document)
             .ready(function () {
-                renderGraph('@Url.PackageDownloadsDetailReport()', location.search);
+                renderGraph('@Url.StatisticsPackageDownloadsDetailReport()', location.search);
             });
     </script>
 }

From eb15220bc10a0e6d2de1f7c6e5f41d0313838e60 Mon Sep 17 00:00:00 2001
From: Xavier Decoster <xavierdecoster@users.noreply.github.com>
Date: Tue, 12 Sep 2017 19:14:09 +0200
Subject: [PATCH 15/19] Fix and consolidate routing in NuGetGallery unit test
 configurations. (#4661)

---
 .../Controllers/JsonApiController.cs          |   2 +-
 src/NuGetGallery/UrlExtensions.cs             |   8 +-
 .../AuthenticationServiceFacts.cs             |  30 +-
 .../Authentication/AuthenticatorFacts.cs      |  16 +-
 .../ApiKeyAuthenticationHandlerFacts.cs       |   2 +-
 .../Controllers/ApiControllerFacts.cs         | 171 ++++++-----
 .../AuthenticationControllerFacts.cs          |  92 +++---
 .../Controllers/JsonApiControllerFacts.cs     |  17 +-
 .../Controllers/PackagesControllerFacts.cs    | 275 ++++++++++++------
 .../Controllers/StatisticsControllerFacts.cs  |  11 +-
 .../Controllers/UsersControllerFacts.cs       |  28 +-
 ...quiresAccountConfirmationAttributeFacts.cs |  12 +-
 tests/NuGetGallery.Facts/Framework/Fakes.cs   |   2 +-
 .../Framework/TestContainer.cs                |  20 +-
 .../TestGalleryConfigurationService.cs        |   3 +-
 .../Framework/UnitTestBindings.cs             |  24 +-
 .../Services/MessageServiceFacts.cs           | 208 +++++++------
 .../TestUtils/TestUtility.cs                  |  27 +-
 18 files changed, 564 insertions(+), 384 deletions(-)

diff --git a/src/NuGetGallery/Controllers/JsonApiController.cs b/src/NuGetGallery/Controllers/JsonApiController.cs
index 4e3e267e2c..7fd7d14f5a 100644
--- a/src/NuGetGallery/Controllers/JsonApiController.cs
+++ b/src/NuGetGallery/Controllers/JsonApiController.cs
@@ -121,7 +121,7 @@ public async Task<JsonResult> AddPackageOwner(string id, string username, string
                     model.User.Username,
                     ownerRequest.ConfirmationCode,
                     new { id = model.Package.Id });
-                var packageUrl = Url.Package(model.Package.Id, null, scheme: "http");
+                var packageUrl = Url.Package(model.Package.Id, null, scheme: _appConfiguration.RequireSSL ? Uri.UriSchemeHttps : Uri.UriSchemeHttp);
                 var policyMessage = GetNoticeOfPoliciesRequiredMessage(model.Package, model.User, model.CurrentUser);
 
                 _messageService.SendPackageOwnerRequest(model.CurrentUser, model.User, model.Package, packageUrl,
diff --git a/src/NuGetGallery/UrlExtensions.cs b/src/NuGetGallery/UrlExtensions.cs
index 249f9c35b7..00e45111a3 100644
--- a/src/NuGetGallery/UrlExtensions.cs
+++ b/src/NuGetGallery/UrlExtensions.cs
@@ -12,7 +12,7 @@ namespace NuGetGallery
 {
     public static class UrlExtensions
     {
-        private static ConfigurationService _configuration;
+        private static IGalleryConfigurationService _configuration;
         private const string PackageExplorerDeepLink = @"https://npe.codeplex.com/releases/clickonce/NuGetPackageExplorer.application?url={0}&id={1}&version={2}";
 
         // Shorthand for current url
@@ -37,7 +37,7 @@ private static string GetProtocol(UrlHelper url)
             return url.RequestContext.HttpContext.Request.IsSecureConnection ? Uri.UriSchemeHttps : Uri.UriSchemeHttp;
         }
                 
-        internal static void SetConfigurationService(ConfigurationService configurationService)
+        internal static void SetConfigurationService(IGalleryConfigurationService configurationService)
         {
             _configuration = configurationService;
         }
@@ -778,7 +778,9 @@ private static UriBuilder GetCanonicalUrl(UrlHelper url)
 
         internal static string EnsureTrailingSlash(string url)
         {
-            if (url != null && !url.EndsWith("/", StringComparison.OrdinalIgnoreCase))
+            if (url != null 
+                && !url.EndsWith("/", StringComparison.OrdinalIgnoreCase)
+                && !url.Contains("?"))
             {
                 return url + '/';
             }
diff --git a/tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs b/tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs
index e1c6fff554..2669fa18b4 100644
--- a/tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Authentication/AuthenticationServiceFacts.cs
@@ -14,7 +14,6 @@
 using NuGetGallery.Auditing;
 using NuGetGallery.Authentication.Providers;
 using NuGetGallery.Authentication.Providers.MicrosoftAccount;
-using NuGetGallery.Configuration;
 using NuGetGallery.Framework;
 using NuGetGallery.Infrastructure.Authentication;
 using Xunit;
@@ -265,7 +264,7 @@ public async Task GivenMatchingCredential_ItWritesCredentialLastUsed()
 
                 var referenceTime = DateTime.UtcNow;
                 _dateTimeProviderMock.SetupGet(x => x.UtcNow).Returns(referenceTime);
-                
+
                 Assert.False(cred.LastUsed.HasValue);
 
                 // Act
@@ -304,8 +303,8 @@ public async Task GivenExpiredMatchingApiKeyCredential_ItReturnsNull(string apiK
             public async Task GivenMatchingApiKeyCredentialThatWasLastUsedTooLongAgo_ItReturnsNullAndExpiresTheApiKeyAndWritesAuditRecord(string apiKeyType, bool shouldExpire)
             {
                 // Arrange
-                var config = GetMock<IAppConfiguration>();
-                config.SetupGet(m => m.ExpirationInDaysForApiKeyV1).Returns(10);
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ExpirationInDaysForApiKeyV1 = 10;
 
                 var cred = _fakes.User.Credentials.Single(c => string.Equals(c.Type, apiKeyType, StringComparison.OrdinalIgnoreCase));
 
@@ -540,7 +539,8 @@ public async Task WritesAnAuditRecord()
             }
         }
 
-        public class TheRegisterMethod : TestContainer
+        public class TheRegisterMethod 
+            : TestContainer
         {
             [Fact]
             public async Task GivenPlainTextPassword_ItSaltsHashesAndPassesThru()
@@ -625,10 +625,10 @@ public async Task WillSaveTheNewUser()
             public async Task WillSaveTheNewUserAsConfirmedWhenConfigured()
             {
                 // Arrange
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = false;
+
                 var auth = Get<AuthenticationService>();
-                GetMock<IAppConfiguration>()
-                    .Setup(x => x.ConfirmEmailAddresses)
-                    .Returns(false);
 
                 // Act
                 var authUser = await auth.Register(
@@ -646,10 +646,10 @@ public async Task WillSaveTheNewUserAsConfirmedWhenConfigured()
             public async Task SetsAConfirmationToken()
             {
                 // Arrange
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = true;
+
                 var auth = Get<AuthenticationService>();
-                GetMock<IAppConfiguration>()
-                    .Setup(c => c.ConfirmEmailAddresses)
-                    .Returns(true);
 
                 // Arrange
                 var authUser = await auth.Register(
@@ -1267,8 +1267,8 @@ public void GivenATokenCredential_LegacyApiKey_ItDescribesItCorrectly(bool hasEx
                 // Arrange
                 const int expirationForApiKeyV1 = 365;
 
-                var mockConfig = GetMock<IAppConfiguration>();
-                mockConfig.SetupGet(x => x.ExpirationInDaysForApiKeyV1).Returns(expirationForApiKeyV1);
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ExpirationInDaysForApiKeyV1 = expirationForApiKeyV1;
 
                 var cred = TestCredentialHelper.CreateV1ApiKey(Guid.NewGuid(), Fakes.ExpirationForApiKeyV1);
                 cred.LastUsed = hasBeenUsedInLastDays
@@ -1339,7 +1339,7 @@ public void GivenAnExternalCredential_ItDescribesItCorrectly(bool hasExpired)
                 // Arrange
                 var cred = new CredentialBuilder().CreateExternalCredential("MicrosoftAccount", "abc123", "Test User");
                 cred.Expires = hasExpired ? DateTime.UtcNow - TimeSpan.FromDays(1) : DateTime.UtcNow + TimeSpan.FromDays(1);
-                 
+
                 var msftAuther = new MicrosoftAccountAuthenticator();
                 var authService = Get<AuthenticationService>();
 
@@ -1427,7 +1427,7 @@ public async Task SavesChangesInTheDataStore()
                 var newScopes =
                     Enumerable.Range(1, 2)
                         .Select(
-                            i => new Scope { AllowedAction = NuGetScopes.PackageUnlist, Key = i*10, Subject = "otherpackage" + i }).ToList();
+                            i => new Scope { AllowedAction = NuGetScopes.PackageUnlist, Key = i * 10, Subject = "otherpackage" + i }).ToList();
 
                 cred.Scopes = credscopes;
 
diff --git a/tests/NuGetGallery.Facts/Authentication/AuthenticatorFacts.cs b/tests/NuGetGallery.Facts/Authentication/AuthenticatorFacts.cs
index 5e28334058..207ad85776 100644
--- a/tests/NuGetGallery.Facts/Authentication/AuthenticatorFacts.cs
+++ b/tests/NuGetGallery.Facts/Authentication/AuthenticatorFacts.cs
@@ -46,11 +46,12 @@ public class TheStartupMethod : TestContainer
             public async Task LoadsConfigFromConfigurationService()
             {
                 // Arrange
+                var configurationService = GetConfigurationService();
                 var authConfig = new AuthenticatorConfiguration();
                 var auther = new ATestAuthenticator();
 
                 // Act
-                await auther.Startup(Get<IGalleryConfigurationService>(), Get<IAppBuilder>());
+                await auther.Startup(configurationService, Get<IAppBuilder>());
 
                 // Assert
                 Assert.Equal(authConfig.Enabled, auther.BaseConfig.Enabled);
@@ -65,11 +66,11 @@ public async Task DoesNotAttachToOwinAppIfDisabled()
 
                 var tempAuthConfig = new AuthenticatorConfiguration();
 
-                var mockConfiguration = (TestGalleryConfigurationService)Get<IGalleryConfigurationService>();
+                var mockConfiguration = GetConfigurationService();
                 mockConfiguration.Settings[$"{Authenticator.AuthPrefix}{auther.Name}.{nameof(tempAuthConfig.Enabled)}"] = "false";
 
                 // Act
-                await auther.Startup(Get<IGalleryConfigurationService>(), Get<IAppBuilder>());
+                await auther.Startup(mockConfiguration, Get<IAppBuilder>());
 
                 // Assert
                 Assert.Null(auther.AttachedTo);
@@ -83,8 +84,8 @@ public async Task AttachesToOwinAppIfEnabled()
 
                 var tempAuthConfig = new AuthenticatorConfiguration();
 
-                var mockConfiguration = (TestGalleryConfigurationService)Get<IGalleryConfigurationService>();
-                mockConfiguration.Settings[$"{Authenticator.AuthPrefix}{auther.Name}.{nameof(tempAuthConfig.Enabled)}"] = "true"; 
+                var mockConfiguration = GetConfigurationService();
+                mockConfiguration.Settings[$"{Authenticator.AuthPrefix}{auther.Name}.{nameof(tempAuthConfig.Enabled)}"] = "true";
 
                 // Act
                 await auther.Startup(mockConfiguration, Get<IAppBuilder>());
@@ -100,7 +101,7 @@ public class TheGetAllAvailableMethod
             public void IgnoresAbstractAndNonAuthenticatorTypes()
             {
                 // Act
-                var authers = Authenticator.GetAllAvailable(new [] {
+                var authers = Authenticator.GetAllAvailable(new[] {
                     typeof(ATestAuthenticator),
                     typeof(Authenticator),
                     typeof(TheGetAllAvailableMethod)
@@ -120,7 +121,8 @@ public void ReturnsInstanceOfGenericParameter()
             }
         }
 
-        private class ATestAuthenticator : Authenticator {
+        private class ATestAuthenticator : Authenticator
+        {
             public IAppBuilder AttachedTo { get; private set; }
 
             protected override void AttachToOwinApp(IGalleryConfigurationService config, IAppBuilder app)
diff --git a/tests/NuGetGallery.Facts/Authentication/Providers/ApiKey/ApiKeyAuthenticationHandlerFacts.cs b/tests/NuGetGallery.Facts/Authentication/Providers/ApiKey/ApiKeyAuthenticationHandlerFacts.cs
index 3a90f284a9..3e84eae54c 100644
--- a/tests/NuGetGallery.Facts/Authentication/Providers/ApiKey/ApiKeyAuthenticationHandlerFacts.cs
+++ b/tests/NuGetGallery.Facts/Authentication/Providers/ApiKey/ApiKeyAuthenticationHandlerFacts.cs
@@ -126,7 +126,7 @@ public async Task GivenA401ResponseInActiveModeAndNoHeader_ItReturns401ApiKeyReq
 
                 var authenticateValues = handler.OwinContext.Response.Headers.GetCommaSeparatedValues("WWW-Authenticate");
                 Assert.Contains(
-                    "ApiKey realm=\"nuget.local\"",
+                    "ApiKey realm=\"localhost\"",
                     authenticateValues);
                 Assert.Contains(
                     "existing",
diff --git a/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
index e0ca95849b..3c7d3fd687 100644
--- a/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
@@ -15,19 +15,19 @@
 using Moq;
 using Newtonsoft.Json.Linq;
 using NuGet.Packaging;
-using NuGet.Protocol;
 using NuGetGallery.Auditing;
 using NuGetGallery.Authentication;
-using NuGetGallery.Configuration;
 using NuGetGallery.Framework;
 using NuGetGallery.Infrastructure.Authentication;
 using NuGetGallery.Packaging;
 using NuGetGallery.Security;
 using Xunit;
+using NuGetGallery.Configuration;
 
 namespace NuGetGallery
 {
-    class TestableApiController : ApiController
+    internal class TestableApiController
+        : ApiController
     {
         public Mock<IEntitiesContext> MockEntitiesContext { get; private set; }
         public Mock<IPackageService> MockPackageService { get; private set; }
@@ -39,14 +39,15 @@ class TestableApiController : ApiController
         public Mock<IIndexingService> MockIndexingService { get; private set; }
         public Mock<IAutomaticallyCuratePackageCommand> MockAutoCuratePackage { get; private set; }
         public Mock<IMessageService> MockMessageService { get; private set; }
-        public Mock<IGalleryConfigurationService> MockConfigurationService { get; private set; }
         public Mock<ITelemetryService> MockTelemetryService { get; private set; }
         public Mock<AuthenticationService> MockAuthenticationService { get; private set; }
         public Mock<ISecurityPolicyService> MockSecurityPolicyService { get; private set; }
 
         private Stream PackageFromInputStream { get; set; }
 
-        public TestableApiController(MockBehavior behavior = MockBehavior.Default)
+        public TestableApiController(
+            IGalleryConfigurationService configurationService,
+            MockBehavior behavior = MockBehavior.Default)
         {
             SetOwinContextOverride(Fakes.CreateOwinContext());
             EntitiesContext = (MockEntitiesContext = new Mock<IEntitiesContext>()).Object;
@@ -69,10 +70,8 @@ public TestableApiController(MockBehavior behavior = MockBehavior.Default)
 
             MessageService = (MockMessageService = new Mock<IMessageService>()).Object;
 
-            MockConfigurationService = new Mock<IGalleryConfigurationService>();
-            MockConfigurationService.SetupGet(s => s.Features.TrackPackageDownloadCountInLocalDatabase)
-                .Returns(false);
-            ConfigurationService = MockConfigurationService.Object;
+            configurationService.Features.TrackPackageDownloadCountInLocalDatabase = false;
+            ConfigurationService = configurationService;
 
             AuditingService = new TestAuditingService();
 
@@ -95,7 +94,14 @@ public TestableApiController(MockBehavior behavior = MockBehavior.Default)
             MockSecurityPolicyService.Setup(s => s.EvaluateAsync(It.IsAny<SecurityPolicyAction>(), It.IsAny<HttpContextBase>()))
                 .Returns(Task.FromResult(SecurityPolicyResult.SuccessResult));
 
-            TestUtility.SetupHttpContextMockForUrlGeneration(new Mock<HttpContextBase>(), this);
+            var requestMock = new Mock<HttpRequestBase>();
+            requestMock.Setup(m => m.IsSecureConnection).Returns(true);
+            requestMock.Setup(m => m.Url).Returns(new Uri(TestUtility.GallerySiteRootHttps));
+
+            var httpContextMock = new Mock<HttpContextBase>();
+            httpContextMock.Setup(m => m.Request).Returns(requestMock.Object);
+
+            TestUtility.SetupHttpContextMockForUrlGeneration(httpContextMock, this);
         }
 
         internal void SetupPackageFromInputStream(Stream packageStream)
@@ -115,12 +121,13 @@ public class ApiControllerFacts
         private static readonly Uri HttpsRequestUrl = new Uri("https://nuget.org/api/v2/something");
 
         public class TheCreatePackageAction
+            : TestContainer
         {
             [Fact]
             public async Task CreatePackage_Returns400IfSecurityPolicyFails()
             {
                 // Arrange
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.MockSecurityPolicyService.Setup(s => s.EvaluateAsync(It.IsAny<SecurityPolicyAction>(), It.IsAny<HttpContextBase>()))
                     .Returns(Task.FromResult(SecurityPolicyResult.CreateErrorResult("A")));
 
@@ -144,7 +151,7 @@ public async Task CreatePackageWillSavePackageFileToFileStorage()
                 package.Version = "1.0.42";
                 packageRegistration.Packages.Add(package);
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockPackageFileService.Setup(p => p.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))
                     .Returns(Task.CompletedTask).Verifiable();
@@ -178,7 +185,7 @@ public async Task WillDeletePackageFileFromBlobStorageIfSavingDbChangesFails()
                 package.Version = "1.0.42";
                 packageRegistration.Packages.Add(package);
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockPackageFileService.Setup(
                         p => p.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))
@@ -220,7 +227,7 @@ public async Task WritesAnAuditRecord()
                 package.Version = "1.0.42";
                 packageRegistration.Packages.Add(package);
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockPackageService.Setup(p => p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), false))
                     .Returns(Task.FromResult(package));
@@ -251,7 +258,7 @@ public async Task CreatePackageWillSendPackageAddedNotice()
                 package.Version = "1.0.42";
                 packageRegistration.Packages.Add(package);
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockMessageService.Setup(p => p.SendPackageAddedNotice(package, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
                     .Verifiable();
@@ -276,7 +283,7 @@ public async Task CreatePackageWillReturn400IfFileIsNotANuGetPackage()
                 var packageRegistration = new PackageRegistration();
                 packageRegistration.Owners.Add(user);
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockPackageFileService.Setup(p => p.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))
                     .Returns(Task.CompletedTask).Verifiable();
@@ -306,10 +313,10 @@ public async Task CreatePackageReturns400IfEnsureValidThrowsExceptionMessage(Typ
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
-                
+
                 var exception =
                     exceptionType.GetConstructor(new[] { typeof(string) }).Invoke(new[] { EnsureValidExceptionMessage });
 
@@ -339,7 +346,7 @@ public async Task CreatePackageReturns400IfPackageIdIsInvalid(string packageId)
                 var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, "1.0.42");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -362,7 +369,7 @@ public async Task WillWriteAnAuditRecordIfUserIsNotPackageOwner()
                 package.Version = "1.0.42";
                 packageRegistration.Packages.Add(package);
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockPackageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>()))
                     .Returns(packageRegistration);
@@ -393,7 +400,7 @@ public async Task WillReturnConflictIfAPackageWithTheIdAndSameNormalizedVersionA
                     Owners = new List<User> { user }
                 };
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(new User());
                 controller.MockPackageService.Setup(x => x.FindPackageRegistrationById("theId")).Returns(packageRegistration);
                 controller.SetupPackageFromInputStream(nuGetPackage);
@@ -421,7 +428,7 @@ public async Task WillReturnConflictIfAPackageWithTheIdExistsBelongingToAnotherU
                 package.Version = "1.0.42";
                 packageRegistration.Packages.Add(package);
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockPackageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>()))
                     .Returns(packageRegistration);
@@ -445,7 +452,7 @@ public async Task WillReturnConflictIfSavingPackageBlobFailsOnConflict()
             {
                 // Arrange
                 var user = new User { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.MockPackageFileService.Setup(
                         x => x.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))
@@ -473,7 +480,7 @@ public async Task WillCreateAPackageFromTheNuGetPackage()
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -489,7 +496,7 @@ public async Task WillReturnServerWarningWhenCreatingSemVer2Package()
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42+metadata");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -504,7 +511,7 @@ public async Task WillCurateThePackage()
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -520,7 +527,7 @@ public async Task WillCurateThePackageViaApi()
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -536,7 +543,7 @@ public async Task WillCreateAPackageWithTheUserMatchingTheApiKey()
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -556,13 +563,13 @@ public async Task WillVerifyScopesForNewPackageId(string apiKeyScopes, bool isPu
                 // Arrange
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
 
-                var user = new User {EmailAddress = "confirmed@email.com", Username = "username"};
+                var user = new User { EmailAddress = "confirmed@email.com", Username = "username" };
 
                 var package = new Package();
                 package.PackageRegistration = new PackageRegistration();
                 package.Version = "1.0.42";
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user, apiKeyScopes);
                 controller.SetupPackageFromInputStream(nuGetPackage);
                 controller.MockPackageService.Setup(
@@ -610,7 +617,7 @@ public async Task WillVerifyScopesForExistingPackageId(string apiKeyScopes, bool
 
                 var user = new User { EmailAddress = "confirmed@email.com", Username = "username", Key = 1 };
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user, apiKeyScopes);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -662,7 +669,7 @@ public async Task WillSendPackagePushEvent()
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
 
                 var user = new User() { EmailAddress = "confirmed@email.com" };
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
                 controller.SetupPackageFromInputStream(nuGetPackage);
 
@@ -673,11 +680,12 @@ public async Task WillSendPackagePushEvent()
         }
 
         public class TheDeletePackageAction
+            : TestContainer
         {
             [Fact]
             public async Task WillThrowIfAPackageWithTheIdAndNuGetVersionDoesNotExist()
             {
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict("theId", "1.0.42")).Returns((Package)null);
                 controller.SetCurrentUser(new User());
 
@@ -695,11 +703,11 @@ public async Task WillNotDeleteThePackageIfApiKeyDoesNotBelongToAnOwner()
             {
                 var notOwner = new User { Key = 1 };
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Owners = new[] { new User() } }
-                    };
+                {
+                    PackageRegistration = new PackageRegistration { Owners = new[] { new User() } }
+                };
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(notOwner);
                 controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict("theId", "1.0.42")).Returns(package);
 
@@ -718,13 +726,13 @@ public async Task WillNotDeleteThePackageIfApiKeyDoesNotBelongToAnOwner()
             [Theory]
             public async Task WillVerifyApiKeyScopeBeforeDelete(string apiKeyScope, bool isDeleteAllowed)
             {
-                var owner = new User {Key = 1, Username = "owner"};
+                var owner = new User { Key = 1, Username = "owner" };
                 var package = new Package
                 {
-                    PackageRegistration = new PackageRegistration {Owners = new[] {owner}}
+                    PackageRegistration = new PackageRegistration { Owners = new[] { owner } }
                 };
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(owner, apiKeyScope);
                 controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict("theId", "1.0.42"))
                     .Returns(package);
@@ -734,7 +742,7 @@ public async Task WillVerifyApiKeyScopeBeforeDelete(string apiKeyScope, bool isD
                 if (!isDeleteAllowed)
                 {
                     Assert.IsType<HttpStatusCodeWithBodyResult>(result);
-                    var statusCodeResult = (HttpStatusCodeWithBodyResult) result;
+                    var statusCodeResult = (HttpStatusCodeWithBodyResult)result;
                     Assert.Equal(string.Format(Strings.ApiKeyNotAuthorized, "delete"),
                         statusCodeResult.StatusDescription);
 
@@ -752,10 +760,10 @@ public async Task WillUnlistThePackageIfApiKeyBelongsToAnOwner()
             {
                 var owner = new User { Key = 1 };
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Owners = new[] { new User(), owner } }
-                    };
-                var controller = new TestableApiController();
+                {
+                    PackageRegistration = new PackageRegistration { Owners = new[] { new User(), owner } }
+                };
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(package);
                 controller.SetCurrentUser(owner);
 
@@ -767,11 +775,12 @@ public async Task WillUnlistThePackageIfApiKeyBelongsToAnOwner()
         }
 
         public class TheGetPackageAction
+            : TestContainer
         {
             [Fact]
             public async Task GetPackageReturns400ForEvilPackageName()
             {
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 var result = await controller.GetPackage("../..", "1.0.0.0");
                 var badRequestResult = (HttpStatusCodeWithBodyResult)result;
                 Assert.Equal(400, badRequestResult.StatusCode);
@@ -780,7 +789,7 @@ public async Task GetPackageReturns400ForEvilPackageName()
             [Fact]
             public async Task GetPackageReturns400ForEvilPackageVersion()
             {
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 var result2 = await controller.GetPackage("Foo", "10../..1.0");
                 var badRequestResult2 = (HttpStatusCodeWithBodyResult)result2;
                 Assert.Equal(400, badRequestResult2.StatusCode);
@@ -794,7 +803,7 @@ public async Task GetPackageReturns404IfPackageIsNotFound()
                 const string packageVersion = "1.0.1";
                 var actionResult = new RedirectResult("http://foo");
 
-                var controller = new TestableApiController(MockBehavior.Strict);
+                var controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);
                 controller.MockPackageService
                     .Setup(x => x.FindPackageByIdAndVersion(packageId, packageVersion, SemVerLevelKey.SemVer2, false))
                     .Returns((Package)null).Verifiable();
@@ -819,7 +828,7 @@ public async Task GetPackageReturnsPackageIfItExists()
                 const string packageId = "Baz";
                 var package = new Package() { Version = "1.0.01", NormalizedVersion = "1.0.1" };
                 var actionResult = new EmptyResult();
-                var controller = new TestableApiController(MockBehavior.Strict);
+                var controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);
                 // controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersion(PackageId, "1.0.1", false)).Returns(package);
                 // controller.MockPackageService.Setup(x => x.AddDownloadStatistics(It.IsAny<PackageStatistics>())).Verifiable();
                 controller.MockPackageFileService.Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, packageId, package.NormalizedVersion))
@@ -856,7 +865,7 @@ public async Task GetPackageReturnsSpecificPackageEvenIfDatabaseIsOffline()
                 // Arrange
                 var actionResult = new EmptyResult();
 
-                var controller = new TestableApiController(MockBehavior.Strict);
+                var controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);
                 //controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersion("Baz", "1.0.0", false)).Throws(new DataException("Can't find the database")).Verifiable();
                 controller.MockPackageFileService.Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, "Baz", "1.0.0"))
                               .Returns(Task.FromResult<ActionResult>(actionResult))
@@ -892,7 +901,7 @@ public async Task GetPackageReturnsLatestPackageIfNoVersionIsProvided()
                 const string packageId = "Baz";
                 var package = new Package() { Version = "1.2.0408", NormalizedVersion = "1.2.408" };
                 var actionResult = new EmptyResult();
-                var controller = new TestableApiController(MockBehavior.Strict);
+                var controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);
                 controller.MockPackageService
                     .Setup(x => x.FindPackageByIdAndVersion(packageId, string.Empty, SemVerLevelKey.SemVer2, false))
                     .Returns(package);
@@ -933,13 +942,13 @@ public async Task GetPackageReturns503IfNoVersionIsProvidedAndDatabaseUnavailabl
                 const string packageId = "Baz";
                 var package = new Package();
                 var actionResult = new EmptyResult();
-                var controller = new TestableApiController(MockBehavior.Strict);
+                var controller = new TestableApiController(GetConfigurationService(), MockBehavior.Strict);
                 controller.MockPackageService
                     .Setup(x => x.FindPackageByIdAndVersion("Baz", string.Empty, SemVerLevelKey.SemVer2, false))
                     .Throws(new DataException("Oh noes, database broken!"));
- 		        controller.MockPackageFileService.Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, packageId, package.NormalizedVersion))
-                             .Returns(Task.FromResult<ActionResult>(actionResult))
-                             .Verifiable();
+                controller.MockPackageFileService.Setup(s => s.CreateDownloadPackageActionResultAsync(HttpRequestUrl, packageId, package.NormalizedVersion))
+                            .Returns(Task.FromResult<ActionResult>(actionResult))
+                            .Verifiable();
 
                 NameValueCollection headers = new NameValueCollection();
                 headers.Add("NuGet-Operation", "Install");
@@ -960,19 +969,20 @@ public async Task GetPackageReturns503IfNoVersionIsProvidedAndDatabaseUnavailabl
 
                 // Assert
                 ResultAssert.IsStatusCode(result, HttpStatusCode.ServiceUnavailable, Strings.DatabaseUnavailable_TrySpecificVersion);
-               // controller.MockPackageFileService.Verify();
+                // controller.MockPackageFileService.Verify();
                 controller.MockPackageService.Verify();
-               // controller.MockUserService.Verify();
+                // controller.MockUserService.Verify();
             }
         }
 
         public class ThePublishPackageAction
+            : TestContainer
         {
             [Fact]
             public async Task WillThrowIfAPackageWithTheIdAndNuGetVersionDoesNotExist()
             {
                 // Arrange
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict("theId", "1.0.42")).Returns((Package)null);
                 controller.SetCurrentUser(new User());
 
@@ -993,11 +1003,11 @@ public async Task WillNotListThePackageIfApiKeyDoesNotBelongToAnOwner()
                 // Arrange
                 var owner = new User { Key = 1 };
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Owners = new[] { new User() } }
-                    };
+                {
+                    PackageRegistration = new PackageRegistration { Owners = new[] { new User() } }
+                };
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict("theId", "1.0.42")).Returns(package);
                 controller.SetCurrentUser(owner);
 
@@ -1023,7 +1033,7 @@ public async Task WillListThePackageIfUserIsAnOwner()
                     PackageRegistration = new PackageRegistration { Owners = new[] { new User(), owner } }
                 };
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.MockPackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(package);
                 controller.SetCurrentUser(owner);
 
@@ -1055,7 +1065,7 @@ internal TestableApiController SetupController(string keyType, string scopes, Pa
                     package.PackageRegistration.Owners.Add(user);
                 }
 
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
 
                 controller.MockAuthenticationService
                     .Setup(s => s.AddCredential(It.IsAny<User>(), It.IsAny<Credential>()))
@@ -1079,7 +1089,8 @@ internal TestableApiController SetupController(string keyType, string scopes, Pa
             }
         }
 
-        public class TheCreatePackageVerificationKeyAsyncAction : PackageVerificationKeyContainer
+        public class TheCreatePackageVerificationKeyAsyncAction
+            : PackageVerificationKeyContainer
         {
             [Theory]
             [InlineData("")]
@@ -1104,13 +1115,14 @@ public async Task CreatePackageVerificationKeyAsync_ReturnsPackageVerificationKe
                 Assert.True(DateTime.TryParse(json.Expires, out expires));
 
                 controller.MockAuthenticationService.Verify(s => s.AddCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Once);
-                
+
                 controller.MockTelemetryService.Verify(x => x.TrackCreatePackageVerificationKeyEvent("foo", "1.0.0",
                     It.IsAny<User>(), controller.OwinContext.Request.User.Identity), Times.Once);
             }
         }
 
-        public class TheVerifyPackageKeyAsyncAction : PackageVerificationKeyContainer
+        public class TheVerifyPackageKeyAsyncAction
+            : PackageVerificationKeyContainer
         {
             [Fact]
             public async Task VerifyPackageKeyAsync_Returns400IfSecurityPolicyFails()
@@ -1197,7 +1209,7 @@ public async Task VerifyPackageKeyAsync_Returns403IfUserIsNotAnOwner_ApiKeyV2(st
                     Strings.ApiKeyNotAuthorized);
 
                 controller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Never);
-                
+
                 controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent("foo", "1.0.0",
                     It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 403), Times.Once);
             }
@@ -1306,13 +1318,13 @@ public async Task VerifyPackageKeyAsync_Returns200IfApiKeyWithPushCapability_Api
                     Version = "1.0.0"
                 };
                 var controller = SetupController(CredentialTypes.ApiKey.V2, scope, package);
-                
+
                 // Act
                 var result = await controller.VerifyPackageKeyAsync("foo", "1.0.0");
 
                 // Assert
                 ResultAssert.IsEmpty(result);
-                
+
                 controller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Never);
 
                 controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent("foo", "1.0.0",
@@ -1366,6 +1378,7 @@ public async Task VerifyPackageKeyAsync_WritesAuditRecord()
         }
 
         public class TheGetStatsDownloadsAction
+            : TestContainer
         {
             [Fact]
             public async Task VerifyRecentPopularityStatsDownloads()
@@ -1402,14 +1415,16 @@ public async Task VerifyRecentPopularityStatsDownloads()
 
                 var fakeReportService = new Mock<IReportService>();
 
-                fakeReportService.Setup(x => x.Load("recentpopularitydetail.json")).Returns(Task.FromResult(new StatisticsReport(fakePackageVersionReport, DateTime.UtcNow)));
+                fakeReportService
+                    .Setup(x => x.Load("recentpopularitydetail.json"))
+                    .Returns(Task.FromResult(new StatisticsReport(fakePackageVersionReport, DateTime.UtcNow)));
 
-                var controller = new TestableApiController
+                var controller = new TestableApiController(GetConfigurationService())
                 {
                     StatisticsService = new JsonStatisticsService(fakeReportService.Object),
                 };
 
-                TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+                TestUtility.SetupUrlHelperForUrlGeneration(controller);
 
                 ActionResult actionResult = await controller.GetStatsDownloads(null);
 
@@ -1417,17 +1432,17 @@ public async Task VerifyRecentPopularityStatsDownloads()
 
                 JArray result = JArray.Parse(contentResult.Content);
 
-                Assert.True((string)result[3]["Gallery"] == "http://nuget.org/packages/B/1.1", "unexpected content result[3].Gallery");
+                Assert.True((string)result[3]["Gallery"] == TestUtility.GallerySiteRootHttps + "packages/B/1.1", "unexpected content result[3].Gallery");
                 Assert.True((int)result[2]["Downloads"] == 5, "unexpected content result[2].Downloads");
             }
 
             [Fact]
             public async Task VerifyStatsDownloadsReturnsNotFoundWhenStatsNotAvailable()
             {
-                var controller = new TestableApiController();
+                var controller = new TestableApiController(GetConfigurationService());
                 controller.MockStatisticsService.Setup(x => x.LoadDownloadPackageVersions()).Returns(Task.FromResult(StatisticsReportResult.Failed));
 
-                TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+                TestUtility.SetupUrlHelperForUrlGeneration(controller);
 
                 ActionResult actionResult = await controller.GetStatsDownloads(null);
 
@@ -1455,12 +1470,12 @@ public async Task VerifyRecentPopularityStatsDownloadsCount()
 
                 fakeReportService.Setup(x => x.Load("recentpopularitydetail.json")).Returns(Task.FromResult(new StatisticsReport(fakePackageVersionReport, DateTime.UtcNow)));
 
-                var controller = new TestableApiController
+                var controller = new TestableApiController(GetConfigurationService())
                 {
                     StatisticsService = new JsonStatisticsService(fakeReportService.Object),
                 };
 
-                TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+                TestUtility.SetupUrlHelperForUrlGeneration(controller);
 
                 ActionResult actionResult = await controller.GetStatsDownloads(3);
 
diff --git a/tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs
index da1c1257d0..2e696d6aee 100644
--- a/tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs
@@ -332,12 +332,9 @@ public async Task GivenAdminLogsInWithValidExternalAuth_ItChallengesWhenNotUsing
             {
                 var enforcedProvider = "AzureActiveDirectory";
 
-                var mockConfig = GetMock<IGalleryConfigurationService>();
-                mockConfig.Setup(x => x.Current).Returns(new AppConfiguration
-                {
-                    ConfirmEmailAddresses = false,
-                    EnforcedAuthProviderForAdmin = enforcedProvider
-                });
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = false;
+                configurationService.Current.EnforcedAuthProviderForAdmin = enforcedProvider;
 
                 var externalCred = new CredentialBuilder().CreateExternalCredential(providerUsedForLogin, "blorg", "Bloog");
 
@@ -385,7 +382,7 @@ public async Task GivenAdminLogsInWithValidExternalAuth_ItChallengesWhenNotUsing
                        .Returns(Task.FromResult(0))
                        .Verifiable();
                 }
-                
+
                 GetMock<AuthenticationService>()
                     .Setup(x => x.ReadExternalLoginCredential(controller.OwinContext))
                     .CompletesWith(new AuthenticateExternalLoginResult()
@@ -438,6 +435,7 @@ public async Task WillInvalidateModelStateAndShowTheViewWhenAnEntityExceptionIsT
                 GetMock<AuthenticationService>()
                     .Setup(x => x.Register(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Credential>()))
                     .Throws(new EntityException("aMessage"));
+
                 var controller = GetController<AuthenticationController>();
 
                 var request = new LogOnViewModel()
@@ -446,7 +444,7 @@ public async Task WillInvalidateModelStateAndShowTheViewWhenAnEntityExceptionIsT
                     {
                         Username = "theUsername",
                         Password = "thePassword",
-                        EmailAddress = "theEmailAddress",
+                        EmailAddress = "someone@example.com",
                     }
                 };
                 var result = await controller.Register(request, null, linkingAccount: false);
@@ -461,18 +459,20 @@ public async Task WillCreateAndLogInTheUserWhenNotLinking()
             {
                 // Arrange
                 var authUser = new AuthenticatedUser(
-                    new User("theUsername") {
+                    new User("theUsername")
+                    {
                         UnconfirmedEmailAddress = "unconfirmed@example.com",
                         EmailConfirmationToken = "t0k3n"
                     },
                     new Credential());
-                GetMock<AuthenticationService>()
-                    .Setup(x => x.Register("theUsername", "unconfirmed@example.com", It.IsAny<Credential>()))
-                    .CompletesWith(authUser);
-
+                
+                var authenticationService = GetMock<AuthenticationService>();
                 var controller = GetController<AuthenticationController>();
 
-                GetMock<AuthenticationService>()
+                authenticationService.Setup(x => x.Register(authUser.User.Username, authUser.User.UnconfirmedEmailAddress, It.IsAny<Credential>()))
+                    .CompletesWith(authUser);
+
+                authenticationService
                     .Setup(x => x.CreateSessionAsync(controller.OwinContext, authUser))
                     .Returns(Task.FromResult(0))
                     .Verifiable();
@@ -483,9 +483,9 @@ public async Task WillCreateAndLogInTheUserWhenNotLinking()
                     {
                         Register = new RegisterViewModel
                         {
-                            Username = "theUsername",
+                            Username = authUser.User.Username,
                             Password = "thePassword",
-                            EmailAddress = "unconfirmed@example.com",
+                            EmailAddress = authUser.User.UnconfirmedEmailAddress,
                         }
                     }, "/theReturnUrl", linkingAccount: false);
 
@@ -496,7 +496,7 @@ public async Task WillCreateAndLogInTheUserWhenNotLinking()
                 GetMock<IMessageService>()
                     .Verify(x => x.SendNewAccountEmail(
                         expectedAddress,
-                        "https://nuget.local/account/confirm/theUsername/t0k3n"));
+                        TestUtility.GallerySiteRootHttps + "account/confirm/" + authUser.User.Username + "/" + authUser.User.EmailConfirmationToken));
                 ResultAssert.IsSafeRedirectTo(result, "/theReturnUrl");
             }
 
@@ -512,8 +512,8 @@ public async Task WillNotSendConfirmationEmailWhenConfirmEmailAddressesIsOff()
                     },
                     new Credential());
 
-                var mockConfig = GetMock<IGalleryConfigurationService>();
-                mockConfig.Setup(x => x.Current).Returns(new AppConfiguration { ConfirmEmailAddresses = false });
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = false;
 
                 GetMock<AuthenticationService>()
                     .Setup(x => x.Register("theUsername", "unconfirmed@example.com", It.IsAny<Credential>()))
@@ -591,20 +591,20 @@ public async Task GivenValidExternalAuth_ItCreatesAccountAndLinksCredential()
                         EmailConfirmationToken = "t0k3n"
                     },
                     new Credential());
-                var externalCred = new CredentialBuilder().CreateExternalCredential("MicrosoftAccount", "blorg", "Bloog");
-
-                GetMock<AuthenticationService>()
-                    .Setup(x => x.Register("theUsername", "theEmailAddress", externalCred))
-                    .CompletesWith(authUser);
 
+                var externalCred = new CredentialBuilder().CreateExternalCredential("MicrosoftAccount", "blorg", "Bloog");
+                
+                var authenticationServiceMock = GetMock<AuthenticationService>();
                 var controller = GetController<AuthenticationController>();
-
-                GetMock<AuthenticationService>()
+                authenticationServiceMock
+                    .Setup(x => x.Register(authUser.User.Username, authUser.User.UnconfirmedEmailAddress, externalCred))
+                    .CompletesWith(authUser);
+                authenticationServiceMock
                     .Setup(x => x.CreateSessionAsync(controller.OwinContext, authUser))
                     .Returns(Task.FromResult(0))
                     .Verifiable();
 
-                GetMock<AuthenticationService>()
+                authenticationServiceMock
                     .Setup(x => x.ReadExternalLoginCredential(controller.OwinContext))
                     .CompletesWith(new AuthenticateExternalLoginResult()
                     {
@@ -621,19 +621,19 @@ public async Task GivenValidExternalAuth_ItCreatesAccountAndLinksCredential()
                     {
                         Register = new RegisterViewModel
                         {
-                            Username = "theUsername",
-                            EmailAddress = "theEmailAddress",
+                            Username = authUser.User.Username,
+                            EmailAddress = authUser.User.UnconfirmedEmailAddress,
                         }
                     }, "/theReturnUrl", linkingAccount: true);
 
                 // Assert
-                GetMock<AuthenticationService>().VerifyAll();
+                authenticationServiceMock.VerifyAll();
 
                 var expectedAddress = new MailAddress(authUser.User.UnconfirmedEmailAddress, authUser.User.Username);
                 GetMock<IMessageService>()
                     .Verify(x => x.SendNewAccountEmail(
                         expectedAddress,
-                        "https://nuget.local/account/confirm/theUsername/t0k3n"));
+                        TestUtility.GallerySiteRootHttps + "account/confirm/" + authUser.User.Username + "/" + authUser.User.EmailConfirmationToken));
 
                 ResultAssert.IsSafeRedirectTo(result, "/theReturnUrl");
             }
@@ -646,12 +646,9 @@ public async Task GivenAdminLogsInWithExternalIdentity_ItChallengesWhenNotUsingR
                 // Arrange
                 var enforcedProvider = "AzureActiveDirectory";
 
-                var mockConfig = GetMock<IGalleryConfigurationService>();
-                mockConfig.Setup(x => x.Current).Returns(new AppConfiguration
-                {
-                    ConfirmEmailAddresses = false,
-                    EnforcedAuthProviderForAdmin = enforcedProvider
-                });
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = false;
+                configurationService.Current.EnforcedAuthProviderForAdmin = enforcedProvider;
 
                 var externalCred = new CredentialBuilder().CreateExternalCredential(providerUsedForLogin, "blorg", "Bloog");
 
@@ -734,7 +731,7 @@ public void WillChallengeTheUserUsingTheGivenProviderAndReturnUrl()
                 var result = controller.ChallengeAuthentication("/theReturnUrl", "MicrosoftAccount");
 
                 // Assert
-                ResultAssert.IsChallengeResult(result, "MicrosoftAccount", "/users/account/authenticate/return?ReturnUrl=%2FtheReturnUrl");
+                ResultAssert.IsChallengeResult(result, "MicrosoftAccount", TestUtility.GallerySiteRootHttps + "users/account/authenticate/return?ReturnUrl=%2FtheReturnUrl");
             }
         }
 
@@ -762,10 +759,7 @@ public async Task GivenAssociatedLocalUser_ItCreatesASessionAndSafeRedirectsToRe
             {
                 // Arrange
                 var fakes = Get<Fakes>();
-
-                var mockConfig = GetMock<IGalleryConfigurationService>();
-                mockConfig.Setup(x => x.Current).Returns(new AppConfiguration());
-
+                
                 GetMock<AuthenticationService>(); // Force a mock to be created
                 var controller = GetController<AuthenticationController>();
                 var cred = new CredentialBuilder().CreateExternalCredential("MicrosoftAccount", "blorg", "Bloog");
@@ -797,12 +791,9 @@ public async Task GivenAssociatedLocalAdminUser_ItChallengesWhenNotUsingRequired
                 // Arrange
                 var enforcedProvider = "AzureActiveDirectory";
 
-                var mockConfig = GetMock<IGalleryConfigurationService>();
-                mockConfig.Setup(x => x.Current).Returns(new AppConfiguration
-                {
-                    ConfirmEmailAddresses = false,
-                    EnforcedAuthProviderForAdmin = enforcedProvider
-                });
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = false;
+                configurationService.Current.EnforcedAuthProviderForAdmin = enforcedProvider;
 
                 var fakes = Get<Fakes>();
                 GetMock<AuthenticationService>(); // Force a mock to be created
@@ -975,7 +966,7 @@ public async Task GivenNoLinkButEmailMatchingLocalUser_ItDisplaysLogOnViewPreset
                     .Setup(x => x.AuthenticateExternalLogin(controller.OwinContext))
                     .CompletesWith(new AuthenticateExternalLoginResult()
                     {
-                        ExternalIdentity = new ClaimsIdentity(new [] {
+                        ExternalIdentity = new ClaimsIdentity(new[] {
                             new Claim(ClaimTypes.Email, existingUser.EmailAddress)
                         }),
                         Authenticator = msAuther
@@ -1031,7 +1022,8 @@ public void VerifyShouldChallenge(string providerUsedForLogin, bool shouldChalle
             }
         }
 
-        public static void VerifyExternalLinkExpiredResult(AuthenticationController controller, ActionResult result) {
+        public static void VerifyExternalLinkExpiredResult(AuthenticationController controller, ActionResult result)
+        {
             ResultAssert.IsRedirectToRoute(result, new { action = "LogOn" });
             Assert.Equal(Strings.ExternalAccountLinkExpired, controller.TempData["Message"]);
         }
diff --git a/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs
index 24ca3224b6..2b188e3288 100644
--- a/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs
@@ -163,7 +163,7 @@ public void ReturnsDetailedConfirmationIfNewOwnerPropagatesPolicy()
                 // Arrange
                 var fakes = Get<Fakes>();
                 var controller = GetController<JsonApiController>();
-                GetMock<IAppConfiguration>().Setup(c => c.GalleryOwner).Returns(new MailAddress("support@example.com"));
+
                 GetMock<HttpContextBase>()
                     .Setup(c => c.User)
                     .Returns(Fakes.ToPrincipal(fakes.Owner));
@@ -186,7 +186,6 @@ public void ReturnsDetailedConfirmationIfCurrentOwnerPropagatesPolicy()
                 // Arrange
                 var fakes = Get<Fakes>();
                 var controller = GetController<JsonApiController>();
-                GetMock<IAppConfiguration>().Setup(c => c.GalleryOwner).Returns(new MailAddress("support@example.com"));
                 GetMock<HttpContextBase>()
                     .Setup(c => c.User)
                     .Returns(Fakes.ToPrincipal(fakes.Owner));
@@ -209,7 +208,6 @@ public void DoesNotReturnConfirmationIfCurrentOwnerPropagatesButNewOwnerIsSubscr
                 // Arrange
                 var fakes = Get<Fakes>();
                 var controller = GetController<JsonApiController>();
-                GetMock<IAppConfiguration>().Setup(c => c.GalleryOwner).Returns(new MailAddress("support@example.com"));
                 GetMock<HttpContextBase>()
                     .Setup(c => c.User)
                     .Returns(Fakes.ToPrincipal(fakes.Owner));
@@ -232,7 +230,6 @@ public void ReturnsDetailedConfirmationIfPendingOwnerPropagatesPolicy()
                 // Arrange
                 var fakes = Get<Fakes>();
                 var controller = GetController<JsonApiController>();
-                GetMock<IAppConfiguration>().Setup(c => c.GalleryOwner).Returns(new MailAddress("support@example.com"));
                 GetMock<HttpContextBase>()
                     .Setup(c => c.User)
                     .Returns(Fakes.ToPrincipal(fakes.Owner));
@@ -264,7 +261,6 @@ public void DoesNotReturnConfirmationIfPendingOwnerPropagatesButNewOwnerIsSubscr
                 // Arrange
                 var fakes = Get<Fakes>();
                 var controller = GetController<JsonApiController>();
-                GetMock<IAppConfiguration>().Setup(c => c.GalleryOwner).Returns(new MailAddress("support@example.com"));
                 GetMock<HttpContextBase>()
                     .Setup(c => c.User)
                     .Returns(Fakes.ToPrincipal(fakes.Owner));
@@ -429,8 +425,8 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState()
                         fakes.Owner,
                         fakes.User,
                         fakes.Package,
-                        "http://nuget.local/packages/FakePackage/",
-                        "https://nuget.local/packages/FakePackage/owners/testUser/confirm/confirmation-code",
+                        TestUtility.GallerySiteRootHttps + "packages/FakePackage/",
+                        TestUtility.GallerySiteRootHttps + "packages/FakePackage/owners/testUser/confirm/confirmation-code",
                         "Hello World! Html Encoded &lt;3",
                         ""))
                     .Verifiable();
@@ -500,10 +496,11 @@ private async Task<string> GetSendPackageOwnerRequestPolicyMessage(Fakes fakes,
             {
                 // Arrange
                 var controller = GetController<JsonApiController>();
-                GetMock<IAppConfiguration>().Setup(c => c.GalleryOwner).Returns(new MailAddress("support@example.com"));
+                
                 GetMock<HttpContextBase>()
                     .Setup(c => c.User)
                     .Returns(Fakes.ToPrincipal(fakes.Owner));
+
                 userToSubscribe.SecurityPolicies = (new RequireSecurePushForCoOwnersPolicy().Policies).ToList();
 
                 var packageServiceMock = GetMock<IPackageService>();
@@ -518,8 +515,8 @@ private async Task<string> GetSendPackageOwnerRequestPolicyMessage(Fakes fakes,
                         fakes.Owner,
                         fakes.User,
                         fakes.Package,
-                        "http://nuget.local/packages/FakePackage/",
-                        "https://nuget.local/packages/FakePackage/owners/testUser/confirm/confirmation-code",
+                        TestUtility.GallerySiteRootHttps + "packages/FakePackage/",
+                        TestUtility.GallerySiteRootHttps + "packages/FakePackage/owners/testUser/confirm/confirmation-code",
                         string.Empty,
                         It.IsAny<string>()))
                     .Callback<User, User, PackageRegistration, string, string, string, string>(
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
index 270f1bf71f..0ee93c6282 100644
--- a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
@@ -15,18 +15,20 @@
 using NuGetGallery.Areas.Admin;
 using NuGetGallery.AsyncFileUpload;
 using NuGetGallery.Auditing;
-using NuGetGallery.Configuration;
 using NuGetGallery.Framework;
 using NuGetGallery.Helpers;
 using NuGetGallery.Packaging;
 using NuGetGallery.Security;
 using Xunit;
+using NuGetGallery.Configuration;
 
 namespace NuGetGallery
 {
     public class PackagesControllerFacts
+        : TestContainer
     {
         private static PackagesController CreateController(
+            IGalleryConfigurationService configurationService,
             Mock<IPackageService> packageService = null,
             Mock<IUploadFileService> uploadFileService = null,
             Mock<IMessageService> messageService = null,
@@ -36,7 +38,6 @@ private static PackagesController CreateController(
             Mock<ISearchService> searchService = null,
             Exception readPackageException = null,
             Mock<IAutomaticallyCuratePackageCommand> autoCuratePackageCmd = null,
-            Mock<IAppConfiguration> config = null,
             Mock<IPackageFileService> packageFileService = null,
             Mock<IEntitiesContext> entitiesContext = null,
             Mock<IIndexingService> indexingService = null,
@@ -58,8 +59,6 @@ private static PackagesController CreateController(
             messageService = messageService ?? new Mock<IMessageService>();
             searchService = searchService ?? CreateSearchService();
             autoCuratePackageCmd = autoCuratePackageCmd ?? new Mock<IAutomaticallyCuratePackageCommand>();
-            config = config ?? new Mock<IAppConfiguration>();
-            config.Setup(c => c.GalleryOwner).Returns(new MailAddress("support@example.com"));
 
             if (packageFileService == null)
             {
@@ -93,7 +92,7 @@ private static PackagesController CreateController(
                 autoCuratePackageCmd.Object,
                 packageFileService.Object,
                 entitiesContext.Object,
-                config.Object,
+                configurationService.Current,
                 indexingService.Object,
                 cacheService.Object,
                 editPackageService.Object,
@@ -136,6 +135,7 @@ private static Mock<ISearchService> CreateSearchService()
         }
 
         public class TheCancelVerifyPackageAction
+            : TestContainer
         {
             [Fact]
             public async Task DeletesTheInProgressPackageUpload()
@@ -143,6 +143,7 @@ public async Task DeletesTheInProgressPackageUpload()
                 var fakeUploadFileService = new Mock<IUploadFileService>();
                 fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(42)).Returns(Task.FromResult(0));
                 var controller = CreateController(
+                    GetConfigurationService(),
                     uploadFileService: fakeUploadFileService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -157,6 +158,7 @@ public async Task RedirectsToUploadPageAfterDelete()
                 var fakeUploadFileService = new Mock<IUploadFileService>();
                 fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(42)).Returns(Task.FromResult(0));
                 var controller = CreateController(
+                    GetConfigurationService(),
                     uploadFileService: fakeUploadFileService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -168,12 +170,13 @@ public async Task RedirectsToUploadPageAfterDelete()
         }
 
         public class TheDisplayPackageMethod
+            : TestContainer
         {
             [Fact]
             public async Task GivenANonNormalizedVersionIt302sToTheNormalizedVersion()
             {
                 // Arrange
-                var controller = CreateController();
+                var controller = CreateController(GetConfigurationService());
 
                 // Act
                 var result = await controller.DisplayPackage("Foo", "01.01.01");
@@ -192,7 +195,9 @@ public async Task GivenANonExistantPackageIt404s()
             {
                 // Arrange
                 var packageService = new Mock<IPackageService>();
-                var controller = CreateController(packageService: packageService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    packageService: packageService);
 
                 packageService.Setup(p => p.FindPackageByIdAndVersion("Foo", "1.1.1", SemVerLevelKey.SemVer2, true))
                               .ReturnsNull();
@@ -211,7 +216,9 @@ public async Task GivenAValidPackageThatTheCurrentUserDoesNotOwnItDisplaysCurren
                 var packageService = new Mock<IPackageService>();
                 var indexingService = new Mock<IIndexingService>();
                 var controller = CreateController(
-                    packageService: packageService, indexingService: indexingService);
+                    GetConfigurationService(),
+                    packageService: packageService,
+                    indexingService: indexingService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 packageService.Setup(p => p.FindPackageByIdAndVersion("Foo", "1.1.1", SemVerLevelKey.SemVer2, true))
@@ -248,6 +255,7 @@ public async Task GivenAValidPackageThatTheCurrentUserOwnsItDisablesResponseCach
                 var httpContext = new Mock<HttpContextBase>();
                 var httpCachePolicy = new Mock<HttpCachePolicyBase>(MockBehavior.Strict);
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     editPackageService: editPackageService,
                     httpContext: httpContext);
@@ -292,6 +300,7 @@ public async Task GivenAValidPackageThatTheCurrentUserOwnsWithNoEditsItDisplaysC
                 var httpContext = new Mock<HttpContextBase>();
                 var httpCachePolicy = new Mock<HttpCachePolicyBase>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     editPackageService: editPackageService,
                     indexingService: indexingService,
@@ -340,6 +349,7 @@ public async Task GivenAValidPackageThatTheCurrentUserOwnsWithEditsItDisplaysEdi
                 var httpContext = new Mock<HttpContextBase>();
                 var httpCachePolicy = new Mock<HttpCachePolicyBase>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     editPackageService: editPackageService,
                     indexingService: indexingService,
@@ -387,24 +397,25 @@ public async Task GivenAnAbsoluteLatestVersionItQueriesTheCorrectVersion()
                 var packageService = new Mock<IPackageService>();
                 var indexingService = new Mock<IIndexingService>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService, indexingService: indexingService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
-                
-               packageService
-                    .Setup(p => p.FindAbsoluteLatestPackageById("Foo", SemVerLevelKey.SemVer2))
-                    .Returns(new Package()
-                    {
-                        PackageRegistration = new PackageRegistration()
-                        {
-                            Id = "Foo",
-                            Owners = new List<User>()
-                        },
-                        Version = "2.0.0",
-                        NormalizedVersion = "2.0.0",
-                        IsLatest = true,
-                        Title = "A test package!"
-                    });
-               
+
+                packageService
+                     .Setup(p => p.FindAbsoluteLatestPackageById("Foo", SemVerLevelKey.SemVer2))
+                     .Returns(new Package()
+                     {
+                         PackageRegistration = new PackageRegistration()
+                         {
+                             Id = "Foo",
+                             Owners = new List<User>()
+                         },
+                         Version = "2.0.0",
+                         NormalizedVersion = "2.0.0",
+                         IsLatest = true,
+                         Title = "A test package!"
+                     });
+
 
                 indexingService.Setup(i => i.GetLastWriteTime()).Returns(Task.FromResult((DateTime?)DateTime.UtcNow));
 
@@ -426,7 +437,9 @@ public async Task GivenAValidPackageWithNoVersionThatTheCurrentUserDoesNotOwnItD
                 var packageService = new Mock<IPackageService>();
                 var indexingService = new Mock<IIndexingService>();
                 var controller = CreateController(
-                    packageService: packageService, indexingService: indexingService);
+                    GetConfigurationService(),
+                    packageService: packageService,
+                    indexingService: indexingService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 packageService.Setup(p => p.FindPackageByIdAndVersion("Foo", null, SemVerLevelKey.SemVer2, true))
@@ -462,7 +475,9 @@ public async Task WithEmptyTokenReturnsHttpNotFound()
             {
                 var packageService = new Mock<IPackageService>();
                 packageService.Setup(p => p.FindPackageRegistrationById("foo")).Returns(new PackageRegistration());
-                var controller = CreateController(packageService: packageService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    packageService: packageService);
                 controller.SetCurrentUser(new User { Username = "username" });
 
                 var result = await controller.ConfirmOwner("foo", "username", "");
@@ -473,7 +488,7 @@ public async Task WithEmptyTokenReturnsHttpNotFound()
             [Fact]
             public async Task WithIdentityNotMatchingUserInRequestReturnsViewWithMessage()
             {
-                var controller = CreateController();
+                var controller = CreateController(GetConfigurationService());
                 controller.SetCurrentUser(new User("userA"));
                 var result = await controller.ConfirmOwner("foo", "userB", "token");
 
@@ -486,7 +501,7 @@ public async Task WithIdentityNotMatchingUserInRequestReturnsViewWithMessage()
             public async Task WithNonExistentPackageIdReturnsHttpNotFound()
             {
                 // Arrange
-                var controller = CreateController();
+                var controller = CreateController(GetConfigurationService());
                 controller.SetCurrentUser(new User { Username = "username" });
 
                 // Act
@@ -506,7 +521,10 @@ public async Task WithOwnerReturnsAlreadyOwnerResult()
                 var mockHttpContext = new Mock<HttpContextBase>();
                 var packageService = new Mock<IPackageService>();
                 packageService.Setup(p => p.FindPackageRegistrationById("foo")).Returns(package);
-                var controller = CreateController(httpContext: mockHttpContext, packageService: packageService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    httpContext: mockHttpContext,
+                    packageService: packageService);
                 controller.SetCurrentUser(user);
                 TestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);
 
@@ -532,7 +550,10 @@ public async Task ReturnsSuccessIfTokenIsValid(bool tokenValid)
                 packageService.Setup(p => p.IsValidPackageOwnerRequest(package, user, "token"))
                     .Returns(tokenValid);
                 packageService.Setup(p => p.AddPackageOwnerAsync(package, user)).Returns(Task.CompletedTask).Verifiable();
-                var controller = CreateController(httpContext: mockHttpContext, packageService: packageService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    httpContext: mockHttpContext,
+                    packageService: packageService);
                 controller.SetCurrentUser(user);
                 TestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);
 
@@ -621,6 +642,7 @@ private async Task<IDictionary<string, string>> AssertConfirmOwnerSubscribesUser
                         });
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         httpContext: mockHttpContext,
                         packageService: packageService,
                         messageService: messageService,
@@ -644,11 +666,13 @@ private async Task<IDictionary<string, string>> AssertConfirmOwnerSubscribesUser
         }
 
         public class TheContactOwnersMethod
+            : TestContainer
         {
             [Fact]
             public void OnlyShowsOwnersWhoAllowReceivingEmails()
             {
-                var package = new Package {
+                var package = new Package
+                {
                     PackageRegistration = new PackageRegistration
                     {
                         Id = "pkgid",
@@ -663,7 +687,9 @@ public void OnlyShowsOwnersWhoAllowReceivingEmails()
 
                 var packageService = new Mock<IPackageService>();
                 packageService.Setup(p => p.FindPackageByIdAndVersion("pkgid", null, null, true)).Returns(package);
-                var controller = CreateController(packageService: packageService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    packageService: packageService);
 
                 var model = (controller.ContactOwners("pkgid") as ViewResult).Model as ContactOwnersViewModel;
 
@@ -690,6 +716,7 @@ public void HtmlEncodesMessageContent()
                 packageService.Setup(p => p.FindPackageRegistrationById("factory")).Returns(package);
                 var userService = new Mock<IUserService>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     messageService: messageService);
                 controller.SetCurrentUser(new User { EmailAddress = "montgomery@burns.example.com", Username = "Montgomery" });
@@ -719,13 +746,14 @@ public void CallsSendContactOwnersMessageWithUserInfo()
                 packageService.Setup(p => p.FindPackageRegistrationById("factory")).Returns(package);
                 var userService = new Mock<IUserService>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     messageService: messageService);
                 controller.SetCurrentUser(new User { EmailAddress = "montgomery@burns.example.com", Username = "Montgomery" });
                 var model = new ContactOwnersViewModel
-                    {
-                        Message = "I like the cut of your jib",
-                    };
+                {
+                    Message = "I like the cut of your jib",
+                };
 
                 var result = controller.ContactOwners("factory", model) as RedirectToRouteResult;
 
@@ -734,17 +762,18 @@ public void CallsSendContactOwnersMessageWithUserInfo()
         }
 
         public class TheEditMethod
+            : TestContainer
         {
             [Fact]
             public async Task UpdatesUnlistedIfSelected()
             {
                 // Arrange
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Id = "Foo" },
-                        Version = "1.0",
-                        Listed = true
-                    };
+                {
+                    PackageRegistration = new PackageRegistration { Id = "Foo" },
+                    Version = "1.0",
+                    Listed = true
+                };
                 package.PackageRegistration.Owners.Add(new User("Frodo"));
 
                 var packageService = new Mock<IPackageService>(MockBehavior.Strict);
@@ -757,7 +786,10 @@ public async Task UpdatesUnlistedIfSelected()
 
                 var indexingService = new Mock<IIndexingService>();
 
-                var controller = CreateController(packageService: packageService, indexingService: indexingService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    packageService: packageService,
+                    indexingService: indexingService);
                 controller.SetCurrentUser(new User("Frodo"));
                 controller.Url = new UrlHelper(new RequestContext(), new RouteCollection());
 
@@ -776,11 +808,11 @@ public async Task UpdatesUnlistedIfNotSelected()
             {
                 // Arrange
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Id = "Foo" },
-                        Version = "1.0",
-                        Listed = true
-                    };
+                {
+                    PackageRegistration = new PackageRegistration { Id = "Foo" },
+                    Version = "1.0",
+                    Listed = true
+                };
                 package.PackageRegistration.Owners.Add(new User("Frodo"));
 
                 var packageService = new Mock<IPackageService>(MockBehavior.Strict);
@@ -793,7 +825,10 @@ public async Task UpdatesUnlistedIfNotSelected()
 
                 var indexingService = new Mock<IIndexingService>();
 
-                var controller = CreateController(packageService: packageService, indexingService: indexingService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    packageService: packageService,
+                    indexingService: indexingService);
                 controller.SetCurrentUser(new User("Frodo"));
                 controller.Url = new UrlHelper(new RequestContext(), new RouteCollection());
 
@@ -809,6 +844,7 @@ public async Task UpdatesUnlistedIfNotSelected()
         }
 
         public class TheListPackagesMethod
+            : TestContainer
         {
             [Fact]
             public async Task TrimsSearchTerm()
@@ -816,10 +852,12 @@ public async Task TrimsSearchTerm()
                 var searchService = new Mock<ISearchService>();
                 searchService.Setup(s => s.Search(It.IsAny<SearchFilter>())).Returns(
                     Task.FromResult(new SearchResults(0, DateTime.UtcNow)));
-                var controller = CreateController(searchService: searchService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    searchService: searchService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
-                var result = (await controller.ListPackages(new PackageListSearchViewModel() { Q = " test "})) as ViewResult;
+                var result = (await controller.ListPackages(new PackageListSearchViewModel() { Q = " test " })) as ViewResult;
 
                 var model = result.Model as PackageListViewModel;
                 Assert.Equal("test", model.SearchTerm);
@@ -831,7 +869,9 @@ public async Task DefaultsToFirstPageAndIncludingPrerelease()
                 var searchService = new Mock<ISearchService>();
                 searchService.Setup(s => s.Search(It.IsAny<SearchFilter>())).Returns(
                     Task.FromResult(new SearchResults(0, DateTime.UtcNow)));
-                var controller = CreateController(searchService: searchService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    searchService: searchService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 var result = (await controller.ListPackages(new PackageListSearchViewModel { Q = "test" })) as ViewResult;
@@ -849,7 +889,9 @@ public async Task PassesPrerelParameterOnToSearchFilter(bool prerel)
                 var searchService = new Mock<ISearchService>();
                 searchService.Setup(s => s.Search(It.IsAny<SearchFilter>())).Returns(
                     Task.FromResult(new SearchResults(0, DateTime.UtcNow)));
-                var controller = CreateController(searchService: searchService);
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    searchService: searchService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 var result = (await controller.ListPackages(new PackageListSearchViewModel { Q = "test", Prerel = prerel })) as ViewResult;
@@ -861,6 +903,7 @@ public async Task PassesPrerelParameterOnToSearchFilter(bool prerel)
         }
 
         public class TheReportAbuseMethod
+            : TestContainer
         {
             [Fact]
             public async Task SendsMessageToGalleryOwnerWithEmailOnlyWhenUnauthenticated()
@@ -869,24 +912,25 @@ public async Task SendsMessageToGalleryOwnerWithEmailOnlyWhenUnauthenticated()
                 messageService.Setup(
                     s => s.ReportAbuse(It.Is<ReportPackageRequest>(r => r.Message == "Mordor took my finger")));
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Id = "mordor" },
-                        Version = "2.0.1"
-                    };
+                {
+                    PackageRegistration = new PackageRegistration { Id = "mordor" },
+                    Version = "2.0.1"
+                };
                 var packageService = new Mock<IPackageService>();
                 packageService.Setup(p => p.FindPackageByIdAndVersionStrict("mordor", "2.0.1")).Returns(package);
                 var httpContext = new Mock<HttpContextBase>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     messageService: messageService,
                     httpContext: httpContext);
                 var model = new ReportAbuseViewModel
-                    {
-                        Email = "frodo@hobbiton.example.com",
-                        Message = "Mordor took my finger.",
-                        Reason = ReportPackageReason.IsFraudulent,
-                        AlreadyContactedOwner = true,
-                    };
+                {
+                    Email = "frodo@hobbiton.example.com",
+                    Message = "Mordor took my finger.",
+                    Reason = ReportPackageReason.IsFraudulent,
+                    AlreadyContactedOwner = true,
+                };
 
                 TestUtility.SetupUrlHelper(controller, httpContext);
                 var result = await controller.ReportAbuse("mordor", "2.0.1", model) as RedirectResult;
@@ -910,23 +954,24 @@ public async Task SendsMessageToGalleryOwnerWithUserInfoWhenAuthenticated()
                     s => s.ReportAbuse(It.Is<ReportPackageRequest>(r => r.Message == "Mordor took my finger")));
                 var user = new User { EmailAddress = "frodo@hobbiton.example.com", Username = "Frodo", Key = 1 };
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Id = "mordor" },
-                        Version = "2.0.1"
-                    };
+                {
+                    PackageRegistration = new PackageRegistration { Id = "mordor" },
+                    Version = "2.0.1"
+                };
                 var packageService = new Mock<IPackageService>();
                 packageService.Setup(p => p.FindPackageByIdAndVersionStrict("mordor", It.IsAny<string>())).Returns(package);
                 var httpContext = new Mock<HttpContextBase>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     messageService: messageService,
                     httpContext: httpContext);
                 controller.SetCurrentUser(user);
                 var model = new ReportAbuseViewModel
-                    {
-                        Message = "Mordor took my finger",
-                        Reason = ReportPackageReason.IsFraudulent
-                    };
+                {
+                    Message = "Mordor took my finger",
+                    Reason = ReportPackageReason.IsFraudulent
+                };
 
                 TestUtility.SetupUrlHelper(controller, httpContext);
                 ActionResult result = await controller.ReportAbuse("mordor", "2.0.1", model) as RedirectResult;
@@ -954,6 +999,7 @@ public void FormRedirectsPackageOwnerToReportMyPackage()
                 packageService.Setup(p => p.FindPackageByIdAndVersionStrict("Mordor", It.IsAny<string>())).Returns(package);
                 var httpContext = new Mock<HttpContextBase>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     httpContext: httpContext);
                 controller.SetCurrentUser(user);
@@ -980,6 +1026,7 @@ public async Task HtmlEncodesMessageContent()
                 var httpContext = new Mock<HttpContextBase>();
                 httpContext.Setup(h => h.Request.IsAuthenticated).Returns(false);
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     messageService: messageService,
                     httpContext: httpContext);
@@ -1006,6 +1053,7 @@ public async Task HtmlEncodesMessageContent()
         }
 
         public class TheReportMyPackageMethod
+            : TestContainer
         {
             [Fact]
             public void FormRedirectsNonOwnersToReportAbuse()
@@ -1020,6 +1068,7 @@ public void FormRedirectsNonOwnersToReportAbuse()
                 packageService.Setup(p => p.FindPackageByIdAndVersionStrict("Mordor", It.IsAny<string>())).Returns(package);
                 var httpContext = new Mock<HttpContextBase>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     httpContext: httpContext);
                 controller.SetCurrentUser(user);
@@ -1049,6 +1098,7 @@ public async Task HtmlEncodesMessageContent()
                     .Callback<ReportPackageRequest>(r => reportRequest = r);
                 var httpContext = new Mock<HttpContextBase>();
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: packageService,
                     messageService: messageService,
                     httpContext: httpContext);
@@ -1071,6 +1121,7 @@ public async Task HtmlEncodesMessageContent()
         }
 
         public class TheUploadFileActionForGetRequests
+            : TestContainer
         {
             [Fact]
             public async Task WillRedirectToVerifyPackageActionWhenThereIsAlreadyAnUploadInProgress()
@@ -1081,6 +1132,7 @@ public async Task WillRedirectToVerifyPackageActionWhenThereIsAlreadyAnUploadInP
                     fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key))
                         .Returns(Task.FromResult<Stream>(fakeFileStream));
                     var controller = CreateController(
+                        GetConfigurationService(),
                         uploadFileService: fakeUploadFileService);
                     controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1098,6 +1150,7 @@ public async Task WillShowTheViewWhenThereIsNoUploadInProgress()
                 var fakeUploadFileService = new Mock<IUploadFileService>();
                 fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(null));
                 var controller = CreateController(
+                    GetConfigurationService(),
                     uploadFileService: fakeUploadFileService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1108,6 +1161,7 @@ public async Task WillShowTheViewWhenThereIsNoUploadInProgress()
         }
 
         public class TheUploadFileActionForPostRequests
+            : TestContainer
         {
             [Fact]
             public async Task WillReturn409WhenThereIsAlreadyAnUploadInProgress()
@@ -1117,6 +1171,7 @@ public async Task WillReturn409WhenThereIsAlreadyAnUploadInProgress()
                     var fakeUploadFileService = new Mock<IUploadFileService>();
                     fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));
                     var controller = CreateController(
+                        GetConfigurationService(),
                         uploadFileService: fakeUploadFileService);
                     controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1129,7 +1184,7 @@ public async Task WillReturn409WhenThereIsAlreadyAnUploadInProgress()
             [Fact]
             public async Task WillShowViewWithErrorsIfPackageFileIsNull()
             {
-                var controller = CreateController();
+                var controller = CreateController(GetConfigurationService());
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 var result = await controller.UploadPackage(null) as JsonResult;
@@ -1144,7 +1199,7 @@ public async Task WillShowViewWithErrorsIfFileIsNotANuGetPackage()
             {
                 var fakeUploadedFile = new Mock<HttpPostedFileBase>();
                 fakeUploadedFile.Setup(x => x.FileName).Returns("theFile.notNuPkg");
-                var controller = CreateController();
+                var controller = CreateController(GetConfigurationService());
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 var result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;
@@ -1153,7 +1208,7 @@ public async Task WillShowViewWithErrorsIfFileIsNotANuGetPackage()
                 Assert.False(controller.ModelState.IsValid);
                 Assert.Equal(Strings.UploadFileMustBeNuGetPackage, controller.ModelState[String.Empty].Errors[0].ErrorMessage);
             }
-            
+
             [Fact]
             public async Task WillShowViewWithErrorsIfEnsureValidThrowsException()
             {
@@ -1164,6 +1219,7 @@ public async Task WillShowViewWithErrorsIfEnsureValidThrowsException()
                 var readPackageException = new Exception();
 
                 var controller = CreateController(
+                    GetConfigurationService(),
                     readPackageException: readPackageException);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1187,11 +1243,12 @@ public async Task WillShowViewWithErrorsIfEnsureValidThrowsExceptionMessage(Type
                 fakeUploadedFile.Setup(x => x.FileName).Returns("theFile.nupkg");
                 var fakeFileStream = TestPackage.CreateTestPackageStream("theId", "1.0.0");
                 fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);
-                
+
                 var readPackageException =
-                    exceptionType.GetConstructor(new[] {typeof(string)}).Invoke(new[] { EnsureValidExceptionMessage });
+                    exceptionType.GetConstructor(new[] { typeof(string) }).Invoke(new[] { EnsureValidExceptionMessage });
 
                 var controller = CreateController(
+                    GetConfigurationService(),
                     readPackageException: readPackageException as Exception);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1219,7 +1276,9 @@ public async Task WillShowViewWithErrorsIfPackageIdIsInvalid(string packageId)
                 var fakeFileStream = TestPackage.CreateTestPackageStream(packageId, "1.0.0");
                 fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);
 
-                var controller = CreateController(fakeNuGetPackage: TestPackage.CreateTestPackageStream(packageId, "1.0.0"));
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    fakeNuGetPackage: TestPackage.CreateTestPackageStream(packageId, "1.0.0"));
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 var result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;
@@ -1239,6 +1298,7 @@ public async Task WillShowTheViewWithErrorsWhenThePackageIdIsAlreadyBeingUsed()
                 var fakePackageService = new Mock<IPackageService>();
                 fakePackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(fakePackageRegistration);
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: fakePackageService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1260,6 +1320,7 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists()
                 fakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(
                     new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "1.0.0" });
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: fakePackageService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1283,6 +1344,7 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExistsAndOnlyDif
                 fakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(
                     new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "1.0.0+metadata" });
                 var controller = CreateController(
+                    GetConfigurationService(),
                     packageService: fakePackageService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1308,6 +1370,7 @@ public async Task WillSaveTheUploadFile()
                 fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(null));
                 fakeUploadFileService.Setup(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));
                 var controller = CreateController(
+                    GetConfigurationService(),
                     uploadFileService: fakeUploadFileService,
                     fakeNuGetPackage: fakeFileStream);
                 controller.SetCurrentUser(TestUtility.FakeUser);
@@ -1332,6 +1395,7 @@ public async Task WillRedirectToVerifyPackageActionAfterSaving()
                     .Returns(Task.FromResult<Stream>(TestPackage.CreateTestPackageStream("thePackageId", "1.0.0")));
                 fakeUploadFileService.Setup(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));
                 var controller = CreateController(
+                    GetConfigurationService(),
                     uploadFileService: fakeUploadFileService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
@@ -1343,6 +1407,7 @@ public async Task WillRedirectToVerifyPackageActionAfterSaving()
         }
 
         public class TheVerifyPackageActionForPostRequests
+            : TestContainer
         {
             [Fact]
             public async Task WillRedirectToUploadPageWhenThereIsNoUploadInProgress()
@@ -1350,8 +1415,9 @@ public async Task WillRedirectToUploadPageWhenThereIsNoUploadInProgress()
                 var fakeUploadFileService = new Mock<IUploadFileService>();
                 fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(null));
                 var controller = CreateController(
+                    GetConfigurationService(),
                     uploadFileService: fakeUploadFileService);
-                TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://uploadpackage.xyz"));
+                TestUtility.SetupUrlHelperForUrlGeneration(controller);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 var result = await controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Edit = null }) as JsonResult;
@@ -1373,6 +1439,7 @@ public async Task WillCreateThePackage()
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
@@ -1403,6 +1470,7 @@ public async Task WillSavePackageToFileStorage()
                     fakePackageFileService.Setup(x => x.SavePackageFileAsync(fakePackage, It.IsAny<Stream>())).Returns(Task.FromResult(0)).Verifiable();
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1443,6 +1511,7 @@ public async Task WillDeletePackageFileFromBlobStorageIfSavingDbChangesFails()
                     fakeEntitiesContext.Setup(e => e.SaveChangesAsync()).Throws<Exception>();
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1481,6 +1550,7 @@ public async Task WillShowViewWithMessageIfSavingPackageBlobFails()
                     var fakeEntitiesContext = new Mock<IEntitiesContext>();
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1519,6 +1589,7 @@ public async Task WillUpdateIndexingService()
                     fakeIndexingService.Setup(f => f.UpdateIndex()).Verifiable();
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1556,6 +1627,7 @@ public async Task WillSaveChangesToEntitiesContext()
                         .Returns(Task.FromResult(0)).Verifiable();
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1592,6 +1664,7 @@ public async Task WillNotCommitChangesToPackageService()
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
@@ -1620,6 +1693,7 @@ public async Task WillPublishThePackage()
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
@@ -1645,6 +1719,7 @@ public async Task WillMarkThePackageUnlistedWhenListedArgumentIsFalse()
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
@@ -1673,6 +1748,7 @@ public async Task WillNotMarkThePackageUnlistedWhenListedArgumentIsNullorTrue(bo
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
@@ -1698,6 +1774,7 @@ public async Task WillDeleteTheUploadFile()
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
@@ -1724,6 +1801,7 @@ public async Task WillSetAFlashMessage()
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
@@ -1749,16 +1827,20 @@ public async Task WillRedirectToPackagePage()
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage);
                     controller.SetCurrentUser(TestUtility.FakeUser);
 
-                    var result = await controller.VerifyPackage(new VerifyPackageRequest() { Listed = false, Edit = null }) as JsonResult;
+                    var result = await controller.VerifyPackage(
+                        new VerifyPackageRequest() { Listed = false, Edit = null }) as JsonResult;
 
                     Assert.NotNull(result);
                     Assert.NotNull(result.Data);
-                    Assert.Equal("{ location = /?id=theId }", result.Data.ToString());
+                    Assert.Equal(
+                        "{ location = " + TestUtility.GallerySiteRootHttps + "?id=theId }",
+                        result.Data.ToString());
                 }
             }
 
@@ -1778,6 +1860,7 @@ public async Task WillCurateThePackage()
 
                     var fakeAutoCuratePackageCmd = new Mock<IAutomaticallyCuratePackageCommand>();
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1808,6 +1891,7 @@ public async Task WritesAnAuditRecord()
                     var auditingService = new TestAuditingService();
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1842,6 +1926,7 @@ public async Task WillSendPackagePublishedEvent()
                     var fakeTelemetryService = new Mock<ITelemetryService>();
 
                     var controller = CreateController(
+                        GetConfigurationService(),
                         packageService: fakePackageService,
                         uploadFileService: fakeUploadFileService,
                         fakeNuGetPackage: fakeNuGetPackage,
@@ -1893,9 +1978,13 @@ public async Task WillApplyEdits(EditPackageVersionRequest edit)
 
                     var fakeEditPackageService = new Mock<EditPackageService>();
 
-                    var controller = CreateController(packageService: packageService, editPackageService: fakeEditPackageService, uploadFileService: fakeUploadFileService);
+                    var controller = CreateController(
+                        GetConfigurationService(), 
+                        packageService: packageService, 
+                        editPackageService: fakeEditPackageService, 
+                        uploadFileService: fakeUploadFileService);
                     controller.SetCurrentUser(TestUtility.FakeUser);
-                
+
                     // Act
                     await controller.VerifyPackage(new VerifyPackageRequest { Listed = true, Edit = edit });
 
@@ -1906,6 +1995,7 @@ public async Task WillApplyEdits(EditPackageVersionRequest edit)
         }
 
         public class TheUploadProgressAction
+            : TestContainer
         {
             private static readonly string FakeUploadName = "upload-" + TestUtility.FakeUserName;
 
@@ -1916,7 +2006,9 @@ public void WillReturnHttpNotFoundForUnknownUser()
                 var cacheService = new Mock<ICacheService>(MockBehavior.Strict);
                 cacheService.Setup(c => c.GetItem(FakeUploadName)).Returns(null);
 
-                var controller = CreateController(cacheService: cacheService);
+                var controller = CreateController(
+                        GetConfigurationService(), 
+                        cacheService: cacheService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 // Act
@@ -1934,7 +2026,9 @@ public void WillReturnCorrectResultForKnownUser()
                 cacheService.Setup(c => c.GetItem(FakeUploadName))
                             .Returns(new AsyncFileUploadProgress(100) { FileName = "haha", TotalBytesRead = 80 });
 
-                var controller = CreateController(cacheService: cacheService);
+                var controller = CreateController(
+                        GetConfigurationService(), 
+                        cacheService: cacheService);
                 controller.SetCurrentUser(TestUtility.FakeUser);
 
                 // Act
@@ -1952,17 +2046,18 @@ public void WillReturnCorrectResultForKnownUser()
         }
 
         public class TheSetLicenseReportVisibilityMethod
+            : TestContainer
         {
             [Fact]
             public async Task IndexingAndPackageServicesAreUpdated()
             {
                 // Arrange
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Id = "Foo" },
-                        Version = "1.0",
-                        HideLicenseReport = true
-                    };
+                {
+                    PackageRegistration = new PackageRegistration { Id = "Foo" },
+                    Version = "1.0",
+                    HideLicenseReport = true
+                };
                 package.PackageRegistration.Owners.Add(new User("Smeagol"));
 
                 var packageService = new Mock<IPackageService>(MockBehavior.Strict);
@@ -1979,7 +2074,11 @@ public async Task IndexingAndPackageServicesAreUpdated()
 
                 var indexingService = new Mock<IIndexingService>();
 
-                var controller = CreateController(packageService: packageService, httpContext: httpContext, indexingService: indexingService);
+                var controller = CreateController(
+                        GetConfigurationService(), 
+                        packageService: packageService,
+                        httpContext: httpContext, 
+                        indexingService: indexingService);
                 controller.SetCurrentUser(new User("Smeagol"));
                 controller.Url = new UrlHelper(new RequestContext(), new RouteCollection());
 
diff --git a/tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs
index 4e12a77e41..d781c5d12e 100644
--- a/tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs
@@ -12,7 +12,6 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 using Moq;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
 
@@ -350,7 +349,7 @@ public async void StatisticsHomePage_Per_Package_ValidateModel()
 
             var controller = new StatisticsController(new JsonStatisticsService(fakeReportService.Object));
 
-            TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+            TestUtility.SetupUrlHelperForUrlGeneration(controller);
 
             var model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageDownloadsByVersion(PackageId, new[] { Constants.StatisticsDimensions.Version })).Model;
 
@@ -422,7 +421,7 @@ public async Task StatisticsHomePage_Per_Package_ValidateReportStructureAndAvail
 
             var controller = new StatisticsController(new JsonStatisticsService(fakeReportService.Object));
 
-            TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+            TestUtility.SetupUrlHelperForUrlGeneration(controller);
 
             var actualReport = (StatisticsPackagesReport)((JsonResult)await controller.PackageDownloadsByVersionReport(PackageId, new[] { Constants.StatisticsDimensions.Version })).Data;
 
@@ -504,7 +503,7 @@ public async Task StatisticsHomePage_Per_Package_ValidateReportStructureAndAvail
 
             var controller = new StatisticsController(new JsonStatisticsService(fakeReportService.Object));
 
-            TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+            TestUtility.SetupUrlHelperForUrlGeneration(controller);
 
             var invalidDimension = "this_dimension_does_not_exist";
             
@@ -534,7 +533,7 @@ public async void Statistics_By_Client_Operation_ValidateModel()
 
             var controller = new StatisticsController(new JsonStatisticsService(fakeReportService.Object));
 
-            TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+            TestUtility.SetupUrlHelperForUrlGeneration(controller);
             
             var model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageDownloadsDetail(PackageId, PackageVersion, new string[] { "ClientName" })).Model;
 
@@ -608,7 +607,7 @@ public async Task Statistics_By_Client_Operation_ValidateReportStructureAndAvail
 
             var controller = new StatisticsController(new JsonStatisticsService(fakeReportService.Object));
 
-            TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri("http://nuget.org"));
+            TestUtility.SetupUrlHelperForUrlGeneration(controller);
             
             var actualReport = (StatisticsPackagesReport)((JsonResult)await controller.PackageDownloadsDetailReport(PackageId, PackageVersion, new string[] { "ClientName" })).Data;
 
diff --git a/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs
index 449c7e0d9d..8b39910856 100644
--- a/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs
@@ -155,7 +155,7 @@ public void WillSendNewUserEmailWhenPosted()
 
                 // We use a catch-all route for unit tests so we can see the parameters
                 // are passed correctly.
-                Assert.Equal("https://nuget.local/account/confirm/theUsername/confirmation", sentConfirmationUrl);
+                Assert.Equal(TestUtility.GallerySiteRootHttps + "account/confirm/theUsername/confirmation", sentConfirmationUrl);
                 Assert.Equal("to@example.com", sentToAddress.Address);
             }
         }
@@ -196,9 +196,8 @@ public class TheThanksAction : TestContainer
             [Fact]
             public void ShowsDefaultThanksView()
             {
-                GetMock<IAppConfiguration>()
-                    .Setup(x => x.ConfirmEmailAddresses)
-                    .Returns(true);
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = true;
                 var controller = GetController<UsersController>();
 
                 var result = controller.Thanks() as ViewResult;
@@ -210,9 +209,9 @@ public void ShowsDefaultThanksView()
             [Fact]
             public void ShowsConfirmViewWithModelWhenConfirmingEmailAddressIsNotRequired()
             {
-                GetMock<IAppConfiguration>()
-                    .Setup(x => x.ConfirmEmailAddresses)
-                    .Returns(false);
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ConfirmEmailAddresses = false;
+
                 var controller = GetController<UsersController>();
 
                 ResultAssert.IsView(controller.Thanks());
@@ -224,7 +223,7 @@ public class TheForgotPasswordAction : TestContainer
             [Fact]
             public async Task SendsEmailWithPasswordResetUrl()
             {
-                const string resetUrl = "https://nuget.local/account/forgotpassword/somebody/confirmation";
+                string resetUrl = TestUtility.GallerySiteRootHttps + "account/forgotpassword/somebody/confirmation";
                 var user = new User("somebody")
                 {
                     EmailAddress = "some@example.com",
@@ -651,12 +650,12 @@ public async Task WhenExpirationInDaysIsProvidedItsUsed(int? inputExpirationInDa
                 // Arrange 
                 var user = new User("the-username");
 
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ExpirationInDaysForApiKeyV1 = 365;
+
                 var controller = GetController<UsersController>();
                 controller.SetCurrentUser(user);
 
-                var config = GetMock<IAppConfiguration>();
-                config.SetupGet(x => x.ExpirationInDaysForApiKeyV1).Returns(365);
-
                 // Act
                 await controller.GenerateApiKey(
                     description: "my new api key",
@@ -775,9 +774,8 @@ public async Task ReturnsNewCredentialJson()
             {
                 var user = new User { Username = "the-username" };
 
-                GetMock<IAppConfiguration>()
-                    .Setup(x => x.ExpirationInDaysForApiKeyV1)
-                    .Returns(365);
+                var configurationService = GetConfigurationService();
+                configurationService.Current.ExpirationInDaysForApiKeyV1 = 365;
 
                 var controller = GetController<UsersController>();
                 controller.SetCurrentUser(user);
@@ -1212,7 +1210,7 @@ public async Task GivenNoOldPassword_ItSendsAPasswordSetEmail()
                 await controller.ChangePassword(new AccountViewModel());
 
                 // Assert
-                Assert.Equal("https://nuget.local/account/setpassword/test/t0k3n", actualConfirmUrl);
+                Assert.Equal(TestUtility.GallerySiteRootHttps + "account/setpassword/test/t0k3n", actualConfirmUrl);
                 GetMock<IMessageService>().VerifyAll();
             }
         }
diff --git a/tests/NuGetGallery.Facts/Filters/RequiresAccountConfirmationAttributeFacts.cs b/tests/NuGetGallery.Facts/Filters/RequiresAccountConfirmationAttributeFacts.cs
index f0a3d9bc51..307b276a5c 100644
--- a/tests/NuGetGallery.Facts/Filters/RequiresAccountConfirmationAttributeFacts.cs
+++ b/tests/NuGetGallery.Facts/Filters/RequiresAccountConfirmationAttributeFacts.cs
@@ -2,17 +2,19 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Globalization;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Moq;
+using NuGetGallery.Framework;
 using Xunit;
 
 namespace NuGetGallery.Filters
 {
-    using System.Globalization;
 
     public class RequiresAccountConfirmationAttributeFacts
+        : TestContainer
     {
         [Fact]
         public void RequiresAccountConfirmationAttributeThrowsExceptionIfContextNull()
@@ -77,12 +79,14 @@ public void RequiresAccountConfirmationAttributePassedWithConfirmationRequiredMe
             response.Setup(x => x.ApplyAppPathModifier("/account/ConfirmationRequired")).Returns<string>(x => x);
 
             var request = new Mock<HttpRequestBase>();
+            request.Setup(m => m.Url).Returns(new Uri(TestUtility.GallerySiteRootHttps));
+            request.Setup(m => m.RawUrl).Returns(TestUtility.GallerySiteRootHttps);
+            request.Setup(m => m.IsSecureConnection).Returns(true);
 
             var httpContext = new Mock<HttpContextBase>();
             httpContext.SetupGet(h => h.Request).Returns(request.Object);
             httpContext.SetupGet(x => x.Response).Returns(response.Object);
-            httpContext.SetupGet(x => x.Request.RawUrl).Returns("/returnUrl");
-
+            
             var routeCollection = new RouteCollection();
             Routes.RegisterRoutes(routeCollection);
 
@@ -104,7 +108,7 @@ public void RequiresAccountConfirmationAttributePassedWithConfirmationRequiredMe
 
             // Assert
             Assert.IsType<RedirectResult>(result);
-            Assert.Equal("/account/ConfirmationRequired", ((RedirectResult)result).Url);
+            Assert.Equal(TestUtility.GallerySiteRootHttps + "account/ConfirmationRequired", ((RedirectResult)result).Url);
             Assert.Equal(string.Format(CultureInfo.CurrentCulture, "Before you can {0} you must first confirm your email address.", inOrderTo), controller.TempData["ConfirmationRequiredMessage"]);
             Assert.Equal("ConfirmationContext", cookieCollection[0].Name);
             Assert.NotEmpty(cookieCollection[0].Value);
diff --git a/tests/NuGetGallery.Facts/Framework/Fakes.cs b/tests/NuGetGallery.Facts/Framework/Fakes.cs
index 42fcc04dad..da74024d87 100644
--- a/tests/NuGetGallery.Facts/Framework/Fakes.cs
+++ b/tests/NuGetGallery.Facts/Framework/Fakes.cs
@@ -153,7 +153,7 @@ public static IOwinContext CreateOwinContext()
         {
             var ctx = new OwinContext();
 
-            ctx.Request.SetUrl("http://nuget.local/");
+            ctx.Request.SetUrl(TestUtility.GallerySiteRootHttps);
 
             // Fill in some values that cause exceptions if not present
             ctx.Set<Action<Action<object>, object>>("server.OnSendingHeaders", (_, __) => { });
diff --git a/tests/NuGetGallery.Facts/Framework/TestContainer.cs b/tests/NuGetGallery.Facts/Framework/TestContainer.cs
index 8e0c5ec6cc..e54c0fb3d3 100644
--- a/tests/NuGetGallery.Facts/Framework/TestContainer.cs
+++ b/tests/NuGetGallery.Facts/Framework/TestContainer.cs
@@ -23,7 +23,8 @@ protected TestContainer(IContainer container)
             Container = container;
         }
 
-        protected TController GetController<TController>() where TController : Controller
+        protected TController GetController<TController>()
+            where TController : Controller
         {
             if (!Container.IsRegistered(typeof(TController)))
             {
@@ -47,12 +48,17 @@ protected TController GetController<TController>() where TController : Controlle
             if (appCtrl != null)
             {
                 appCtrl.SetOwinContextOverride(Fakes.CreateOwinContext());
-                appCtrl.NuGetContext.Config = Container.Resolve<IGalleryConfigurationService>();
+                appCtrl.NuGetContext.Config = GetConfigurationService();
             }
 
             return c;
         }
 
+        protected TestGalleryConfigurationService GetConfigurationService()
+        {
+            return Container.Resolve<IGalleryConfigurationService>() as TestGalleryConfigurationService;
+        }
+
         protected TService GetService<TService>()
         {
             var updater = new ContainerBuilder();
@@ -90,7 +96,8 @@ protected FakeEntitiesContext GetFakeContext()
 
         protected T Get<T>()
         {
-            if (typeof(Controller).IsAssignableFrom(typeof(T))) {
+            if (typeof(Controller).IsAssignableFrom(typeof(T)))
+            {
                 throw new InvalidOperationException("Use GetController<T> to get a controller instance");
             }
 
@@ -100,7 +107,7 @@ protected T Get<T>()
         protected Mock<T> GetMock<T>() where T : class
         {
             bool registerMock = false;
-            if (Container.IsRegistered(typeof (T)))
+            if (Container.IsRegistered(typeof(T)))
             {
                 try
                 {
@@ -114,7 +121,7 @@ protected Mock<T> GetMock<T>() where T : class
 
             if (registerMock || !Container.IsRegistered(typeof(T)))
             {
-                var mockInstance = (new Mock<T>() {CallBase = true}).Object;
+                var mockInstance = (new Mock<T>() { CallBase = true }).Object;
 
                 var updater = new ContainerBuilder();
                 updater.RegisterInstance(mockInstance).As<T>();
@@ -139,5 +146,4 @@ public void Dispose()
             this.Dispose(true);
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/tests/NuGetGallery.Facts/Framework/TestGalleryConfigurationService.cs b/tests/NuGetGallery.Facts/Framework/TestGalleryConfigurationService.cs
index a3ffda1ff8..028a9910e3 100644
--- a/tests/NuGetGallery.Facts/Framework/TestGalleryConfigurationService.cs
+++ b/tests/NuGetGallery.Facts/Framework/TestGalleryConfigurationService.cs
@@ -11,7 +11,8 @@ public class TestGalleryConfigurationService : ConfigurationService
     {
         public IDictionary<string, string> Settings = new Dictionary<string, string>();
 
-        public TestGalleryConfigurationService() : base(new EmptySecretReaderFactory())
+        public TestGalleryConfigurationService() 
+            : base(new EmptySecretReaderFactory())
         {
         }
 
diff --git a/tests/NuGetGallery.Facts/Framework/UnitTestBindings.cs b/tests/NuGetGallery.Facts/Framework/UnitTestBindings.cs
index ff58d83b78..ea7d6c93fe 100644
--- a/tests/NuGetGallery.Facts/Framework/UnitTestBindings.cs
+++ b/tests/NuGetGallery.Facts/Framework/UnitTestBindings.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Net.Mail;
 using System.Web;
 using Autofac;
 using Microsoft.Owin;
@@ -48,7 +49,8 @@ protected override void Load(ContainerBuilder builder)
             builder.Register(_ =>
             {
                 var mockContext = new Mock<HttpContextBase>();
-                mockContext.Setup(c => c.Request.Url).Returns(new Uri("https://nuget.local/"));
+                mockContext.Setup(c => c.Request.Url).Returns(new Uri(TestUtility.GallerySiteRootHttps));
+                mockContext.Setup(c => c.Request.IsSecureConnection).Returns(true);
                 mockContext.Setup(c => c.Request.ApplicationPath).Returns("/");
                 mockContext.Setup(c => c.Response.ApplyAppPathModifier(It.IsAny<string>())).Returns<string>(s => s);
                 return mockContext.Object;
@@ -90,13 +92,31 @@ protected override void Load(ContainerBuilder builder)
                 .As<IOwinContext>()
                 .SingleInstance();
 
-            builder.Register(_ => new TestGalleryConfigurationService())
+            var configurationService = CreateTestConfigurationService();
+            UrlExtensions.SetConfigurationService(configurationService);
+
+            builder.Register(_ => configurationService)
                 .As<IGalleryConfigurationService>()
                 .SingleInstance();
 
+            builder.Register(_ => configurationService.Current)
+                .As<IAppConfiguration>()
+                .SingleInstance();
+
             builder.RegisterType<CredentialBuilder>().As<ICredentialBuilder>().SingleInstance();
             builder.RegisterType<CredentialValidator>().As<ICredentialValidator>().SingleInstance();
             builder.RegisterType<DateTimeProvider>().As<IDateTimeProvider>().SingleInstance();
         }
+
+        private static IGalleryConfigurationService CreateTestConfigurationService()
+        {
+            // We configure HTTP site root, but require SSL.
+            var configurationService = new TestGalleryConfigurationService();
+            configurationService.Current.SiteRoot = TestUtility.GallerySiteRootHttp;
+            configurationService.Current.RequireSSL = true;
+            configurationService.Current.GalleryOwner = new MailAddress("support@example.com");
+
+            return configurationService;
+        }
     }
 }
diff --git a/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
index e6aae094ed..1840936f3b 100644
--- a/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
@@ -9,7 +9,6 @@
 using AnglicanGeek.MarkdownMailer;
 using Moq;
 using NuGetGallery.Authentication;
-using NuGetGallery.Authentication.Providers;
 using NuGetGallery.Configuration;
 using NuGetGallery.Framework;
 using NuGetGallery.Infrastructure.Authentication;
@@ -24,6 +23,7 @@ public class MessageServiceFacts
         public static readonly MailAddress TestGalleryNoReplyAddress = new MailAddress("noreply@example.com", "No Reply");
 
         public class TheReportAbuseMethod
+            : TestContainer
         {
             [Fact]
             public void WillSendEmailToGalleryOwner()
@@ -31,12 +31,14 @@ public void WillSendEmailToGalleryOwner()
                 // Arrange
                 var from = new MailAddress("legit@example.com", "too");
                 var package = new Package
-                    {
-                        PackageRegistration = new PackageRegistration { Id = "smangit" },
-                        Version = "1.42.0.1"
-                    };
-
-                var messageService = new TestableMessageService();
+                {
+                    PackageRegistration = new PackageRegistration { Id = "smangit" },
+                    Version = "1.42.0.1"
+                };
+                
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
 
                 // Act
                 messageService.ReportAbuse(
@@ -75,8 +77,10 @@ public void WillCopySenderIfAsked()
                     PackageRegistration = new PackageRegistration { Id = "smangit" },
                     Version = "1.42.0.1",
                 };
-
-                var messageService = new TestableMessageService();
+                
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
 
                 var reportPackageRequest = new ReportPackageRequest
                 {
@@ -105,7 +109,8 @@ public void WillCopySenderIfAsked()
             }
         }
 
-        public class TheReportMyPackageMethod : TestContainer
+        public class TheReportMyPackageMethod
+            : TestContainer
         {
             [Fact]
             public void WillSendEmailToGalleryOwner()
@@ -125,7 +130,10 @@ public void WillSendEmailToGalleryOwner()
                     },
                     Version = "1.42.0.1"
                 };
-                var messageService = new TestableMessageService();
+                
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
 
                 messageService.ReportMyPackage(
                     new ReportPackageRequest
@@ -161,7 +169,10 @@ public void WillCopySenderIfAsked()
                     PackageRegistration = new PackageRegistration { Id = "smangit" },
                     Version = "1.42.0.1",
                 };
-                var messageService = new TestableMessageService();
+                
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
 
                 var reportPackageRequest = new ReportPackageRequest
                 {
@@ -191,6 +202,7 @@ public void WillCopySenderIfAsked()
         }
 
         public class TheSendContactOwnersMessageMethod
+            : TestContainer
         {
             [Fact]
             public void WillCopySenderIfAsked()
@@ -202,7 +214,9 @@ public void WillCopySenderIfAsked()
                         new User { EmailAddress = "yung@example.com", EmailAllowed = true },
                         new User { EmailAddress = "flynt@example.com", EmailAllowed = true }
                     };
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
 
                 messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", true);
 
@@ -233,7 +247,10 @@ public void WillSendEmailToAllOwners()
                     }
                 };
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
+
                 messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -261,7 +278,10 @@ public void WillNotSendEmailToOwnerThatOptsOut()
                     }
                 };
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
+
                 messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -283,7 +303,9 @@ public void WillNotAttemptToSendIfNoOwnersAllow()
                     }
                 };
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
 
                 Assert.Empty(messageService.MockMailSender.Sent);
@@ -300,7 +322,9 @@ public void WillNotCopySenderIfNoOwnersAllow()
                         new User { EmailAddress = "flynt@example.com", EmailAllowed = false }
                     };
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
 
                 Assert.Empty(messageService.MockMailSender.Sent);
@@ -308,13 +332,16 @@ public void WillNotCopySenderIfNoOwnersAllow()
         }
 
         public class TheSendNewAccountEmailMethod
+            : TestContainer
         {
             [Fact]
             public void WillSendEmailToNewUser()
             {
                 var to = new MailAddress("legit@example.com", "too");
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendNewAccountEmail(to, "http://example.com/confirmation-token-url");
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -326,6 +353,7 @@ public void WillSendEmailToNewUser()
         }
 
         public class TheSendPackageOwnerRequestMethod
+            : TestContainer
         {
             [Fact]
             public void SendsPackageOwnerRequestConfirmationUrl()
@@ -336,7 +364,10 @@ public void SendsPackageOwnerRequestConfirmationUrl()
                 const string packageUrl = "http://nuget.local/packages/CoolStuff";
                 const string confirmationUrl = "http://example.com/confirmation-token-url";
                 const string userMessage = "Hello World!";
-                var messageService = new TestableMessageService();
+
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, userMessage, string.Empty);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -359,7 +390,10 @@ public void SendsPackageOwnerRequestConfirmationUrlWithoutUserMessage()
                 var package = new PackageRegistration { Id = "CoolStuff" };
                 const string packageUrl = "http://nuget.local/packages/CoolStuff";
                 const string confirmationUrl = "http://example.com/confirmation-token-url";
-                var messageService = new TestableMessageService();
+
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, string.Empty, string.Empty);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -375,7 +409,9 @@ public void DoesNotSendRequestIfUserDoesNotAllowEmails()
                 const string packageUrl = "http://nuget.local/packages/CoolStuff";
                 const string confirmationUrl = "http://example.com/confirmation-token-url";
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, string.Empty, string.Empty);
 
                 Assert.Empty(messageService.MockMailSender.Sent);
@@ -383,6 +419,7 @@ public void DoesNotSendRequestIfUserDoesNotAllowEmails()
         }
 
         public class TheSendPackageOwnerAddedNoticeMethod
+            : TestContainer
         {
             [Fact]
             public void SendsPackageOwnerAddedNotice()
@@ -391,9 +428,11 @@ public void SendsPackageOwnerAddedNotice()
                 var toUser = new User { Username = "Existing", EmailAddress = "existing-owner@example.com", EmailAllowed = true };
                 var newUser = new User { Username = "Noob", EmailAddress = "new-owner@example.com" };
                 var package = new PackageRegistration { Id = "CoolStuff" };
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
 
                 // Act
-                var messageService = new TestableMessageService();
                 messageService.SendPackageOwnerAddedNotice(toUser, newUser, package, "packageUrl", "policyMessage");
 
                 // Assert
@@ -412,9 +451,11 @@ public void DoesNotSendPackageOwnerAddedNoticeIfUserDoesNotAllowEmails()
                 var toUser = new User { Username = "Existing", EmailAddress = "existing-owner@example.com" };
                 var newUser = new User { Username = "Noob", EmailAddress = "new-owner@example.com", EmailAllowed = false };
                 var package = new PackageRegistration { Id = "CoolStuff" };
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
 
                 // Act
-                var messageService = new TestableMessageService();
                 messageService.SendPackageOwnerAddedNotice(toUser, newUser, package, "packageUrl", "policyMessage");
 
                 // Assert
@@ -423,6 +464,7 @@ public void DoesNotSendPackageOwnerAddedNoticeIfUserDoesNotAllowEmails()
         }
 
         public class TheSendPackageOwnerRemovedNoticeMethod
+            : TestContainer
         {
             [Fact]
             public void SendsPackageOwnerRemovedNotice()
@@ -431,7 +473,9 @@ public void SendsPackageOwnerRemovedNotice()
                 var from = new User { Username = "Existing", EmailAddress = "existing-owner@example.com" };
                 var package = new PackageRegistration { Id = "CoolStuff" };
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPackageOwnerRemovedNotice(from, to, package);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -449,7 +493,9 @@ public void DoesNotSendRemovedNoticeIfUserDoesNotAllowEmails()
                 var from = new User { Username = "Existing", EmailAddress = "existing-owner@example.com" };
                 var package = new PackageRegistration { Id = "CoolStuff" };
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPackageOwnerRemovedNotice(from, to, package);
 
                 Assert.Empty(messageService.MockMailSender.Sent);
@@ -457,13 +503,16 @@ public void DoesNotSendRemovedNoticeIfUserDoesNotAllowEmails()
         }
 
         public class TheSendResetPasswordInstructionsMethod
+            : TestContainer
         {
             [Fact]
             public void WillSendInstructions()
             {
                 var user = new User { EmailAddress = "legit@example.com", Username = "too" };
 
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPasswordResetInstructions(user, "http://example.com/pwd-reset-token-url", true);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -476,21 +525,18 @@ public void WillSendInstructions()
         }
 
         public class TheSendCredentialRemovedNoticeMethod
+            : TestContainer
         {
             [Fact]
             public void UsesProviderNounToDescribeCredentialIfPresent()
             {
                 var user = new User { EmailAddress = "legit@example.com", Username = "foo" };
                 var cred = new CredentialBuilder().CreateExternalCredential("MicrosoftAccount", "abc123", "Test User");
-                const string MicrosoftAccountCredentialName = "Microsoft Account";
-                var messageService = new TestableMessageService();
-                messageService.MockAuthService
-                    .Setup(a => a.DescribeCredential(cred))
-                    .Returns(new CredentialViewModel
-                    {
-                        AuthUI = new AuthenticatorUI("sign in", "register", MicrosoftAccountCredentialName)
-                    });
+                const string MicrosoftAccountCredentialName = "Microsoft account";
 
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendCredentialRemovedNotice(user, cred);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -505,14 +551,10 @@ public void UsesTypeCaptionToDescribeCredentialIfNoProviderNounPresent()
             {
                 var user = new User { EmailAddress = "legit@example.com", Username = "foo" };
                 var cred = new CredentialBuilder().CreatePasswordCredential("bogus");
-                var messageService = new TestableMessageService();
-                messageService.MockAuthService
-                    .Setup(a => a.DescribeCredential(cred))
-                    .Returns(new CredentialViewModel()
-                    {
-                        TypeCaption = Strings.CredentialType_Password
-                    });
 
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendCredentialRemovedNotice(user, cred);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -528,14 +570,10 @@ public void ApiKeyRemovedMessageIsCorrect()
                 var user = new User { EmailAddress = "legit@example.com", Username = "foo" };
                 var cred = new CredentialBuilder().CreateApiKey(TimeSpan.FromDays(1));
                 cred.Description = "new api key";
-                var messageService = new TestableMessageService();
-                messageService.MockAuthService
-                    .Setup(a => a.DescribeCredential(cred))
-                    .Returns(new CredentialViewModel
-                    {
-                        Description = cred.Description
-                    });
 
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendCredentialRemovedNotice(user, cred);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -547,22 +585,18 @@ public void ApiKeyRemovedMessageIsCorrect()
         }
 
         public class TheSendCredentialAddedNoticeMethod
+            : TestContainer
         {
             [Fact]
             public void UsesProviderNounToDescribeCredentialIfPresent()
             {
                 var user = new User { EmailAddress = "legit@example.com", Username = "foo" };
                 var cred = new CredentialBuilder().CreateExternalCredential("MicrosoftAccount", "abc123", "Test User");
-                const string MicrosoftAccountCredentialName = "Microsoft Account";
-
-                var messageService = new TestableMessageService();
-                messageService.MockAuthService
-                    .Setup(a => a.DescribeCredential(cred))
-                    .Returns(new CredentialViewModel
-                    {
-                        AuthUI = new AuthenticatorUI("sign in", "register", MicrosoftAccountCredentialName)
-                    });
+                const string MicrosoftAccountCredentialName = "Microsoft account";
 
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendCredentialAddedNotice(user, cred);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -577,14 +611,10 @@ public void UsesTypeCaptionToDescribeCredentialIfNoProviderNounPresent()
             {
                 var user = new User { EmailAddress = "legit@example.com", Username = "foo" };
                 var cred = new CredentialBuilder().CreatePasswordCredential("bogus");
-                var messageService = new TestableMessageService();
-                messageService.MockAuthService
-                    .Setup(a => a.DescribeCredential(cred))
-                    .Returns(new CredentialViewModel
-                    {
-                        TypeCaption = "Password"
-                    });
 
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendCredentialAddedNotice(user, cred);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -600,14 +630,10 @@ public void ApiKeyAddedMessageIsCorrect()
                 var user = new User { EmailAddress = "legit@example.com", Username = "foo" };
                 var cred = new CredentialBuilder().CreateApiKey(TimeSpan.FromDays(1));
                 cred.Description = "new api key";
-                var messageService = new TestableMessageService();
-                messageService.MockAuthService
-                    .Setup(a => a.DescribeCredential(cred))
-                    .Returns(new CredentialViewModel
-                    {
-                        Description = cred.Description
-                    });
 
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendCredentialAddedNotice(user, cred);
                 var message = messageService.MockMailSender.Sent.Last();
 
@@ -619,6 +645,7 @@ public void ApiKeyAddedMessageIsCorrect()
         }
 
         public class TheSendPackageAddedNoticeMethod
+            : TestContainer
         {
             [Theory]
             [InlineData("1.2.3")]
@@ -648,7 +675,9 @@ public void WillSendEmailToAllOwners(string version)
                 packageRegistration.Packages.Add(package);
 
                 // Act
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 var packageUrl = $"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}";
                 var supportUrl = $"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage";
                 var emailSettingsUrl = "https://localhost/account";
@@ -686,7 +715,9 @@ public void WillNotSendEmailToOwnerThatOptsOut()
                 packageRegistration.Packages.Add(package);
 
                 // Act
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPackageAddedNotice(package, "http://dummy1", "http://dummy2", "http://dummy3");
 
                 // Assert
@@ -717,7 +748,9 @@ public void WillNotAttemptToSendIfNoOwnersAllow()
                 packageRegistration.Packages.Add(package);
 
                 // Act
-                var messageService = new TestableMessageService();
+                var messageService = TestableMessageService.Create(
+                    GetService<AuthenticationService>(),
+                    GetConfigurationService());
                 messageService.SendPackageAddedNotice(package, "http://dummy1", "http://dummy2", "http://dummy3");
 
                 // Assert
@@ -725,20 +758,29 @@ public void WillNotAttemptToSendIfNoOwnersAllow()
             }
         }
 
-        public class TestableMessageService : MessageService
+        public class TestableMessageService 
+            : MessageService
         {
+            private TestableMessageService(
+                AuthenticationService authenticationService,
+                IGalleryConfigurationService configurationService)
+            {
+                configurationService.Current.GalleryOwner = TestGalleryOwner;
+                configurationService.Current.GalleryNoReplyAddress = TestGalleryNoReplyAddress;
+
+                Config = configurationService.Current;
+                MailSender = MockMailSender = new TestMailSender();
+                AuthService = authenticationService;
+            }
+
             public Mock<AuthenticationService> MockAuthService { get; protected set; }
-            public Mock<IAppConfiguration> MockConfig { get; protected set; }
             public TestMailSender MockMailSender { get; protected set; }
 
-            public TestableMessageService()
+            public static TestableMessageService Create(
+                AuthenticationService authenticationService,
+                IGalleryConfigurationService configurationService)
             {
-                AuthService = (MockAuthService = new Mock<AuthenticationService>()).Object;
-                Config = (MockConfig = new Mock<IAppConfiguration>()).Object;
-                MailSender = MockMailSender = new TestMailSender();
-
-                MockConfig.Setup(x => x.GalleryOwner).Returns(TestGalleryOwner);
-                MockConfig.Setup(x => x.GalleryNoReplyAddress).Returns(TestGalleryNoReplyAddress);
+                return new TestableMessageService(authenticationService, configurationService);
             }
         }
 
diff --git a/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs b/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs
index 17943a1a20..cf3d61ec9c 100644
--- a/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs
+++ b/tests/NuGetGallery.Facts/TestUtils/TestUtility.cs
@@ -15,11 +15,17 @@
 using Moq;
 using NuGet;
 using NuGetGallery.Framework;
+using NuGetGallery.Configuration;
 
 namespace NuGetGallery
 {
     public static class TestUtility
     {
+        private static readonly string galleryHostName = "localhost";
+
+        public static readonly string GallerySiteRootHttp = $"http://{galleryHostName}/";
+        public static readonly string GallerySiteRootHttps = $"https://{galleryHostName}/";
+
         public static readonly string FakeUserName = "theUsername";
         public static readonly string FakeAdminName = "theAdmin";
 
@@ -30,7 +36,8 @@ public static class TestUtility
         // Alternatively, we could write our own service for generating URLs.
         public static Mock<HttpContextBase> SetupHttpContextMockForUrlGeneration(Mock<HttpContextBase> httpContext, Controller controller)
         {
-            httpContext.Setup(c => c.Request.Url).Returns(new Uri("https://example.org/"));
+            // We default all requests to HTTPS in our tests.
+            httpContext.Setup(c => c.Request.Url).Returns(new Uri(GallerySiteRootHttps));
             httpContext.Setup(c => c.Request.ApplicationPath).Returns("/");
             httpContext.Setup(c => c.Response.ApplyAppPathModifier(It.IsAny<string>())).Returns<string>(s => s);
             var requestContext = new RequestContext(httpContext.Object, new RouteData());
@@ -52,15 +59,14 @@ public static void SetupUrlHelper(Controller controller, Mock<HttpContextBase> m
 
         public static UrlHelper MockUrlHelper()
         {
-            var siteRoot = "http://unittest.nuget.org/";
-
+            // We default all requests to HTTPS in our tests.
             var mockHttpContext = new Mock<HttpContextBase>(MockBehavior.Loose);
             var mockHttpRequest = new Mock<HttpRequestBase>(MockBehavior.Strict);
             var mockHttpResponse = new Mock<HttpResponseBase>(MockBehavior.Strict);
             mockHttpContext.Setup(httpContext => httpContext.Request).Returns(mockHttpRequest.Object);
             mockHttpContext.Setup(httpContext => httpContext.Response).Returns(mockHttpResponse.Object);
-            mockHttpRequest.Setup(httpRequest => httpRequest.Url).Returns(new Uri(siteRoot));
-            mockHttpRequest.Setup(httpRequest => httpRequest.ApplicationPath).Returns(siteRoot);
+            mockHttpRequest.Setup(httpRequest => httpRequest.Url).Returns(new Uri(GallerySiteRootHttps));
+            mockHttpRequest.Setup(httpRequest => httpRequest.ApplicationPath).Returns(GallerySiteRootHttps);
             mockHttpRequest.Setup(httpRequest => httpRequest.ServerVariables).Returns(new NameValueCollection());
             mockHttpRequest.Setup(httpRequest => httpRequest.IsSecureConnection).Returns(false);
 
@@ -76,19 +82,16 @@ public static UrlHelper MockUrlHelper()
             var routes = new RouteCollection();
             Routes.RegisterRoutes(routes);
 
-            var configurationService = new TestGalleryConfigurationService();
-            configurationService.Current.SiteRoot = siteRoot;
-
-            UrlExtensions.SetConfigurationService(configurationService);
-
             return new UrlHelper(requestContext, routes);
         }
 
-        public static void SetupUrlHelperForUrlGeneration(Controller controller, Uri address)
+        public static void SetupUrlHelperForUrlGeneration(Controller controller)
         {
+            // We default all requests to HTTPS in our tests.
             var mockHttpContext = new Mock<HttpContextBase>();
-            mockHttpContext.Setup(c => c.Request.Url).Returns(address);
+            mockHttpContext.Setup(c => c.Request.Url).Returns(new Uri(GallerySiteRootHttps));
             mockHttpContext.Setup(c => c.Request.ApplicationPath).Returns("/");
+            mockHttpContext.Setup(c => c.Request.IsSecureConnection).Returns(true);
             mockHttpContext.Setup(c => c.Response.ApplyAppPathModifier(It.IsAny<string>())).Returns<string>(s => s);
 
             var requestContext = new RequestContext(mockHttpContext.Object, new RouteData());

From 95a5171319aa2005951c63e8c331f9630ded8da0 Mon Sep 17 00:00:00 2001
From: Shishir H <shishir.f22@gmail.com>
Date: Tue, 12 Sep 2017 12:46:44 -0700
Subject: [PATCH 16/19] [Prefix] Restrict uploads for prefix matching IDs
 (#4639)

* Add upload verification for namespaces
* add code support to block uploads on reserved namespaces
* add tests
* add upload service for refactoring
* fix tests; services
---
 .../App_Start/DefaultDependenciesModule.cs    |   5 +
 src/NuGetGallery/Controllers/ApiController.cs |  38 +++-
 .../Controllers/PackagesController.cs         |  35 ++-
 src/NuGetGallery/NuGetGallery.csproj          |   2 +
 src/NuGetGallery/Services/IPackageService.cs  |   3 +-
 .../Services/IPackageUploadService.cs         |  14 ++
 .../Services/IReservedNamespaceService.cs     |  19 ++
 src/NuGetGallery/Services/PackageService.cs   |   9 +-
 .../Services/PackageUploadService.cs          |  47 ++++
 .../Services/ReservedNamespaceService.cs      |  60 ++++-
 src/NuGetGallery/Strings.Designer.cs          |   9 +
 src/NuGetGallery/Strings.resx                 |   3 +
 .../Controllers/ApiControllerFacts.cs         | 153 +++++++++++--
 .../Controllers/PackagesControllerFacts.cs    | 187 +++++++++++++--
 .../Services/PackageServiceFacts.cs           |  78 +++----
 .../Services/ReservedNamespaceServiceFacts.cs | 212 +++++++++++++++++-
 16 files changed, 777 insertions(+), 97 deletions(-)
 create mode 100644 src/NuGetGallery/Services/IPackageUploadService.cs
 create mode 100644 src/NuGetGallery/Services/PackageUploadService.cs

diff --git a/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs b/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
index 43735bd4ce..2738441052 100644
--- a/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
+++ b/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
@@ -198,6 +198,11 @@ protected override void Load(ContainerBuilder builder)
                 .As<IReservedNamespaceService>()
                 .InstancePerLifetimeScope();
 
+            builder.RegisterType<PackageUploadService>()
+                .AsSelf()
+                .As<IPackageUploadService>()
+                .InstancePerLifetimeScope();
+
             builder.RegisterType<SecurePushSubscription>()
                 .SingleInstance();
 
diff --git a/src/NuGetGallery/Controllers/ApiController.cs b/src/NuGetGallery/Controllers/ApiController.cs
index b5b8f6ba9f..acfd85191a 100644
--- a/src/NuGetGallery/Controllers/ApiController.cs
+++ b/src/NuGetGallery/Controllers/ApiController.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Globalization;
@@ -49,6 +50,8 @@ public partial class ApiController
         public AuthenticationService AuthenticationService { get; set; }
         public ICredentialBuilder CredentialBuilder { get; set; }
         protected ISecurityPolicyService SecurityPolicyService { get; set; }
+        public IReservedNamespaceService ReservedNamespaceService { get; set; }
+        public IPackageUploadService PackageUploadService { get; set; }
 
         protected ApiController()
         {
@@ -72,7 +75,9 @@ public ApiController(
             ITelemetryService telemetryService,
             AuthenticationService authenticationService,
             ICredentialBuilder credentialBuilder,
-            ISecurityPolicyService securityPolicies)
+            ISecurityPolicyService securityPolicies,
+            IReservedNamespaceService reservedNamespaceService,
+            IPackageUploadService packageUploadService)
         {
             EntitiesContext = entitiesContext;
             PackageService = packageService;
@@ -91,6 +96,8 @@ public ApiController(
             AuthenticationService = authenticationService;
             CredentialBuilder = credentialBuilder;
             SecurityPolicyService = securityPolicies;
+            ReservedNamespaceService = reservedNamespaceService;
+            PackageUploadService = packageUploadService;
             StatisticsService = null;
         }
 
@@ -112,10 +119,13 @@ public ApiController(
             ITelemetryService telemetryService,
             AuthenticationService authenticationService,
             ICredentialBuilder credentialBuilder,
-            ISecurityPolicyService securityPolicies)
+            ISecurityPolicyService securityPolicies,
+            IReservedNamespaceService reservedNamespaceService,
+            IPackageUploadService packageUploadService)
             : this(entitiesContext, packageService, packageFileService, userService, nugetExeDownloaderService, contentService,
                   indexingService, searchService, autoCuratePackage, statusService, messageService, auditingService,
-                  configurationService, telemetryService, authenticationService, credentialBuilder, securityPolicies)
+                  configurationService, telemetryService, authenticationService, credentialBuilder, securityPolicies, 
+                  reservedNamespaceService, packageUploadService)
         {
             StatisticsService = statisticsService;
         }
@@ -394,17 +404,26 @@ private async Task<ActionResult> CreatePackageInternal()
                         }
 
                         // Ensure that the user can push packages for this partialId.
-                        var packageRegistration = PackageService.FindPackageRegistrationById(nuspec.GetId());
+                        var id = nuspec.GetId();
+                        var packageRegistration = PackageService.FindPackageRegistrationById(id);
+                        IReadOnlyCollection<ReservedNamespace> userOwnedNamespaces = null;
                         if (packageRegistration == null)
                         {
                             // Check if API key allows pushing a new package id
                             if (!ApiKeyScopeAllows(
-                                subject: nuspec.GetId(),
+                                subject: id,
                                 requestedActions: NuGetScopes.PackagePush))
                             {
                                 // User cannot push a new package ID as the API key scope does not allow it
                                 return new HttpStatusCodeWithBodyResult(HttpStatusCode.Unauthorized, Strings.ApiKeyNotAuthorized);
                             }
+
+                            // For a new package id verify that the user is allowed to push to the matching namespaces, if any.
+                            var isPushAllowed = ReservedNamespaceService.IsPushAllowed(id, user, out userOwnedNamespaces);
+                            if (!isPushAllowed)
+                            {
+                                return new HttpStatusCodeWithBodyResult(HttpStatusCode.Conflict, Strings.UploadPackage_IdNamespaceConflict);
+                            }
                         }
                         else
                         {
@@ -417,12 +436,12 @@ await AuditingService.SaveAuditRecordAsync(
                                         user.Username,
                                         AuditedAuthenticatedOperationAction.PackagePushAttemptByNonOwner,
                                         attemptedPackage: new AuditedPackageIdentifier(
-                                            nuspec.GetId(), nuspec.GetVersion().ToNormalizedStringSafe())));
+                                            id, nuspec.GetVersion().ToNormalizedStringSafe())));
 
                                 // User cannot push a package to an ID owned by another user.
                                 return new HttpStatusCodeWithBodyResult(HttpStatusCode.Conflict,
                                     string.Format(CultureInfo.CurrentCulture, Strings.PackageIdNotAvailable,
-                                        nuspec.GetId()));
+                                        id));
                             }
 
                             // Check if API key allows pushing the current package id
@@ -448,7 +467,7 @@ await AuditingService.SaveAuditRecordAsync(
                                 return new HttpStatusCodeWithBodyResult(
                                     HttpStatusCode.Conflict,
                                     string.Format(CultureInfo.CurrentCulture, Strings.PackageExistsAndCannotBeModified,
-                                        nuspec.GetId(), nuspec.GetVersion().ToNormalizedStringSafe()));
+                                        id, nuspec.GetVersion().ToNormalizedStringSafe()));
                             }
                         }
 
@@ -459,7 +478,8 @@ await AuditingService.SaveAuditRecordAsync(
                             Size = packageStream.Length
                         };
 
-                        var package = await PackageService.CreatePackageAsync(
+                        var package = await PackageUploadService.GeneratePackageAsync(
+                            id,
                             packageToPush,
                             packageStreamMetadata,
                             user,
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
index 5aa429d796..4d3716be26 100644
--- a/src/NuGetGallery/Controllers/PackagesController.cs
+++ b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -55,6 +55,8 @@ public partial class PackagesController
         private readonly IAuditingService _auditingService;
         private readonly ITelemetryService _telemetryService;
         private readonly ISecurityPolicyService _securityPolicyService;
+        private readonly IReservedNamespaceService _reservedNamespaceService;
+        private readonly IPackageUploadService _packageUploadService;
 
         public PackagesController(
             IPackageService packageService,
@@ -72,7 +74,9 @@ public PackagesController(
             ISupportRequestService supportRequestService,
             IAuditingService auditingService,
             ITelemetryService telemetryService,
-            ISecurityPolicyService securityPolicyService)
+            ISecurityPolicyService securityPolicyService,
+            IReservedNamespaceService reservedNamespaceService,
+            IPackageUploadService packageUploadService)
         {
             _packageService = packageService;
             _uploadFileService = uploadFileService;
@@ -90,6 +94,8 @@ public PackagesController(
             _auditingService = auditingService;
             _telemetryService = telemetryService;
             _securityPolicyService = securityPolicyService;
+            _reservedNamespaceService = reservedNamespaceService;
+            _packageUploadService = packageUploadService;
         }
 
         [HttpGet]
@@ -315,7 +321,24 @@ public virtual async Task<JsonResult> UploadPackage(HttpPostedFileBase uploadFil
                             nuspec.GetMinClientVersion()) });
                 }
 
-                var packageRegistration = _packageService.FindPackageRegistrationById(nuspec.GetId());
+                var id = nuspec.GetId();
+                var packageRegistration = _packageService.FindPackageRegistrationById(id);
+                // For a new package id verify if the user is allowed to use it.
+                if (packageRegistration == null)
+                {
+                    var isPushAllowed = _reservedNamespaceService
+                        .IsPushAllowed(id, currentUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+
+                    if (!isPushAllowed)
+                    {
+                        ModelState.AddModelError(
+                            string.Empty, string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict));
+
+                        return Json(409, new string[] { string.Format(CultureInfo.CurrentCulture, Strings.UploadPackage_IdNamespaceConflict) });
+                    }
+                }
+
+                // For existing package id verify if it is owned by the current user
                 if (packageRegistration != null && !packageRegistration.Owners.AnySafe(x => x.Key == currentUser.Key))
                 {
                     ModelState.AddModelError(
@@ -1320,7 +1343,13 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
                 // update relevant database tables
                 try
                 {
-                    package = await _packageService.CreatePackageAsync(nugetPackage, packageStreamMetadata, currentUser, commitChanges: false);
+                    package = await _packageUploadService.GeneratePackageAsync(
+                        packageMetadata.Id,
+                        nugetPackage,
+                        packageStreamMetadata,
+                        currentUser,
+                        commitChanges: false);
+
                     Debug.Assert(package.PackageRegistration != null);
                 }
                 catch (InvalidPackageException ex)
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index ba0663622b..06cca3cca5 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -809,7 +809,9 @@
     <Compile Include="Security\UserSecurityPolicyEvaluationContext.cs" />
     <Compile Include="Security\SecurityPolicyResult.cs" />
     <Compile Include="Security\UserSecurityPolicySubscriptionContext.cs" />
+    <Compile Include="Services\PackageUploadService.cs" />
     <Compile Include="Services\IReservedNamespaceService.cs" />
+    <Compile Include="Services\IPackageUploadService.cs" />
     <Compile Include="Services\ReservedNamespaceService.cs" />
     <Compile Include="Telemetry\ClientInformationTelemetryEnricher.cs" />
     <Compile Include="Telemetry\QuietExceptionLogger.cs" />
diff --git a/src/NuGetGallery/Services/IPackageService.cs b/src/NuGetGallery/Services/IPackageService.cs
index 97a381a32d..d4906afdb2 100644
--- a/src/NuGetGallery/Services/IPackageService.cs
+++ b/src/NuGetGallery/Services/IPackageService.cs
@@ -46,9 +46,10 @@ public interface IPackageService
         /// <param name="nugetPackage">The package to be created.</param>
         /// <param name="packageStreamMetadata">The package stream's metadata.</param>
         /// <param name="user">The owner of the package</param>
+        /// <param name="isVerified">Mark the package registration as verified or not</param>
         /// <param name="commitChanges">Specifies whether to commit the changes to database.</param>
         /// <returns>The created package entity.</returns>
-        Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges = true);
+        Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool isVerified, bool commitChanges = true);
 
         Package EnrichPackageFromNuGetPackage(Package package, PackageArchiveReader packageArchive, PackageMetadata packageMetadata, PackageStreamMetadata packageStreamMetadata, User user);
 
diff --git a/src/NuGetGallery/Services/IPackageUploadService.cs b/src/NuGetGallery/Services/IPackageUploadService.cs
new file mode 100644
index 0000000000..bfb6d2b6b6
--- /dev/null
+++ b/src/NuGetGallery/Services/IPackageUploadService.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using NuGet.Packaging;
+using NuGetGallery.Packaging;
+
+namespace NuGetGallery
+{
+    public interface IPackageUploadService
+    {
+        Task<Package> GeneratePackageAsync(string id, PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges = true);
+    }
+}
\ No newline at end of file
diff --git a/src/NuGetGallery/Services/IReservedNamespaceService.cs b/src/NuGetGallery/Services/IReservedNamespaceService.cs
index cab511f568..d0a3ee2b73 100644
--- a/src/NuGetGallery/Services/IReservedNamespaceService.cs
+++ b/src/NuGetGallery/Services/IReservedNamespaceService.cs
@@ -44,6 +44,15 @@ public interface IReservedNamespaceService
         /// <returns>Awaitable Task</returns>
         Task DeleteOwnerFromReservedNamespaceAsync(string prefix, string username);
 
+        /// <summary>
+        /// Add the specified package registration to the reserved namespace
+        /// </summary>
+        /// <param name="prefix">The reserved namespace to modify</param>
+        /// <param name="pr">The package registration to be added</param>
+        /// <param name="commitChanges">Commit changes to the database, defaults to true</param>
+        /// <returns>Awaitable Task</returns>
+        Task AddPackageRegistrationToNamespaceAsync(string prefix, PackageRegistration packageRegistration, bool commitChanges = true);
+
         /// <summary>
         /// Retrieves the first reserved namespace which matches the given prefix.
         /// </summary>
@@ -71,5 +80,15 @@ public interface IReservedNamespaceService
         /// <param name="id">The package id to lookup</param>
         /// <returns>The list of reserved namespaces which are prefixes for the given id</returns>
         IReadOnlyCollection<ReservedNamespace> GetReservedNamespacesForId(string id);
+
+        /// <summary>
+        /// Verifies if the id is allowed to be pushed by the user or not and try to get 
+        /// user owned namespaces if any.
+        /// </summary>
+        /// <param name="id">The package id to lookup</param>
+        /// <param name="user">The user to verify for permission to push to new id</param>
+        /// <param name="userOwnedMatchingNamespaces">The out list of namespaces owned by the user</param>
+        /// <returns>True if the push is allowed for the specified user for the given id, false otherwise</returns>
+        bool IsPushAllowed(string id, User user, out IReadOnlyCollection<ReservedNamespace> userOwnedMatchingNamespaces);
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/Services/PackageService.cs b/src/NuGetGallery/Services/PackageService.cs
index d571fd0e1d..3fb15dd74d 100644
--- a/src/NuGetGallery/Services/PackageService.cs
+++ b/src/NuGetGallery/Services/PackageService.cs
@@ -113,7 +113,7 @@ public void EnsureValid(PackageArchiveReader packageArchiveReader)
         /// <exception cref="InvalidPackageException">
         /// This exception will be thrown when a package metadata property violates a data validation constraint.
         /// </exception>
-        public async Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges = true)
+        public async Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool isVerified, bool commitChanges = true)
         {
             PackageMetadata packageMetadata;
             PackageRegistration packageRegistration;
@@ -126,7 +126,7 @@ public async Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage,
 
                 ValidatePackageTitle(packageMetadata);
 
-                packageRegistration = CreateOrGetPackageRegistration(user, packageMetadata);
+                packageRegistration = CreateOrGetPackageRegistration(user, packageMetadata, isVerified);
             }
             catch (Exception exception) when (exception is EntityException || exception is PackagingException)
             {
@@ -574,7 +574,7 @@ private IQueryable<Package> GetPackagesByIdQueryable(string id)
                             .Where(p => p.PackageRegistration.Id == id);
         }
 
-        private PackageRegistration CreateOrGetPackageRegistration(User currentUser, PackageMetadata packageMetadata)
+        private PackageRegistration CreateOrGetPackageRegistration(User currentUser, PackageMetadata packageMetadata, bool isVerified)
         {
             var packageRegistration = FindPackageRegistrationById(packageMetadata.Id);
 
@@ -592,7 +592,8 @@ private PackageRegistration CreateOrGetPackageRegistration(User currentUser, Pac
 
                 packageRegistration = new PackageRegistration
                 {
-                    Id = packageMetadata.Id
+                    Id = packageMetadata.Id,
+                    IsVerified = isVerified
                 };
 
                 packageRegistration.Owners.Add(currentUser);
diff --git a/src/NuGetGallery/Services/PackageUploadService.cs b/src/NuGetGallery/Services/PackageUploadService.cs
new file mode 100644
index 0000000000..b623d3125e
--- /dev/null
+++ b/src/NuGetGallery/Services/PackageUploadService.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using NuGet.Packaging;
+using NuGetGallery.Packaging;
+
+namespace NuGetGallery
+{
+    public class PackageUploadService: IPackageUploadService
+    {
+        private readonly IPackageService _packageService;
+        private readonly IReservedNamespaceService _reservedNamespaceService;
+
+        public PackageUploadService(
+            IPackageService packageService,
+            IReservedNamespaceService reservedNamespaceService)
+        {
+            _packageService = packageService;
+            _reservedNamespaceService = reservedNamespaceService;
+        }
+
+        public async Task<Package> GeneratePackageAsync(string id, PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges)
+        {
+            _reservedNamespaceService.IsPushAllowed(id, user, out IReadOnlyCollection<ReservedNamespace> userOwnedNamespaces);
+
+            var shouldMarkIdVerified = userOwnedNamespaces != null && userOwnedNamespaces.Any();
+            var package = await _packageService.CreatePackageAsync(
+                nugetPackage,
+                packageStreamMetadata,
+                user,
+                isVerified: shouldMarkIdVerified,
+                commitChanges: false);
+
+            if (shouldMarkIdVerified)
+            {
+                // Add all relevant package registrations to the applicable namespaces
+                await Task.WhenAll(userOwnedNamespaces
+                    .Select(rn => _reservedNamespaceService.AddPackageRegistrationToNamespaceAsync(rn.Value, package.PackageRegistration, commitChanges)));
+            }
+
+            return package;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NuGetGallery/Services/ReservedNamespaceService.cs b/src/NuGetGallery/Services/ReservedNamespaceService.cs
index 5970bb3286..9804153530 100644
--- a/src/NuGetGallery/Services/ReservedNamespaceService.cs
+++ b/src/NuGetGallery/Services/ReservedNamespaceService.cs
@@ -111,7 +111,7 @@ public async Task AddOwnerToReservedNamespaceAsync(string prefix, string usernam
             using (var strategy = new SuspendDbExecutionStrategy())
             using (var transaction = EntitiesContext.GetDatabase().BeginTransaction())
             {
-                var namespaceToModify = FindReservedNamespaceForPrefix(prefix) 
+                var namespaceToModify = FindReservedNamespaceForPrefix(prefix)
                     ?? throw new InvalidOperationException(string.Format(
                         CultureInfo.CurrentCulture, Strings.ReservedNamespace_NamespaceNotFound, prefix));
 
@@ -196,6 +196,40 @@ public async Task DeleteOwnerFromReservedNamespaceAsync(string prefix, string us
             }
         }
 
+        /// <summary>
+        /// This method fetches the reserved namespace matching the prefix and adds the 
+        /// package registration entry to the reserved namespace, the provided package registration
+        /// should be an entry in the database or an entity from memory to be committed.
+        /// </summary>
+        /// <param name="prefix">The prefix value of the reserved namespace to modify</param>
+        /// <param name="packageRegistration">The package registration entity entry to be added.</param>
+        /// <param name="commitChanges">Flag to commit the modifications to the database, if set to false
+        /// the caller of this method should take care of saving changes for entities context.</param>
+        /// <returns>Awaitable task</returns>
+        public async Task AddPackageRegistrationToNamespaceAsync(string prefix, PackageRegistration packageRegistration, bool commitChanges = true)
+        {
+            if (string.IsNullOrWhiteSpace(prefix))
+            {
+                throw new ArgumentException(Strings.ReservedNamespace_InvalidNamespace);
+            }
+
+            if (packageRegistration == null)
+            {
+                throw new ArgumentNullException(nameof(packageRegistration));
+            }
+
+            var namespaceToModify = FindReservedNamespaceForPrefix(prefix)
+                ?? throw new InvalidOperationException(string.Format(
+                    CultureInfo.CurrentCulture, Strings.ReservedNamespace_NamespaceNotFound, prefix));
+
+            namespaceToModify.PackageRegistrations.Add(packageRegistration);
+
+            if (commitChanges)
+            {
+                await ReservedNamespaceRepository.CommitChangesAsync();
+            }
+        }
+
         public ReservedNamespace FindReservedNamespaceForPrefix(string prefix)
         {
             return (from request in ReservedNamespaceRepository.GetAll()
@@ -208,11 +242,11 @@ public IReadOnlyCollection<ReservedNamespace> FindAllReservedNamespacesForPrefix
             Expression<Func<ReservedNamespace, bool>> prefixMatch;
             if (getExactMatches)
             {
-                prefixMatch = dbPrefix => dbPrefix.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase);
+                prefixMatch = dbPrefix => dbPrefix.Value.Equals(prefix);
             }
             else
             {
-                prefixMatch = dbPrefix => dbPrefix.Value.StartsWith(prefix, StringComparison.OrdinalIgnoreCase);
+                prefixMatch = dbPrefix => dbPrefix.Value.StartsWith(prefix);
             }
 
             return ReservedNamespaceRepository.GetAll()
@@ -231,7 +265,8 @@ on dbPrefix.Value equals queryPrefix
         public IReadOnlyCollection<ReservedNamespace> GetReservedNamespacesForId(string id)
         {
             return (from request in ReservedNamespaceRepository.GetAll()
-                    where id.StartsWith(request.Value)
+                    where (request.IsPrefix && id.StartsWith(request.Value))
+                        || (!request.IsPrefix && id.Equals(request.Value))
                     select request).ToList();
         }
 
@@ -259,5 +294,22 @@ public static void ValidateNamespace(string value)
                     value));
             }
         }
+
+        public bool IsPushAllowed(string id, User user, out IReadOnlyCollection<ReservedNamespace> userOwnedMatchingNamespaces)
+        {
+            // Allow push to a new package ID only if
+            // 1. There is no namespace match for the given ID
+            // 2. Or one of the matching namespace is a shared namespace.
+            // 3. Or the current user is one of the owner of a matching namespace.
+            var matchingNamespaces = GetReservedNamespacesForId(id);
+            var noNamespaceMatches = matchingNamespaces.Count() == 0;
+            var idMatchesSharedNamespace = matchingNamespaces.Any(rn => rn.IsSharedNamespace);
+            userOwnedMatchingNamespaces = matchingNamespaces
+                .Where(rn => rn.Owners.AnySafe(o => o.Username == user.Username))
+                .ToList()
+                .AsReadOnly();
+
+            return noNamespaceMatches || idMatchesSharedNamespace || userOwnedMatchingNamespaces.Any();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/Strings.Designer.cs b/src/NuGetGallery/Strings.Designer.cs
index f5a8b104e2..478396938d 100644
--- a/src/NuGetGallery/Strings.Designer.cs
+++ b/src/NuGetGallery/Strings.Designer.cs
@@ -1137,6 +1137,15 @@ public static string UploadFileMustBeNuGetPackage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID..
+        /// </summary>
+        public static string UploadPackage_IdNamespaceConflict {
+            get {
+                return ResourceManager.GetString("UploadPackage_IdNamespaceConflict", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to There is a conflict with the ID and version of your package and another package. Please change your package&apos;s ID or version and try again..
         /// </summary>
diff --git a/src/NuGetGallery/Strings.resx b/src/NuGetGallery/Strings.resx
index a58c5577cf..f4f78fab2b 100644
--- a/src/NuGetGallery/Strings.resx
+++ b/src/NuGetGallery/Strings.resx
@@ -564,4 +564,7 @@ For more information, please contact '{2}'.</value>
   <data name="ReservedNamespace_ReservedIndicatorTooltip" xml:space="preserve">
     <value>The ID prefix of this package has been reserved for one of the owner of this package by NuGet.org.</value>
   </data>
+  <data name="UploadPackage_IdNamespaceConflict" xml:space="preserve">
+    <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
index 3c7d3fd687..b73861e8a5 100644
--- a/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
@@ -23,6 +23,7 @@
 using NuGetGallery.Security;
 using Xunit;
 using NuGetGallery.Configuration;
+using NuGetGallery.TestUtils;
 
 namespace NuGetGallery
 {
@@ -42,6 +43,8 @@ internal class TestableApiController
         public Mock<ITelemetryService> MockTelemetryService { get; private set; }
         public Mock<AuthenticationService> MockAuthenticationService { get; private set; }
         public Mock<ISecurityPolicyService> MockSecurityPolicyService { get; private set; }
+        public Mock<IReservedNamespaceService> MockReservedNamespaceService { get; private set; }
+        public Mock<IPackageUploadService> MockPackageUploadService { get; private set; }
 
         private Stream PackageFromInputStream { get; set; }
 
@@ -60,6 +63,8 @@ public TestableApiController(
             AutoCuratePackage = (MockAutoCuratePackage = new Mock<IAutomaticallyCuratePackageCommand>()).Object;
             AuthenticationService = (MockAuthenticationService = new Mock<AuthenticationService>()).Object;
             SecurityPolicyService = (MockSecurityPolicyService = new Mock<ISecurityPolicyService>()).Object;
+            ReservedNamespaceService = (MockReservedNamespaceService = new Mock<IReservedNamespaceService>()).Object;
+            PackageUploadService = (MockPackageUploadService = new Mock<IPackageUploadService>()).Object;
 
             CredentialBuilder = new CredentialBuilder();
 
@@ -78,13 +83,13 @@ public TestableApiController(
             MockTelemetryService = new Mock<ITelemetryService>();
             TelemetryService = MockTelemetryService.Object;
 
-            MockPackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>())).
-                Returns((PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges) =>
+            MockPackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>())).
+                Returns((PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool isVerified, bool commitChanges) =>
                 {
                     var packageMetadata = PackageMetadata.FromNuspecReader(nugetPackage.GetNuspecReader());
 
                     var package = new Package();
-                    package.PackageRegistration = new PackageRegistration { Id = packageMetadata.Id };
+                    package.PackageRegistration = new PackageRegistration { Id = packageMetadata.Id, IsVerified = isVerified };
                     package.Version = packageMetadata.Version.ToString();
                     package.SemVerLevelKey = SemVerLevelKey.ForPackage(packageMetadata.Version, packageMetadata.GetDependencyGroups().AsPackageDependencyEnumerable());
 
@@ -94,6 +99,16 @@ public TestableApiController(
             MockSecurityPolicyService.Setup(s => s.EvaluateAsync(It.IsAny<SecurityPolicyAction>(), It.IsAny<HttpContextBase>()))
                 .Returns(Task.FromResult(SecurityPolicyResult.SuccessResult));
 
+            IReadOnlyCollection<ReservedNamespace> matchingNamespaces = new List<ReservedNamespace>();
+            MockReservedNamespaceService
+                .Setup(r => r.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out matchingNamespaces))
+                .Returns(true);
+
+            MockPackageUploadService.Setup(x => x.GeneratePackageAsync(It.IsAny<string>(), It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                .Returns((string id, PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges) => {
+                    return MockPackageService.Object.CreatePackageAsync(nugetPackage, packageStreamMetadata, user, isVerified: false, commitChanges: commitChanges);
+                });
+
             var requestMock = new Mock<HttpRequestBase>();
             requestMock.Setup(m => m.IsSecureConnection).Returns(true);
             requestMock.Setup(m => m.Url).Returns(new Uri(TestUtility.GallerySiteRootHttps));
@@ -157,7 +172,7 @@ public async Task CreatePackageWillSavePackageFileToFileStorage()
                     .Returns(Task.CompletedTask).Verifiable();
                 controller.MockPackageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>()))
                     .Returns(packageRegistration);
-                controller.MockPackageService.Setup(p => p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), false))
+                controller.MockPackageService.Setup(p => p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false))
                     .Returns(Task.FromResult(package));
 
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
@@ -200,7 +215,7 @@ public async Task WillDeletePackageFileFromBlobStorageIfSavingDbChangesFails()
                 controller.MockPackageService.Setup(
                         p =>
                             p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(),
-                                It.IsAny<User>(), false))
+                                It.IsAny<User>(), It.IsAny<bool>(), false))
                     .Returns(Task.FromResult(package));
                 controller.MockEntitiesContext.Setup(e => e.SaveChangesAsync()).Throws<Exception>();
 
@@ -229,7 +244,7 @@ public async Task WritesAnAuditRecord()
 
                 var controller = new TestableApiController(GetConfigurationService());
                 controller.SetCurrentUser(user);
-                controller.MockPackageService.Setup(p => p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), false))
+                controller.MockPackageService.Setup(p => p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false))
                     .Returns(Task.FromResult(package));
 
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
@@ -262,7 +277,7 @@ public async Task CreatePackageWillSendPackageAddedNotice()
                 controller.SetCurrentUser(user);
                 controller.MockMessageService.Setup(p => p.SendPackageAddedNotice(package, It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
                     .Verifiable();
-                controller.MockPackageService.Setup(p => p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), false))
+                controller.MockPackageService.Setup(p => p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false))
                     .Returns(Task.FromResult(package));
 
                 var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
@@ -474,6 +489,44 @@ public async Task WillReturnConflictIfSavingPackageBlobFailsOnConflict()
                 controller.MockEntitiesContext.VerifyCommitted(Times.Never());
             }
 
+            [Fact]
+            public async Task WillReturnConflictIfAPackageWithTheIdMatchesNonOwnedNamespace()
+            {
+                // Arrange
+                var user1 = new User { Key = 1, Username = "random1" };
+                var user2 = new User { Key = 2, Username = "random2" };
+                var packageId = "Random.Extention.Package1";
+                var packageRegistration = new PackageRegistration();
+                packageRegistration.Id = packageId;
+                var package = new Package();
+                package.PackageRegistration = packageRegistration;
+                package.Version = "1.0.0";
+                packageRegistration.Packages.Add(package);
+
+                var controller = new TestableApiController(GetConfigurationService());
+                controller.SetCurrentUser(user1);
+                controller.MockPackageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>()))
+                    .Returns(() => null);
+
+                var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, "1.0.0");
+                controller.SetupPackageFromInputStream(nuGetPackage);
+                var testNamespace = new ReservedNamespace("random.", isSharedNamespace: false, isPrefix: true);
+                testNamespace.Owners.Add(user2);
+                IReadOnlyCollection<ReservedNamespace> matchingNamespaces = new List<ReservedNamespace> { testNamespace };
+                controller.MockReservedNamespaceService
+                    .Setup(r => r.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out matchingNamespaces))
+                    .Returns(false);
+
+                // Act
+                var result = await controller.CreatePackagePut();
+
+                // Assert
+                ResultAssert.IsStatusCode(
+                    result,
+                    HttpStatusCode.Conflict,
+                    String.Format(Strings.UploadPackage_IdNamespaceConflict));
+            }
+
             [Fact]
             public async Task WillCreateAPackageFromTheNuGetPackage()
             {
@@ -486,7 +539,79 @@ public async Task WillCreateAPackageFromTheNuGetPackage()
 
                 await controller.CreatePackagePut();
 
-                controller.MockPackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), false));
+                controller.MockPackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false));
+                controller.MockEntitiesContext.VerifyCommitted();
+            }
+
+            [Fact]
+            public async Task WillCreatePackageIfIdMatchesSharedNamespace()
+            {
+                // Arrange
+                var user1 = new User { Key = 1, Username = "random1" };
+                var user2 = new User { Key = 2, Username = "random2" };
+                var packageId = "Random.Extention.Package1";
+                var packageRegistration = new PackageRegistration();
+                packageRegistration.Id = packageId;
+                var package = new Package();
+                package.PackageRegistration = packageRegistration;
+                package.Version = "1.0.0";
+                packageRegistration.Packages.Add(package);
+
+                var controller = new TestableApiController(GetConfigurationService());
+                controller.SetCurrentUser(user1);
+                controller.MockPackageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>()))
+                    .Returns(() => null);
+
+                var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, "1.0.0");
+                controller.SetupPackageFromInputStream(nuGetPackage);
+                var testNamespace = new ReservedNamespace("random.", isSharedNamespace: true, isPrefix: true);
+                testNamespace.Owners.Add(user2);
+                IReadOnlyCollection<ReservedNamespace> matchingNamespaces = new List<ReservedNamespace> { testNamespace };
+                controller.MockReservedNamespaceService
+                    .Setup(r => r.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out matchingNamespaces))
+                    .Returns(true);
+
+                // Act
+                var result = await controller.CreatePackagePut();
+
+                // Assert
+                controller.MockPackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false));
+                controller.MockEntitiesContext.VerifyCommitted();
+            }
+
+            [Fact]
+            public async Task WillCreatePackageIfIdMatchesAnOwnedNamespace()
+            {
+                // Arrange
+                var user1 = new User { Key = 1, Username = "random1" };
+                var user2 = new User { Key = 2, Username = "random2" };
+                var packageId = "Random.Extention.Package1";
+                var packageRegistration = new PackageRegistration();
+                packageRegistration.Id = packageId;
+                var package = new Package();
+                package.PackageRegistration = packageRegistration;
+                package.Version = "1.0.0";
+                packageRegistration.Packages.Add(package);
+
+                var controller = new TestableApiController(GetConfigurationService());
+                controller.SetCurrentUser(user1);
+                controller.MockPackageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>()))
+                    .Returns(() => null);
+
+                var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, "1.0.0");
+                controller.SetupPackageFromInputStream(nuGetPackage);
+                var testNamespace = new ReservedNamespace("random.", isSharedNamespace: false, isPrefix: true);
+                testNamespace.Owners.Add(user1);
+                IReadOnlyCollection<ReservedNamespace> matchingNamespaces = new List<ReservedNamespace> { testNamespace };
+                controller.MockReservedNamespaceService
+                    .Setup(r => r.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out matchingNamespaces))
+                    .Returns(true);
+
+                // Act
+                var result = await controller.CreatePackagePut();
+
+                // Assert
+                controller.MockPackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false));
                 controller.MockEntitiesContext.VerifyCommitted();
             }
 
@@ -549,7 +674,7 @@ public async Task WillCreateAPackageWithTheUserMatchingTheApiKey()
 
                 await controller.CreatePackagePut();
 
-                controller.MockPackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user, false));
+                controller.MockPackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user, It.IsAny<bool>(), false));
                 controller.MockEntitiesContext.VerifyCommitted();
             }
 
@@ -575,7 +700,7 @@ public async Task WillVerifyScopesForNewPackageId(string apiKeyScopes, bool isPu
                 controller.MockPackageService.Setup(
                     x =>
                         x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user,
-                            It.IsAny<bool>())).Returns(Task.FromResult(package));
+                            It.IsAny<bool>(), It.IsAny<bool>())).Returns(Task.FromResult(package));
 
                 // Act
                 var result = await controller.CreatePackagePut();
@@ -584,7 +709,7 @@ public async Task WillVerifyScopesForNewPackageId(string apiKeyScopes, bool isPu
                 if (isPushAllowed)
                 {
                     controller.MockPackageService.Verify(
-                        x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user, false));
+                        x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user, It.IsAny<bool>(), false));
                     controller.MockEntitiesContext.VerifyCommitted();
                 }
                 else
@@ -594,6 +719,7 @@ public async Task WillVerifyScopesForNewPackageId(string apiKeyScopes, bool isPu
                             It.IsAny<PackageArchiveReader>(),
                             It.IsAny<PackageStreamMetadata>(),
                             It.IsAny<User>(),
+                            It.IsAny<bool>(),
                             It.IsAny<bool>()),
                         Times.Never);
 
@@ -634,7 +760,7 @@ public async Task WillVerifyScopesForExistingPackageId(string apiKeyScopes, bool
                 controller.MockPackageService.Setup(
                     x =>
                         x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user,
-                            It.IsAny<bool>())).Returns(Task.FromResult(package));
+                            It.IsAny<bool>(), It.IsAny<bool>())).Returns(Task.FromResult(package));
 
                 // Act
                 var result = await controller.CreatePackagePut();
@@ -643,7 +769,7 @@ public async Task WillVerifyScopesForExistingPackageId(string apiKeyScopes, bool
                 if (isPushAllowed)
                 {
                     controller.MockPackageService.Verify(
-                        x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user, false));
+                        x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), user, It.IsAny<bool>(), false));
                     controller.MockEntitiesContext.VerifyCommitted();
                 }
                 else
@@ -653,6 +779,7 @@ public async Task WillVerifyScopesForExistingPackageId(string apiKeyScopes, bool
                             It.IsAny<PackageArchiveReader>(),
                             It.IsAny<PackageStreamMetadata>(),
                             It.IsAny<User>(),
+                            It.IsAny<bool>(),
                             It.IsAny<bool>()),
                         Times.Never);
 
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
index 0ee93c6282..584d64e6c9 100644
--- a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
@@ -21,6 +21,7 @@
 using NuGetGallery.Security;
 using Xunit;
 using NuGetGallery.Configuration;
+using NuGetGallery.TestUtils;
 
 namespace NuGetGallery
 {
@@ -46,7 +47,9 @@ private static PackagesController CreateController(
             Mock<ISupportRequestService> supportRequestService = null,
             IAuditingService auditingService = null,
             Mock<ITelemetryService> telemetryService = null,
-            Mock<ISecurityPolicyService> securityPolicyService = null)
+            Mock<ISecurityPolicyService> securityPolicyService = null,
+            Mock<IReservedNamespaceService> reservedNamespaceService = null,
+            Mock<IPackageUploadService> packageUploadService = null)
         {
             packageService = packageService ?? new Mock<IPackageService>();
             if (uploadFileService == null)
@@ -84,6 +87,21 @@ private static PackagesController CreateController(
 
             securityPolicyService = securityPolicyService ?? new Mock<ISecurityPolicyService>();
 
+            if (reservedNamespaceService == null)
+            {
+                reservedNamespaceService = new Mock<IReservedNamespaceService>();
+                IReadOnlyCollection<ReservedNamespace> userOwnedMatchingNamespaces = new List<ReservedNamespace>();
+                reservedNamespaceService.Setup(s => s.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out userOwnedMatchingNamespaces))
+                    .Returns(true);
+            }
+
+            packageUploadService = packageUploadService ?? new Mock<IPackageUploadService>();
+
+            packageUploadService.Setup(x => x.GeneratePackageAsync(It.IsAny<string>(), It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                .Returns((string id, PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges) => {
+                    return packageService.Object.CreatePackageAsync(nugetPackage, packageStreamMetadata, user, isVerified: false, commitChanges: commitChanges);
+                });
+
             var controller = new Mock<PackagesController>(
                 packageService.Object,
                 uploadFileService.Object,
@@ -100,7 +118,9 @@ private static PackagesController CreateController(
                 supportRequestService.Object,
                 auditingService,
                 telemetryService.Object,
-                securityPolicyService.Object);
+                securityPolicyService.Object,
+                reservedNamespaceService.Object,
+                packageUploadService.Object);
 
             controller.CallBase = true;
             controller.Object.SetOwinContextOverride(Fakes.CreateOwinContext());
@@ -1309,6 +1329,127 @@ public async Task WillShowTheViewWithErrorsWhenThePackageIdIsAlreadyBeingUsed()
                 Assert.Equal(String.Format(Strings.PackageIdNotAvailable, "theId"), controller.ModelState[String.Empty].Errors[0].ErrorMessage);
             }
 
+            [Fact]
+            public async Task WillShowTheViewWithErrorsWhenThePackageIdMatchesNonOwnedNamespace()
+            {
+                var fakeUploadedFile = new Mock<HttpPostedFileBase>();
+                fakeUploadedFile.Setup(x => x.FileName).Returns("theFile.nupkg");
+                var fakeFileStream = TestPackage.CreateTestPackageStream("Random.Package1", "1.0.0");
+                fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);
+
+                var fakeUploadFileService = new Mock<IUploadFileService>();
+                fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
+                fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(null));
+                fakeUploadFileService.Setup(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));
+                var fakePackageService = new Mock<IPackageService>();
+                fakePackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(() => null);
+
+                var fakeReservedNamespaceService = new Mock<IReservedNamespaceService>();
+                var testNamespace = new ReservedNamespace("random.", isSharedNamespace: false, isPrefix: true);
+                var user1 = new User { Key = 1, Username = "random1" };
+                testNamespace.Owners.Add(user1);
+                IReadOnlyCollection<ReservedNamespace> matchingNamespaces = new List<ReservedNamespace> { testNamespace };
+                fakeReservedNamespaceService
+                    .Setup(r => r.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out matchingNamespaces))
+                    .Returns(false);
+
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    uploadFileService: fakeUploadFileService,
+                    packageService: fakePackageService,
+                    fakeNuGetPackage: fakeFileStream,
+                    reservedNamespaceService: fakeReservedNamespaceService);
+                controller.SetCurrentUser(TestUtility.FakeUser);
+
+                var result = await controller.UploadPackage(fakeUploadedFile.Object) as JsonResult;
+
+                Assert.NotNull(result);
+                Assert.False(controller.ModelState.IsValid);
+                Assert.Equal(String.Format(Strings.UploadPackage_IdNamespaceConflict), controller.ModelState[String.Empty].Errors[0].ErrorMessage);
+            }
+
+            [Fact]
+            public async Task WillUploadThePackageWhenIdMatchesSharedNamespace()
+            {
+                var fakeUploadedFile = new Mock<HttpPostedFileBase>();
+                fakeUploadedFile.Setup(x => x.FileName).Returns("theFile.nupkg");
+                var fakeFileStream = TestPackage.CreateTestPackageStream("Random.Package1", "1.0.0");
+                fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);
+
+                var fakeUploadFileService = new Mock<IUploadFileService>();
+                fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
+                fakeUploadFileService.SetupSequence(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key))
+                    .Returns(Task.FromResult<Stream>(null))
+                    .Returns(Task.FromResult<Stream>(TestPackage.CreateTestPackageStream("Random.Package1", "1.0.0")));
+                fakeUploadFileService.Setup(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));
+                var fakePackageService = new Mock<IPackageService>();
+                fakePackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(() => null);
+
+                var fakeReservedNamespaceService = new Mock<IReservedNamespaceService>();
+                var testNamespace = new ReservedNamespace("random.", isSharedNamespace: true, isPrefix: true);
+                var user1 = new User { Key = 1, Username = "random1" };
+                testNamespace.Owners.Add(user1);
+                IReadOnlyCollection<ReservedNamespace> matchingNamespaces = new List<ReservedNamespace> { testNamespace };
+                fakeReservedNamespaceService
+                    .Setup(r => r.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out matchingNamespaces))
+                    .Returns(true);
+
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    uploadFileService: fakeUploadFileService,
+                    packageService: fakePackageService,
+                    fakeNuGetPackage: fakeFileStream,
+                    reservedNamespaceService: fakeReservedNamespaceService);
+                controller.SetCurrentUser(TestUtility.FakeUser);
+
+                await controller.UploadPackage(fakeUploadedFile.Object);
+
+                Assert.True(controller.ModelState.IsValid);
+                fakeUploadFileService.Verify(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, fakeFileStream));
+                fakeFileStream.Dispose();
+            }
+
+            [Fact]
+            public async Task WillUploadThePackageWhenIdMatchesOwnedNamespace()
+            {
+                var fakeUploadedFile = new Mock<HttpPostedFileBase>();
+                fakeUploadedFile.Setup(x => x.FileName).Returns("theFile.nupkg");
+                var fakeFileStream = TestPackage.CreateTestPackageStream("Random.Package1", "1.0.0");
+                fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);
+
+                var fakeUploadFileService = new Mock<IUploadFileService>();
+                fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
+                fakeUploadFileService.SetupSequence(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key))
+                    .Returns(Task.FromResult<Stream>(null))
+                    .Returns(Task.FromResult<Stream>(TestPackage.CreateTestPackageStream("Random.Package1", "1.0.0")));
+                fakeUploadFileService.Setup(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));
+                var fakePackageService = new Mock<IPackageService>();
+                fakePackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(() => null);
+
+                var fakeReservedNamespaceService = new Mock<IReservedNamespaceService>();
+                var testNamespace = new ReservedNamespace("random.", isSharedNamespace: true, isPrefix: true);
+                testNamespace.Owners.Add(TestUtility.FakeUser);
+
+                IReadOnlyCollection<ReservedNamespace> matchingNamespaces = new List<ReservedNamespace> { testNamespace };
+                fakeReservedNamespaceService
+                    .Setup(r => r.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out matchingNamespaces))
+                    .Returns(true);
+
+                var controller = CreateController(
+                    GetConfigurationService(),
+                    uploadFileService: fakeUploadFileService,
+                    packageService: fakePackageService,
+                    fakeNuGetPackage: fakeFileStream,
+                    reservedNamespaceService: fakeReservedNamespaceService);
+                controller.SetCurrentUser(TestUtility.FakeUser);
+
+                await controller.UploadPackage(fakeUploadedFile.Object);
+
+                Assert.True(controller.ModelState.IsValid);
+                fakeUploadFileService.Verify(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, fakeFileStream));
+                fakeFileStream.Dispose();
+            }
+
             [Fact]
             public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists()
             {
@@ -1434,7 +1575,7 @@ public async Task WillCreateThePackage()
                     fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>())).Returns(
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>())).Returns(
                         Task.FromResult(new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" }));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1447,7 +1588,7 @@ public async Task WillCreateThePackage()
 
                     await controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Edit = null });
 
-                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), TestUtility.FakeUser, false));
+                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false));
                 }
             }
 
@@ -1462,7 +1603,7 @@ public async Task WillSavePackageToFileStorage()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1481,7 +1622,7 @@ public async Task WillSavePackageToFileStorage()
                     await controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Edit = null });
 
                     // Assert
-                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), TestUtility.FakeUser, false));
+                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false));
                     fakePackageFileService.Verify();
                 }
             }
@@ -1499,7 +1640,7 @@ public async Task WillDeletePackageFileFromBlobStorageIfSavingDbChangesFails()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = packageId }, Version = packageVersion };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream(packageId, packageVersion);
 
@@ -1523,7 +1664,7 @@ public async Task WillDeletePackageFileFromBlobStorageIfSavingDbChangesFails()
                     await Assert.ThrowsAsync<Exception>(async () => await controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Edit = null }));
 
                     // Assert
-                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), TestUtility.FakeUser, false));
+                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false));
                     fakePackageFileService.Verify();
                 }
             }
@@ -1539,7 +1680,7 @@ public async Task WillShowViewWithMessageIfSavingPackageBlobFails()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1562,7 +1703,7 @@ public async Task WillShowViewWithMessageIfSavingPackageBlobFails()
                     await controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Edit = null });
 
                     // Assert
-                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), TestUtility.FakeUser, false));
+                    fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false));
                     Assert.Equal(Strings.UploadPackage_IdVersionConflict, controller.TempData["Message"]);
                     fakeEntitiesContext.VerifyCommitted(Times.Never());
                 }
@@ -1579,7 +1720,7 @@ public async Task WillUpdateIndexingService()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
                     var fakePackageFileService = new Mock<IPackageFileService>();
@@ -1618,7 +1759,7 @@ public async Task WillSaveChangesToEntitiesContext()
                         .Returns(Task.CompletedTask);
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1655,7 +1796,7 @@ public async Task WillNotCommitChangesToPackageService()
                         .Returns(Task.CompletedTask);
                     var fakePackageService = new Mock<IPackageService>(MockBehavior.Strict);
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), false))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), false))
                         .Returns(Task.FromResult(fakePackage));
                     fakePackageService.Setup(x => x.PublishPackageAsync(fakePackage, false))
                         .Returns(Task.CompletedTask);
@@ -1688,7 +1829,7 @@ public async Task WillPublishThePackage()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
                     var fakePackageService = new Mock<IPackageService>();
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1714,7 +1855,7 @@ public async Task WillMarkThePackageUnlistedWhenListedArgumentIsFalse()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));
                     var fakePackageService = new Mock<IPackageService>();
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" }));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1743,7 +1884,7 @@ public async Task WillNotMarkThePackageUnlistedWhenListedArgumentIsNullorTrue(bo
                     fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" }));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1769,7 +1910,7 @@ public async Task WillDeleteTheUploadFile()
                 {
                     fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));
                     var fakePackageService = new Mock<IPackageService>();
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" }));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1796,7 +1937,7 @@ public async Task WillSetAFlashMessage()
                     fakeUploadFileService.Setup(x => x.SaveUploadFileAsync(TestUtility.FakeUser.Key, It.IsAny<Stream>())).Returns(Task.FromResult(0));
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" }));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1822,7 +1963,7 @@ public async Task WillRedirectToPackagePage()
                     fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" }));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1854,7 +1995,7 @@ public async Task WillCurateThePackage()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1884,7 +2025,7 @@ public async Task WritesAnAuditRecord()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
 
@@ -1920,7 +2061,7 @@ public async Task WillSendPackagePublishedEvent()
                     fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.CompletedTask);
                     var fakePackageService = new Mock<IPackageService>();
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "theId" }, Version = "theVersion" };
-                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
                     var fakeNuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.0");
                     var fakeTelemetryService = new Mock<ITelemetryService>();
@@ -1973,7 +2114,7 @@ public async Task WillApplyEdits(EditPackageVersionRequest edit)
                     var packageService = new Mock<IPackageService>();
 
                     var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = "thePackageId" }, Version = "1.0.0" };
-                    packageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))
+                    packageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>()))
                         .Returns(Task.FromResult(fakePackage));
 
                     var fakeEditPackageService = new Mock<EditPackageService>();
diff --git a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
index 5917b310d4..36fa76f9a1 100644
--- a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
@@ -253,7 +253,7 @@ public void WillCreateANewPackageRegistrationUsingTheNugetPackIdWhenOneDoesNotAl
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 packageRegistrationRepository.Verify(x => x.InsertOnCommit(It.Is<PackageRegistration>(pr => pr.Id == "theId")));
                 packageRegistrationRepository.Verify(x => x.CommitChangesAsync());
@@ -296,7 +296,7 @@ public async Task WillThrowWhenCreateANewPackageRegistrationWithAnIdThatMatchesA
                 var nugetPackage = CreateNuGetPackage(id: idThatMatchesExistingTitle);
 
                 // Assert
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, true));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true));
 
                 Assert.Equal(String.Format(Strings.NewRegistrationIdMatchesExistingPackageTitle, idThatMatchesExistingTitle), ex.Message);
             }
@@ -310,7 +310,7 @@ public void WillMakeTheCurrentUserTheOwnerWhenCreatingANewPackageRegistration()
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 packageRegistrationRepository.Verify(x => x.InsertOnCommit(It.Is<PackageRegistration>(pr => pr.Owners.Contains(currentUser))));
             }
@@ -324,7 +324,7 @@ public async Task WillReadThePropertiesFromTheNuGetPackageWhenCreatingANewPackag
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 // Note that there is no assertion on package identifier, because that's at the package registration level (and covered in another test).
                 Assert.Equal("01.0.42.0", package.Version);
@@ -361,7 +361,7 @@ public async Task WillReadTheLanguagePropertyFromThePackage()
                 var nugetPackage = CreateNuGetPackage(language: "fr");
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 // Assert
                 Assert.Equal("fr", package.Language);
@@ -382,7 +382,7 @@ public async Task WillReadPrereleaseFlagFromNuGetPackage()
                 var currentUser = new User();
 
                 // Act
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 // Assert
                 Assert.True(package.IsPrerelease);
@@ -402,7 +402,7 @@ public async Task DoNotCommitChangesIfCommitChangesIsFalse()
                 var currentUser = new User();
 
                 // Act
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, commitChanges: false);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: false);
 
                 // Assert
                 packageRegistrationRepository.Verify();
@@ -423,7 +423,7 @@ public async Task DoNotUpdateIndexIfCommitChangesIsFalse()
                 var currentUser = new User();
 
                 // Act
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, commitChanges: false);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: false);
             }
 
             [Fact]
@@ -443,7 +443,7 @@ public async Task UpdateIndexIfCommitChangesIsTrue()
                 var currentUser = new User();
 
                 // Act
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, commitChanges: true);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true);
 
                 // Assert
                 indexingService.Verify();
@@ -466,7 +466,7 @@ public async Task CommitChangesIfCommitChangesIsTrue()
                 var currentUser = new User();
 
                 // Act
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, commitChanges: true);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true);
 
                 // Assert
                 packageRegistrationRepository.Verify();
@@ -488,7 +488,7 @@ public async Task WillStoreTheHashForTheCreatedPackage()
                     HashAlgorithm = Constants.Sha512HashAlgorithmId,
                     Size = packageStream.Length
                 };
-                var package = await service.CreatePackageAsync(nugetPackage.Object, packageStreamMetadata, currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, packageStreamMetadata, currentUser, isVerified: false);
 
                 Assert.Equal(expectedHash, package.Hash);
                 Assert.Equal(Constants.Sha512HashAlgorithmId, package.HashAlgorithm);
@@ -502,7 +502,7 @@ public async Task WillNotCreateThePackageInAnUnpublishedState()
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 Assert.NotNull(package.Published);
             }
@@ -515,7 +515,7 @@ public async Task WillNotSetTheNewPackagesCreatedAndLastUpdatedTimesAsTheDatabas
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 Assert.Equal(DateTime.MinValue, package.Created);
             }
@@ -528,7 +528,7 @@ public async Task WillSetTheNewPackagesLastUpdatedTimes()
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 Assert.NotEqual(DateTime.MinValue, package.LastUpdated);
             }
@@ -549,7 +549,7 @@ public async Task WillSaveThePackageFileAndSetThePackageFileSize()
                     HashAlgorithm = Constants.Sha512HashAlgorithmId,
                     Size = 618
                 };
-                var package = await service.CreatePackageAsync(nugetPackage.Object, packageStreamMetadata, currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, packageStreamMetadata, currentUser, isVerified: false);
 
                 Assert.Equal(618, package.PackageFileSize);
             }
@@ -563,7 +563,7 @@ private async Task WillSaveTheCreatedPackageWhenANewPackageRegistrationIsCreated
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 packageRegistrationRepository.Verify(x => x.InsertOnCommit(It.Is<PackageRegistration>(pr => pr.Packages.ElementAt(0) == package)));
                 packageRegistrationRepository.Verify(x => x.CommitChangesAsync());
@@ -583,7 +583,7 @@ private async Task WillSaveTheCreatedPackageWhenThePackageRegistrationAlreadyExi
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(packageRegistration); });
                 var nugetPackage = CreateNuGetPackage();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 Assert.Same(packageRegistration.Packages.ElementAt(0), package);
                 packageRegistrationRepository.Verify(x => x.CommitChangesAsync());
@@ -603,7 +603,7 @@ private async Task WillThrowIfThePackageRegistrationAlreadyExistsAndTheCurrentUs
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(packageRegistration); });
                 var nugetPackage = CreateNuGetPackage();
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, true));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true));
 
                 Assert.Equal(String.Format(Strings.PackageIdNotAvailable, "theId"), ex.Message);
             }
@@ -631,7 +631,7 @@ private async Task WillThrowIfThePackageTitleMatchesAnExistingPackageRegistratio
                 var nugetPackage = CreateNuGetPackage(title: newPackageTitle);
 
                 // Assert
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, true));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true));
 
                 Assert.Equal(String.Format(Strings.TitleMatchesExistingRegistration, newPackageTitle), ex.Message);
             }
@@ -642,7 +642,7 @@ private async Task WillThrowIfTheNuGetPackageIdIsLongerThanMaxPackageIdLength()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(id: "theId".PadRight(131, '_'));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Id", CoreConstants.MaxPackageIdLength), ex.Message);
             }
@@ -653,7 +653,7 @@ private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsADot()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(id: "theId", version: "1.2.3-alpha.0");
 
-                await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null);
+                await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false);
             }
 
             [Fact]
@@ -662,7 +662,7 @@ private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsOnlyNumber
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(id: "theId", version: "1.2.3-12345");
 
-                await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null);
+                await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false);
             }
 
             [Fact]
@@ -671,7 +671,7 @@ private async Task WillThrowIfTheNuGetPackageAuthorsIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(authors: "theFirstAuthor".PadRight(2001, '_') + ", " + "theSecondAuthor".PadRight(2001, '_'));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Authors", "4000"), ex.Message);
             }
@@ -682,7 +682,7 @@ private async Task WillThrowIfTheNuGetPackageCopyrightIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(copyright: "theCopyright".PadRight(4001, '_'));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Copyright", "4000"), ex.Message);
             }
@@ -694,7 +694,7 @@ private async Task WillThrowIfTheVersionIsLongerThan64Characters()
                 var versionString = "1.0.0-".PadRight(65, 'a');
                 var nugetPackage = CreateNuGetPackage(version: versionString);
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Version", "64"), ex.Message);
             }
@@ -719,7 +719,7 @@ private async Task WillThrowIfTheNuGetPackageDependenciesIsLongerThanInt16MaxVal
                         packageDependencies),
                 });
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Dependencies", Int16.MaxValue), ex.Message);
             }
@@ -741,7 +741,7 @@ private async Task WillThrowIfThePackageDependencyIdIsLongerThanMaxPackageIdLeng
                                 })
                     });
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Dependency.Id", CoreConstants.MaxPackageIdLength), ex.Message);
             }
@@ -763,7 +763,7 @@ private async Task WillThrowIfThePackageDependencyVersionSpecIsLongerThan256()
                                 })
                     });
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Dependency.VersionSpec", 256), ex.Message);
             }
@@ -774,7 +774,7 @@ public async Task WillThrowIfTheNuGetPackageDescriptionIsNull()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(description: null);
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyMissing, "Description"), ex.Message);
             }
@@ -786,7 +786,7 @@ private async Task WillThrowIfTheNuGetPackageDescriptionIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(description: "theDescription".PadRight(4001, '_'));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Description", "4000"), ex.Message);
             }
@@ -797,7 +797,7 @@ private async Task WillThrowIfTheNuGetPackageIconUrlIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(iconUrl: new Uri("http://theIconUrl/".PadRight(4001, '-'), UriKind.Absolute));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "IconUrl", "4000"), ex.Message);
             }
@@ -808,7 +808,7 @@ private async Task WillThrowIfTheNuGetPackageLicenseUrlIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(licenseUrl: new Uri("http://theLicenseUrl/".PadRight(4001, '-'), UriKind.Absolute));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "LicenseUrl", "4000"), ex.Message);
             }
@@ -819,7 +819,7 @@ private async Task WillThrowIfTheNuGetPackageProjectUrlIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(projectUrl: new Uri("http://theProjectUrl/".PadRight(4001, '-'), UriKind.Absolute));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "ProjectUrl", "4000"), ex.Message);
             }
@@ -830,7 +830,7 @@ private async Task WillThrowIfTheNuGetPackageSummaryIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(summary: "theSummary".PadRight(4001, '_'));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Summary", "4000"), ex.Message);
             }
@@ -841,7 +841,7 @@ private async Task WillThrowIfTheNuGetPackageTagsIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(tags: "theTags".PadRight(4001, '_'));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Tags", "4000"), ex.Message);
             }
@@ -852,7 +852,7 @@ private async Task WillThrowIfTheNuGetPackageTitleIsLongerThan4000()
                 var service = CreateService();
                 var nugetPackage = CreateNuGetPackage(title: "theTitle".PadRight(4001, '_'));
 
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Title", "256"), ex.Message);
             }
@@ -865,7 +865,7 @@ private async Task WillThrowIfTheNuGetPackageLanguageIsLongerThan20()
                 var nugetPackage = CreateNuGetPackage(language: new string('a', 21));
 
                 // Act
-                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));
+                var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
                 // Assert
                 Assert.Equal(String.Format(Strings.NuGetPackagePropertyTooLong, "Language", "20"), ex.Message);
@@ -888,7 +888,7 @@ private async Task WillSaveSupportedFrameworks()
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 Assert.Equal("net40", package.SupportedFrameworks.First().TargetFramework);
                 Assert.Equal("net35", package.SupportedFrameworks.ElementAt(1).TargetFramework);
@@ -911,7 +911,7 @@ private async Task WillNotSaveAnySupportedFrameworksWhenThereIsAnAnyTargetFramew
                 var nugetPackage = CreateNuGetPackage();
                 var currentUser = new User();
 
-                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser);
+                var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
                 Assert.Empty(package.SupportedFrameworks);
             }
diff --git a/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs b/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs
index c0994ea6d3..8f5d5d91e8 100644
--- a/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs
@@ -317,6 +317,73 @@ public async Task AddingOwnerToNamespaceMarksRegistrationsVerified()
             }
         }
 
+        public class TheAddPackageRegistrationToNamespaceAsyncMethod
+        {
+            [Theory]
+            [InlineData(null)]
+            [InlineData("")]
+            [InlineData("  ")]
+            public async Task NullNamespaceThrowsException(string value)
+            {
+                var service = new TestableReservedNamespaceService();
+
+                await Assert.ThrowsAsync<ArgumentException>(async () => await service.AddPackageRegistrationToNamespaceAsync(value, new PackageRegistration()));
+            }
+
+            [Fact]
+            public async Task NullPackageRegistrationThrowsException()
+            {
+                var service = new TestableReservedNamespaceService();
+
+                await Assert.ThrowsAsync<ArgumentNullException>(async () => await service.AddPackageRegistrationToNamespaceAsync("Microsoft.", null));
+            }
+
+            [Fact]
+            public async Task NonExistentNamespaceThrowsException()
+            {
+                var testNamespaces = GetTestNamespaces();
+                var testPackageRegistrations = GetRegistrations();
+                var existingReg = testPackageRegistrations.First();
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);
+
+                await Assert.ThrowsAsync<InvalidOperationException>(async () => await service.AddPackageRegistrationToNamespaceAsync("Non.Existent.Namespace.", existingReg));
+            }
+
+            [Fact]
+            public async Task PackageRegistrationIsAddedWithCommitSuccessfully()
+            {
+                var testNamespaces = GetTestNamespaces();
+                var existingNamespace = testNamespaces.First();
+                var testPackageRegistrations = GetRegistrations();
+                var existingReg = testPackageRegistrations.First();
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);
+
+                await service.AddPackageRegistrationToNamespaceAsync(existingNamespace.Value, existingReg, commitChanges: true);
+
+                service
+                    .MockReservedNamespaceRepository
+                    .Verify(x => x.CommitChangesAsync());
+                Assert.True(existingNamespace.PackageRegistrations.Contains(existingReg));
+            }
+
+            [Fact]
+            public async Task CommitChangesIsNotExecuted()
+            {
+                var testNamespaces = GetTestNamespaces();
+                var existingNamespace = testNamespaces.First();
+                var testPackageRegistrations = GetRegistrations();
+                var existingReg = testPackageRegistrations.First();
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);
+
+                await service.AddPackageRegistrationToNamespaceAsync(existingNamespace.Value, existingReg, commitChanges: false);
+
+                service
+                    .MockReservedNamespaceRepository
+                    .Verify(x => x.CommitChangesAsync(), Times.Never);
+                Assert.True(existingNamespace.PackageRegistrations.Contains(existingReg));
+            }
+        }
+
         public class TheDeleteOwnerFromReservedNamespaceAsyncMethod
         {
             [Theory]
@@ -497,6 +564,149 @@ public async Task DeletingOwnerFromMultipleOwnedNamespaceDoesNotMarkPackagesUnVe
             }
         }
 
+        public class TheIsPushAllowedMethod
+        {
+            [Theory]
+            [InlineData("Microsoft.Aspnet")]
+            [InlineData("Microsoft.Aspnet.Newpackage")]
+            [InlineData("jquery")]
+            public void NonOwnedNamespacesRejectPush(string id)
+            {
+                var testNamespaces = GetTestNamespaces();
+                var prefix = "microsoft.";
+                var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
+                var testUsers = GetTestUsers();
+                var firstUser = testUsers.First();
+                var lastUser = testUsers.Last();
+                existingNamespace.Owners.Add(firstUser);
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
+
+                var isPushAllowed = service.IsPushAllowed(id, lastUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+                Assert.Empty(matchingNamespaces);
+                Assert.False(isPushAllowed);
+            }
+
+            [Theory]
+            [InlineData("Microsoft.Aspnet")]
+            [InlineData("Microsoft.Aspnet.Newpackage")]
+            public void SharedNamespacesAllowsPush(string id)
+            {
+                var testNamespaces = GetTestNamespaces();
+                var prefix = "microsoft.";
+                var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
+                existingNamespace.IsSharedNamespace = true;
+                var testUsers = GetTestUsers();
+                var firstUser = testUsers.First();
+                var lastUser = testUsers.Last();
+                existingNamespace.Owners.Add(firstUser);
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
+
+                var isPushAllowed = service.IsPushAllowed(id, lastUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+                Assert.Empty(matchingNamespaces);
+                Assert.True(isPushAllowed);
+            }
+
+            [Theory]
+            [InlineData("Microsoft.Aspnet")]
+            [InlineData("Microsoft.Aspnet.Newpackage")]
+            public void OwnedSharedNamespacesAllowsPushAndReturnsDataCorrectly(string id)
+            {
+                var testNamespaces = GetTestNamespaces();
+                var prefix = "microsoft.";
+                var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
+                existingNamespace.IsSharedNamespace = true;
+                var testUsers = GetTestUsers();
+                var firstUser = testUsers.First();
+                existingNamespace.Owners.Add(firstUser);
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
+
+                var isPushAllowed = service.IsPushAllowed(id, firstUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+                Assert.NotEmpty(matchingNamespaces);
+                Assert.True(isPushAllowed);
+            }
+
+            [Theory]
+            [InlineData("Non.Matching.Id")]
+            [InlineData("RandomId")]
+            public void NonMatchingNamespacesAllowsPush(string id)
+            {
+                var testNamespaces = GetTestNamespaces();
+                var prefix = "microsoft.";
+                var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
+                var testUsers = GetTestUsers();
+                var firstUser = testUsers.First();
+                var lastUser = testUsers.Last();
+                existingNamespace.Owners.Add(firstUser);
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
+
+                var isPushAllowed = service.IsPushAllowed(id, lastUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+                Assert.Empty(matchingNamespaces);
+                Assert.True(isPushAllowed);
+            }
+
+            [Theory]
+            [InlineData("jquer")]
+            [InlineData("j.query")]
+            [InlineData("jqueryextention")]
+            [InlineData("jquery.extention")]
+            public void NonPrefixNamespaceDoesNotBlockPush(string id)
+            {
+                var testNamespaces = GetTestNamespaces();
+                var prefix = "jQuery";
+                var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
+                existingNamespace.IsPrefix = false;
+                var testUsers = GetTestUsers();
+                var firstUser = testUsers.First();
+                var lastUser = testUsers.Last();
+                existingNamespace.Owners.Add(firstUser);
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
+
+                var isPushAllowed = service.IsPushAllowed(id, lastUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+                Assert.Empty(matchingNamespaces);
+                Assert.True(isPushAllowed);
+            }
+
+            [Theory]
+            [InlineData("Microsoft.Aspnet")]
+            [InlineData("Microsoft.Aspnet.Newpackage")]
+            public void OwnedNamespacesAllowsPush(string id)
+            {
+                var testNamespaces = GetTestNamespaces();
+                var prefix = "microsoft.";
+                var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
+                var testUsers = GetTestUsers();
+                var firstUser = testUsers.First();
+                existingNamespace.Owners.Add(firstUser);
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
+
+                var isPushAllowed = service.IsPushAllowed(id, firstUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+                Assert.True(isPushAllowed);
+                Assert.NotEmpty(matchingNamespaces);
+                Assert.True(matchingNamespaces.Count() == 1);
+            }
+
+            [Theory]
+            [InlineData("Microsoft.Aspnet.Newpackage")]
+            public void MultipleOwnedNamespacesAreReturnedCorrectly(string id)
+            {
+                var testNamespaces = GetTestNamespaces();
+                var prefixes = new List<string> { "microsoft.", "microsoft.aspnet." };
+                var testUsers = GetTestUsers();
+                var firstUser = testUsers.First();
+                prefixes.ForEach(p => {
+                    var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(p, StringComparison.OrdinalIgnoreCase));
+                    existingNamespace.Owners.Add(firstUser);
+                });
+
+                var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
+
+                var isPushAllowed = service.IsPushAllowed(id, firstUser, out IReadOnlyCollection<ReservedNamespace> matchingNamespaces);
+                Assert.True(isPushAllowed);
+                Assert.NotEmpty(matchingNamespaces);
+                Assert.True(matchingNamespaces.Count() == prefixes.Count());
+            }
+        }
+
         public class ValidateNamespaceMethod
         {
             [Theory]
@@ -530,7 +740,7 @@ private static IList<ReservedNamespace> GetTestNamespaces()
         {
             var result = new List<ReservedNamespace>();
             result.Add(new ReservedNamespace("Microsoft.", isSharedNamespace: false, isPrefix: true));
-            result.Add(new ReservedNamespace("microsoft.aspnet.", isSharedNamespace: false, isPrefix: true));
+            result.Add(new ReservedNamespace("Microsoft.Aspnet.", isSharedNamespace: false, isPrefix: true));
             result.Add(new ReservedNamespace("baseTest.", isSharedNamespace: false, isPrefix: true));
             result.Add(new ReservedNamespace("jquery", isSharedNamespace: false, isPrefix: false));
             result.Add(new ReservedNamespace("jquery.Extentions.", isSharedNamespace: true, isPrefix: true));

From 3e04263dd7539fd455e2e94c495415a63c54bc30 Mon Sep 17 00:00:00 2001
From: Isaac Abraham <isaac.abraham@live.co.uk>
Date: Tue, 12 Sep 2017 23:11:24 +0200
Subject: [PATCH 17/19] Add support for Paket CLI (#4638)

---
 src/NuGetGallery/Views/Packages/DisplayPackage.cshtml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index 163067f7af..4e1279d203 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -23,6 +23,15 @@
             CommandPrefix = "> ",
             InstallPackageCommand = string.Format("dotnet add package {0} --version {1}", Model.Id, Model.Version)
         },
+
+        new ThirdPartyPackageManagerViewModel()
+        {
+            Id = "paket-cli",
+            Name = "Paket CLI",
+            CommandPrefix = "> ",
+            InstallPackageCommand = string.Format("paket add {0} --version {1}", Model.Id, Model.Version),
+            ContactUrl = "https://fsprojects.github.io/Paket/"
+        },
     };
 }
 @section SocialMeta {

From 800461c96d7db11c5dbfa6c7e7c87b33f5cc7ce5 Mon Sep 17 00:00:00 2001
From: Shishir H <shishir.f22@gmail.com>
Date: Tue, 12 Sep 2017 16:51:06 -0700
Subject: [PATCH 18/19] [Prefix] Prefix Upload nit fixes and tests (#4669)

* Nit fixes for missing flag.
* Add tests for package upload service
---
 .../Services/IReservedNamespaceService.cs     |   2 +-
 .../Services/PackageUploadService.cs          |   6 +-
 .../Services/ReservedNamespaceService.cs      |   8 +-
 .../Controllers/ApiControllerFacts.cs         |   2 -
 .../NuGetGallery.Facts.csproj                 |   2 +
 .../Services/PackageServiceFacts.cs           | 153 +++++-------------
 .../Services/PackageUploadServiceFacts.cs     | 142 ++++++++++++++++
 .../Services/ReservedNamespaceServiceFacts.cs | 153 +++++++-----------
 .../TestUtils/TestDataUtility.cs              |  50 ++++++
 .../TestUtils/TestServiceUtility.cs           | 114 ++++++++++++-
 10 files changed, 415 insertions(+), 217 deletions(-)
 create mode 100644 tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs
 create mode 100644 tests/NuGetGallery.Facts/TestUtils/TestDataUtility.cs

diff --git a/src/NuGetGallery/Services/IReservedNamespaceService.cs b/src/NuGetGallery/Services/IReservedNamespaceService.cs
index d0a3ee2b73..f89df89658 100644
--- a/src/NuGetGallery/Services/IReservedNamespaceService.cs
+++ b/src/NuGetGallery/Services/IReservedNamespaceService.cs
@@ -48,7 +48,7 @@ public interface IReservedNamespaceService
         /// Add the specified package registration to the reserved namespace
         /// </summary>
         /// <param name="prefix">The reserved namespace to modify</param>
-        /// <param name="pr">The package registration to be added</param>
+        /// <param name="packageRegistration">The package registration to be added</param>
         /// <param name="commitChanges">Commit changes to the database, defaults to true</param>
         /// <returns>Awaitable Task</returns>
         Task AddPackageRegistrationToNamespaceAsync(string prefix, PackageRegistration packageRegistration, bool commitChanges = true);
diff --git a/src/NuGetGallery/Services/PackageUploadService.cs b/src/NuGetGallery/Services/PackageUploadService.cs
index b623d3125e..cc69040217 100644
--- a/src/NuGetGallery/Services/PackageUploadService.cs
+++ b/src/NuGetGallery/Services/PackageUploadService.cs
@@ -24,15 +24,15 @@ public PackageUploadService(
 
         public async Task<Package> GeneratePackageAsync(string id, PackageArchiveReader nugetPackage, PackageStreamMetadata packageStreamMetadata, User user, bool commitChanges)
         {
-            _reservedNamespaceService.IsPushAllowed(id, user, out IReadOnlyCollection<ReservedNamespace> userOwnedNamespaces);
+            var isPushAllowed = _reservedNamespaceService.IsPushAllowed(id, user, out IReadOnlyCollection<ReservedNamespace> userOwnedNamespaces);
 
-            var shouldMarkIdVerified = userOwnedNamespaces != null && userOwnedNamespaces.Any();
+            var shouldMarkIdVerified = isPushAllowed && userOwnedNamespaces != null && userOwnedNamespaces.Any();
             var package = await _packageService.CreatePackageAsync(
                 nugetPackage,
                 packageStreamMetadata,
                 user,
                 isVerified: shouldMarkIdVerified,
-                commitChanges: false);
+                commitChanges: commitChanges);
 
             if (shouldMarkIdVerified)
             {
diff --git a/src/NuGetGallery/Services/ReservedNamespaceService.cs b/src/NuGetGallery/Services/ReservedNamespaceService.cs
index 9804153530..784810a152 100644
--- a/src/NuGetGallery/Services/ReservedNamespaceService.cs
+++ b/src/NuGetGallery/Services/ReservedNamespaceService.cs
@@ -230,14 +230,14 @@ public async Task AddPackageRegistrationToNamespaceAsync(string prefix, PackageR
             }
         }
 
-        public ReservedNamespace FindReservedNamespaceForPrefix(string prefix)
+        public virtual ReservedNamespace FindReservedNamespaceForPrefix(string prefix)
         {
             return (from request in ReservedNamespaceRepository.GetAll()
-                    where request.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase)
+                    where request.Value.Equals(prefix)
                     select request).FirstOrDefault();
         }
 
-        public IReadOnlyCollection<ReservedNamespace> FindAllReservedNamespacesForPrefix(string prefix, bool getExactMatches)
+        public virtual IReadOnlyCollection<ReservedNamespace> FindAllReservedNamespacesForPrefix(string prefix, bool getExactMatches)
         {
             Expression<Func<ReservedNamespace, bool>> prefixMatch;
             if (getExactMatches)
@@ -262,7 +262,7 @@ on dbPrefix.Value equals queryPrefix
                     select dbPrefix).ToList();
         }
 
-        public IReadOnlyCollection<ReservedNamespace> GetReservedNamespacesForId(string id)
+        public virtual IReadOnlyCollection<ReservedNamespace> GetReservedNamespacesForId(string id)
         {
             return (from request in ReservedNamespaceRepository.GetAll()
                     where (request.IsPrefix && id.StartsWith(request.Value))
diff --git a/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
index b73861e8a5..c4266dc04c 100644
--- a/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs
@@ -23,7 +23,6 @@
 using NuGetGallery.Security;
 using Xunit;
 using NuGetGallery.Configuration;
-using NuGetGallery.TestUtils;
 
 namespace NuGetGallery
 {
@@ -584,7 +583,6 @@ public async Task WillCreatePackageIfIdMatchesAnOwnedNamespace()
             {
                 // Arrange
                 var user1 = new User { Key = 1, Username = "random1" };
-                var user2 = new User { Key = 2, Username = "random2" };
                 var packageId = "Random.Extention.Package1";
                 var packageRegistration = new PackageRegistration();
                 packageRegistration.Id = packageId;
diff --git a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
index dce4d0fa3b..2bae6ae3bc 100644
--- a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
+++ b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
@@ -429,6 +429,7 @@
     <Compile Include="Services\AllowLocalHttpRedirectPolicyFacts.cs" />
     <Compile Include="Services\NoLessSecureDestinationRedirectPolicyFacts.cs" />
     <Compile Include="Services\PagerDutyClientFacts.cs" />
+    <Compile Include="Services\PackageUploadServiceFacts.cs" />
     <Compile Include="Services\ReflowPackageServiceFacts.cs" />
     <Compile Include="Services\ReservedNamespaceServiceFacts.cs" />
     <Compile Include="Services\ScopeEvaluatorFacts.cs" />
@@ -497,6 +498,7 @@
     <Compile Include="TestUtils\ResultAssert.cs" />
     <Compile Include="TestUtils\TaskAssert.cs" />
     <Compile Include="TestUtils\TestServiceUtility.cs" />
+    <Compile Include="TestUtils\TestDataUtility.cs" />
     <Compile Include="TestUtils\TestUtility.cs" />
     <Compile Include="UrlExtensionsFacts.cs" />
     <Compile Include="ViewModels\DependencySetsViewModelFacts.cs" />
diff --git a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
index 36fa76f9a1..6a90e9dead 100644
--- a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
@@ -13,85 +13,12 @@
 using NuGetGallery.Framework;
 using NuGetGallery.Packaging;
 using Xunit;
+using NuGetGallery.TestUtils;
 
 namespace NuGetGallery
 {
     public class PackageServiceFacts
     {
-        private static Mock<TestPackageReader> CreateNuGetPackage(
-            string id = "theId",
-            string version = "01.0.42.0",
-            string title = "theTitle",
-            string summary = "theSummary",
-            string authors = "theFirstAuthor, theSecondAuthor",
-            string owners = "Package owners",
-            string description = "theDescription",
-            string tags = "theTags",
-            string language = null,
-            string copyright = "theCopyright",
-            string releaseNotes = "theReleaseNotes",
-            string minClientVersion = null,
-            Uri licenseUrl = null,
-            Uri projectUrl = null,
-            Uri iconUrl = null,
-            bool requireLicenseAcceptance = true,
-            IEnumerable<PackageDependencyGroup> packageDependencyGroups = null,
-            IEnumerable<NuGet.Packaging.Core.PackageType> packageTypes = null)
-        {
-            licenseUrl = licenseUrl ?? new Uri("http://thelicenseurl/");
-            projectUrl = projectUrl ?? new Uri("http://theprojecturl/");
-            iconUrl = iconUrl ?? new Uri("http://theiconurl/");
-
-            if (packageDependencyGroups == null)
-            {
-                packageDependencyGroups = new[]
-                {
-                    new PackageDependencyGroup(
-                        new NuGetFramework("net40"),
-                        new[]
-                        {
-                            new NuGet.Packaging.Core.PackageDependency(
-                                "theFirstDependency",
-                                VersionRange.Parse("[1.0.0, 2.0.0)")),
-
-                            new NuGet.Packaging.Core.PackageDependency(
-                                "theSecondDependency",
-                                VersionRange.Parse("[1.0]")),
-
-                            new NuGet.Packaging.Core.PackageDependency(
-                                "theThirdDependency")
-                        }),
-
-                    new PackageDependencyGroup(
-                        new NuGetFramework("net35"),
-                        new[]
-                        {
-                            new NuGet.Packaging.Core.PackageDependency(
-                                "theFourthDependency",
-                                VersionRange.Parse("[1.0]"))
-                        })
-                };
-            }
-
-            if (packageTypes == null)
-            {
-                packageTypes = new[]
-                {
-                    new NuGet.Packaging.Core.PackageType("dependency", new Version("1.0.0")),
-                    new NuGet.Packaging.Core.PackageType("DotNetCliTool", new Version("2.1.1"))
-                };
-            }
-
-            var testPackage = TestPackage.CreateTestPackageStream(
-                id, version, title, summary, authors, owners,
-                description, tags, language, copyright, releaseNotes,
-                minClientVersion, licenseUrl, projectUrl, iconUrl,
-                requireLicenseAcceptance, packageDependencyGroups, packageTypes);
-
-            var mock = new Mock<TestPackageReader>(testPackage);
-            mock.CallBase = true;
-            return mock;
-        }
 
         private static IPackageService CreateService(
             Mock<IEntityRepository<PackageRegistration>> packageRegistrationRepository = null,
@@ -250,7 +177,7 @@ public void WillCreateANewPackageRegistrationUsingTheNugetPackIdWhenOneDoesNotAl
                         mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null);
                     });
 
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -293,7 +220,7 @@ public async Task WillThrowWhenCreateANewPackageRegistrationWithAnIdThatMatchesA
                     });
 
                 // Act
-                var nugetPackage = CreateNuGetPackage(id: idThatMatchesExistingTitle);
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: idThatMatchesExistingTitle);
 
                 // Assert
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true));
@@ -307,7 +234,7 @@ public void WillMakeTheCurrentUserTheOwnerWhenCreatingANewPackageRegistration()
                 var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -321,7 +248,7 @@ public async Task WillReadThePropertiesFromTheNuGetPackageWhenCreatingANewPackag
                 var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -358,7 +285,7 @@ public async Task WillReadTheLanguagePropertyFromThePackage()
                 var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage(language: "fr");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(language: "fr");
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -378,7 +305,7 @@ public async Task WillReadPrereleaseFlagFromNuGetPackage()
                     .Returns(Task.CompletedTask).Verifiable();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage(version: "2.14.0-a");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(version: "2.14.0-a");
                 var currentUser = new User();
 
                 // Act
@@ -398,7 +325,7 @@ public async Task DoNotCommitChangesIfCommitChangesIsFalse()
                 packageRegistrationRepository.Setup(r => r.InsertOnCommit(It.IsAny<PackageRegistration>())).Returns(1).Verifiable();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage(version: "2.14.0-a");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(version: "2.14.0-a");
                 var currentUser = new User();
 
                 // Act
@@ -419,7 +346,7 @@ public async Task DoNotUpdateIndexIfCommitChangesIsFalse()
                 var service = CreateService(indexingService: indexingService, packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
 
-                var nugetPackage = CreateNuGetPackage(version: "2.14.0-a");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(version: "2.14.0-a");
                 var currentUser = new User();
 
                 // Act
@@ -439,7 +366,7 @@ public async Task UpdateIndexIfCommitChangesIsTrue()
                 indexingService.Setup(s => s.UpdateIndex()).Verifiable();
                 var service = CreateService(indexingService: indexingService, packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage(version: "2.14.0-a");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(version: "2.14.0-a");
                 var currentUser = new User();
 
                 // Act
@@ -462,7 +389,7 @@ public async Task CommitChangesIfCommitChangesIsTrue()
                     .Returns(Task.CompletedTask).Verifiable();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage(version: "2.14.0-a");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(version: "2.14.0-a");
                 var currentUser = new User();
 
                 // Act
@@ -477,7 +404,7 @@ public async Task WillStoreTheHashForTheCreatedPackage()
             {
                 var service = CreateService(setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var packageStream = nugetPackage.Object.GetStream().AsSeekableStream();
@@ -499,7 +426,7 @@ public async Task WillNotCreateThePackageInAnUnpublishedState()
             {
                 var service = CreateService(setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -512,7 +439,7 @@ public async Task WillNotSetTheNewPackagesCreatedAndLastUpdatedTimesAsTheDatabas
             {
                 var service = CreateService(setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -525,7 +452,7 @@ public async Task WillSetTheNewPackagesLastUpdatedTimes()
             {
                 var service = CreateService(setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -538,7 +465,7 @@ public async Task WillSaveThePackageFileAndSetThePackageFileSize()
             {
                 var service = CreateService(setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var packageStream = nugetPackage.Object.GetStream().AsSeekableStream();
@@ -560,7 +487,7 @@ private async Task WillSaveTheCreatedPackageWhenANewPackageRegistrationIsCreated
                 var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -581,7 +508,7 @@ private async Task WillSaveTheCreatedPackageWhenThePackageRegistrationAlreadyExi
                 var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(packageRegistration); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
 
@@ -601,7 +528,7 @@ private async Task WillThrowIfThePackageRegistrationAlreadyExistsAndTheCurrentUs
                 var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository, setup:
                         mockPackageService => { mockPackageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns(packageRegistration); });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true));
 
@@ -628,7 +555,7 @@ private async Task WillThrowIfThePackageTitleMatchesAnExistingPackageRegistratio
                 var service = CreateService(packageRegistrationRepository: packageRegistrationRepository);
 
                 // Act
-                var nugetPackage = CreateNuGetPackage(title: newPackageTitle);
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(title: newPackageTitle);
 
                 // Assert
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false, commitChanges: true));
@@ -640,7 +567,7 @@ private async Task WillThrowIfThePackageTitleMatchesAnExistingPackageRegistratio
             private async Task WillThrowIfTheNuGetPackageIdIsLongerThanMaxPackageIdLength()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(id: "theId".PadRight(131, '_'));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: "theId".PadRight(131, '_'));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -651,7 +578,7 @@ private async Task WillThrowIfTheNuGetPackageIdIsLongerThanMaxPackageIdLength()
             private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsADot()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(id: "theId", version: "1.2.3-alpha.0");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: "theId", version: "1.2.3-alpha.0");
 
                 await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false);
             }
@@ -660,7 +587,7 @@ private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsADot()
             private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsOnlyNumbers()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(id: "theId", version: "1.2.3-12345");
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: "theId", version: "1.2.3-12345");
 
                 await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false);
             }
@@ -669,7 +596,7 @@ private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsOnlyNumber
             private async Task WillThrowIfTheNuGetPackageAuthorsIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(authors: "theFirstAuthor".PadRight(2001, '_') + ", " + "theSecondAuthor".PadRight(2001, '_'));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(authors: "theFirstAuthor".PadRight(2001, '_') + ", " + "theSecondAuthor".PadRight(2001, '_'));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -680,7 +607,7 @@ private async Task WillThrowIfTheNuGetPackageAuthorsIsLongerThan4000()
             private async Task WillThrowIfTheNuGetPackageCopyrightIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(copyright: "theCopyright".PadRight(4001, '_'));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(copyright: "theCopyright".PadRight(4001, '_'));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -692,7 +619,7 @@ private async Task WillThrowIfTheVersionIsLongerThan64Characters()
             {
                 var service = CreateService();
                 var versionString = "1.0.0-".PadRight(65, 'a');
-                var nugetPackage = CreateNuGetPackage(version: versionString);
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(version: versionString);
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -712,7 +639,7 @@ private async Task WillThrowIfTheNuGetPackageDependenciesIsLongerThanInt16MaxVal
                     packageDependencies.Add(new NuGet.Packaging.Core.PackageDependency("dependency" + i, versionSpec));
                 }
 
-                var nugetPackage = CreateNuGetPackage(packageDependencyGroups: new[]
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(packageDependencyGroups: new[]
                 {
                     new PackageDependencyGroup(
                         new NuGetFramework("net40"),
@@ -728,7 +655,7 @@ private async Task WillThrowIfTheNuGetPackageDependenciesIsLongerThanInt16MaxVal
             private async Task WillThrowIfThePackageDependencyIdIsLongerThanMaxPackageIdLength()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(packageDependencyGroups: new[]
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(packageDependencyGroups: new[]
                     {
                         new PackageDependencyGroup(
                             new NuGetFramework("net40"),
@@ -750,7 +677,7 @@ private async Task WillThrowIfThePackageDependencyIdIsLongerThanMaxPackageIdLeng
             private async Task WillThrowIfThePackageDependencyVersionSpecIsLongerThan256()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(packageDependencyGroups: new[]
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(packageDependencyGroups: new[]
                     {
                         new PackageDependencyGroup(
                             new NuGetFramework("net40"),
@@ -772,7 +699,7 @@ private async Task WillThrowIfThePackageDependencyVersionSpecIsLongerThan256()
             public async Task WillThrowIfTheNuGetPackageDescriptionIsNull()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(description: null);
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(description: null);
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -784,7 +711,7 @@ public async Task WillThrowIfTheNuGetPackageDescriptionIsNull()
             private async Task WillThrowIfTheNuGetPackageDescriptionIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(description: "theDescription".PadRight(4001, '_'));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(description: "theDescription".PadRight(4001, '_'));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -795,7 +722,7 @@ private async Task WillThrowIfTheNuGetPackageDescriptionIsLongerThan4000()
             private async Task WillThrowIfTheNuGetPackageIconUrlIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(iconUrl: new Uri("http://theIconUrl/".PadRight(4001, '-'), UriKind.Absolute));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(iconUrl: new Uri("http://theIconUrl/".PadRight(4001, '-'), UriKind.Absolute));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -806,7 +733,7 @@ private async Task WillThrowIfTheNuGetPackageIconUrlIsLongerThan4000()
             private async Task WillThrowIfTheNuGetPackageLicenseUrlIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(licenseUrl: new Uri("http://theLicenseUrl/".PadRight(4001, '-'), UriKind.Absolute));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(licenseUrl: new Uri("http://theLicenseUrl/".PadRight(4001, '-'), UriKind.Absolute));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -817,7 +744,7 @@ private async Task WillThrowIfTheNuGetPackageLicenseUrlIsLongerThan4000()
             private async Task WillThrowIfTheNuGetPackageProjectUrlIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(projectUrl: new Uri("http://theProjectUrl/".PadRight(4001, '-'), UriKind.Absolute));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(projectUrl: new Uri("http://theProjectUrl/".PadRight(4001, '-'), UriKind.Absolute));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -828,7 +755,7 @@ private async Task WillThrowIfTheNuGetPackageProjectUrlIsLongerThan4000()
             private async Task WillThrowIfTheNuGetPackageSummaryIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(summary: "theSummary".PadRight(4001, '_'));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(summary: "theSummary".PadRight(4001, '_'));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -839,7 +766,7 @@ private async Task WillThrowIfTheNuGetPackageSummaryIsLongerThan4000()
             private async Task WillThrowIfTheNuGetPackageTagsIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(tags: "theTags".PadRight(4001, '_'));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(tags: "theTags".PadRight(4001, '_'));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -850,7 +777,7 @@ private async Task WillThrowIfTheNuGetPackageTagsIsLongerThan4000()
             private async Task WillThrowIfTheNuGetPackageTitleIsLongerThan4000()
             {
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(title: "theTitle".PadRight(4001, '_'));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(title: "theTitle".PadRight(4001, '_'));
 
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
 
@@ -862,7 +789,7 @@ private async Task WillThrowIfTheNuGetPackageLanguageIsLongerThan20()
             {
                 // Arrange
                 var service = CreateService();
-                var nugetPackage = CreateNuGetPackage(language: new string('a', 21));
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(language: new string('a', 21));
 
                 // Act
                 var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), user: null, isVerified: false));
@@ -885,7 +812,7 @@ private async Task WillSaveSupportedFrameworks()
                                            NuGetFramework.Parse("net35")
                                        });
                                });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
@@ -908,7 +835,7 @@ private async Task WillNotSaveAnySupportedFrameworksWhenThereIsAnAnyTargetFramew
                             NuGetFramework.Parse("net35")
                         });
                 });
-                var nugetPackage = CreateNuGetPackage();
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage();
                 var currentUser = new User();
 
                 var package = await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), currentUser, isVerified: false);
diff --git a/tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs
new file mode 100644
index 0000000000..9a8d67965a
--- /dev/null
+++ b/tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs
@@ -0,0 +1,142 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+using Moq;
+using NuGet.Packaging;
+using NuGetGallery.Framework;
+using NuGetGallery.Packaging;
+using Xunit;
+using NuGetGallery.TestUtils;
+
+namespace NuGetGallery
+{
+    public class PackageUploadServiceFacts
+    {
+        public Mock<IPackageService> MockPackageService { get; private set; }
+
+        private static PackageUploadService CreateService(
+            Mock<IPackageService> packageService = null,
+            Mock<IReservedNamespaceService> reservedNamespaceService = null)
+        {
+            {
+            if (packageService == null)
+                packageService = new Mock<IPackageService>();
+                packageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null);
+                packageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), It.IsAny<bool>())).
+                    Returns((PackageArchiveReader packageArchiveReader, PackageStreamMetadata packageStreamMetadata, User user, bool isVerified, bool commitChanges) =>
+                    {
+                        var packageMetadata = PackageMetadata.FromNuspecReader(packageArchiveReader.GetNuspecReader());
+
+                        var newPackage = new Package();
+                        newPackage.PackageRegistration = new PackageRegistration { Id = packageMetadata.Id, IsVerified = isVerified };
+                        newPackage.Version = packageMetadata.Version.ToString();
+                        newPackage.SemVerLevelKey = SemVerLevelKey.ForPackage(packageMetadata.Version, packageMetadata.GetDependencyGroups().AsPackageDependencyEnumerable());
+
+                        return Task.FromResult(newPackage);
+                    });
+            }
+            
+            if (reservedNamespaceService == null)
+            {
+                reservedNamespaceService = new Mock<IReservedNamespaceService>();
+                IReadOnlyCollection<ReservedNamespace> userOwnedMatchingNamespaces = new List<ReservedNamespace>();
+                reservedNamespaceService.Setup(s => s.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out userOwnedMatchingNamespaces))
+                    .Returns(true);
+            }
+
+            var packageUploadService = new Mock<PackageUploadService>(
+                packageService.Object,
+                reservedNamespaceService.Object);
+
+            return packageUploadService.Object;
+        }
+
+        public class TheGeneratePackageAsyncMethod
+        {
+            [Theory]
+            [InlineData(true)]
+            [InlineData(false)]
+            public async Task WillCallCreatePackageAsyncCorrectly(bool commitChangesParameter)
+            {
+                var packageService = new Mock<IPackageService>();
+                packageService.Setup(x => x.FindPackageRegistrationById(It.IsAny<string>())).Returns((PackageRegistration)null);
+
+                var id = "Microsoft.Aspnet.Mvc";
+                var packageUploadService = CreateService(packageService);
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: id);
+                var currentUser = new User();
+
+                var package = await packageUploadService.GeneratePackageAsync(id, nugetPackage.Object, new PackageStreamMetadata(), currentUser, commitChanges: commitChangesParameter);
+
+                packageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>(), commitChangesParameter), Times.Once);
+                Assert.False(package.PackageRegistration.IsVerified);
+            }
+
+            [Theory]
+            [InlineData(true)]
+            [InlineData(false)]
+            public async Task WillMarkPackageRegistrationVerifiedFlagCorrectly(bool shouldMarkIdVerified)
+            {
+                var id = "Microsoft.Aspnet.Mvc";
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
+                var prefixes = new List<string> { "microsoft.", "microsoft.aspnet." };
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
+                var firstUser = testUsers.First();
+                var matchingNamepsaces = testNamespaces
+                    .Where(rn => prefixes.Any(pr => id.StartsWith(pr, StringComparison.OrdinalIgnoreCase)))
+                    .ToList();
+                prefixes.ForEach(p => {
+                    var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(p, StringComparison.OrdinalIgnoreCase));
+                    existingNamespace.Owners.Add(firstUser);
+                });
+
+                var reservedNamespaceService = new Mock<IReservedNamespaceService>();
+                IReadOnlyCollection<ReservedNamespace> userOwnedMatchingNamespaces = matchingNamepsaces;
+                reservedNamespaceService.Setup(s => s.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out userOwnedMatchingNamespaces))
+                    .Returns(shouldMarkIdVerified);
+
+                var packageUploadService = CreateService(reservedNamespaceService: reservedNamespaceService);
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: id);
+
+                var package = await packageUploadService.GeneratePackageAsync(id, nugetPackage.Object, new PackageStreamMetadata(), firstUser, commitChanges: true);
+
+                Assert.Equal(shouldMarkIdVerified, package.PackageRegistration.IsVerified);
+            }
+
+            [Fact]
+            public async Task WillMarkPackageRegistrationNotVerifiedIfIdMatchesNonOwnedSharedNamespace()
+            {
+                var id = "Microsoft.Aspnet.Mvc";
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
+                var prefixes = new List<string> { "microsoft.", "microsoft.aspnet." };
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
+                var firstUser = testUsers.First();
+                var lastUser = testUsers.Last();
+                prefixes.ForEach(p => {
+                    var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(p, StringComparison.OrdinalIgnoreCase));
+                    existingNamespace.IsSharedNamespace = true;
+                    existingNamespace.Owners.Add(firstUser);
+                });
+
+                var reservedNamespaceService = new Mock<IReservedNamespaceService>();
+                IReadOnlyCollection<ReservedNamespace> userOwnedMatchingNamespaces = new List<ReservedNamespace>();
+                reservedNamespaceService.Setup(s => s.IsPushAllowed(It.IsAny<string>(), It.IsAny<User>(), out userOwnedMatchingNamespaces))
+                    .Returns(true);
+
+                var packageUploadService = CreateService(reservedNamespaceService: reservedNamespaceService);
+                var nugetPackage = PackageServiceUtility.CreateNuGetPackage(id: id);
+
+                var package = await packageUploadService.GeneratePackageAsync(id, nugetPackage.Object, new PackageStreamMetadata(), lastUser, commitChanges: true);
+
+                Assert.False(package.PackageRegistration.IsVerified);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs b/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs
index 8f5d5d91e8..cca31aaab2 100644
--- a/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/ReservedNamespaceServiceFacts.cs
@@ -62,7 +62,7 @@ public async Task InvalidNamespaceThrowsException(string value)
             [Fact]
             public async Task ExistingNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var newNamespace = testNamespaces.FirstOrDefault();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
 
@@ -72,7 +72,7 @@ public async Task ExistingNamespaceThrowsException()
             [Fact]
             public async Task ExistingNamespaceWithDifferentPrefixStateThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var newNamespace = testNamespaces.FirstOrDefault(x => x.Value == "jquery");
                 newNamespace.IsPrefix = !newNamespace.IsPrefix;
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
@@ -83,7 +83,7 @@ public async Task ExistingNamespaceWithDifferentPrefixStateThrowsException()
             [Fact]
             public async Task LiberalNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 // test case has a namespace with "Microsoft." as the value.
                 var newNamespace = new ReservedNamespace("Micro", isSharedNamespace: false, isPrefix: true);
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
@@ -94,7 +94,7 @@ public async Task LiberalNamespaceThrowsException()
             [Fact]
             public async Task LiberalNamespaceForExactMatchIsAllowed()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 // test case has a namespace with "Microsoft." as the value.
                 var newNamespace = new ReservedNamespace("Micro", isSharedNamespace: false, isPrefix: false /*exact match*/);
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
@@ -117,7 +117,7 @@ public class TheDeleteReservedNamespaceAsyncMethod
             [Fact]
             public async Task VanillaReservedNamespaceIsDeletedCorrectly()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var existingNamespace = testNamespaces.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
 
@@ -152,7 +152,7 @@ public async Task InvalidNamespaceThrowsException(string value)
             [Fact]
             public async Task NonexistentNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
 
                 await Assert.ThrowsAsync<InvalidOperationException>(async () => await service.DeleteReservedNamespaceAsync("Nonexistent.Namespace."));
@@ -161,8 +161,8 @@ public async Task NonexistentNamespaceThrowsException()
             [Fact]
             public async Task DeletingNamespaceClearsVerifiedFlagOnPackage()
             {
-                var namespaces = GetTestNamespaces();
-                var registrations = GetRegistrations();
+                var namespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
+                var registrations = ReservedNamespaceServiceTestData.GetRegistrations();
                 var msPrefix = namespaces.First();
                 msPrefix.PackageRegistrations = registrations.Where(x => x.Id.StartsWith(msPrefix.Value)).ToList();
                 msPrefix.PackageRegistrations.ToList().ForEach(x => x.ReservedNamespaces.Add(msPrefix));
@@ -213,8 +213,8 @@ public async Task InvalidNamespaceThrowsException(string value)
             [Fact]
             public async Task NonExistentNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
-                var testUsers = GetTestUsers();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var existingUser = testUsers.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
 
@@ -227,7 +227,7 @@ public async Task NonExistentNamespaceThrowsException()
             [InlineData("   ")]
             public async Task AddingInvalidOwnerToNamespaceThrowsException(string username)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var existingNamespace = testNamespaces.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
 
@@ -237,9 +237,9 @@ public async Task AddingInvalidOwnerToNamespaceThrowsException(string username)
             [Fact]
             public async Task AddingNonExistentUserToNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var existingNamespace = testNamespaces.First();
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
 
                 await Assert.ThrowsAsync<InvalidOperationException>(async () => await service.AddOwnerToReservedNamespaceAsync(existingNamespace.Value, "NonExistentUser"));
@@ -248,10 +248,10 @@ public async Task AddingNonExistentUserToNamespaceThrowsException()
             [Fact]
             public async Task AddAnOwnerToNamespaceSuccessfully()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var owner = testUsers.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
 
@@ -273,13 +273,13 @@ public async Task AddAnOwnerToNamespaceSuccessfully()
             [Fact]
             public async Task AddingOwnerToNamespaceMarksRegistrationsVerified()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var owner1 = testUsers.First(u => u.Username == "test1");
                 var owner2 = testUsers.First(u => u.Username == "test2");
-                var registrations = GetRegistrations();
+                var registrations = ReservedNamespaceServiceTestData.GetRegistrations();
                 var pr1 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.Package1"));
                 var pr2 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.Package2"));
                 var pr3 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.AspNet.Package2"));
@@ -341,8 +341,8 @@ public async Task NullPackageRegistrationThrowsException()
             [Fact]
             public async Task NonExistentNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
-                var testPackageRegistrations = GetRegistrations();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
+                var testPackageRegistrations = ReservedNamespaceServiceTestData.GetRegistrations();
                 var existingReg = testPackageRegistrations.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);
 
@@ -352,9 +352,9 @@ public async Task NonExistentNamespaceThrowsException()
             [Fact]
             public async Task PackageRegistrationIsAddedWithCommitSuccessfully()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var existingNamespace = testNamespaces.First();
-                var testPackageRegistrations = GetRegistrations();
+                var testPackageRegistrations = ReservedNamespaceServiceTestData.GetRegistrations();
                 var existingReg = testPackageRegistrations.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);
 
@@ -369,9 +369,9 @@ public async Task PackageRegistrationIsAddedWithCommitSuccessfully()
             [Fact]
             public async Task CommitChangesIsNotExecuted()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var existingNamespace = testNamespaces.First();
-                var testPackageRegistrations = GetRegistrations();
+                var testPackageRegistrations = ReservedNamespaceServiceTestData.GetRegistrations();
                 var existingReg = testPackageRegistrations.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, packageRegistrations: testPackageRegistrations);
 
@@ -400,8 +400,8 @@ public async Task NullNamespaceThrowsException(string value)
             [Fact]
             public async Task NonExistentNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
-                var testUsers = GetTestUsers();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var existingUser = testUsers.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
 
@@ -414,7 +414,7 @@ public async Task NonExistentNamespaceThrowsException()
             [InlineData("   ")]
             public async Task DeletingInvalidOwnerFromNamespaceThrowsException(string username)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var existingNamespace = testNamespaces.First();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces);
 
@@ -424,9 +424,9 @@ public async Task DeletingInvalidOwnerFromNamespaceThrowsException(string userna
             [Fact]
             public async Task DeletingNonExistentUserFromNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var existingNamespace = testNamespaces.First();
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
 
                 await Assert.ThrowsAsync<InvalidOperationException>(async () => await service.DeleteOwnerFromReservedNamespaceAsync(existingNamespace.Value, "NonExistentUser"));
@@ -435,10 +435,10 @@ public async Task DeletingNonExistentUserFromNamespaceThrowsException()
             [Fact]
             public async Task DeletingNonOwnerFromNamespaceThrowsException()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var user1 = testUsers.First(u => u.Username == "test1");
                 var user2 = testUsers.First(u => u.Username == "test2");
                 existingNamespace.Owners.Add(user1);
@@ -450,10 +450,10 @@ public async Task DeletingNonOwnerFromNamespaceThrowsException()
             [Fact]
             public async Task DeleteOwnerFromNamespaceSuccessfully()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var owner = testUsers.First();
                 existingNamespace.Owners.Add(owner);
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
@@ -476,13 +476,13 @@ public async Task DeleteOwnerFromNamespaceSuccessfully()
             [Fact]
             public async Task DeletingOwnerFromNamespaceMarksRegistrationsUnverified()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var owner1 = testUsers.First(u => u.Username == "test1");
                 var owner2 = testUsers.First(u => u.Username == "test2");
-                var registrations = GetRegistrations();
+                var registrations = ReservedNamespaceServiceTestData.GetRegistrations();
                 var pr1 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.Package1"));
                 var pr2 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.Package2"));
                 var pr3 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.AspNet.Package2"));
@@ -522,13 +522,13 @@ public async Task DeletingOwnerFromNamespaceMarksRegistrationsUnverified()
             [Fact]
             public async Task DeletingOwnerFromMultipleOwnedNamespaceDoesNotMarkPackagesUnVerfied()
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var owner1 = testUsers.First(u => u.Username == "test1");
                 var owner2 = testUsers.First(u => u.Username == "test2");
-                var registrations = GetRegistrations();
+                var registrations = ReservedNamespaceServiceTestData.GetRegistrations();
                 var pr1 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.Package1"));
                 var pr2 = registrations.ToList().FirstOrDefault(pr => (pr.Id == "Microsoft.Package2"));
                 pr1.Owners.Add(owner1);
@@ -568,14 +568,17 @@ public class TheIsPushAllowedMethod
         {
             [Theory]
             [InlineData("Microsoft.Aspnet")]
+            [InlineData("microsoft.aspnet")]
             [InlineData("Microsoft.Aspnet.Newpackage")]
+            [InlineData("microsoft.aspnet.newpackage")]
             [InlineData("jquery")]
+            [InlineData("jQuery")]
             public void NonOwnedNamespacesRejectPush(string id)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var firstUser = testUsers.First();
                 var lastUser = testUsers.Last();
                 existingNamespace.Owners.Add(firstUser);
@@ -588,14 +591,15 @@ public void NonOwnedNamespacesRejectPush(string id)
 
             [Theory]
             [InlineData("Microsoft.Aspnet")]
+            [InlineData("microsoft.aspnet")]
             [InlineData("Microsoft.Aspnet.Newpackage")]
             public void SharedNamespacesAllowsPush(string id)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
                 existingNamespace.IsSharedNamespace = true;
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var firstUser = testUsers.First();
                 var lastUser = testUsers.Last();
                 existingNamespace.Owners.Add(firstUser);
@@ -608,14 +612,15 @@ public void SharedNamespacesAllowsPush(string id)
 
             [Theory]
             [InlineData("Microsoft.Aspnet")]
+            [InlineData("microsoft.aspnet")]
             [InlineData("Microsoft.Aspnet.Newpackage")]
             public void OwnedSharedNamespacesAllowsPushAndReturnsDataCorrectly(string id)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
                 existingNamespace.IsSharedNamespace = true;
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var firstUser = testUsers.First();
                 existingNamespace.Owners.Add(firstUser);
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
@@ -630,10 +635,10 @@ public void OwnedSharedNamespacesAllowsPushAndReturnsDataCorrectly(string id)
             [InlineData("RandomId")]
             public void NonMatchingNamespacesAllowsPush(string id)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var firstUser = testUsers.First();
                 var lastUser = testUsers.Last();
                 existingNamespace.Owners.Add(firstUser);
@@ -651,11 +656,11 @@ public void NonMatchingNamespacesAllowsPush(string id)
             [InlineData("jquery.extention")]
             public void NonPrefixNamespaceDoesNotBlockPush(string id)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "jQuery";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
                 existingNamespace.IsPrefix = false;
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var firstUser = testUsers.First();
                 var lastUser = testUsers.Last();
                 existingNamespace.Owners.Add(firstUser);
@@ -668,13 +673,14 @@ public void NonPrefixNamespaceDoesNotBlockPush(string id)
 
             [Theory]
             [InlineData("Microsoft.Aspnet")]
+            [InlineData("microsoft.aspnet")]
             [InlineData("Microsoft.Aspnet.Newpackage")]
             public void OwnedNamespacesAllowsPush(string id)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefix = "microsoft.";
                 var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase));
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var firstUser = testUsers.First();
                 existingNamespace.Owners.Add(firstUser);
                 var service = new TestableReservedNamespaceService(reservedNamespaces: testNamespaces, users: testUsers);
@@ -687,11 +693,12 @@ public void OwnedNamespacesAllowsPush(string id)
 
             [Theory]
             [InlineData("Microsoft.Aspnet.Newpackage")]
+            [InlineData("microsoft.aspnet.newpackage")]
             public void MultipleOwnedNamespacesAreReturnedCorrectly(string id)
             {
-                var testNamespaces = GetTestNamespaces();
+                var testNamespaces = ReservedNamespaceServiceTestData.GetTestNamespaces();
                 var prefixes = new List<string> { "microsoft.", "microsoft.aspnet." };
-                var testUsers = GetTestUsers();
+                var testUsers = ReservedNamespaceServiceTestData.GetTestUsers();
                 var firstUser = testUsers.First();
                 prefixes.ForEach(p => {
                     var existingNamespace = testNamespaces.FirstOrDefault(rn => rn.Value.Equals(p, StringComparison.OrdinalIgnoreCase));
@@ -735,45 +742,5 @@ public void ValidNamespacesDontThrowException(string value)
                 Assert.Null(ex);
             }
         }
-
-        private static IList<ReservedNamespace> GetTestNamespaces()
-        {
-            var result = new List<ReservedNamespace>();
-            result.Add(new ReservedNamespace("Microsoft.", isSharedNamespace: false, isPrefix: true));
-            result.Add(new ReservedNamespace("Microsoft.Aspnet.", isSharedNamespace: false, isPrefix: true));
-            result.Add(new ReservedNamespace("baseTest.", isSharedNamespace: false, isPrefix: true));
-            result.Add(new ReservedNamespace("jquery", isSharedNamespace: false, isPrefix: false));
-            result.Add(new ReservedNamespace("jquery.Extentions.", isSharedNamespace: true, isPrefix: true));
-            result.Add(new ReservedNamespace("Random.", isSharedNamespace: false, isPrefix: true));
-
-            return result;
-        }
-
-        private static IList<PackageRegistration> GetRegistrations()
-        {
-            var result = new List<PackageRegistration>();
-            result.Add(new PackageRegistration { Id = "Microsoft.Package1", IsVerified = false });
-            result.Add(new PackageRegistration { Id = "Microsoft.Package2", IsVerified = false });
-            result.Add(new PackageRegistration { Id = "Microsoft.AspNet.Package2", IsVerified = false });
-            result.Add(new PackageRegistration { Id = "Random.Package1", IsVerified = false });
-            result.Add(new PackageRegistration { Id = "jQuery", IsVerified = false });
-            result.Add(new PackageRegistration { Id = "jQuery.Extentions.OwnerView", IsVerified = false });
-            result.Add(new PackageRegistration { Id = "jQuery.Extentions.ThirdPartyView", IsVerified = false });
-            result.Add(new PackageRegistration { Id = "DeltaX.Test1", IsVerified = false });
-
-            return result;
-        }
-
-        private static IList<User> GetTestUsers()
-        {
-            var result = new List<User>();
-            result.Add(new User("test1"));
-            result.Add(new User("test2"));
-            result.Add(new User("test3"));
-            result.Add(new User("test4"));
-            result.Add(new User("test5"));
-
-            return result;
-        }
     }
 }
diff --git a/tests/NuGetGallery.Facts/TestUtils/TestDataUtility.cs b/tests/NuGetGallery.Facts/TestUtils/TestDataUtility.cs
new file mode 100644
index 0000000000..36c32822f5
--- /dev/null
+++ b/tests/NuGetGallery.Facts/TestUtils/TestDataUtility.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace NuGetGallery.TestUtils
+{
+    public static class ReservedNamespaceServiceTestData
+    {
+        public static IList<ReservedNamespace> GetTestNamespaces()
+        {
+            var result = new List<ReservedNamespace>();
+            result.Add(new ReservedNamespace("Microsoft.", isSharedNamespace: false, isPrefix: true));
+            result.Add(new ReservedNamespace("Microsoft.Aspnet.", isSharedNamespace: false, isPrefix: true));
+            result.Add(new ReservedNamespace("baseTest.", isSharedNamespace: false, isPrefix: true));
+            result.Add(new ReservedNamespace("jquery", isSharedNamespace: false, isPrefix: false));
+            result.Add(new ReservedNamespace("jquery.Extentions.", isSharedNamespace: true, isPrefix: true));
+            result.Add(new ReservedNamespace("Random.", isSharedNamespace: false, isPrefix: true));
+
+            return result;
+        }
+
+        public static IList<PackageRegistration> GetRegistrations()
+        {
+            var result = new List<PackageRegistration>();
+            result.Add(new PackageRegistration { Id = "Microsoft.Package1", IsVerified = false });
+            result.Add(new PackageRegistration { Id = "Microsoft.Package2", IsVerified = false });
+            result.Add(new PackageRegistration { Id = "Microsoft.AspNet.Package2", IsVerified = false });
+            result.Add(new PackageRegistration { Id = "Random.Package1", IsVerified = false });
+            result.Add(new PackageRegistration { Id = "jQuery", IsVerified = false });
+            result.Add(new PackageRegistration { Id = "jQuery.Extentions.OwnerView", IsVerified = false });
+            result.Add(new PackageRegistration { Id = "jQuery.Extentions.ThirdPartyView", IsVerified = false });
+            result.Add(new PackageRegistration { Id = "DeltaX.Test1", IsVerified = false });
+
+            return result;
+        }
+
+        public static IList<User> GetTestUsers()
+        {
+            var result = new List<User>();
+            result.Add(new User("test1"));
+            result.Add(new User("test2"));
+            result.Add(new User("test3"));
+            result.Add(new User("test4"));
+            result.Add(new User("test5"));
+
+            return result;
+        }
+    }
+}
diff --git a/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs b/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs
index 963d0d2e37..ccafc0174d 100644
--- a/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs
+++ b/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs
@@ -1,9 +1,14 @@
 using Moq;
+using NuGet.Frameworks;
+using NuGet.Packaging;
+using NuGet.Versioning;
 using NuGetGallery.Configuration;
 using NuGetGallery.Framework;
+using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
+using System.Linq.Expressions;
 
 namespace NuGetGallery.TestUtils
 {
@@ -46,6 +51,81 @@ public static Package CreateTestPackage(string id = null)
 
             return package;
         }
+
+        public static Mock<TestPackageReader> CreateNuGetPackage(
+            string id = "theId",
+            string version = "01.0.42.0",
+            string title = "theTitle",
+            string summary = "theSummary",
+            string authors = "theFirstAuthor, theSecondAuthor",
+            string owners = "Package owners",
+            string description = "theDescription",
+            string tags = "theTags",
+            string language = null,
+            string copyright = "theCopyright",
+            string releaseNotes = "theReleaseNotes",
+            string minClientVersion = null,
+            Uri licenseUrl = null,
+            Uri projectUrl = null,
+            Uri iconUrl = null,
+            bool requireLicenseAcceptance = true,
+            IEnumerable<PackageDependencyGroup> packageDependencyGroups = null,
+            IEnumerable<NuGet.Packaging.Core.PackageType> packageTypes = null)
+        {
+            licenseUrl = licenseUrl ?? new Uri("http://thelicenseurl/");
+            projectUrl = projectUrl ?? new Uri("http://theprojecturl/");
+            iconUrl = iconUrl ?? new Uri("http://theiconurl/");
+
+            if (packageDependencyGroups == null)
+            {
+                packageDependencyGroups = new[]
+                {
+                    new PackageDependencyGroup(
+                        new NuGetFramework("net40"),
+                        new[]
+                        {
+                            new NuGet.Packaging.Core.PackageDependency(
+                                "theFirstDependency",
+                                VersionRange.Parse("[1.0.0, 2.0.0)")),
+
+                            new NuGet.Packaging.Core.PackageDependency(
+                                "theSecondDependency",
+                                VersionRange.Parse("[1.0]")),
+
+                            new NuGet.Packaging.Core.PackageDependency(
+                                "theThirdDependency")
+                        }),
+
+                    new PackageDependencyGroup(
+                        new NuGetFramework("net35"),
+                        new[]
+                        {
+                            new NuGet.Packaging.Core.PackageDependency(
+                                "theFourthDependency",
+                                VersionRange.Parse("[1.0]"))
+                        })
+                };
+            }
+
+            if (packageTypes == null)
+            {
+                packageTypes = new[]
+                {
+                    new NuGet.Packaging.Core.PackageType("dependency", new Version("1.0.0")),
+                    new NuGet.Packaging.Core.PackageType("DotNetCliTool", new Version("2.1.1"))
+                };
+            }
+
+            var testPackage = TestPackage.CreateTestPackageStream(
+                id, version, title, summary, authors, owners,
+                description, tags, language, copyright, releaseNotes,
+                minClientVersion, licenseUrl, projectUrl, iconUrl,
+                requireLicenseAcceptance, packageDependencyGroups, packageTypes);
+
+            var mock = new Mock<TestPackageReader>(testPackage);
+            mock.CallBase = true;
+            return mock;
+        }
     }
 
     public class TestableUserService : UserService
@@ -120,7 +200,39 @@ public TestableReservedNamespaceService(
 
             AuditingService = new TestAuditingService();
         }
-        
+
+        public override ReservedNamespace FindReservedNamespaceForPrefix(string prefix)
+        {
+            return (from request in ReservedNamespaceRepository.GetAll()
+                    where request.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase)
+                    select request).FirstOrDefault();
+        }
+
+        public override IReadOnlyCollection<ReservedNamespace> FindAllReservedNamespacesForPrefix(string prefix, bool getExactMatches)
+        {
+            Expression<Func<ReservedNamespace, bool>> prefixMatch;
+            if (getExactMatches)
+            {
+                prefixMatch = dbPrefix => dbPrefix.Value.Equals(prefix, StringComparison.OrdinalIgnoreCase);
+            }
+            else
+            {
+                prefixMatch = dbPrefix => dbPrefix.Value.StartsWith(prefix, StringComparison.OrdinalIgnoreCase);
+            }
+
+            return ReservedNamespaceRepository.GetAll()
+                .Where(prefixMatch)
+                .ToList();
+        }
+
+        public override IReadOnlyCollection<ReservedNamespace> GetReservedNamespacesForId(string id)
+        {
+            return (from request in ReservedNamespaceRepository.GetAll()
+                    where (request.IsPrefix && id.StartsWith(request.Value, StringComparison.OrdinalIgnoreCase))
+                        || (!request.IsPrefix && id.Equals(request.Value, StringComparison.OrdinalIgnoreCase))
+                    select request).ToList();
+        }
+
         private Mock<IEntityRepository<ReservedNamespace>> SetupReservedNamespaceRepository()
         {
             var obj = new Mock<IEntityRepository<ReservedNamespace>>();

From 79cae74834ad8494ac17e1d64f2cc26cd92f7cac Mon Sep 17 00:00:00 2001
From: Steffen Forkmann <sforkmann@gmail.com>
Date: Wed, 13 Sep 2017 20:03:00 +0200
Subject: [PATCH 19/19] Link to new contact page for Paket (#4671)

---
 src/NuGetGallery/Views/Packages/DisplayPackage.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index 4e1279d203..347b498ee0 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -30,7 +30,7 @@
             Name = "Paket CLI",
             CommandPrefix = "> ",
             InstallPackageCommand = string.Format("paket add {0} --version {1}", Model.Id, Model.Version),
-            ContactUrl = "https://fsprojects.github.io/Paket/"
+            ContactUrl = "https://fsprojects.github.io/Paket/contact.html"
         },
     };
 }