From 71ad465c933ede12851792fd4e4a1fa944f7bb0c Mon Sep 17 00:00:00 2001
From: Scrub <72096833+ScrubN@users.noreply.github.com>
Date: Wed, 12 Feb 2025 20:17:10 -0500
Subject: [PATCH] Bump nuget packages (#1304)
* Bump nuget packages
* No more Newtonsoft.Json!
* Revert license file change
---
.../TwitchDownloaderCLI.Tests.csproj | 8 ++++----
TwitchDownloaderCLI/TwitchDownloaderCLI.csproj | 2 +-
.../TwitchDownloaderCore.Tests.csproj | 8 ++++----
TwitchDownloaderWPF/PageChatRender.xaml.cs | 8 ++++----
TwitchDownloaderWPF/TwitchDownloaderWPF.csproj | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/TwitchDownloaderCLI.Tests/TwitchDownloaderCLI.Tests.csproj b/TwitchDownloaderCLI.Tests/TwitchDownloaderCLI.Tests.csproj
index c835c04b..601e6f40 100644
--- a/TwitchDownloaderCLI.Tests/TwitchDownloaderCLI.Tests.csproj
+++ b/TwitchDownloaderCLI.Tests/TwitchDownloaderCLI.Tests.csproj
@@ -11,13 +11,13 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/TwitchDownloaderCLI/TwitchDownloaderCLI.csproj b/TwitchDownloaderCLI/TwitchDownloaderCLI.csproj
index f403c3ea..a170dc6d 100644
--- a/TwitchDownloaderCLI/TwitchDownloaderCLI.csproj
+++ b/TwitchDownloaderCLI/TwitchDownloaderCLI.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/TwitchDownloaderCore.Tests/TwitchDownloaderCore.Tests.csproj b/TwitchDownloaderCore.Tests/TwitchDownloaderCore.Tests.csproj
index 8b8af64f..cf7c39b0 100644
--- a/TwitchDownloaderCore.Tests/TwitchDownloaderCore.Tests.csproj
+++ b/TwitchDownloaderCore.Tests/TwitchDownloaderCore.Tests.csproj
@@ -11,13 +11,13 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/TwitchDownloaderWPF/PageChatRender.xaml.cs b/TwitchDownloaderWPF/PageChatRender.xaml.cs
index 26a1cd97..8f5c8b67 100644
--- a/TwitchDownloaderWPF/PageChatRender.xaml.cs
+++ b/TwitchDownloaderWPF/PageChatRender.xaml.cs
@@ -1,6 +1,5 @@
using HandyControl.Controls;
using Microsoft.Win32;
-using Newtonsoft.Json;
using SkiaSharp;
using System;
using System.Collections.Generic;
@@ -9,6 +8,7 @@
using System.Globalization;
using System.IO;
using System.Linq;
+using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@@ -527,7 +527,7 @@ private void btnResetFfmpeg_Click(object sender, RoutedEventArgs e)
private void SaveArguments()
{
- List args = JsonConvert.DeserializeObject>(Settings.Default.FfmpegArguments);
+ List args = JsonSerializer.Deserialize>(Settings.Default.FfmpegArguments);
bool foundArg = false;
foreach (CustomFfmpegArgs arg in args)
@@ -548,13 +548,13 @@ private void SaveArguments()
args.Add(newArgs);
}
- Settings.Default.FfmpegArguments = JsonConvert.SerializeObject(args);
+ Settings.Default.FfmpegArguments = JsonSerializer.Serialize(args);
Settings.Default.Save();
}
private void LoadFfmpegArgs()
{
- List args = JsonConvert.DeserializeObject>(Settings.Default.FfmpegArguments);
+ List args = JsonSerializer.Deserialize>(Settings.Default.FfmpegArguments);
bool foundArg = false;
foreach (CustomFfmpegArgs arg in args)
diff --git a/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj b/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj
index b6b7d24e..b1d9ac18 100644
--- a/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj
+++ b/TwitchDownloaderWPF/TwitchDownloaderWPF.csproj
@@ -54,7 +54,7 @@
-
+