Merge dev-2

src/Pepperdash Core/Comm/ControlPropertiesConfig.cs

@@ -1,11 +1,6 @@
-extern alias Full;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs

@@ -3,21 +3,18 @@
 Copyright:		2017
 ------------------------------------
 ***Notice of Ownership and Copyright***
-The material in which this notice appears is the property of PepperDash Technology Corporation, 
-which claims copyright under the laws of the United States of America in the entire body of material 
-and in all parts thereof, regardless of the use to which it is being put.  Any use, in whole or in part, 
-of this material by another party without the express written permission of PepperDash Technology Corporation is prohibited.  
+The material in which this notice appears is the property of PepperDash Technology Corporation,
+which claims copyright under the laws of the United States of America in the entire body of material
+and in all parts thereof, regardless of the use to which it is being put.  Any use, in whole or in part,
+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;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/Comm/GenericTcpIpClient.cs

@@ -1,12 +1,10 @@
-extern alias Full;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/Comm/GenericTcpIpServer.cs

@@ -3,21 +3,18 @@
 Copyright:		2017
 ------------------------------------
 ***Notice of Ownership and Copyright***
-The material in which this notice appears is the property of PepperDash Technology Corporation, 
-which claims copyright under the laws of the United States of America in the entire body of material 
-and in all parts thereof, regardless of the use to which it is being put.  Any use, in whole or in part, 
-of this material by another party without the express written permission of PepperDash Technology Corporation is prohibited.  
+The material in which this notice appears is the property of PepperDash Technology Corporation,
+which claims copyright under the laws of the United States of America in the entire body of material
+and in all parts thereof, regardless of the use to which it is being put.  Any use, in whole or in part,
+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;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/Comm/GenericUdpServer.cs

@@ -1,19 +1,11 @@
-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 Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
-
-
-
+using Newtonsoft.Json;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/Comm/TcpClientConfigObject.cs

@@ -1,6 +1,4 @@
-extern alias Full;
-
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/CommunicationExtras.cs

@@ -1,13 +1,10 @@
-extern alias Full;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using System.Text.RegularExpressions;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/Config/PortalConfigReader.cs

@@ -1,15 +1,9 @@
-extern alias Full;
-
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Text;
-
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
 namespace PepperDash.Core.Config

src/Pepperdash Core/EthernetHelper.cs

@@ -1,11 +1,5 @@
-extern alias Full;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Full.Newtonsoft.Json;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
 
 namespace PepperDash.Core
 {

src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs

@@ -1,11 +1,6 @@
-extern alias Full;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
 using PepperDash.Core.JsonToSimpl;
 
 namespace PepperDash.Core.JsonStandardObjects

src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs

@@ -1,11 +1,6 @@
-extern alias Full;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Core.JsonToSimpl
 {

src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs

@@ -1,11 +1,7 @@
-extern alias Full;
-using System;
+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.Linq;
 
 namespace PepperDash.Core.JsonToSimpl
 {

src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs

@@ -1,14 +1,11 @@
-extern alias Full;
-using System;
-//using System.IO;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 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.Linq;
 
 namespace PepperDash.Core.JsonToSimpl
 {

src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs

@@ -1,14 +1,4 @@
-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 Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
+
 
 namespace PepperDash.Core.JsonToSimpl
 {

src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs

@@ -1,9 +1,7 @@
-extern alias Full;
-
-using System;
+using System;
 using System.Collections.Generic;
 using Crestron.SimplSharp;
-using Full.Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Core.JsonToSimpl
 {

src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs

@@ -1,14 +1,9 @@
-extern alias Full;
-
-using System;
-//using System.IO;
+using System;
 using System.Collections.Generic;
-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
 {
@@ -164,7 +159,7 @@ public static class JsonFixes
             /// <returns></returns>
 			public static JObject ParseObject(string json)
 			{
-				using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
+				using (var reader = new JsonTextReader(new StringReader(json)))
 				{
 					var startDepth = reader.Depth;
 					var obj = JObject.Load(reader);
@@ -181,7 +176,7 @@ public static JObject ParseObject(string json)
             /// <returns></returns>
 			public static JArray ParseArray(string json)
 			{
-				using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
+				using (var reader = new JsonTextReader(new StringReader(json)))
 				{
 					var startDepth = reader.Depth;
 					var obj = JArray.Load(reader);

src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs

@@ -1,15 +1,9 @@
-extern alias Full;
-
-using System;
-//using System.IO;
+using System;
 using System.Collections.Generic;
 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.Linq;
 using PepperDash.Core.Config;
 
 namespace PepperDash.Core.JsonToSimpl

src/Pepperdash Core/Logging/Debug.cs

@@ -1,12 +1,11 @@
-extern alias Full;
-using System;
+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 Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 using PepperDash.Core.DebugThings;
 using Serilog;
 using Serilog.Core;

src/Pepperdash Core/Logging/DebugContext.cs

@@ -1,14 +1,9 @@
-extern alias Full;
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronDataStore;
 using Crestron.SimplSharp.CrestronIO;
-using Full.Newtonsoft.Json;
-using PepperDash.Core.DebugThings;
+using Newtonsoft.Json;
 
 
 namespace PepperDash.Core

src/Pepperdash Core/Logging/DebugMemory.cs

@@ -1,9 +1,6 @@
-extern alias Full;
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Crestron.SimplSharp;
-
-using Full.Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace PepperDash.Core.DebugThings
 {

src/Pepperdash Core/PasswordManagement/PasswordManager.cs

@@ -1,14 +1,6 @@
-extern alias Full;
-
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Full.Newtonsoft.Json;
-using Full.Newtonsoft.Json.Linq;
 using Crestron.SimplSharp;
-using PepperDash.Core.JsonToSimpl;
-using PepperDash.Core.JsonStandardObjects;
 
 namespace PepperDash.Core.PasswordManagement
 {

src/Pepperdash Core/PepperDash_Core.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>PepperDash.Core</RootNamespace>
     <AssemblyName>PepperDashCore</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
     <Deterministic>false</Deterministic>
     <NeutralLanguage>en</NeutralLanguage>
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -32,10 +32,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BouncyCastle" Version="1.8.9" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.19.35" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
-      <Aliases>Full</Aliases>
-    </PackageReference>
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.20.42" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />

src/Pepperdash Core/WebApi/Presets/Preset.cs

@@ -1,13 +1,4 @@
-extern alias Full;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Full.Newtonsoft.Json;
-
+using System;
 
 namespace PepperDash.Core.WebApi.Presets
 {