From 84d43cb2d8c1076626c707315fe28edaf2d7ba7b Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Fri, 6 Apr 2018 08:16:19 -0700
Subject: [PATCH] Remove extra class (#1884)

- Merged 2 DI classes in SignalR
---
 ...HubOptionsDependencyInjectionExtensions.cs | 19 -------------------
 .../SignalRDependencyInjectionExtensions.cs   |  7 +++++++
 2 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.SignalR/HubOptionsDependencyInjectionExtensions.cs

diff --git a/src/Microsoft.AspNetCore.SignalR/HubOptionsDependencyInjectionExtensions.cs b/src/Microsoft.AspNetCore.SignalR/HubOptionsDependencyInjectionExtensions.cs
deleted file mode 100644
index c7af96616a..0000000000
--- a/src/Microsoft.AspNetCore.SignalR/HubOptionsDependencyInjectionExtensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Options;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static class HubOptionsDependencyInjectionExtensions
-    {
-        public static ISignalRServerBuilder AddHubOptions<THub>(this ISignalRServerBuilder signalrBuilder, Action<HubOptions<THub>> options) where THub : Hub
-        {
-            signalrBuilder.Services.AddSingleton<IConfigureOptions<HubOptions<THub>>, HubOptionsSetup<THub>>();
-            signalrBuilder.Services.Configure(options);
-            return signalrBuilder;
-        }
-    }
-}
diff --git a/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs b/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs
index 5864111ab2..8febc0ab09 100644
--- a/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs
@@ -9,6 +9,13 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class SignalRDependencyInjectionExtensions
     {
+        public static ISignalRServerBuilder AddHubOptions<THub>(this ISignalRServerBuilder signalrBuilder, Action<HubOptions<THub>> options) where THub : Hub
+        {
+            signalrBuilder.Services.AddSingleton<IConfigureOptions<HubOptions<THub>>, HubOptionsSetup<THub>>();
+            signalrBuilder.Services.Configure(options);
+            return signalrBuilder;
+        }
+        
         public static ISignalRServerBuilder AddSignalR(this IServiceCollection services)
         {
             services.AddConnections();