From b061a729079867ffed26023335253a8aba22c2f4 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Mon, 6 Feb 2023 13:15:58 -0700 Subject: [PATCH] refactor: add alias for newtonsoft package --- .../Pepperdash Core/Comm/ControlPropertiesConfig.cs | 6 ++++-- .../Pepperdash Core/Comm/GenericSecureTcpIpServer.cs | 5 +++-- .../Pepperdash Core/Comm/GenericTcpIpClient.cs | 5 +++-- .../Pepperdash Core/Comm/GenericTcpIpServer.cs | 5 +++-- .../Pepperdash Core/Comm/GenericUdpServer.cs | 8 +++++--- .../Pepperdash Core/Comm/TcpClientConfigObject.cs | 4 +++- .../Pepperdash Core/CommunicationExtras.cs | 7 ++++--- .../Pepperdash Core/Config/PortalConfigReader.cs | 8 +++++--- Pepperdash Core/Pepperdash Core/EthernetHelper.cs | 5 +++-- .../JsonStandardObjects/JsonToSimplDevice.cs | 7 ++++--- .../JsonToSimpl/JsonToSimplArrayLookupChild.cs | 7 ++++--- .../JsonToSimpl/JsonToSimplChildObjectBase.cs | 7 ++++--- .../JsonToSimpl/JsonToSimplFileMaster.cs | 7 ++++--- .../JsonToSimpl/JsonToSimplFixedPathObject.cs | 8 +++++--- .../JsonToSimpl/JsonToSimplGenericMaster.cs | 6 ++++-- .../Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs | 12 +++++++----- .../JsonToSimpl/JsonToSimplPortalFileMaster.cs | 8 +++++--- Pepperdash Core/Pepperdash Core/Logging/Debug.cs | 5 +++-- .../Pepperdash Core/Logging/DebugContext.cs | 6 ++++-- .../Pepperdash Core/Logging/DebugMemory.cs | 6 ++++-- .../PasswordManagement/PasswordManager.cs | 8 +++++--- .../Pepperdash Core/WebApi/Presets/Preset.cs | 6 ++++-- .../WebApi/Presets/WebApiPasscodeClient.cs | 8 +++++--- 23 files changed, 95 insertions(+), 59 deletions(-) diff --git a/Pepperdash Core/Pepperdash Core/Comm/ControlPropertiesConfig.cs b/Pepperdash Core/Pepperdash Core/Comm/ControlPropertiesConfig.cs index 47e0ec8..7bb7557 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/ControlPropertiesConfig.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/ControlPropertiesConfig.cs @@ -1,9 +1,11 @@ -using System; +extern alias Full; + +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Newtonsoft.Json; +using Full.Newtonsoft.Json; namespace PepperDash.Core { diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs index d53a801..7731556 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs @@ -9,14 +9,15 @@ and in all parts thereof, regardless of the use to which it is being put. Any u of this material by another party without the express written permission of PepperDash Technology Corporation is prohibited. PepperDash Technology Corporation reserves all rights under applicable laws. ------------------------------------ */ +extern alias Full; using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core { diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs index 8cfaad2..458a44c 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs @@ -1,11 +1,12 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Text.RegularExpressions; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; -using Newtonsoft.Json; +using Full.Newtonsoft.Json; namespace PepperDash.Core { diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs index e3a00f2..e14bfd0 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpServer.cs @@ -9,14 +9,15 @@ and in all parts thereof, regardless of the use to which it is being put. Any u of this material by another party without the express written permission of PepperDash Technology Corporation is prohibited. PepperDash Technology Corporation reserves all rights under applicable laws. ------------------------------------ */ +extern alias Full; using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core { diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs index 5bd85b0..e1daeb2 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/GenericUdpServer.cs @@ -1,4 +1,5 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -7,8 +8,9 @@ using System.Text.RegularExpressions; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; + +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; diff --git a/Pepperdash Core/Pepperdash Core/Comm/TcpClientConfigObject.cs b/Pepperdash Core/Pepperdash Core/Comm/TcpClientConfigObject.cs index c3b3bce..5c71a50 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/TcpClientConfigObject.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/TcpClientConfigObject.cs @@ -1,4 +1,6 @@ -using Newtonsoft.Json; +extern alias Full; + +using Full.Newtonsoft.Json; namespace PepperDash.Core { diff --git a/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs b/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs index 353b14f..1548ece 100644 --- a/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs +++ b/Pepperdash Core/Pepperdash Core/CommunicationExtras.cs @@ -1,12 +1,13 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; using System.Text.RegularExpressions; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core { diff --git a/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs b/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs index f2ad746..803875f 100644 --- a/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs +++ b/Pepperdash Core/Pepperdash Core/Config/PortalConfigReader.cs @@ -1,10 +1,12 @@ -using System; +extern alias Full; + +using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; diff --git a/Pepperdash Core/Pepperdash Core/EthernetHelper.cs b/Pepperdash Core/Pepperdash Core/EthernetHelper.cs index 220d386..5e02540 100644 --- a/Pepperdash Core/Pepperdash Core/EthernetHelper.cs +++ b/Pepperdash Core/Pepperdash Core/EthernetHelper.cs @@ -1,10 +1,11 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Newtonsoft.Json; +using Full.Newtonsoft.Json; namespace PepperDash.Core { diff --git a/Pepperdash Core/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs b/Pepperdash Core/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs index eef68f2..97a0297 100644 --- a/Pepperdash Core/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs +++ b/Pepperdash Core/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs @@ -1,10 +1,11 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; using PepperDash.Core.JsonToSimpl; namespace PepperDash.Core.JsonStandardObjects diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs index 6535308..d1dd07c 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs @@ -1,10 +1,11 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs index e507105..1984293 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs @@ -1,10 +1,11 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs index c5f50d5..5fbd034 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs @@ -1,4 +1,5 @@ -using System; +extern alias Full; +using System; //using System.IO; using System.Collections.Generic; using System.Linq; @@ -6,8 +7,8 @@ using System.Text; using System.Text.RegularExpressions; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs index 4d56772..1ad0cd3 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs @@ -1,12 +1,14 @@ -using System; +extern alias Full; + +using System; //using System.IO; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs index e0f42f8..d9b201d 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs @@ -1,7 +1,9 @@ -using System; +extern alias Full; + +using System; using System.Collections.Generic; using Crestron.SimplSharp; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs index 2443c0a..ab13429 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs @@ -1,12 +1,14 @@ -using System; +extern alias Full; + +using System; //using System.IO; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { @@ -162,7 +164,7 @@ namespace PepperDash.Core.JsonToSimpl /// public static JObject ParseObject(string json) { - using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json))) + using (var reader = new JsonTextReader(new System.IO.StringReader(json))) { var startDepth = reader.Depth; var obj = JObject.Load(reader); @@ -179,7 +181,7 @@ namespace PepperDash.Core.JsonToSimpl /// public static JArray ParseArray(string json) { - using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json))) + using (var reader = new JsonTextReader(new System.IO.StringReader(json))) { var startDepth = reader.Depth; var obj = JArray.Load(reader); diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs index ca307e5..30b14ac 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs @@ -1,12 +1,14 @@ -using System; +extern alias Full; + +using System; //using System.IO; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; using PepperDash.Core.Config; diff --git a/Pepperdash Core/Pepperdash Core/Logging/Debug.cs b/Pepperdash Core/Pepperdash Core/Logging/Debug.cs index d959f99..b4d212d 100644 --- a/Pepperdash Core/Pepperdash Core/Logging/Debug.cs +++ b/Pepperdash Core/Pepperdash Core/Logging/Debug.cs @@ -1,11 +1,12 @@ -using System; +extern alias Full; +using System; using System.Collections.Generic; using System.Text.RegularExpressions; using Crestron.SimplSharp; using Crestron.SimplSharp.Reflection; using Crestron.SimplSharp.CrestronLogger; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; +using Full.Newtonsoft.Json; using PepperDash.Core.DebugThings; diff --git a/Pepperdash Core/Pepperdash Core/Logging/DebugContext.cs b/Pepperdash Core/Pepperdash Core/Logging/DebugContext.cs index 0809418..3d7e7bb 100644 --- a/Pepperdash Core/Pepperdash Core/Logging/DebugContext.cs +++ b/Pepperdash Core/Pepperdash Core/Logging/DebugContext.cs @@ -1,11 +1,13 @@ -using System; +extern alias Full; + +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronDataStore; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; +using Full.Newtonsoft.Json; using PepperDash.Core.DebugThings; diff --git a/Pepperdash Core/Pepperdash Core/Logging/DebugMemory.cs b/Pepperdash Core/Pepperdash Core/Logging/DebugMemory.cs index ab48afe..6bb3dbb 100644 --- a/Pepperdash Core/Pepperdash Core/Logging/DebugMemory.cs +++ b/Pepperdash Core/Pepperdash Core/Logging/DebugMemory.cs @@ -1,7 +1,9 @@ -using System.Collections.Generic; +extern alias Full; + +using System.Collections.Generic; using Crestron.SimplSharp; -using Newtonsoft.Json; +using Full.Newtonsoft.Json; namespace PepperDash.Core.DebugThings { diff --git a/Pepperdash Core/Pepperdash Core/PasswordManagement/PasswordManager.cs b/Pepperdash Core/Pepperdash Core/PasswordManagement/PasswordManager.cs index c9bc06b..3c3ec53 100644 --- a/Pepperdash Core/Pepperdash Core/PasswordManagement/PasswordManager.cs +++ b/Pepperdash Core/Pepperdash Core/PasswordManagement/PasswordManager.cs @@ -1,9 +1,11 @@ -using System; +extern alias Full; + +using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; using Crestron.SimplSharp; using PepperDash.Core.JsonToSimpl; using PepperDash.Core.JsonStandardObjects; diff --git a/Pepperdash Core/Pepperdash Core/WebApi/Presets/Preset.cs b/Pepperdash Core/Pepperdash Core/WebApi/Presets/Preset.cs index 804156f..49e6427 100644 --- a/Pepperdash Core/Pepperdash Core/WebApi/Presets/Preset.cs +++ b/Pepperdash Core/Pepperdash Core/WebApi/Presets/Preset.cs @@ -1,10 +1,12 @@ -using System; +extern alias Full; + +using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Newtonsoft.Json; +using Full.Newtonsoft.Json; namespace PepperDash.Core.WebApi.Presets diff --git a/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs b/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs index e7e0efb..3f178f8 100644 --- a/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs +++ b/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs @@ -1,12 +1,14 @@ -using System; +extern alias Full; + +using System; using System.Text; using Crestron.SimplSharp; // For Basic SIMPL# Classes using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharp.Net; using Crestron.SimplSharp.Net.Http; using Crestron.SimplSharp.Net.Https; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using Full.Newtonsoft.Json; +using Full.Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Core.JsonToSimpl;