Switch to System.Text.Json

Author: ElektroKill

dnSpy/dnSpy/Documents/Tabs/NodeTabSaver.cs

@@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 using System.Windows.Threading;
 using dnSpy.Contracts.App;
 using dnSpy.Contracts.Decompiler;

dnSpy/dnSpy/MainApp/UpdateService.cs

@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reflection;
+using System.Text.Json;
 using System.Threading.Tasks;
 using dnSpy.Contracts.Settings;
-using Newtonsoft.Json.Linq;
 
 namespace dnSpy.MainApp {
 	public readonly struct UpdateCheckInfo {
@@ -146,11 +146,18 @@ public async Task<UpdateCheckInfo> CheckForUpdatesAsync() {
 					result = await client.GetStringAsync("https://api.github.com/repos/dnSpyEx/dnSpy/releases/latest");
 				}
 
-				var json = JObject.Parse(result);
-				if (!json.TryGetValue("tag_name", out var tagToken) || tagToken is not JValue tagValue || tagValue.Value is not string tagName)
+				using var doc = JsonDocument.Parse(result);
+				var root = doc.RootElement;
+				if (!root.TryGetProperty("tag_name", out var tagElement) || tagElement.ValueKind != JsonValueKind.String)
 					return null;
-				if (!json.TryGetValue("html_url", out var urlToken) || urlToken is not JValue urlValue || urlValue.Value is not string htmlUrl)
+				if (!root.TryGetProperty("html_url", out var urlElement) || urlElement.ValueKind != JsonValueKind.String)
 					return null;
+
+				string? tagName = tagElement.GetString();
+				string? htmlUrl = urlElement.GetString();
+				if (tagName is null || htmlUrl is null)
+					return null;
+
 				if (tagName[0] == 'v')
 					tagName = tagName.Remove(0, 1);
 				if (Version.TryParse(tagName, out var version)) {

dnSpy/dnSpy/app.config

@@ -111,11 +111,11 @@
 
 			<dependentAssembly>
 				<assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-				<bindingRedirect oldVersion="1.1.0.0-10.0.0.3" newVersion="10.0.0.3" />
+				<bindingRedirect oldVersion="1.1.0.0-10.0.0.5" newVersion="10.0.0.5" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.Reflection.Metadata" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-				<bindingRedirect oldVersion="1.0.21.0-10.0.0.3" newVersion="10.0.0.3" />
+				<bindingRedirect oldVersion="1.0.21.0-10.0.0.5" newVersion="10.0.0.5" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

dnSpy/dnSpy/dnSpy.csproj

@@ -108,7 +108,6 @@
     <!-- Self contained .NET apps already ship with this DLL (not necessarily the same version, though) -->
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(DiaSymReaderVersion)" Condition=" '$(IsSelfContainedDotNet)' != 'true' " />
     <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(MSVSTextVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
   </ItemGroup>
 
 </Project>