diff --git a/src/PepperDash Core.sln b/src/PepperDash Core.sln deleted file mode 100644 index f38b242..0000000 --- a/src/PepperDash Core.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32228.430 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash_Core", "Pepperdash Core\PepperDash_Core.csproj", "{66EB9188-E7AC-410D-AD59-931131DA7C2E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66EB9188-E7AC-410D-AD59-931131DA7C2E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E4615FA3-8C8C-4DC0-897B-E85408B4E341} - EndGlobalSection -EndGlobal diff --git a/src/Pepperdash Core/Comm/ControlPropertiesConfig.cs b/src/Pepperdash Core/Comm/ControlPropertiesConfig.cs index 7bb7557..288f130 100644 --- a/src/Pepperdash Core/Comm/ControlPropertiesConfig.cs +++ b/src/Pepperdash Core/Comm/ControlPropertiesConfig.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Core { diff --git a/src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs b/src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs index f00d030..c29f96b 100644 --- a/src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs +++ b/src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs @@ -9,15 +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 Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core { diff --git a/src/Pepperdash Core/Comm/GenericTcpIpClient.cs b/src/Pepperdash Core/Comm/GenericTcpIpClient.cs index f77d06f..277aecd 100644 --- a/src/Pepperdash Core/Comm/GenericTcpIpClient.cs +++ b/src/Pepperdash Core/Comm/GenericTcpIpClient.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Text; using System.Text.RegularExpressions; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Core { diff --git a/src/Pepperdash Core/Comm/GenericTcpIpServer.cs b/src/Pepperdash Core/Comm/GenericTcpIpServer.cs index f77a71c..1b8a360 100644 --- a/src/Pepperdash Core/Comm/GenericTcpIpServer.cs +++ b/src/Pepperdash Core/Comm/GenericTcpIpServer.cs @@ -9,15 +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 Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core { diff --git a/src/Pepperdash Core/Comm/GenericUdpServer.cs b/src/Pepperdash Core/Comm/GenericUdpServer.cs index e1daeb2..e83d5b6 100644 --- a/src/Pepperdash Core/Comm/GenericUdpServer.cs +++ b/src/Pepperdash Core/Comm/GenericUdpServer.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; @@ -9,8 +9,8 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; diff --git a/src/Pepperdash Core/Comm/TcpClientConfigObject.cs b/src/Pepperdash Core/Comm/TcpClientConfigObject.cs index 5c71a50..0539441 100644 --- a/src/Pepperdash Core/Comm/TcpClientConfigObject.cs +++ b/src/Pepperdash Core/Comm/TcpClientConfigObject.cs @@ -1,6 +1,6 @@ -extern alias Full; + -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Core { diff --git a/src/Pepperdash Core/CommunicationExtras.cs b/src/Pepperdash Core/CommunicationExtras.cs index 79a6b9a..cd1ce71 100644 --- a/src/Pepperdash Core/CommunicationExtras.cs +++ b/src/Pepperdash Core/CommunicationExtras.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; @@ -6,8 +6,8 @@ using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronSockets; using System.Text.RegularExpressions; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core { diff --git a/src/Pepperdash Core/Config/PortalConfigReader.cs b/src/Pepperdash Core/Config/PortalConfigReader.cs index 803875f..e4611f5 100644 --- a/src/Pepperdash Core/Config/PortalConfigReader.cs +++ b/src/Pepperdash Core/Config/PortalConfigReader.cs @@ -1,12 +1,12 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; diff --git a/src/Pepperdash Core/EthernetHelper.cs b/src/Pepperdash Core/EthernetHelper.cs index 5e02540..3b1a2e4 100644 --- a/src/Pepperdash Core/EthernetHelper.cs +++ b/src/Pepperdash Core/EthernetHelper.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Core { diff --git a/src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs b/src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs index e0486fa..61c12b1 100644 --- a/src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs +++ b/src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core.JsonToSimpl; namespace PepperDash.Core.JsonStandardObjects diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs index b462b58..690aa94 100644 --- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs +++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs index a7a32b2..01e4e0c 100644 --- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs +++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs index 521cecc..0cb79b1 100644 --- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs +++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; //using System.IO; using System.Collections.Generic; @@ -7,8 +7,8 @@ using System.Text; using System.Text.RegularExpressions; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs index 1ad0cd3..c12053e 100644 --- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs +++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; //using System.IO; @@ -7,8 +7,8 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs index d9b201d..de9faf1 100644 --- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs +++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs @@ -1,9 +1,9 @@ -extern alias Full; + using System; using System.Collections.Generic; using Crestron.SimplSharp; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs index ab13429..05f61dd 100644 --- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs +++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; //using System.IO; @@ -7,8 +7,8 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Core.JsonToSimpl { diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs index 8a85b33..74b10eb 100644 --- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs +++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; //using System.IO; @@ -7,8 +7,8 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core.Config; diff --git a/src/Pepperdash Core/Logging/Debug.cs b/src/Pepperdash Core/Logging/Debug.cs index a0af198..19961cc 100644 --- a/src/Pepperdash Core/Logging/Debug.cs +++ b/src/Pepperdash Core/Logging/Debug.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Text.RegularExpressions; @@ -6,7 +6,7 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.Reflection; using Crestron.SimplSharp.CrestronLogger; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core.DebugThings; diff --git a/src/Pepperdash Core/Logging/DebugContext.cs b/src/Pepperdash Core/Logging/DebugContext.cs index 3d7e7bb..2ff52be 100644 --- a/src/Pepperdash Core/Logging/DebugContext.cs +++ b/src/Pepperdash Core/Logging/DebugContext.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronDataStore; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core.DebugThings; diff --git a/src/Pepperdash Core/Logging/DebugMemory.cs b/src/Pepperdash Core/Logging/DebugMemory.cs index 6bb3dbb..0c74f1f 100644 --- a/src/Pepperdash Core/Logging/DebugMemory.cs +++ b/src/Pepperdash Core/Logging/DebugMemory.cs @@ -1,9 +1,9 @@ -extern alias Full; + using System.Collections.Generic; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Core.DebugThings { diff --git a/src/Pepperdash Core/PasswordManagement/PasswordManager.cs b/src/Pepperdash Core/PasswordManagement/PasswordManager.cs index 594e70e..d869e54 100644 --- a/src/Pepperdash Core/PasswordManagement/PasswordManager.cs +++ b/src/Pepperdash Core/PasswordManagement/PasswordManager.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Crestron.SimplSharp; using PepperDash.Core.JsonToSimpl; using PepperDash.Core.JsonStandardObjects; diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj index 845577b..78b17a2 100644 --- a/src/Pepperdash Core/PepperDash_Core.csproj +++ b/src/Pepperdash Core/PepperDash_Core.csproj @@ -32,7 +32,7 @@ - Full + @@ -43,4 +43,11 @@ + + + + crestron + + + \ No newline at end of file diff --git a/src/Pepperdash Core/WebApi/Presets/Preset.cs b/src/Pepperdash Core/WebApi/Presets/Preset.cs index 49e6427..2cc762e 100644 --- a/src/Pepperdash Core/WebApi/Presets/Preset.cs +++ b/src/Pepperdash Core/WebApi/Presets/Preset.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Core.WebApi.Presets diff --git a/src/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs b/src/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs index 3f178f8..a16a6e0 100644 --- a/src/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs +++ b/src/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Text; @@ -7,8 +7,8 @@ using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharp.Net; using Crestron.SimplSharp.Net.Http; using Crestron.SimplSharp.Net.Https; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Core.JsonToSimpl;