Update NuGet.Jobs to ServerCommon 2.46.0 and latest NuGetGallery.Core (…

…#744) Progress on NuGet/NuGetGallery#6475
NuGet · Apr 9, 2019 · 810f695 · 810f695
1 parent 4738084
commit 810f695
Show file tree

Hide file tree

Showing 48 changed files with 197 additions and 323 deletions.
diff --git a/src/CopyAzureContainer/CopyAzureContainer.csproj b/src/CopyAzureContainer/CopyAzureContainer.csproj
@@ -59,9 +59,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="System.ComponentModel.EventBasedAsync">
       <Version>4.0.11</Version>
     </PackageReference>

diff --git a/src/Gallery.CredentialExpiration/Configuration/InitializationConfiguration.cs b/src/Gallery.CredentialExpiration/Configuration/InitializationConfiguration.cs
@@ -1,9 +1,11 @@
 // 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.Jobs.Configuration;
+
 namespace Gallery.CredentialExpiration
 {
-    public class InitializationConfiguration
+    public class InitializationConfiguration : MessageServiceConfiguration
     {
         public string ContainerName { get; set; }
 

diff --git a/src/Gallery.CredentialExpiration/Gallery.CredentialExpiration.csproj b/src/Gallery.CredentialExpiration/Gallery.CredentialExpiration.csproj
@@ -102,11 +102,8 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.39.0</Version>
-    </PackageReference>
     <PackageReference Include="NuGet.Services.Storage">
-      <Version>2.1.3</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.3</Version>

diff --git a/src/Gallery.CredentialExpiration/Job.cs b/src/Gallery.CredentialExpiration/Job.cs
@@ -45,12 +45,18 @@ 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, LoggerFactory.CreateLogger<AsynchronousEmailMessageService>());
+            EmailService = new AsynchronousEmailMessageService(
+                enqueuer,
+                LoggerFactory.CreateLogger<AsynchronousEmailMessageService>(),
+                InitializationConfiguration);
 
             FromAddress = new MailAddress(InitializationConfiguration.MailFrom);
 
             var storageAccount = CloudStorageAccount.Parse(InitializationConfiguration.DataStorageAccount);
-            var storageFactory = new AzureStorageFactory(storageAccount, InitializationConfiguration.ContainerName, LoggerFactory);
+            var storageFactory = new AzureStorageFactory(
+                storageAccount,
+                InitializationConfiguration.ContainerName,
+                LoggerFactory.CreateLogger<AzureStorage>());
             Storage = storageFactory.Create();
         }
 
@@ -120,7 +126,11 @@ public override async Task Run()
 
                 string json = JsonConvert.SerializeObject(newCursor);
                 var content = new StringStorageContent(json, "application/json");
-                await Storage.Save(Storage.ResolveUri(_cursorFile), content, CancellationToken.None);
+                await Storage.Save(
+                    Storage.ResolveUri(_cursorFile),
+                    content,
+                    overwrite: true,
+                    cancellationToken: CancellationToken.None);
             }
         }
 

diff --git a/src/Gallery.Maintenance/Gallery.Maintenance.csproj b/src/Gallery.Maintenance/Gallery.Maintenance.csproj
@@ -69,9 +69,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>

