From dcdd8cfa9a7659d4416627ae927a4e3b7ea8c900 Mon Sep 17 00:00:00 2001
From: moozzyk <pawelka@microsoft.com>
Date: Fri, 10 Mar 2017 15:50:54 -0800
Subject: [PATCH] Removing our own copy of NullLoggerFactory Moving TaskQueue
 to the Internal folder as it is in the Internal namespace

---
 .../HubConnection.cs                          |  2 +-
 .../Connection.cs                             |  1 +
 .../Internal/NullLoggerFactory.cs             | 30 -------------------
 .../{ => Internal}/TaskQueue.cs               |  0
 .../LongPollingTransport.cs                   |  4 +--
 .../WebSocketsTransport.cs                    |  2 +-
 6 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.Sockets.Client/Internal/NullLoggerFactory.cs
 rename src/Microsoft.AspNetCore.Sockets.Client/{ => Internal}/TaskQueue.cs (100%)

diff --git a/src/Microsoft.AspNetCore.SignalR.Client/HubConnection.cs b/src/Microsoft.AspNetCore.SignalR.Client/HubConnection.cs
index 4f35b8a6c2..2a8ef35908 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client/HubConnection.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Client/HubConnection.cs
@@ -12,8 +12,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Sockets;
 using Microsoft.AspNetCore.Sockets.Client;
-using Microsoft.AspNetCore.Sockets.Client.Internal;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Microsoft.AspNetCore.SignalR.Client
 {
diff --git a/src/Microsoft.AspNetCore.Sockets.Client/Connection.cs b/src/Microsoft.AspNetCore.Sockets.Client/Connection.cs
index c4cd19e6ea..7c55d7c698 100644
--- a/src/Microsoft.AspNetCore.Sockets.Client/Connection.cs
+++ b/src/Microsoft.AspNetCore.Sockets.Client/Connection.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks.Channels;
 using Microsoft.AspNetCore.Sockets.Client.Internal;
 using Microsoft.AspNetCore.Sockets.Internal;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Microsoft.AspNetCore.Sockets.Client
 {
diff --git a/src/Microsoft.AspNetCore.Sockets.Client/Internal/NullLoggerFactory.cs b/src/Microsoft.AspNetCore.Sockets.Client/Internal/NullLoggerFactory.cs
deleted file mode 100644
index 261a2f5d7f..0000000000
--- a/src/Microsoft.AspNetCore.Sockets.Client/Internal/NullLoggerFactory.cs
+++ /dev/null
@@ -1,30 +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 Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-
-namespace Microsoft.AspNetCore.Sockets.Client.Internal
-{
-    public class NullLoggerFactory : ILoggerFactory
-    {
-        public static readonly ILoggerFactory Instance = new NullLoggerFactory();
-
-        private NullLoggerFactory()
-        {
-        }
-
-        public void AddProvider(ILoggerProvider provider)
-        {
-        }
-
-        public ILogger CreateLogger(string categoryName)
-        {
-            return NullLogger.Instance;
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}
diff --git a/src/Microsoft.AspNetCore.Sockets.Client/TaskQueue.cs b/src/Microsoft.AspNetCore.Sockets.Client/Internal/TaskQueue.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Sockets.Client/TaskQueue.cs
rename to src/Microsoft.AspNetCore.Sockets.Client/Internal/TaskQueue.cs
diff --git a/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs
index bc8ae517f1..a294655a41 100644
--- a/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs
+++ b/src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs
@@ -9,10 +9,10 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Sockets.Client.Internal;
 using Microsoft.AspNetCore.Sockets.Formatters;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Microsoft.AspNetCore.Sockets.Client
 {
@@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Sockets.Client
 
         public Task Running { get; private set; } = Task.CompletedTask;
 
-        public LongPollingTransport(HttpClient httpClient) 
+        public LongPollingTransport(HttpClient httpClient)
             : this(httpClient, null)
         { }
 
diff --git a/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
index 7d7a537acd..6634190624 100644
--- a/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
+++ b/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
@@ -7,8 +7,8 @@ using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Sockets.Client.Internal;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Microsoft.AspNetCore.Sockets.Client
 {