diff --git a/ICD.Common.Utils/IcdConsole.cs b/ICD.Common.Utils/IcdConsole.cs index 38217f3..e318c31 100644 --- a/ICD.Common.Utils/IcdConsole.cs +++ b/ICD.Common.Utils/IcdConsole.cs @@ -40,7 +40,7 @@ namespace ICD.Common.Utils { if (s_IsConsoleApp == null) { -#if SIMPLSHARP +#if !NETSTANDARD s_IsConsoleApp = true; #else try @@ -110,11 +110,10 @@ namespace ICD.Common.Utils { PrintLine(message); } - return; } -#endif - +#else PrintLine(message); +#endif } public static void PrintLine(string message) diff --git a/ICD.Common.Utils/IcdEnvironment.SimplSharp.cs b/ICD.Common.Utils/IcdEnvironment.SimplSharp.cs index 54d3863..23c13e6 100644 --- a/ICD.Common.Utils/IcdEnvironment.SimplSharp.cs +++ b/ICD.Common.Utils/IcdEnvironment.SimplSharp.cs @@ -1,4 +1,4 @@ -#if SIMPLSHARP +#if !NETSTANDARD using System; using System.Collections.Generic; using Crestron.SimplSharp; diff --git a/ICD.Common.Utils/IcdEnvironment.Standard.cs b/ICD.Common.Utils/IcdEnvironment.Standard.cs index c9ed3a4..9bdab23 100644 --- a/ICD.Common.Utils/IcdEnvironment.Standard.cs +++ b/ICD.Common.Utils/IcdEnvironment.Standard.cs @@ -1,4 +1,4 @@ -#if !SIMPLSHARP +#if NETSTANDARD using System; using System.Collections.Generic; using System.Linq; @@ -9,9 +9,7 @@ using ICD.Common.Utils.EventArguments; using ICD.Common.Utils.Timers; using AddressFamily = System.Net.Sockets.AddressFamily; using Dns = System.Net.Dns; -#if !NETSTANDARD -using Crestron.SimplSharp; -#endif + namespace ICD.Common.Utils { diff --git a/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs b/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs index 742be1a..5093d78 100644 --- a/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs +++ b/ICD.Common.Utils/ProcessorUtils.SimplSharp.cs @@ -1,4 +1,4 @@ -#if SIMPLSHARP +#if !NETSTANDARD using System.Globalization; using Crestron.SimplSharp; using ICD.Common.Utils.Services; diff --git a/ICD.Common.Utils/ProcessorUtils.Standard.cs b/ICD.Common.Utils/ProcessorUtils.Standard.cs index 40214b4..63781e4 100644 --- a/ICD.Common.Utils/ProcessorUtils.Standard.cs +++ b/ICD.Common.Utils/ProcessorUtils.Standard.cs @@ -1,4 +1,4 @@ -#if !SIMPLSHARP +#if NETSTANDARD using System; using System.Diagnostics; using System.Linq; diff --git a/ICD.Common.Utils/ProgramUtils.SimplSharp.cs b/ICD.Common.Utils/ProgramUtils.SimplSharp.cs index 8b55dd7..0662f89 100644 --- a/ICD.Common.Utils/ProgramUtils.SimplSharp.cs +++ b/ICD.Common.Utils/ProgramUtils.SimplSharp.cs @@ -2,7 +2,7 @@ using ICD.Common.Utils.IO; using ICD.Common.Utils.Services; using ICD.Common.Utils.Services.Logging; -#if SIMPLSHARP +#if !NETSTANDARD using Crestron.SimplSharp; using ICD.Common.Properties; using ICD.Common.Utils.Extensions; diff --git a/ICD.Common.Utils/ProgramUtils.Standard.cs b/ICD.Common.Utils/ProgramUtils.Standard.cs index cc3647c..49ed301 100644 --- a/ICD.Common.Utils/ProgramUtils.Standard.cs +++ b/ICD.Common.Utils/ProgramUtils.Standard.cs @@ -1,4 +1,4 @@ -#if !SIMPLSHARP +#if NETSTANDARD using ICD.Common.Utils.IO; using System; using System.Reflection; diff --git a/ICD.Common.Utils/TableBuilder.cs b/ICD.Common.Utils/TableBuilder.cs index 7482a60..1609fcb 100644 --- a/ICD.Common.Utils/TableBuilder.cs +++ b/ICD.Common.Utils/TableBuilder.cs @@ -13,7 +13,7 @@ namespace ICD.Common.Utils /// public sealed class TableBuilder { -#if SIMPLSHARP +#if !NETSTANDARD private const char HORIZONTAL = '-'; private const char VERTICAL = '|'; private const char INTERSECT = '+'; @@ -230,7 +230,7 @@ namespace ICD.Common.Utils private void AppendTopSeparator(StringBuilder builder, IList columnWidths) { -#if SIMPLSHARP +#if !NETSTANDARD // Can't do fancy tables so don't bother drawing the top row #else builder.Append(DOWN_RIGHT).Append(HORIZONTAL); @@ -256,7 +256,7 @@ namespace ICD.Common.Utils private void AppendBottomSeparator(StringBuilder builder, IList columnWidths) { -#if SIMPLSHARP +#if !NETSTANDARD AppendSeparator(builder, columnWidths); #else builder.Append(UP_RIGHT).Append(HORIZONTAL); @@ -282,7 +282,7 @@ namespace ICD.Common.Utils private static void AppendRow(StringBuilder builder, IList row, IList columnWidths) { -#if !SIMPLSHARP +#if NETSTANDARD builder.Append(VERTICAL).Append(' '); #endif @@ -298,7 +298,7 @@ namespace ICD.Common.Utils builder.Append(VERTICAL); } -#if !SIMPLSHARP +#if NETSTANDARD builder.Append(VERTICAL); #endif @@ -307,7 +307,7 @@ namespace ICD.Common.Utils private static void AppendSeparator(StringBuilder builder, IList columnWidths) { -#if !SIMPLSHARP +#if NETSTANDARD builder.Append(VERTICAL_RIGHT).Append(HORIZONTAL); #endif @@ -324,7 +324,7 @@ namespace ICD.Common.Utils builder.Append(INTERSECT); } -#if !SIMPLSHARP +#if NETSTANDARD builder.Append(VERTICAL_LEFT); #endif