diff --git a/src/NuGet.Jobs.Common/Configuration/MessageServiceConfiguration.cs b/src/NuGet.Jobs.Common/Configuration/MessageServiceConfiguration.cs
@@ -0,0 +1,49 @@
+// 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 System.Net.Mail;
+using NuGet.Services.Messaging.Email;
+
+namespace NuGet.Jobs.Configuration
+{
+    public class MessageServiceConfiguration : IMessageServiceConfiguration
+    {
+        private static readonly string DefaultMailAddress = "NuGet Gallery <support@nuget.org>";
+
+        public string GalleryOwner { get; set; } = DefaultMailAddress;
+
+        public string GalleryNoReplyAddress { get; set; } = DefaultMailAddress;
+
+        MailAddress IMessageServiceConfiguration.GalleryOwner
+        {
+            get => StringToMailAddress(GalleryOwner);
+            set => GalleryOwner = MailAddressToString(value);
+        }
+
+        MailAddress IMessageServiceConfiguration.GalleryNoReplyAddress
+        {
+            get => StringToMailAddress(GalleryNoReplyAddress);
+            set => GalleryNoReplyAddress = MailAddressToString(value);
+        }
+
+        private static MailAddress StringToMailAddress(string input)
+        {
+            if (input == null)
+            {
+                return null;
+            }
+
+            return new MailAddress(input);
+        }
+
+        private static string MailAddressToString(MailAddress mailAddress)
+        {
+            if (mailAddress == null)
+            {
+                return null;
+            }
+
+            return $"{mailAddress.DisplayName} <{mailAddress.Address}>";
+        }
+    }
+}
diff --git a/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj b/src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Configuration\GalleryDbConfiguration.cs" />
     <Compile Include="Configuration\IDbConfiguration.cs" />
     <Compile Include="Configuration\JobArgumentNames.cs" />
+    <Compile Include="Configuration\MessageServiceConfiguration.cs" />
     <Compile Include="Configuration\ServiceBusConfiguration.cs" />
     <Compile Include="Configuration\StatisticsDbConfiguration.cs" />
     <Compile Include="Configuration\SupportRequestDbConfiguration.cs" />
@@ -105,13 +106,16 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
+    </PackageReference>
+    <PackageReference Include="NuGet.Services.Messaging.Email">
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Sql">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.3</Version>

diff --git a/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj b/src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj
@@ -123,7 +123,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Status">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj b/src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj
@@ -169,9 +169,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.40.0</Version>
-    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/src/NuGet.SupportRequests.Notifications/Configuration/InitializationConfiguration.cs b/src/NuGet.SupportRequests.Notifications/Configuration/InitializationConfiguration.cs
@@ -1,9 +1,11 @@
 // 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.Jobs.Configuration;
