Merge pull request #570 from NuGet/master

[ReleasePrep][2018.10.03]FI of master into dev

Author: Christy Henriksson

build.ps1

@@ -9,7 +9,7 @@ param (
     [string]$SemanticVersion = '1.0.0-zlocal',
     [string]$Branch = 'zlocal',
     [string]$CommitSHA,
-    [string]$BuildBranch = '37ff6e758c38b3f513af39f881399ce85f4ff20b'
+    [string]$BuildBranch = 'c35bbc228717720bdbc610f3285259391635e90e'
 )
 
 $msBuildVersion = 15;
@@ -178,6 +178,7 @@ Invoke-BuildStep 'Creating artifacts' {
             "src/Validation.PackageSigning.ValidateCertificate/Validation.PackageSigning.ValidateCertificate.csproj", `
             "src/Validation.PackageSigning.RevalidateCertificate/Validation.PackageSigning.RevalidateCertificate.csproj", `
             "src/PackageLagMonitor/Monitoring.PackageLag.csproj", `
+            "src/Monitoring.RebootSearchInstance/Monitoring.RebootSearchInstance.csproj", `
             "src/StatusAggregator/StatusAggregator.csproj", `
             "src/Validation.Symbols.Core/Validation.Symbols.Core.csproj", `
             "src/Validation.Symbols/Validation.Symbols.csproj" `

src/Monitoring.RebootSearchInstance/FeedClient.cs

@@ -25,7 +25,6 @@ public class FeedClient : IFeedClient
 
         private static readonly IEnumerable<string> TimeStampProperties = new string[]
         {
-            "Created",
             "LastEdited",
         };
 

src/Stats.AggregateCdnDownloadsInGallery/AggregateCdnDownloadsJob.cs

@@ -87,7 +87,7 @@ await connection.QueryWithRetryAsync<DownloadCountData>(
                         _storedProcedureName,
                         transaction: transaction,
                         commandType: CommandType.StoredProcedure,
-                        commandTimeout: TimeSpan.FromMinutes(15),
+                        commandTimeout: TimeSpan.FromMinutes(30),
                         maxRetries: 3))
                     .ToList();
             }