From c314b0e7453a340f0503a1d86321f30e997b86c4 Mon Sep 17 00:00:00 2001
From: jtalborough <jtalborough@gmail.com>
Date: Tue, 25 Feb 2025 15:50:28 -0500
Subject: [PATCH] fix: update StringReader usage for .NET 8 compatibility and
 add Newtonsoft.Json dependency

---
 src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs | 4 ++--
 src/Pepperdash Core/PepperDash_Core.csproj           | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs
index 2f872e4..36ff843 100644
--- a/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs	
+++ b/src/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs	
@@ -163,7 +163,7 @@ namespace PepperDash.Core.JsonToSimpl
 				#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)))
+                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
 #endif
 				{
 					var startDepth = reader.Depth;
@@ -184,7 +184,7 @@ namespace PepperDash.Core.JsonToSimpl
 				#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)))
+                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
 #endif
 				{
 					var startDepth = reader.Depth;
diff --git a/src/Pepperdash Core/PepperDash_Core.csproj b/src/Pepperdash Core/PepperDash_Core.csproj
index 34ec613..28f17de 100644
--- a/src/Pepperdash Core/PepperDash_Core.csproj	
+++ b/src/Pepperdash Core/PepperDash_Core.csproj	
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>PepperDash.Core</RootNamespace>
     <AssemblyName>PepperDashCore</AssemblyName>
-    <TargetFrameworks>net472;net6</TargetFrameworks>
+    <TargetFrameworks>net8</TargetFrameworks>
     <Deterministic>true</Deterministic>
     <NeutralLanguage>en</NeutralLanguage>
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -34,6 +34,7 @@
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
     <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
@@ -42,9 +43,6 @@
     <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" />