Merge pull request #5985 from NuGet/dev

[Deployment][2018.05.21]RI dev into master

Author: ryuyu

.gitignore

@@ -31,6 +31,7 @@ tools/
 .nuget/EULA_Microsoft Visual Studio Team Services Credential Provider.docx
 .nuget/ThirdPartyNotices.txt
 AssemblyInfo.g.cs
+tests/Scripts/Config-*.json
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

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

@@ -93,7 +93,10 @@
       }
 
       .transform-text {
-        padding: 40px 15px;
+        padding-top: 20px;
+        padding-left: 15px;
+        padding-right: 15px;
+        padding-bottom: 40px;
         margin: 0px;
       }
     }

src/Bootstrap/less/theme/modals.less

@@ -152,7 +152,10 @@ public override string RenderAuditEntry(AuditEntry entry)
 
         public override bool RecordWillBePersisted(AuditRecord auditRecord)
         {
-            return auditRecord.GetType() == typeof(PackageAuditRecord);
+            var packageAuditRecord = auditRecord as PackageAuditRecord;
+
+            return packageAuditRecord != null &&
+                (packageAuditRecord.Action == AuditedPackageAction.Delete || packageAuditRecord.Action == AuditedPackageAction.SoftDelete);
         }
     }
-}
+}

src/NuGetGallery.Core/Auditing/CloudAuditingService.cs

@@ -37,6 +37,11 @@ public static class NuGetClaims
         /// </summary>
         public const string ExternalLogin = ClaimsDomain + "externallogin";
 
+        /// <summary>
+        /// The claim url for the claim that stores the list of associated external login identities.
+        /// </summary>
+        public const string ExternalCredentialIdenities = ClaimsDomain + "externalcredentialidentity";
+
         /// <summary>
         /// The claim url for the claim that stores whether or not the user has enabled multi-factor authentication.
         /// </summary>

src/NuGetGallery.Core/Authentication/NuGetClaims.cs

@@ -20,6 +20,7 @@ public static class CoreConstants
         public const string PackageContentType = "binary/octet-stream";
         public const string OctetStreamContentType = "application/octet-stream";
         public const string TextContentType = "text/plain";
+        public const string CertificateContentType = "application/pkix-cert";
 
         public const string UserCertificatesFolderName = "user-certificates";
         public const string ContentFolderName = "content";

src/NuGetGallery.Core/CoreConstants.cs

@@ -348,7 +348,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
                 .Property(c => c.Sha1Thumbprint)
                 .HasMaxLength(40)
                 .HasColumnType("varchar")
-                .IsOptional();
+                .IsRequired();
 
             modelBuilder.Entity<UserCertificate>()
                 .HasKey(uc => uc.Key);

src/NuGetGallery.Core/Entities/EntitiesContext.cs

@@ -446,6 +446,9 @@ private static string GetContentType(string folderName)
                 case CoreConstants.PackageReadMesFolderName:
                     return CoreConstants.TextContentType;
 
+                case CoreConstants.UserCertificatesFolderName:
+                    return CoreConstants.CertificateContentType;
+
                 default:
                     throw new InvalidOperationException(
                         String.Format(CultureInfo.CurrentCulture, "The folder name {0} is not supported.", folderName));

src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs

@@ -1,20 +1,21 @@
 {
-  "DiscontinuedForEmailAddresses": [
-    "[email protected]"
-  ],
-  "DiscontinuedForDomains": [
-    "cannotUsePassword.com"
-  ],
-  "ExceptionsForEmailAddresses": [
-    "[email protected]"
-  ],
-  "ForceTransformationToOrganizationForEmailAddresses": [
-    "[email protected]"
-  ],
-  "EnabledOrganizationAadTenants": [
-    {
-      "EmailDomain": "tenantOnly.com",
-      "TenantId":  "tenantID"
-    }
-  ]
+    "IsPasswordDiscontinuedForAll": false,
+    "DiscontinuedForEmailAddresses": [
+        "[email protected]"
+    ],
+    "DiscontinuedForDomains": [
+        "cannotUsePassword.com"
+    ],
+    "ExceptionsForEmailAddresses": [
+        "[email protected]"
+    ],
+    "ForceTransformationToOrganizationForEmailAddresses": [
+        "[email protected]"
+    ],
+    "EnabledOrganizationAadTenants": [
+        {
+            "EmailDomain": "tenantOnly.com",
+            "TenantId": "tenantID"
+        }
+    ]
 }

src/NuGetGallery/App_Data/Files/Content/Login-Discontinuation-Configuration.json

@@ -198,7 +198,7 @@ private static void BundlingPostStart()
             BundleTable.Bundles.Add(newScriptBundle);
 
             var d3ScriptBundle = new ScriptBundle("~/Scripts/gallery/stats.min.js")
-                .Include("~/Scripts/gallery/d3.v3.js")
+                .Include("~/Scripts/d3/d3.js")
                 .Include("~/Scripts/gallery/stats-perpackagestatsgraphs.js")
                 .Include("~/Scripts/gallery/stats-dimensions.js");
             BundleTable.Bundles.Add(d3ScriptBundle);