Add email hotfix to NuGet.Jobs (#662)

NuGet · Nov 9, 2018 · 23069be · 23069be
1 parent 6f19343
commit 23069be
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/src/Gallery.CredentialExpiration/Gallery.CredentialExpiration.csproj b/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>

diff --git a/src/Gallery.CredentialExpiration/Job.cs b/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);
 

diff --git a/src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj b/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" />

diff --git a/src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj b/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" />

diff --git a/src/NuGet.SupportRequests.Notifications/Tasks/SupportRequestsNotificationScheduledTask.cs b/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);

diff --git a/src/Validation.Symbols/SymbolsValidatorService.cs b/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;
         }
 

diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs b/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(); }
 

diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs
@@ -145,6 +145,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(); }