From e685a5555295f3d1fc0d03f1c890707c91888f42 Mon Sep 17 00:00:00 2001 From: Riccardo De Agostini Date: Mon, 27 Jan 2020 11:31:35 +0100 Subject: [PATCH] [FIX][BRK] Incorrect namespaces (closes #229) --- src/Swan.Lite/CompositeHashCode.cs | 2 +- src/Swan.Lite/Extensions.cs | 1 - src/Swan.Lite/Logging/ConsoleLogger.cs | 1 - src/Swan.Lite/Logging/DebugLogger.cs | 4 +--- src/Swan.Lite/Logging/FileLogger.cs | 1 - src/Swan.Lite/Logging/LogLevel.cs | 4 ++-- src/Swan.Lite/Logging/LogMessageReceivedEventArgs.cs | 2 +- src/Swan.Lite/Logging/TextLogger.cs | 5 ++--- src/Swan.Lite/Reflection/ConstructorTypeCache.cs | 7 +++---- src/Swan.Lite/Swan.Lite.csproj | 1 + src/Swan.Lite/Terminal.Interaction.cs | 1 - src/Swan/Net/ConnectionDataReceivedTrigger.cs | 2 +- test/Swan.Test/Mocks/LoggingEntryMock.cs | 4 +++- 13 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/Swan.Lite/CompositeHashCode.cs b/src/Swan.Lite/CompositeHashCode.cs index 7f70a7c06..bca9495b2 100644 --- a/src/Swan.Lite/CompositeHashCode.cs +++ b/src/Swan.Lite/CompositeHashCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Swan.Lite +namespace Swan { /// /// Provides a way for types that override diff --git a/src/Swan.Lite/Extensions.cs b/src/Swan.Lite/Extensions.cs index 91a9bb57c..4c558766d 100644 --- a/src/Swan.Lite/Extensions.cs +++ b/src/Swan.Lite/Extensions.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Swan.Lite.Reflection; using Swan.Mappers; using Swan.Reflection; diff --git a/src/Swan.Lite/Logging/ConsoleLogger.cs b/src/Swan.Lite/Logging/ConsoleLogger.cs index 38df7c5dd..a74bca812 100644 --- a/src/Swan.Lite/Logging/ConsoleLogger.cs +++ b/src/Swan.Lite/Logging/ConsoleLogger.cs @@ -1,5 +1,4 @@ using System; -using Swan.Lite.Logging; namespace Swan.Logging { diff --git a/src/Swan.Lite/Logging/DebugLogger.cs b/src/Swan.Lite/Logging/DebugLogger.cs index 4ff26a59f..a71e61531 100644 --- a/src/Swan.Lite/Logging/DebugLogger.cs +++ b/src/Swan.Lite/Logging/DebugLogger.cs @@ -1,6 +1,4 @@ -using Swan.Lite.Logging; - -namespace Swan.Logging +namespace Swan.Logging { /// /// Represents a logger target. This target will write to the diff --git a/src/Swan.Lite/Logging/FileLogger.cs b/src/Swan.Lite/Logging/FileLogger.cs index b131360b4..41a1d844e 100644 --- a/src/Swan.Lite/Logging/FileLogger.cs +++ b/src/Swan.Lite/Logging/FileLogger.cs @@ -3,7 +3,6 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Swan.Lite.Logging; using Swan.Threading; namespace Swan.Logging diff --git a/src/Swan.Lite/Logging/LogLevel.cs b/src/Swan.Lite/Logging/LogLevel.cs index 24da6f569..b3d15a844 100644 --- a/src/Swan.Lite/Logging/LogLevel.cs +++ b/src/Swan.Lite/Logging/LogLevel.cs @@ -1,4 +1,4 @@ -namespace Swan +namespace Swan.Logging { /// /// Defines the log levels. @@ -40,4 +40,4 @@ public enum LogLevel /// Fatal, } -} \ No newline at end of file +} diff --git a/src/Swan.Lite/Logging/LogMessageReceivedEventArgs.cs b/src/Swan.Lite/Logging/LogMessageReceivedEventArgs.cs index 9274f8f95..14e01cb45 100644 --- a/src/Swan.Lite/Logging/LogMessageReceivedEventArgs.cs +++ b/src/Swan.Lite/Logging/LogMessageReceivedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Swan +namespace Swan.Logging { /// /// Event arguments representing the message that is logged diff --git a/src/Swan.Lite/Logging/TextLogger.cs b/src/Swan.Lite/Logging/TextLogger.cs index 404041704..9d63efbef 100644 --- a/src/Swan.Lite/Logging/TextLogger.cs +++ b/src/Swan.Lite/Logging/TextLogger.cs @@ -1,7 +1,6 @@ -using Swan.Logging; -using System; +using System; -namespace Swan.Lite.Logging +namespace Swan.Logging { /// /// Use this class for text-based logger. diff --git a/src/Swan.Lite/Reflection/ConstructorTypeCache.cs b/src/Swan.Lite/Reflection/ConstructorTypeCache.cs index 5498213a0..9098e0c3b 100644 --- a/src/Swan.Lite/Reflection/ConstructorTypeCache.cs +++ b/src/Swan.Lite/Reflection/ConstructorTypeCache.cs @@ -1,10 +1,9 @@ -using Swan.Reflection; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -namespace Swan.Lite.Reflection +namespace Swan.Reflection { /// /// A thread-safe cache of constructors belonging to a given type. @@ -48,4 +47,4 @@ private static Func>> .OrderBy(x => x.Item2.Length) .ToList(); } -} \ No newline at end of file +} diff --git a/src/Swan.Lite/Swan.Lite.csproj b/src/Swan.Lite/Swan.Lite.csproj index ca5a204e3..aa065e7ba 100644 --- a/src/Swan.Lite/Swan.Lite.csproj +++ b/src/Swan.Lite/Swan.Lite.csproj @@ -7,6 +7,7 @@ netstandard2.0 true Swan.Lite + Swan ..\..\StyleCop.Analyzers.ruleset 2.5.0 Unosquare diff --git a/src/Swan.Lite/Terminal.Interaction.cs b/src/Swan.Lite/Terminal.Interaction.cs index 20d7e23a7..dbfacb2bc 100644 --- a/src/Swan.Lite/Terminal.Interaction.cs +++ b/src/Swan.Lite/Terminal.Interaction.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Swan.Lite.Logging; using System.Globalization; using Swan.Logging; diff --git a/src/Swan/Net/ConnectionDataReceivedTrigger.cs b/src/Swan/Net/ConnectionDataReceivedTrigger.cs index e6d592dff..81a5833e9 100644 --- a/src/Swan/Net/ConnectionDataReceivedTrigger.cs +++ b/src/Swan/Net/ConnectionDataReceivedTrigger.cs @@ -1,4 +1,4 @@ -namespace Swan +namespace Swan.Net { /// /// Enumerates the possible causes of the DataReceived event occurring. diff --git a/test/Swan.Test/Mocks/LoggingEntryMock.cs b/test/Swan.Test/Mocks/LoggingEntryMock.cs index 5488b0d68..ef5e94923 100644 --- a/test/Swan.Test/Mocks/LoggingEntryMock.cs +++ b/test/Swan.Test/Mocks/LoggingEntryMock.cs @@ -1,4 +1,6 @@ -namespace Swan.Test.Mocks +using Swan.Logging; + +namespace Swan.Test.Mocks { using System;