From b74755c825105a630aaa33acc60f042b66ba0f0d Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 1 Feb 2024 16:47:10 -0600 Subject: [PATCH] chore: remove references to full Newtonsoft package --- src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs | 4 ++-- .../Comm and IR/ComSpecJsonConverter.cs | 6 +++--- .../Comm and IR/CommFactory.cs | 6 +++--- .../Comm and IR/CommunicationExtras.cs | 6 +++--- .../Comm and IR/GenericComm.cs | 4 ++-- .../Comm and IR/IRPortHelper.cs | 6 +++--- src/PepperDash.Essentials.Core/Config/BasicConfig.cs | 6 +++--- .../Config/ConfigPropertiesHelpers.cs | 4 ++-- .../Config/DeviceConfig.cs | 6 +++--- .../Config/Essentials/ConfigReader.cs | 6 +++--- .../Config/Essentials/ConfigUpdater.cs | 6 +++--- .../Config/Essentials/ConfigWriter.cs | 6 +++--- .../Config/Essentials/EssentialsConfig.cs | 4 ++-- src/PepperDash.Essentials.Core/Config/InfoConfig.cs | 4 ++-- .../CrestronIO/GenericDigitalInputDevice.cs | 4 ++-- .../CrestronIO/GenericRelayDevice.cs | 4 ++-- .../CrestronIO/GenericVersiportAnalogInputDevice.cs | 4 ++-- .../CrestronIO/GenericVersiportInputDevice.cs | 4 ++-- .../CrestronIO/GenericVersiportOutputDevice.cs | 4 ++-- .../CrestronIO/IOPortConfig.cs | 4 ++-- .../Devices/DestinationListItem.cs | 4 ++-- .../Devices/DeviceJsonApi.cs | 4 ++-- .../Devices/GenericIRController.cs | 4 ++-- .../Devices/IrOutputPortController.cs | 4 ++-- .../Devices/ReconfigurableDevice.cs | 6 +++--- .../Devices/SourceListItem.cs | 8 ++++---- .../Display/DisplayBase.cs | 7 +++++-- .../Extensions/JsonExtensions.cs | 6 +++--- .../Factory/DeviceFactory.cs | 4 ++-- .../Factory/ProcessorExtensionDeviceFactory.cs | 12 ++++++------ ...ssentialsHuddleSpaceFusionSystemControllerBase.cs | 6 +++--- .../Fusion/FusionCustomPropertiesBridge.cs | 6 +++--- src/PepperDash.Essentials.Core/Global/Global.cs | 8 ++++---- .../JoinMaps/JoinMapBase.cs | 4 ++-- .../Lighting/LightingBase.cs | 4 ++-- .../Monitoring/SystemMonitorController.cs | 6 +++--- .../PepperDash.Essentials.Core.csproj | 12 +++++++----- .../Presets/DevicePresets.cs | 4 ++-- src/PepperDash.Essentials.Core/Presets/PresetBase.cs | 4 ++-- .../Presets/PresetChannel.cs | 4 ++-- .../Behaviours/RoomOnToDefaultSourceWhenOccupied.cs | 6 +++--- .../EssentialsRoomCombinerPropertiesConfig.cs | 4 ++-- .../Room/Combining/RoomCombinationScenario.cs | 4 ++-- .../Config/EssentialsRoomScheduledEventsConfig.cs | 6 +++--- .../Routing/TieLineConfig.cs | 6 +++--- .../Secrets/SecretsPropertiesConfig.cs | 4 ++-- .../Timers/RetriggerableTimer.cs | 4 ++-- .../Utilities/ActionSequence.cs | 4 ++-- .../AudioCodec/MockAC/MockAcPropertiesConfig.cs | 4 ++-- .../Cameras/CameraBase.cs | 4 ++-- .../Cameras/CameraVisca.cs | 4 ++-- .../Codec/CodecActiveCallItem.cs | 6 +++--- .../Codec/iHasCallHistory.cs | 6 +++--- .../Codec/iHasDirectory.cs | 6 +++--- .../Codec/iHasScheduleAwareness.cs | 4 ++-- .../DeviceFactory.cs | 2 +- .../PepperDash.Essentials.Devices.Common.csproj | 7 ++----- .../SetTopBox/IRSetTopBoxBase.cs | 4 ++-- .../Streaming/AppleTV.cs | 4 ++-- .../VideoCodec/Interfaces/IHasCodecLayouts.cs | 4 ++-- .../VideoCodec/Interfaces/IHasMeetingInfo.cs | 4 ++-- .../VideoCodec/Interfaces/iVideoCodecInfo.cs | 4 ++-- .../VideoCodec/MockVC/MockVC.cs | 6 +++--- .../VideoCodec/MockVC/MockVcPropertiesConfig.cs | 4 ++-- src/PepperDash.Essentials/ControlSystem.cs | 2 +- src/PepperDash.Essentials/Factory/DeviceFactory.cs | 6 +++--- .../PepperDash.Essentials.csproj | 7 ++----- 67 files changed, 170 insertions(+), 171 deletions(-) diff --git a/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs b/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs index 58917199..545733a7 100644 --- a/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs +++ b/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; using Crestron.SimplSharpPro.EthernetCommunication; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs b/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs index 2f6050b6..f13e6375 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -7,8 +7,8 @@ using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharpPro; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; diff --git a/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs b/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs index 8c132a1b..f7b743cc 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using Crestron.SimplSharp; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DM; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs b/src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs index bc4e4302..995004b9 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -7,8 +7,8 @@ using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharpPro; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; diff --git a/src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs b/src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs index 8ce6a8c5..8e00e5c1 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs @@ -1,10 +1,10 @@ -extern alias Full; + using System; using System.Collections.Generic; using Crestron.SimplSharp.CrestronSockets; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; diff --git a/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs b/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs index 4d99edc0..7141613b 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,8 +6,8 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharpPro; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Core/Config/BasicConfig.cs b/src/PepperDash.Essentials.Core/Config/BasicConfig.cs index 728e8dff..6e876de8 100644 --- a/src/PepperDash.Essentials.Core/Config/BasicConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/BasicConfig.cs @@ -1,10 +1,10 @@ -extern alias Full; + using System.Collections.Generic; using System.Linq; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; namespace PepperDash.Essentials.Core.Config { diff --git a/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs b/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs index 0d832bfa..0950d62e 100644 --- a/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs +++ b/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.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 PepperDash.Essentials.Core; using PepperDash.Core; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; namespace PepperDash.Essentials.Core.Config { diff --git a/src/PepperDash.Essentials.Core/Config/DeviceConfig.cs b/src/PepperDash.Essentials.Core/Config/DeviceConfig.cs index ba21ae38..3eac80d9 100644 --- a/src/PepperDash.Essentials.Core/Config/DeviceConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/DeviceConfig.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,8 +6,8 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharpPro; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs index ae90a1b1..9cdd3e98 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs @@ -1,12 +1,12 @@ -extern alias Full; + using System; 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; using PepperDash.Core.Config; diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs index 71783373..13641a80 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,8 +6,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 Crestron.SimplSharp.Net.Http; using Crestron.SimplSharpPro.Diagnostics; diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs index efb17b51..8c1e8f10 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,8 +6,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; namespace PepperDash.Essentials.Core.Config diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs index 16b1886b..dac5a35c 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Text.RegularExpressions; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; diff --git a/src/PepperDash.Essentials.Core/Config/InfoConfig.cs b/src/PepperDash.Essentials.Core/Config/InfoConfig.cs index 820abde5..32a6f71e 100644 --- a/src/PepperDash.Essentials.Core/Config/InfoConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/InfoConfig.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using Crestron.SimplSharp; using Crestron.SimplSharp.Reflection; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core.Config { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs index 589e4fe5..4078c331 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.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.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs index 44ddef63..b8c580df 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.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.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs index 5da79bbf..a0fbd03d 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Bridges; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs index fd215545..aa25e6b4 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Bridges; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs index 2b3d0fab..8dda5bfb 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -13,7 +13,7 @@ using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Bridges; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs b/src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs index 13d35fb5..ab269f08 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.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.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs b/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs index a3314e9c..946ece3b 100644 --- a/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs @@ -1,6 +1,6 @@ -extern alias Full; + -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Core diff --git a/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs b/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs index dafda2a9..d4c3313d 100644 --- a/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs +++ b/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.Reflection; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; diff --git a/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs b/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs index 178e0c30..b7c15fce 100644 --- a/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs +++ b/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs @@ -1,10 +1,10 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs b/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs index 6ffee074..d65d1f7b 100644 --- a/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs +++ b/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.Linq; using Crestron.SimplSharp; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs b/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs index 50bf90bd..1da908a9 100644 --- a/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs +++ b/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -9,8 +9,8 @@ using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Essentials.Core.Devices { diff --git a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs index 87c66e75..491f76a9 100644 --- a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,9 +6,9 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharpPro; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Converters; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; using PepperDash.Core; namespace PepperDash.Essentials.Core diff --git a/src/PepperDash.Essentials.Core/Display/DisplayBase.cs b/src/PepperDash.Essentials.Core/Display/DisplayBase.cs index aa94f4f4..9ba42cab 100644 --- a/src/PepperDash.Essentials.Core/Display/DisplayBase.cs +++ b/src/PepperDash.Essentials.Core/Display/DisplayBase.cs @@ -1,11 +1,14 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Linq; using Crestron.SimplSharp; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Crestron.SimplSharpPro.DM; +using Crestron.SimplSharpPro.DM.Endpoints; +using Crestron.SimplSharpPro.DM.Endpoints.Transmitters; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; diff --git a/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs b/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs index f001c985..2d71c6bc 100644 --- a/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs +++ b/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs @@ -1,12 +1,12 @@ -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.Essentials.Core { diff --git a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs index bfc32661..8b506141 100644 --- a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs +++ b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs @@ -1,8 +1,8 @@ -extern alias Full; + using Crestron.SimplSharp; using Crestron.SimplSharp.Reflection; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.Config; using System; diff --git a/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs index a5b57ad3..4f78892a 100644 --- a/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs +++ b/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs @@ -1,6 +1,6 @@ -extern alias Full; + using Crestron.SimplSharp.Reflection; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.Config; @@ -70,9 +70,9 @@ namespace PepperDash.Essentials.Core ProcessorExtensionDeviceFactory.ProcessorExtensionFactoryMethods.Add(extensionName, wrapper); } - private static void CheckForSecrets(IEnumerable obj) + private static void CheckForSecrets(IEnumerable obj) { - foreach (var prop in obj.Where(prop => prop.Value as Full.Newtonsoft.Json.Linq.JObject != null)) + foreach (var prop in obj.Where(prop => prop.Value as Newtonsoft.Json.Linq.JObject != null)) { if (prop.Name.ToLower() == "secret") { @@ -80,7 +80,7 @@ namespace PepperDash.Essentials.Core //var secret = GetSecret(JsonConvert.DeserializeObject(prop.Children().First().ToString())); prop.Parent.Replace(secret); } - var recurseProp = prop.Value as Full.Newtonsoft.Json.Linq.JObject; + var recurseProp = prop.Value as Newtonsoft.Json.Linq.JObject; if (recurseProp == null) return; CheckForSecrets(recurseProp.Properties()); } @@ -120,7 +120,7 @@ namespace PepperDash.Essentials.Core var typeName = localDc.Type.ToLower(); - var jObject = properties as Full.Newtonsoft.Json.Linq.JObject; + var jObject = properties as Newtonsoft.Json.Linq.JObject; if (jObject != null) { var jProp = jObject.Properties(); diff --git a/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs index 597a31fd..b15fe095 100644 --- a/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs +++ b/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -10,7 +10,7 @@ using Crestron.SimplSharp.CrestronXml; using Crestron.SimplSharp.CrestronXml.Serialization; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.Fusion; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Config; @@ -252,7 +252,7 @@ namespace PepperDash.Essentials.Core.Fusion ? new FusionRoomGuids(Room.Name, _ipId, RoomGuid, FusionStaticAssets) : new FusionRoomGuids(Room.Name, _ipId, RoomGuid, FusionStaticAssets, FusionOccSensor); - var json = JsonConvert.SerializeObject(_guiDs, Full.Newtonsoft.Json.Formatting.Indented); + var json = JsonConvert.SerializeObject(_guiDs, Newtonsoft.Json.Formatting.Indented); using (var sw = new StreamWriter(filePath)) { diff --git a/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs b/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs index 82f3b972..86eeffc3 100644 --- a/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs +++ b/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs @@ -1,12 +1,12 @@ -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; using PepperDash.Essentials.Core; diff --git a/src/PepperDash.Essentials.Core/Global/Global.cs b/src/PepperDash.Essentials.Core/Global/Global.cs index d9e56673..59d37b56 100644 --- a/src/PepperDash.Essentials.Core/Global/Global.cs +++ b/src/PepperDash.Essentials.Core/Global/Global.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Linq; @@ -14,9 +14,9 @@ using Crestron.SimplSharpPro.DM; using PepperDash.Core; using PepperDash.Essentials.License; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; -using Full.Newtonsoft.Json.Schema; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Schema; namespace PepperDash.Essentials.Core diff --git a/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs b/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs index 0f5519eb..6138c003 100644 --- a/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs +++ b/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -12,7 +12,7 @@ using Crestron.SimplSharp; using PepperDash.Core; using PepperDash.Essentials.Core.Config; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core { diff --git a/src/PepperDash.Essentials.Core/Lighting/LightingBase.cs b/src/PepperDash.Essentials.Core/Lighting/LightingBase.cs index 38a74d37..e144ea62 100644 --- a/src/PepperDash.Essentials.Core/Lighting/LightingBase.cs +++ b/src/PepperDash.Essentials.Core/Lighting/LightingBase.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.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; diff --git a/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs b/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs index 1066637c..2b5b6ea2 100644 --- a/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs +++ b/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -7,8 +7,8 @@ using Crestron.SimplSharp; using Crestron.SimplSharpPro.DeviceSupport; using Crestron.SimplSharpPro.Diagnostics; using PepperDash.Core; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Converters; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; using PepperDash.Essentials.Core.Bridges; namespace PepperDash.Essentials.Core.Monitoring diff --git a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj index a5360467..bea39ded 100644 --- a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj +++ b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj @@ -27,11 +27,13 @@ - - - Full - - + + + + + + + diff --git a/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs b/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs index ab59914d..78e7f7e1 100644 --- a/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs +++ b/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; //using SSMono.IO; diff --git a/src/PepperDash.Essentials.Core/Presets/PresetBase.cs b/src/PepperDash.Essentials.Core/Presets/PresetBase.cs index 1263d231..1eaf7739 100644 --- a/src/PepperDash.Essentials.Core/Presets/PresetBase.cs +++ b/src/PepperDash.Essentials.Core/Presets/PresetBase.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.Essentials.Core.Presets { diff --git a/src/PepperDash.Essentials.Core/Presets/PresetChannel.cs b/src/PepperDash.Essentials.Core/Presets/PresetChannel.cs index 203722f3..c10ba75d 100644 --- a/src/PepperDash.Essentials.Core/Presets/PresetChannel.cs +++ b/src/PepperDash.Essentials.Core/Presets/PresetChannel.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.Essentials.Core.Presets { diff --git a/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs b/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs index c3bc0ca2..ba84f949 100644 --- a/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs +++ b/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -7,8 +7,8 @@ using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.Scheduler; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; diff --git a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs index d926a4a8..745f303f 100644 --- a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using Crestron.SimplSharp; using PepperDash.Core; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core { diff --git a/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs b/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs index d9142495..a4525999 100644 --- a/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs +++ b/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using Crestron.SimplSharp; using PepperDash.Core; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core { diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs index a4239ec2..617b7c9f 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs @@ -1,9 +1,9 @@ -extern alias Full; + using System.Collections.Generic; using Crestron.SimplSharp.Scheduler; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Converters; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Room.Config diff --git a/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs b/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs index ba340302..edb34e7f 100644 --- a/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs +++ b/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,8 +6,8 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharpPro; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; diff --git a/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs index f1f7b995..f092d5d3 100644 --- a/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.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.Essentials.Core { diff --git a/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs b/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs index 0064fd7a..fe72247d 100644 --- a/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs +++ b/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -10,7 +10,7 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core.Timers diff --git a/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs b/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs index 8b657fd5..f0c2bfc2 100644 --- a/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs +++ b/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Core.Utilities { diff --git a/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAcPropertiesConfig.cs b/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAcPropertiesConfig.cs index 084c111f..c9d041eb 100644 --- a/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAcPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAcPropertiesConfig.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.Essentials.Devices.Common.AudioCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs index 294e9066..bc7d371d 100644 --- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -16,7 +16,7 @@ using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Presets; using PepperDash.Essentials.Devices.Common.Codec; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Devices.Common.Cameras { diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs index 5f609c46..59c0d418 100644 --- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs +++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -14,7 +14,7 @@ using PepperDash.Essentials.Devices.Common.Codec; using System.Text.RegularExpressions; using Crestron.SimplSharp.Reflection; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Devices.Common.Cameras { diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/CodecActiveCallItem.cs b/src/PepperDash.Essentials.Devices.Common/Codec/CodecActiveCallItem.cs index f9624991..a8b8d563 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/CodecActiveCallItem.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/CodecActiveCallItem.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,8 +6,8 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Converters; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; namespace PepperDash.Essentials.Devices.Common.Codec diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/iHasCallHistory.cs b/src/PepperDash.Essentials.Devices.Common/Codec/iHasCallHistory.cs index 07e53b3d..e5d060ec 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/iHasCallHistory.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/iHasCallHistory.cs @@ -1,11 +1,11 @@ -extern alias Full; + using System; using System.Collections.Generic; using PepperDash.Essentials.Devices.Common.VideoCodec; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Converters; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; namespace PepperDash.Essentials.Devices.Common.Codec { diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs b/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs index 360d111e..6a4e62fe 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -6,8 +6,8 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Converters; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; using PepperDash.Core; diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/iHasScheduleAwareness.cs b/src/PepperDash.Essentials.Devices.Common/Codec/iHasScheduleAwareness.cs index 6ddf10c2..42ef5b76 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/iHasScheduleAwareness.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/iHasScheduleAwareness.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using Crestron.SimplSharp; using PepperDash.Core; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Devices.Common.Codec { diff --git a/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs b/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs index b5ee9a89..00678803 100644 --- a/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs +++ b/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Linq; diff --git a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj index 6b0b5972..bb182ae7 100644 --- a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj +++ b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj @@ -26,10 +26,7 @@ - - - Full - - + + \ No newline at end of file diff --git a/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs b/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs index b7c7e349..8cc29f0f 100644 --- a/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.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.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Bridges; diff --git a/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs b/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs index 33719295..addc0211 100644 --- a/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs +++ b/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.Reflection; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs index 02280fdb..98a8e4f4 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using Crestron.SimplSharp; using PepperDash.Essentials.Core; -using Full.Newtonsoft.Json; +using Newtonsoft.Json; namespace PepperDash.Essentials.Devices.Common.VideoCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingInfo.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingInfo.cs index 304400fc..bde88b61 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingInfo.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingInfo.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.Essentials.Devices.Common.VideoCodec.Interfaces { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/iVideoCodecInfo.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/iVideoCodecInfo.cs index 23c39325..8f004086 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/iVideoCodecInfo.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/iVideoCodecInfo.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.Essentials.Devices.Common.Codec { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs index 66dc6180..87f0fe55 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -14,8 +14,8 @@ using PepperDash.Essentials.Core.Routing; using PepperDash.Essentials.Devices.Common.Codec; using PepperDash.Essentials.Devices.Common.Cameras; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace PepperDash.Essentials.Devices.Common.VideoCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVcPropertiesConfig.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVcPropertiesConfig.cs index 1f1b823e..c1940c3a 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVcPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVcPropertiesConfig.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; using PepperDash.Core; using PepperDash.Essentials.Core; diff --git a/src/PepperDash.Essentials/ControlSystem.cs b/src/PepperDash.Essentials/ControlSystem.cs index a317b9fa..a98e25b2 100644 --- a/src/PepperDash.Essentials/ControlSystem.cs +++ b/src/PepperDash.Essentials/ControlSystem.cs @@ -1,4 +1,4 @@ -extern alias Full; + using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharp.Reflection; diff --git a/src/PepperDash.Essentials/Factory/DeviceFactory.cs b/src/PepperDash.Essentials/Factory/DeviceFactory.cs index 418fb603..1f7cae95 100644 --- a/src/PepperDash.Essentials/Factory/DeviceFactory.cs +++ b/src/PepperDash.Essentials/Factory/DeviceFactory.cs @@ -1,4 +1,4 @@ -extern alias Full; + using System; using System.Collections.Generic; @@ -8,8 +8,8 @@ using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharpPro; using Crestron.SimplSharp.Reflection; -using Full.Newtonsoft.Json; -using Full.Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; diff --git a/src/PepperDash.Essentials/PepperDash.Essentials.csproj b/src/PepperDash.Essentials/PepperDash.Essentials.csproj index 3b6c5d83..2c6b6ebb 100644 --- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj +++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj @@ -45,11 +45,8 @@ - - - Full - - + +