+
 namespace NuGet.SupportRequests.Notifications
 {
-    public class InitializationConfiguration
+    public class InitializationConfiguration : MessageServiceConfiguration
     {
         /// <summary>
         /// Connection string to email publisher job's service bus.

diff --git a/src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj b/src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj
@@ -110,9 +110,6 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.39.0</Version>
-    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/src/NuGet.SupportRequests.Notifications/Tasks/SupportRequestsNotificationScheduledTask.cs b/src/NuGet.SupportRequests.Notifications/Tasks/SupportRequestsNotificationScheduledTask.cs
@@ -39,7 +39,10 @@ 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, loggerFactory.CreateLogger<AsynchronousEmailMessageService>());
+            var messageService = new AsynchronousEmailMessageService(
+                enqueuer,
+                loggerFactory.CreateLogger<AsynchronousEmailMessageService>(),
+                configuration);
             _messagingService = new MessagingService(messageService, loggerFactory.CreateLogger<MessagingService>());
 
             _supportRequestRepository = new SupportRequestRepository(loggerFactory, openSupportRequestSqlConnectionAsync);

diff --git a/src/PackageHash/PackageHash.csproj b/src/PackageHash/PackageHash.csproj
@@ -77,11 +77,8 @@
     <None Include="Settings\prod.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.1.2</Version>
-    </PackageReference>
     <PackageReference Include="NuGet.Services.Cursor">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/PackageLagMonitor/Monitoring.PackageLag.csproj b/src/PackageLagMonitor/Monitoring.PackageLag.csproj
@@ -96,9 +96,6 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
       <Version>1.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging">
-      <Version>1.1.2</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
       <Version>1.1.2</Version>
     </PackageReference>
@@ -112,7 +109,7 @@
       <Version>0.5.0-CI-20180510-012541</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.AzureManagement">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.3</Version>

diff --git a/src/Search.GenerateAuxiliaryData/Search.GenerateAuxiliaryData.csproj b/src/Search.GenerateAuxiliaryData/Search.GenerateAuxiliaryData.csproj
@@ -92,9 +92,6 @@
     <PackageReference Include="Microsoft.Data.Services.Client">
       <Version>5.7.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>

diff --git a/src/SnapshotAzureBlob/SnapshotAzureBlob.csproj b/src/SnapshotAzureBlob/SnapshotAzureBlob.csproj
@@ -54,9 +54,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="System.ComponentModel.EventBasedAsync">
       <Version>4.0.11</Version>
     </PackageReference>

diff --git a/src/Stats.AggregateCdnDownloadsInGallery/Stats.AggregateCdnDownloadsInGallery.csproj b/src/Stats.AggregateCdnDownloadsInGallery/Stats.AggregateCdnDownloadsInGallery.csproj
@@ -76,9 +76,6 @@
     <PackageReference Include="Microsoft.Data.Services.Client">
       <Version>5.7.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>

diff --git a/src/Stats.AzureCdnLogs.Common/Stats.AzureCdnLogs.Common.csproj b/src/Stats.AzureCdnLogs.Common/Stats.AzureCdnLogs.Common.csproj
@@ -92,7 +92,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
+      <Version>1.1.2</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>

diff --git a/src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj b/src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj
@@ -107,9 +107,6 @@
     <PackageReference Include="Microsoft.Data.Services.Client">
       <Version>5.7.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>7.1.2</Version>
     </PackageReference>

diff --git a/src/Stats.CollectAzureChinaCDNLogs/Stats.CollectAzureChinaCDNLogs.csproj b/src/Stats.CollectAzureChinaCDNLogs/Stats.CollectAzureChinaCDNLogs.csproj
@@ -83,9 +83,6 @@
     <PackageReference Include="Microsoft.Data.Services.Client">
       <Version>5.7.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>7.1.2</Version>
     </PackageReference>

diff --git a/src/Stats.CreateAzureCdnWarehouseReports/Stats.CreateAzureCdnWarehouseReports.csproj b/src/Stats.CreateAzureCdnWarehouseReports/Stats.CreateAzureCdnWarehouseReports.csproj
@@ -92,12 +92,6 @@
     <PackageReference Include="Microsoft.Data.Services.Client">
       <Version>5.7.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>

diff --git a/src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj b/src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj
@@ -120,12 +120,6 @@
     <PackageReference Include="Microsoft.Data.Services.Client">
       <Version>5.7.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="NuGet.Versioning">
       <Version>4.3.0-preview1-2524</Version>
     </PackageReference>

diff --git a/src/Stats.RefreshClientDimension/Stats.RefreshClientDimension.csproj b/src/Stats.RefreshClientDimension/Stats.RefreshClientDimension.csproj
@@ -77,9 +77,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>

diff --git a/src/Stats.RollUpDownloadFacts/Stats.RollUpDownloadFacts.csproj b/src/Stats.RollUpDownloadFacts/Stats.RollUpDownloadFacts.csproj
@@ -79,12 +79,6 @@
     <PackageReference Include="Microsoft.Data.Services.Client">
       <Version>5.7.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="MicroBuild.Core">
       <Version>0.3.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/StatusAggregator/StatusAggregator.csproj b/src/StatusAggregator/StatusAggregator.csproj
@@ -157,13 +157,13 @@
       <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Incidents">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Status">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Status.Table">
-      <Version>2.40.0</Version>
+      <Version>2.46.0</Version>
     </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>9.2.0</Version>

diff --git a/src/UpdateLicenseReports/UpdateLicenseReports.csproj b/src/UpdateLicenseReports/UpdateLicenseReports.csproj
@@ -73,9 +73,6 @@
     <PackageReference Include="Dapper.StrongName">
       <Version>1.50.2</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>1.0.0</Version>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>