diff --git a/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs b/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs index e5349a4..dedf3c4 100644 --- a/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs +++ b/ICD.Common.Utils.Tests/Services/Logging/LogItemEventArgsTest.cs @@ -1,4 +1,4 @@ -using ICD.Common.Services.Logging; +using ICD.Common.Utils.Services.Logging; using NUnit.Framework; namespace ICD.Common.Utils.Tests.Services.Logging diff --git a/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs b/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs index ad1f37b..236a489 100644 --- a/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs +++ b/ICD.Common.Utils.Tests/Services/Logging/LogItemTest.cs @@ -1,7 +1,7 @@ using ICD.Common.Properties; -using ICD.Common.Services.Logging; using NUnit.Framework; using System; +using ICD.Common.Utils.Services.Logging; namespace ICD.Common.Utils.Tests.Services.Logging { diff --git a/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs b/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs index 73d2792..9f52ad5 100644 --- a/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs +++ b/ICD.Common.Utils.Tests/Services/Logging/SeverityEventArgsTest.cs @@ -1,4 +1,4 @@ -using ICD.Common.Services.Logging; +using ICD.Common.Utils.Services.Logging; using NUnit.Framework; namespace ICD.Common.Utils.Tests.Services.Logging diff --git a/ICD.Common.Utils.Tests/Services/ServiceProviderTest.cs b/ICD.Common.Utils.Tests/Services/ServiceProviderTest.cs index a0fa93a..348e380 100644 --- a/ICD.Common.Utils.Tests/Services/ServiceProviderTest.cs +++ b/ICD.Common.Utils.Tests/Services/ServiceProviderTest.cs @@ -1,5 +1,5 @@ using System; -using ICD.Common.Services; +using ICD.Common.Utils.Services; using NUnit.Framework; namespace ICD.Common.Utils.Tests.Services diff --git a/ICD.Common.Utils/AttributeUtils.cs b/ICD.Common.Utils/AttributeUtils.cs index 8067353..6db55a3 100644 --- a/ICD.Common.Utils/AttributeUtils.cs +++ b/ICD.Common.Utils/AttributeUtils.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using ICD.Common.Properties; -using ICD.Common.Services; -using ICD.Common.Services.Logging; using ICD.Common.Utils.Collections; using ICD.Common.Utils.Extensions; +using ICD.Common.Utils.Services; +using ICD.Common.Utils.Services.Logging; #if SIMPLSHARP using Crestron.SimplSharp.Reflection; #else diff --git a/ICD.Common.Utils/Attributes/AbstractIcdAttribute.cs b/ICD.Common.Utils/Attributes/AbstractIcdAttribute.cs index 6f08333..eadd8b6 100644 --- a/ICD.Common.Utils/Attributes/AbstractIcdAttribute.cs +++ b/ICD.Common.Utils/Attributes/AbstractIcdAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ICD.Common.Attributes +namespace ICD.Common.Utils.Attributes { /// /// AbstractIcdAttribute is the base class for all ICD attributes. diff --git a/ICD.Common.Utils/Attributes/KrangPluginAttribute.cs b/ICD.Common.Utils/Attributes/KrangPluginAttribute.cs index 4ad5161..2cb5eba 100644 --- a/ICD.Common.Utils/Attributes/KrangPluginAttribute.cs +++ b/ICD.Common.Utils/Attributes/KrangPluginAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ICD.Common.Attributes +namespace ICD.Common.Utils.Attributes { [AttributeUsage(AttributeTargets.Assembly)] public sealed class KrangPluginAttribute : Attribute diff --git a/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs b/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs index e66cb69..067c7c1 100644 --- a/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs +++ b/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using ICD.Common.Attributes; using ICD.Common.Properties; using ICD.Common.Utils.Collections; using ICD.Common.Utils.Extensions; diff --git a/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs b/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs index 9ebd441..637d764 100644 --- a/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs +++ b/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs @@ -1,9 +1,9 @@ -#if SIMPLSHARP +using ICD.Common.Utils.Services; +using ICD.Common.Utils.Services.Logging; +#if SIMPLSHARP using System; using System.Text.RegularExpressions; using ICD.Common.Properties; -using ICD.Common.Services; -using ICD.Common.Services.Logging; namespace ICD.Common.Utils { diff --git a/ICD.Common.Utils/ProgramUtils.SimplSharp.cs b/ICD.Common.Utils/ProgramUtils.SimplSharp.cs index 639f5d2..59955a3 100644 --- a/ICD.Common.Utils/ProgramUtils.SimplSharp.cs +++ b/ICD.Common.Utils/ProgramUtils.SimplSharp.cs @@ -1,8 +1,8 @@ -#if SIMPLSHARP +using ICD.Common.Utils.Services; +using ICD.Common.Utils.Services.Logging; +#if SIMPLSHARP using Crestron.SimplSharp; using ICD.Common.Properties; -using ICD.Common.Services; -using ICD.Common.Services.Logging; using ICD.Common.Utils.Extensions; using System; using System.Collections.Generic; diff --git a/ICD.Common.Utils/Services/Logging/ILoggerService.cs b/ICD.Common.Utils/Services/Logging/ILoggerService.cs index ffb8cac..3a0f1c1 100644 --- a/ICD.Common.Utils/Services/Logging/ILoggerService.cs +++ b/ICD.Common.Utils/Services/Logging/ILoggerService.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using ICD.Common.Properties; -using ICD.Common.Utils; -namespace ICD.Common.Services.Logging +namespace ICD.Common.Utils.Services.Logging { public enum eSeverity { diff --git a/ICD.Common.Utils/Services/Logging/LogItem.cs b/ICD.Common.Utils/Services/Logging/LogItem.cs index eef5929..38a4d5c 100644 --- a/ICD.Common.Utils/Services/Logging/LogItem.cs +++ b/ICD.Common.Utils/Services/Logging/LogItem.cs @@ -1,9 +1,8 @@ using System; using System.Text; using ICD.Common.Properties; -using ICD.Common.Utils; -namespace ICD.Common.Services.Logging +namespace ICD.Common.Utils.Services.Logging { /// /// Log Entry Item diff --git a/ICD.Common.Utils/Services/Logging/LogItemEventArgs.cs b/ICD.Common.Utils/Services/Logging/LogItemEventArgs.cs index 79abe78..3f81f42 100644 --- a/ICD.Common.Utils/Services/Logging/LogItemEventArgs.cs +++ b/ICD.Common.Utils/Services/Logging/LogItemEventArgs.cs @@ -1,6 +1,6 @@ using ICD.Common.Utils.EventArguments; -namespace ICD.Common.Services.Logging +namespace ICD.Common.Utils.Services.Logging { public sealed class LogItemEventArgs : GenericEventArgs { diff --git a/ICD.Common.Utils/Services/Logging/SeverityEventArgs.cs b/ICD.Common.Utils/Services/Logging/SeverityEventArgs.cs index 9e89d60..fd48a62 100644 --- a/ICD.Common.Utils/Services/Logging/SeverityEventArgs.cs +++ b/ICD.Common.Utils/Services/Logging/SeverityEventArgs.cs @@ -1,6 +1,6 @@ using ICD.Common.Utils.EventArguments; -namespace ICD.Common.Services.Logging +namespace ICD.Common.Utils.Services.Logging { public sealed class SeverityEventArgs : GenericEventArgs { diff --git a/ICD.Common.Utils/Services/ServiceNotFoundException.cs b/ICD.Common.Utils/Services/ServiceNotFoundException.cs index 18d8b70..6d2ec0f 100644 --- a/ICD.Common.Utils/Services/ServiceNotFoundException.cs +++ b/ICD.Common.Utils/Services/ServiceNotFoundException.cs @@ -1,6 +1,6 @@ using System; -namespace ICD.Common.Services +namespace ICD.Common.Utils.Services { public sealed class ServiceNotFoundException : Exception { diff --git a/ICD.Common.Utils/Services/ServiceProvider.cs b/ICD.Common.Utils/Services/ServiceProvider.cs index a249c39..8b3e7de 100644 --- a/ICD.Common.Utils/Services/ServiceProvider.cs +++ b/ICD.Common.Utils/Services/ServiceProvider.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; using ICD.Common.Properties; -using ICD.Common.Utils; using ICD.Common.Utils.Extensions; -namespace ICD.Common.Services +namespace ICD.Common.Utils.Services { public sealed class ServiceProvider { diff --git a/ICD.Common.Utils/ThreadingUtils.cs b/ICD.Common.Utils/ThreadingUtils.cs index 3416d35..f719e21 100644 --- a/ICD.Common.Utils/ThreadingUtils.cs +++ b/ICD.Common.Utils/ThreadingUtils.cs @@ -1,7 +1,7 @@ using System; using ICD.Common.Properties; -using ICD.Common.Services; -using ICD.Common.Services.Logging; +using ICD.Common.Utils.Services; +using ICD.Common.Utils.Services.Logging; #if SIMPLSHARP using Crestron.SimplSharp; #else diff --git a/ICD.Common.Utils/Timers/SafeTimer.cs b/ICD.Common.Utils/Timers/SafeTimer.cs index 6953a35..3f028e9 100644 --- a/ICD.Common.Utils/Timers/SafeTimer.cs +++ b/ICD.Common.Utils/Timers/SafeTimer.cs @@ -1,6 +1,6 @@ using System; -using ICD.Common.Services; -using ICD.Common.Services.Logging; +using ICD.Common.Utils.Services; +using ICD.Common.Utils.Services.Logging; #if SIMPLSHARP using Crestron.SimplSharp; #else