Merge pull request #8308 from NuGet/dev

[ReleasePrep][2020.11.01]NuGetGallery of dev into master

Author: lyndaidaii

NuGet.config

@@ -9,8 +9,7 @@
   </packageRestore>
   <packageSources>
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="nugetbuild" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
-    <add key="dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />

src/Bootstrap/dist/css/bootstrap-theme.css

@@ -249,7 +249,7 @@ body {
   .alert {
     margin: 0;
     padding: 10px;
-  } 
+  }
 }
 
 .alert-transient-jumbotron {
@@ -261,7 +261,7 @@ body {
 
   li {
     position: relative;
-    
+
     i.ms-Icon {
       position: absolute;
       left: -24px;
@@ -286,11 +286,12 @@ h2, h3 {
   .container {
     // Bootstrap doesn't set the container width when the screen is xs.
     // This works fine when there are no elements in the container that are wider than the viewport,
-    // however, if there are elements in the container that are wider than the viewport, 
+    // however, if there are elements in the container that are wider than the viewport,
     // their overflow properties will not work properly because they are not bound by the size of the container.
     // To fix this, we need to set the container width to be the width of the viewport minus the row margin on xs screens.
     // This way, those elements that are larger than the viewport are properly bound by the size of the container and overflow properly.
-    width: calc(100vw - 15px);
+    // 2020.10.27: We actually need to set it slightly smaller than the row margin as a horizontal scrollbar appears at xs when exactly matched.
+    width: calc(100vw - 20px);
   }
 
   .navbar-toggle {
@@ -425,4 +426,4 @@ img.reserved-indicator-icon {
 
 .sortable {
 	cursor: pointer;
-}
+}

src/Bootstrap/less/theme/base.less

@@ -26,9 +26,9 @@ public SqlAggregateStatsService(IAppConfiguration configuration, ISqlConnectionF
             _connectionFactory = galleryDbConnectionFactory;
         }
 
-        public Task<AggregateStats> GetAggregateStats()
+        public async Task<AggregateStats> GetAggregateStats()
         {
-            var connection = Task.Run(() => _connectionFactory.CreateAsync()).Result;
+            var connection = await _connectionFactory.CreateAsync();
             using (var dbContext = new EntitiesContext(connection, readOnly: true)) // true - set readonly but it is ignored anyway, as this class doesn't call EntitiesContext.SaveChanges()
             {
                 var database = dbContext.Database;
@@ -41,15 +41,15 @@ public Task<AggregateStats> GetAggregateStats()
                         bool hasData = reader.Read();
                         if (!hasData)
                         {
-                            return Task.FromResult(new AggregateStats());
+                            return new AggregateStats();
                         }
 
-                        return Task.FromResult(new AggregateStats
+                        return new AggregateStats
                         {
                             Downloads = reader.IsDBNull(0) ? 0 : reader.GetInt32(0),
                             UniquePackages = reader.IsDBNull(1) ? 0 : reader.GetInt32(1),
                             TotalPackages = reader.IsDBNull(2) ? 0 : reader.GetInt32(2)
-                        });
+                        };
                     }
                 }
             }

src/NuGetGallery/Services/SqlAggregateStatsService.cs

@@ -4,6 +4,7 @@
     ViewBag.MdPageColumns = GalleryConstants.ColumnsFormMd;
     TempData["Parent"] = this;
 }
+@ViewHelpers.AjaxAntiForgeryToken(Html)
 
 <section role="main" class="container main-container page-account-settings">
     <div class="row">

src/NuGetGallery/Views/Users/Account.cshtml

@@ -10,7 +10,7 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="nugetbuild" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
+    <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />