mperdeck#205 Move to System.Text.Json from Newtonsoft

thompson-tomo · May 21, 2024 · 49741a9 · 49741a9
1 parent bc6cfc0
commit 49741a9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/jsnlog/Infrastructure/LogMessageHelpers.cs b/jsnlog/Infrastructure/LogMessageHelpers.cs
@@ -1,21 +1,21 @@
 using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace JSNLog.Infrastructure
 {
     internal class LogMessageHelpers
     {
         public static T DeserializeJson<T>(string json)
         {
-            T result = JsonConvert.DeserializeObject<T>(json);
+            T result = JsonSerializer.Deserialize<T>(json);
             return result;
         }
 
         public static bool IsPotentialJson(string msg)
         {
             string trimmedMsg = msg.Trim();
-            return (trimmedMsg.StartsWith("{") && trimmedMsg.EndsWith("}")); 
+            return (trimmedMsg.StartsWith("{") && trimmedMsg.EndsWith("}"));
         }
 
         /// <summary>
@@ -71,7 +71,7 @@ public static bool IsJsonString(string msg)
         /// <summary>
         /// Takes a log message and finds out if it contains a valid JSON string.
         /// If so, returns it unchanged.
-        /// 
+        ///
         /// Otherwise, surrounds the string with quotes (") and escapes the string for JavaScript.
         /// </summary>
         /// <param name="ms"></param>

diff --git a/jsnlog/JSNLog.ClassLibrary.nuspec b/jsnlog/JSNLog.ClassLibrary.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata minClientVersion="2.8.6">
-    <id>JSNLog.ClassLibrary</id>   
+    <id>JSNLog.ClassLibrary</id>
     <version>0.0.0</version>
     <title>JSNLog.ClassLibrary - Class library for JSNLog</title>
     <authors>Matt Perdeck</authors>
@@ -19,7 +19,7 @@
 				* JSNLog
 				* CommonLogging - a copy of JSNLog, except for the id.
 				* JSNLog.ClassLibrary.nuspec - does not copy contents files or the readme.txt file, and does not depend on WebActivatorEx. For use in class libraries.
-		
+
                The CommonLogging NuGet package and the JSNLog package have the same dependencies
                and files. This because CommonLogging is purely a convenience package - JSNLog
                already builds on Common.Logging, so it is not really needed. Only reason it is there
@@ -30,9 +30,9 @@
                in the other as well. -->
         <dependency id="Common.Logging" version="3.3.1" />
 
-        <!-- 
-		    The below definition causes NuGet to load version 2.1.0 if no version of 
-		    Microsoft.Owin has already been installed (it tries to install the LOWEST 
+        <!--
+		    The below definition causes NuGet to load version 2.1.0 if no version of
+		    Microsoft.Owin has already been installed (it tries to install the LOWEST
 		    possible version of a package).
 
 		    This will work fine in a .Net 4.0 project. Note that versions past 2.1.0 no longer support .Net 4.0.
@@ -41,9 +41,9 @@
 		    JSNLog project in its references) to the version that is actually installed in the project.
         -->
         <dependency id="Microsoft.Owin" version="2.1.0" />
-        
+
         <!-- Use low minimum version to make installation easier with old code -->
-        <dependency id="Newtonsoft.Json" version="9.0.1" />
+        <dependency id="System.Text.Json" version="4.6.0" />
       </group>
     </dependencies>
   </metadata>

diff --git a/jsnlog/JSNLog.nuspec b/jsnlog/JSNLog.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata minClientVersion="2.8.6">
-    <id>JSNLog</id>   
+    <id>JSNLog</id>
     <version>0.0.0</version>
     <title>JSNLog - JavaScript Logging Package</title>
     <authors>Matt Perdeck</authors>
@@ -31,9 +31,9 @@
         <dependency id="Common.Logging" version="3.3.1" />
         <dependency id="WebActivatorEx" version="2.0.0" />
 
-        <!-- 
-		    The below definition causes NuGet to load version 2.1.0 if no version of 
-		    Microsoft.Owin has already been installed (it tries to install the LOWEST 
+        <!--
+		    The below definition causes NuGet to load version 2.1.0 if no version of
+		    Microsoft.Owin has already been installed (it tries to install the LOWEST
 		    possible version of a package).
 
 		    This will work fine in a .Net 4.0 project. Note that versions past 2.1.0 no longer support .Net 4.0.
@@ -42,9 +42,9 @@
 		    JSNLog project in its references) to the version that is actually installed in the project.
         -->
         <dependency id="Microsoft.Owin" version="2.1.0" />
-        
+
         <!-- Use low minimum version to make installation easier with old code -->
-        <dependency id="Newtonsoft.Json" version="9.0.1" />
+        <dependency id="System.Text.Json" version="4.6.0" />
       </group>
     </dependencies>
   </metadata>

diff --git a/jsnlog/jsnlog.csproj b/jsnlog/jsnlog.csproj
@@ -39,22 +39,19 @@
 		<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.*" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.*" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.1.*" />
+		<PackageReference Include="System.Text.Json" Version="4.6.0" />
     </ItemGroup>
 
 	<ItemGroup Condition="('$(TargetFramework)' != 'netstandard2.0') AND ('$(TargetFramework)' != 'netstandard2.1')">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-	</ItemGroup>
-
   <ItemGroup>
     <Content Include="NuGet\readme.txt">
       <Pack>true</Pack>
       <PackagePath>readme.txt</PackagePath>
     </Content>
-	  <None Include="NuGet\icon.png" Pack="true" PackagePath=""/>
+	  <None Include="NuGet\icon.png" Pack="true" PackagePath="" />
   </ItemGroup>
 </Project>