Merge pull request #6625 from NuGet/dev

[ReleasePrep][2018.11.05]RI Dev into master

build.ps1

@@ -10,7 +10,7 @@ param (
     [string]$PackageSuffix,
     [string]$Branch,
     [string]$CommitSHA,
-    [string]$BuildBranch = '795fed66b8bae2d248237ee5ec82e688e7174a42'
+    [string]$BuildBranch = '5fd8377a9abf3ff411918dbb973948a6677432db'
 )
 
 Set-StrictMode -Version 1.0

src/GalleryTools/Commands/BackfillRepositoryMetadataCommand.cs

@@ -17,6 +17,7 @@
 using Microsoft.Extensions.CommandLineUtils;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
+using NuGet.Services.Entities;
 using NuGet.Services.Search.Client;
 using NuGetGallery;
 using NuGetGallery.Configuration;
@@ -447,7 +448,7 @@ public RepositoryMetadataLogMap()
 
         private class FileCursor : IDisposable
         {
-            private FileStream _fileStream;
+            private readonly FileStream _fileStream;
             private StreamWriter _cursorWriter;
 
             public FileCursor(string fileName)
@@ -473,7 +474,7 @@ public void Dispose()
 
             public DateTime GetCursorTime()
             {
-                using (var reader = new StreamReader(_fileStream, Encoding.ASCII, detectEncodingFromByteOrderMarks: false, bufferSize:100, leaveOpen: true))
+                using (var reader = new StreamReader(_fileStream, Encoding.ASCII, detectEncodingFromByteOrderMarks: false, bufferSize: 100, leaveOpen: true))
                 {
                     reader.BaseStream.Seek(0, SeekOrigin.Begin);
 

src/GalleryTools/Commands/HashCommand.cs

@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Autofac;
 using Microsoft.Extensions.CommandLineUtils;
+using NuGet.Services.Entities;
 using NuGetGallery;
 using NuGetGallery.Configuration;
 using NuGetGallery.Infrastructure.Authentication;

src/GalleryTools/Commands/VerifyApiKeyCommand.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
+using NuGet.Services.Entities;
 using NuGetGallery;
 using NuGetGallery.Infrastructure.Authentication;
 

src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedPackage.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 NuGet.Services.Entities;
 using NuGetGallery.Auditing.Obfuscation;
 
 namespace NuGetGallery.Auditing.AuditedEntities

src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedPackageRegistration.cs

@@ -1,6 +1,8 @@
 // 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.Services.Entities;
+
 namespace NuGetGallery.Auditing.AuditedEntities
 {
     public class AuditedPackageRegistration

src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedReservedNamespace.cs

@@ -1,6 +1,8 @@
 // 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.Services.Entities;
+
 namespace NuGetGallery.Auditing.AuditedEntities
 {
     public class AuditedReservedNamespace

src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedUserSecurityPolicy.cs

@@ -1,6 +1,8 @@
 // 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.Services.Entities;
+
 namespace NuGetGallery.Auditing.AuditedEntities
 {
     /// <summary>

src/NuGetGallery.Core/Auditing/CredentialAuditRecord.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using NuGet.Services.Entities;
 
 namespace NuGetGallery.Auditing
 {

src/NuGetGallery.Core/Auditing/FailedAuthenticatedOperationAuditRecord.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.Services.Entities;
 using NuGetGallery.Auditing.AuditedEntities;
 
 namespace NuGetGallery.Auditing

src/NuGetGallery.Core/Auditing/PackageAuditRecord.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.Services.Entities;
 using NuGetGallery.Auditing.AuditedEntities;
 
 namespace NuGetGallery.Auditing

src/NuGetGallery.Core/Auditing/PackageRegistrationAuditRecord.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 NuGet.Services.Entities;
 using NuGetGallery.Auditing.AuditedEntities;
 
 namespace NuGetGallery.Auditing

src/NuGetGallery.Core/Auditing/ReservedNamespaceAuditRecord.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using NuGetGallery.Auditing.AuditedEntities;
+using NuGet.Services.Entities;
 
 namespace NuGetGallery.Auditing
 {

src/NuGetGallery.Core/Auditing/UserAuditRecord.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NuGet.Services.Entities;
 using NuGetGallery.Auditing.AuditedEntities;
 
 namespace NuGetGallery.Auditing

src/NuGetGallery.Core/Auditing/UserSecurityPolicyAuditRecord.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NuGet.Services.Entities;
 using NuGetGallery.Auditing.AuditedEntities;
 
 namespace NuGetGallery.Auditing

src/NuGetGallery.Core/CoreConstants.cs

@@ -7,8 +7,6 @@ public static class CoreConstants
     {
         public const string AdminRoleName = "Admins";
 
-        public const int MaxPackageIdLength = 128;
-
         public const string PackageFileSavePathTemplate = "{0}.{1}{2}";
         public const string PackageFileBackupSavePathTemplate = "{0}/{1}/{2}.{3}";
 

src/NuGetGallery.Core/CredentialTypes.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NuGet.Services.Entities;
 
 namespace NuGetGallery
 {