From b4efa8927886654041e0b2741c3efd3db7326d05 Mon Sep 17 00:00:00 2001
From: Andrew Knous <aknous@pepperdash.com>
Date: Thu, 20 Feb 2025 17:14:14 -0500
Subject: [PATCH 1/3] feat: updates crestron library to 2.21.90

---
 src/Pepperdash Core/PepperDash_Core.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj
index 5d46b30..8b9a4bd 100644
--- a/src/Pepperdash Core/PepperDash_Core.csproj	
+++ b/src/Pepperdash Core/PepperDash_Core.csproj	
@@ -33,7 +33,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.20.66" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />

From 1fd355d808dd587d93b7f6141d0ea21da2af6d22 Mon Sep 17 00:00:00 2001
From: Andrew Knous <aknous@pepperdash.com>
Date: Thu, 20 Feb 2025 18:16:31 -0500
Subject: [PATCH 2/3] feat: adds Newtonsoft dependency for net6

---
 src/Pepperdash Core/PepperDash_Core.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj
index 8b9a4bd..34ec613 100644
--- a/src/Pepperdash Core/PepperDash_Core.csproj	
+++ b/src/Pepperdash Core/PepperDash_Core.csproj	
@@ -42,6 +42,9 @@
     <PackageReference Include="SSH.NET" Version="2024.2.0" />
     <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6'">
+	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Remove="Comm\._GenericSshClient.cs" />
     <Compile Remove="Comm\._GenericTcpIpClient.cs" />

From d03e136ada5889fd6bd17a550e15899540c251c0 Mon Sep 17 00:00:00 2001
From: jtalborough <jtalborough@gmail.com>
Date: Thu, 20 Feb 2025 18:19:45 -0500
Subject: [PATCH 3/3] fix: resolve StringReader compatibility between .NET
 Framework and .NET 6

- Add conditional compilation directives to use appropriate StringReader implementation
- Use System.IO.StringReader for .NET 6
- Use Crestron.SimplSharp.CrestronIO.StringReader for .NET Framework
---
 .../JsonToSimpl/JsonToSimplMaster.cs              | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs
index d531d18..2f872e4 100644
--- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs	
+++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs	
@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
@@ -159,7 +160,11 @@ namespace PepperDash.Core.JsonToSimpl
             /// <returns></returns>
 			public static JObject ParseObject(string json)
 			{
-				using (var reader = new JsonTextReader(new StringReader(json)))
+				#if NET6_0
+                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
+#else
+                using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))
+#endif
 				{
 					var startDepth = reader.Depth;
 					var obj = JObject.Load(reader);
@@ -176,7 +181,11 @@ namespace PepperDash.Core.JsonToSimpl
             /// <returns></returns>
 			public static JArray ParseArray(string json)
 			{
-				using (var reader = new JsonTextReader(new StringReader(json)))
+				#if NET6_0
+                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
+#else
+                using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))
+#endif
 				{
 					var startDepth = reader.Depth;
 					var obj = JArray.Load(reader);