Merge pull request #670 from NuGet/sb-emailhotfixdev

FI of master into dev for NuGet.Jobs

Author: Scott Bommarito

src/Gallery.CredentialExpiration/Gallery.CredentialExpiration.csproj

@@ -103,7 +103,7 @@
       <Version>9.0.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.33.0</Version>
+      <Version>2.36.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Storage">
       <Version>2.1.3</Version>

src/Gallery.CredentialExpiration/Job.cs

@@ -45,7 +45,7 @@ public override void Init(IServiceContainer serviceContainer, IDictionary<string
             var serializer = new ServiceBusMessageSerializer();
             var topicClient = new TopicClientWrapper(InitializationConfiguration.EmailPublisherConnectionString, InitializationConfiguration.EmailPublisherTopicName);
             var enqueuer = new EmailMessageEnqueuer(topicClient, serializer, LoggerFactory.CreateLogger<EmailMessageEnqueuer>());
-            EmailService = new AsynchronousEmailMessageService(enqueuer);
+            EmailService = new AsynchronousEmailMessageService(enqueuer, LoggerFactory.CreateLogger<AsynchronousEmailMessageService>());
 
             FromAddress = new MailAddress(InitializationConfiguration.MailFrom);
 

src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj

@@ -167,7 +167,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.33.0</Version>
+      <Version>2.36.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj

@@ -111,7 +111,7 @@
       <Version>9.0.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.33.0</Version>
+      <Version>2.36.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/NuGet.SupportRequests.Notifications/Tasks/SupportRequestsNotificationScheduledTask.cs

@@ -39,7 +39,7 @@ protected SupportRequestsNotificationScheduledTask(
             var serializer = new ServiceBusMessageSerializer();
             var topicClient = new TopicClientWrapper(configuration.EmailPublisherConnectionString, configuration.EmailPublisherTopicName);
             var enqueuer = new EmailMessageEnqueuer(topicClient, serializer, loggerFactory.CreateLogger<EmailMessageEnqueuer>());
-            var messageService = new AsynchronousEmailMessageService(enqueuer);
+            var messageService = new AsynchronousEmailMessageService(enqueuer, loggerFactory.CreateLogger<AsynchronousEmailMessageService>());
             _messagingService = new MessagingService(messageService, loggerFactory.CreateLogger<MessagingService>());
 
             _supportRequestRepository = new SupportRequestRepository(loggerFactory, openSupportRequestSqlConnectionAsync);

src/StatusAggregator/Factory/AggregationProvider.cs

@@ -43,20 +43,31 @@ public async Task<TAggregationEntity> GetAsync(ParsedIncident input)
 
             var possiblePath = _aggregationPathProvider.Get(input);
             // Find an aggregation to link to
-            var possibleAggregations = _table
+            var possibleAggregationsQuery = _table
                 .CreateQuery<TAggregationEntity>()
                 .Where(e =>
                     // The aggregation must affect the same path
                     e.AffectedComponentPath == possiblePath &&
                     // The aggregation must begin before or at the same time
-                    e.StartTime <= input.StartTime &&
-                    // The aggregation must cover the same time period
-                    (
-                        // If the aggregation is active, it covers the same time period
-                        e.IsActive || 
-                        // Otherwise, if the child is not active, and the aggregation ends after it ends, it covers the same time period
-                        (!input.IsActive && e.EndTime >= input.EndTime)
-                    ))
+                    e.StartTime <= input.StartTime);
+
+            // The aggregation must cover the same time period
+            if (input.IsActive)
+            {
+                // An active input can only be linked to an active aggregation
+                possibleAggregationsQuery = possibleAggregationsQuery
+                    .Where(e => e.IsActive);
+            }
+            else
+            {
+                // An inactive input can be linked to an active aggregation or an inactive aggregation that ends after it
+                possibleAggregationsQuery = possibleAggregationsQuery
+                    .Where(e =>
+                        e.IsActive ||
+                        e.EndTime >= input.EndTime);
+            }
+
+            var possibleAggregations = possibleAggregationsQuery
                 .ToList();
 
             _logger.LogInformation("Found {AggregationCount} possible aggregations to link entity to with path {AffectedComponentPath}.", possibleAggregations.Count(), possiblePath);

src/StatusAggregator/Factory/IncidentFactory.cs

@@ -42,7 +42,7 @@ public async Task<IncidentEntity> CreateAsync(ParsedIncident input)
                     input.Id,
                     groupEntity,
                     affectedPath,
-                    (ComponentStatus)input.AffectedComponentStatus,
+                    input.AffectedComponentStatus,
                     input.StartTime,
                     input.EndTime);
 

