Merge pull request #7229 from NuGet/dev

RI : dev -> master

Author: cristinamanum

NuGetGallery.sln

@@ -36,6 +36,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.DatabaseMigr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.DatabaseMigration.Facts", "tests\NuGet.Services.DatabaseMigration.Facts\NuGet.Services.DatabaseMigration.Facts.csproj", "{082357A1-682E-4CCC-8FCD-FA250204CDB6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Services", "src\NuGetGallery.Services\NuGetGallery.Services.csproj", "{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -82,6 +84,10 @@ Global
 		{082357A1-682E-4CCC-8FCD-FA250204CDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{082357A1-682E-4CCC-8FCD-FA250204CDB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{082357A1-682E-4CCC-8FCD-FA250204CDB6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,6 +103,7 @@ Global
 		{DCED7162-A24C-4579-96C8-544BFAF4C305} = {2204C510-A559-4ED7-9590-FDC09093575B}
 		{F4C8C34F-72A9-4773-A315-8FA3F2D5CE4E} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
 		{082357A1-682E-4CCC-8FCD-FA250204CDB6} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
+		{C7D5E850-33FA-4EC5-8D7F-B1C8DD5D48F9} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {064A3BDE-5203-4AD6-A6C9-5CF08301EC8F}

build.ps1

@@ -79,6 +79,7 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' {
     $Paths = `
         (Join-Path $PSScriptRoot "src\NuGetGallery\Properties\AssemblyInfo.g.cs"), `
         (Join-Path $PSScriptRoot "src\NuGetGallery.Core\Properties\AssemblyInfo.g.cs"), `
+        (Join-Path $PSScriptRoot "src\NuGetGallery.Services\Properties\AssemblyInfo.g.cs"), `
         (Join-Path $PSScriptRoot "src\NuGet.Services.Entities\Properties\AssemblyInfo.g.cs"), `
         (Join-Path $PSScriptRoot "src\NuGet.Services.DatabaseMigration\Properties\AssemblyInfo.g.cs"), `
         (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\Properties\AssemblyInfo.g.cs")

src/Bootstrap/Gruntfile.js

@@ -165,6 +165,23 @@ module.exports = function (grunt) {
         expand: true,
         src: 'fonts/**',
         dest: 'dist/'
+      },
+      gallerycss: {
+        expand: true,
+        cwd: 'dist/css/',
+        src: [
+          'bootstrap.css',
+          'bootstrap-theme.css'
+        ],
+        dest: '../NuGetGallery/Content/gallery/css/'
+      },
+      galleryjs: {
+        expand: true,
+        cwd: 'dist/js/',
+        src: [
+          'bootstrap.js'
+        ],
+        dest: '../NuGetGallery/Scripts/gallery/'
       }
     },
 
@@ -187,10 +204,10 @@ module.exports = function (grunt) {
   grunt.registerTask('dist-css', ['less:core', 'less:theme', 'postcss:core', 'postcss:theme', 'cssmin:core', 'cssmin:theme']);
 
   // Full distribution task.
-  grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js']);
+  grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js', 'copy:gallerycss', 'copy:galleryjs']);
 
   // Default task.
-  grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'dist-css', 'dist-js']);
+  grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'dist-css', 'dist-js', 'copy:gallerycss', 'copy:galleryjs']);
 
   grunt.registerTask('build-glyphicons-data', function () {
     generateGlyphiconsData.call(this, grunt);

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

@@ -26,6 +26,7 @@
 @import "page-profile.less";
 @import "page-report-abuse.less";
 @import "page-reset-password.less";
+@import "page-search-sxs.less";
 @import "page-sign-in.less";
 @import "page-statistics-most-downloaded.less";
 @import "page-statistics-overview.less";

src/Bootstrap/less/theme/all.less

@@ -70,6 +70,10 @@ body {
   .container {
     margin-top: 50px;
     margin-bottom: 50px;
+
+    // This is a workaround for the following bug:
+    // https://github.com/microsoft/accessibility-insights-web/issues/692
+    background-color: @panel-footer-bg;
   }
 
   a {

src/Bootstrap/less/theme/base.less

@@ -0,0 +1,70 @@
+.page-search-sxs {
+    h1 {
+        font-size: @font-size-h2;
+        border-bottom: 1px solid lightgray;
+    }
+    
+    h2 {
+        font-size: @font-size-h3;
+        margin-top: 0;
+    }
+
+    .list-packages .package {
+        padding-top: 0;
+    }
+
+    .list-packages .package .package-details,
+    .list-packages .package .package-list,
+    .list-packages .package .package-by {
+        line-height: 16px;
+        font-size: 13px;
+    }
+    
+    .list-packages .package .package-details,
+    .list-packages .package .package-list {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+        li {
+          display: inline;
+        }
+    }
+
+    .list-packages .package .package-list {
+        margin-top: 4px;
+        margin-bottom: 4px;
+
+        li + li {
+            margin-left: @padding-small-horizontal;
+            padding-left: @padding-small-horizontal;
+            border-left-style: solid;
+            border-width: 1px;
+            border-color: @gray-lighter;
+        }
+    }
+
+    .list-packages .package .package-header .reserved-indicator {
+        width: 15px;
+    }
+
+    .radio label {
+        margin-right: 30px;
+    }
+
+    .list-packages .package .package-header .package-title {
+        font-size: 20px;
+    }
+
+    .col-package-icon {
+        padding-right: 0;
+    }
+
+    .package .package-legacy-title {
+        display: none;
+    }
+
+    .panel-body p:last-child {
+        margin-bottom: 0;
+    }
+}

src/Bootstrap/less/theme/page-search-sxs.less

@@ -96,10 +96,10 @@
       <Version>4.1.0-master-2602271</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
-      <Version>2.46.0</Version>
+      <Version>2.49.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.47.0-master-2652814</Version>
+      <Version>2.49.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

@@ -4,7 +4,6 @@
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("DatabaseMigrationTools")]

src/DatabaseMigrationTools/Properties/AssemblyInfo.cs

@@ -67,6 +67,10 @@
       <Project>{097b2cdd-9623-4c34-93c2-d373d51f5b4e}</Project>
       <Name>NuGetGallery.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NuGetGallery.Services\NuGetGallery.Services.csproj">
+      <Project>{c7d5e850-33fa-4ec5-8d7f-b1c8dd5d48f9}</Project>
+      <Name>NuGetGallery.Services</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NuGetGallery\NuGetGallery.csproj">
       <Project>{1dacf781-5cd0-4123-8bac-cd385d864be5}</Project>
       <Name>NuGetGallery</Name>