Merge branch 'release/2.1' into dev

test/Microsoft.Extensions.Hosting.Tests/HostTests.cs

@@ -104,6 +104,38 @@ namespace Microsoft.Extensions.Hosting
             Assert.Equal(1, service.DisposeCount);
         }
 
+        [Fact]
+        public void HostedServiceCanAcceptSingletonDependencies()
+        {
+            using (var host = CreateBuilder()
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddSingleton<IFakeService, FakeService>();
+                    services.AddHostedService<FakeHostedServiceWithDependency>();
+                })
+                .Start())
+            {
+            }
+        }
+
+        private class FakeHostedServiceWithDependency : IHostedService
+        {
+            public FakeHostedServiceWithDependency(IFakeService fakeService)
+            {
+                Assert.NotNull(fakeService);
+            }
+
+            public Task StartAsync(CancellationToken cancellationToken)
+            {
+                return Task.CompletedTask;
+            }
+
+            public Task StopAsync(CancellationToken cancellationToken)
+            {
+                return Task.CompletedTask;
+            }
+        }
+
         [Fact]
         public async Task HostedServiceStartNotCalledIfHostNotStarted()
         {