src/Validation.Common.Job/Validation.Common.Job.csproj

@@ -99,12 +99,21 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="NuGet.Packaging">
+      <Version>5.0.0-preview1.5665</Version>
+    </PackageReference>
     <PackageReference Include="NuGet.Services.ServiceBus">
       <Version>2.33.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Storage">
       <Version>2.33.0</Version>
     </PackageReference>
+    <PackageReference Include="NuGet.Services.Validation">
+      <Version>2.33.0</Version>
+    </PackageReference>
+    <PackageReference Include="NuGet.Services.Validation.Issues">
+      <Version>2.33.0</Version>
+    </PackageReference>
     <PackageReference Include="NuGetGallery.Core">
       <Version>4.4.5-dev-2193892</Version>
     </PackageReference>

src/Validation.Symbols/SymbolsValidatorService.cs

@@ -66,10 +66,10 @@ public async Task<IValidationResult> ValidateSymbolsAsync(SymbolsValidatorMessag
                                 {
                                     orphanSymbolFiles.ForEach((symbol) =>
                                     {
-                                        _telemetryService.TrackSymbolsAssemblyValidationResultEvent(message.PackageId, message.PackageNormalizedVersion, ValidationStatus.Failed, nameof(ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound), assemblyName: symbol);
+                                        _telemetryService.TrackSymbolsAssemblyValidationResultEvent(message.PackageId, message.PackageNormalizedVersion, ValidationStatus.Failed, nameof(ValidationIssue.SymbolErrorCode_MatchingAssemblyNotFound), assemblyName: symbol);
                                     });
                                     _telemetryService.TrackSymbolsValidationResultEvent(message.PackageId, message.PackageNormalizedVersion, ValidationStatus.Failed);
-                                    return ValidationResult.FailedWithIssues(ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound);
+                                    return ValidationResult.FailedWithIssues(ValidationIssue.SymbolErrorCode_MatchingAssemblyNotFound);
                                 }
                                 var targetDirectory = Settings.GetWorkingDirectory();
                                 try
@@ -231,8 +231,8 @@ private bool IsChecksumMatch(string peFilePath, string packageId, string package
                     }
                 }
             }
-            _telemetryService.TrackSymbolsAssemblyValidationResultEvent(packageId, packageNormalizedVersion, ValidationStatus.Failed, nameof(ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound), assemblyName: Path.GetFileName(peFilePath));
-            validationResult = ValidationResult.FailedWithIssues(ValidationIssue.SymbolErrorCode_MatchingPortablePDBNotFound);
+            _telemetryService.TrackSymbolsAssemblyValidationResultEvent(packageId, packageNormalizedVersion, ValidationStatus.Failed, nameof(ValidationIssue.SymbolErrorCode_PdbIsNotPortable), assemblyName: Path.GetFileName(peFilePath));
+            validationResult = ValidationResult.FailedWithIssues(ValidationIssue.SymbolErrorCode_PdbIsNotPortable);
             return false;
         }
 

tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs

@@ -122,6 +122,7 @@ public MessageWithCustomDeliveryCount(IBrokeredMessage inner, int deliveryCount)
             public DateTimeOffset ScheduledEnqueueTimeUtc { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
             public DateTimeOffset ExpiresAtUtc => throw new NotImplementedException();
             public DateTimeOffset EnqueuedTimeUtc => throw new NotImplementedException();
+            public TimeSpan TimeToLive { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
             public string MessageId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }