pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-01-11 19:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge dev-2

Browse Source
This commit is contained in:
Andrew Welker
2024-02-05 12:55:49 -06:00
parent def22cfe91 2b95857441
commit b13a178788
24 changed files with 51 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Pepperdash Core/Comm/ControlPropertiesConfig.cs
View File

@@ -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
{

3
src/Pepperdash Core/Comm/GenericSecureTcpIpServer.cs
View File

@@ -9,15 +9,12 @@ 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;
namespace PepperDash.Core
{

6
src/Pepperdash Core/Comm/GenericTcpIpClient.cs
View File

@@ -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
{

3
src/Pepperdash Core/Comm/GenericTcpIpServer.cs
View File

@@ -9,15 +9,12 @@ 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;
namespace PepperDash.Core
{

12
src/Pepperdash Core/Comm/GenericUdpServer.cs
View File

@@ -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
{

4
src/Pepperdash Core/Comm/TcpClientConfigObject.cs
View File

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

5
src/Pepperdash Core/CommunicationExtras.cs
View File

@@ -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
{

12
src/Pepperdash Core/Config/PortalConfigReader.cs
View File

@@ -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

10
src/Pepperdash Core/EthernetHelper.cs
View File

@@ -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
{

7
src/Pepperdash Core/JsonStandardObjects/JsonToSimplDevice.cs
View File

@@ -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

9
src/Pepperdash Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs
View File

@@ -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
{

8
src/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs
View File

@@ -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
{

7
src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs
View File

@@ -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
{

12
src/Pepperdash Core/JsonToSimpl/JsonToSimplFixedPathObject.cs
View File

@@ -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
{

6
src/Pepperdash Core/JsonToSimpl/JsonToSimplGenericMaster.cs
View File

@@ -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
{

15
src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs
View File

@@ -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 @@ namespace PepperDash.Core.JsonToSimpl
/// <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 @@ namespace PepperDash.Core.JsonToSimpl
/// <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);

10
src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs
View File

@@ -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

5
src/Pepperdash Core/Logging/Debug.cs
View File

@@ -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;

9
src/Pepperdash Core/Logging/DebugContext.cs
View File

@@ -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

7
src/Pepperdash Core/Logging/DebugMemory.cs
View File

@@ -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
{

10
src/Pepperdash Core/PasswordManagement/PasswordManager.cs
View File

@@ -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
{

7
src/Pepperdash Core/PepperDash_Core.csproj
View File

@@ -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" />

11
src/Pepperdash Core/WebApi/Presets/Preset.cs
View File

@@ -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
{

12
src/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs
View File

@@ -1,16 +1,10 @@
extern alias Full;
using System;
using System.Text;
using System;
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 Full.Newtonsoft.Json;
using Full.Newtonsoft.Json.Linq;
using PepperDash.Core;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using PepperDash.Core.JsonToSimpl;