Skip to content

Commit a49d348

Browse files
csharpfritzcsharpfritz
committed
Updated projects to .NET 9 and fixed transitive dependencies
1 parent 4acdf14 commit a49d348

8 files changed

Lines changed: 47 additions & 46 deletions

File tree

‎Fritz.Chatbot/Fritz.Chatbot.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="FaunaDB.Client" Version="4.2.0" />
13-
<PackageReference Include="Markdig" Version="0.27.0" />
13+
<PackageReference Include="Markdig" Version="0.37.0" />
1414
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
1515
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0-*" />
16+
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
1617
<PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.CustomVision.Prediction" Version="1.0.0" />
1718
<PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training" Version="1.0.0" />
1819
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0-*" />
@@ -21,7 +22,10 @@
2122
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0-*" />
2223
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-*" />
2324
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-*" />
25+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
2426
<PackageReference Include="NetCoreAudio" Version="1.6.3" />
27+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
28+
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
2529
</ItemGroup>
2630

2731
<ItemGroup>

‎Fritz.ObsProxy/Fritz.ObsProxy.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<UserSecretsId>dotnet-Fritz.ObsProxy-63F1EE89-A75A-469F-919F-8238E927CEB8</UserSecretsId>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.2" />
10-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
9+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0-*" />
10+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-*" />
1111
<PackageReference Include="obs-websocket-dotnet" Version="5.0.0.3" />
12-
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
12+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎Fritz.StreamTools/Fritz.StreamTools.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
55
<UserSecretsId>78c713a0-80e0-4e16-956a-33cf16f08a02</UserSecretsId>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -22,13 +22,16 @@
2222
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
2323
<PackageReference Include="Bundgaard.MixerLib" Version="1.2.65" />
2424
<PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.2" />
25+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.10" />
2626
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language.TextAnalytics" Version="4.0.0" />
2727
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
28-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.2" />
28+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.5" />
2929
<PackageReference Include="Octokit" Version="0.50.0" />
30-
<PackageReference Include="System.IO.Abstractions" Version="16.1.10" />
31-
<PackageReference Include="System.Memory" Version="4.5.4" />
30+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
31+
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
32+
<PackageReference Include="System.Memory" Version="4.5.5" />
33+
<PackageReference Include="System.Net.Security" Version="4.3.2" />
34+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3235
</ItemGroup>
3336
<ItemGroup>
3437
<None Include="wwwroot\js\GoalConfiguration\GoalConfiguration.js" />

‎Fritz.Twitch/Fritz.Twitch.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<Compile Include="..\Fritz.StreamTools\Helpers\TaskExtensions.cs" Link="TaskExtensions.cs" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
13-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
12+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0-*" />
1413
</ItemGroup>
1514

1615
</Project>

‎Fritz.Twitch/Proxy.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using Microsoft.Extensions.Logging;
22
using Microsoft.Extensions.Options;
3-
using Newtonsoft.Json;
4-
using Newtonsoft.Json.Linq;
53
using System;
64
using System.Linq;
75
using System.Net.Http;
6+
using System.Text.Json;
7+
using System.Text.Json.Nodes;
88
using System.Threading;
99
using System.Threading.Tasks;
1010

@@ -292,23 +292,23 @@ public async Task<StreamData> GetStreamAsync()
292292
internal static int ParseFollowerResult(string twitchString)
293293
{
294294

295-
var jObj = JsonConvert.DeserializeObject<JObject>(twitchString);
295+
var jObj = JsonNode.Parse(twitchString);
296296

297-
return jObj.Value<int>("total");
297+
return jObj["total"].GetValue<int>();
298298

299299
}
300300

301301
internal static StreamData ParseStreamResult(string twitchString)
302302
{
303303

304-
var jObj = JsonConvert.DeserializeObject<JObject>(twitchString);
304+
var jObj = JsonNode.Parse(twitchString);
305305

306-
if (!jObj["data"].HasValues)
306+
if (jObj["data"] is null)
307307
{
308308
return null;
309309
}
310310

311-
var data = jObj.GetValue("data")[0];
311+
var data = jObj["data"][0];
312312

313313
return (StreamData)data;
314314

‎Fritz.Twitch/PubSub/Proxy.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using Microsoft.Extensions.Logging;
22
using Microsoft.Extensions.Options;
3-
using Newtonsoft.Json;
4-
using Newtonsoft.Json.Linq;
53
using System;
64
using System.Collections.Generic;
75
using System.Linq;
86
using System.Net.WebSockets;
97
using System.Text;
8+
using System.Text.Json;
109
using System.Threading;
1110
using System.Threading.Tasks;
1211
using System.Timers;
@@ -132,9 +131,9 @@ public async Task StartAsync(IEnumerable<TwitchTopic> topics, CancellationToken
132131
private void HandleMessage(string receivedMessage)
133132
{
134133

135-
var jDoc = JObject.Parse(receivedMessage);
136-
var messageType = jDoc["type"].Value<string>();
137-
if (messageType == "RESPONSE" && jDoc["error"].Value<string>() != "")
134+
var jDoc = JsonDocument.Parse(receivedMessage);
135+
var messageType = jDoc.RootElement.GetProperty("type").GetString();
136+
if (messageType == "RESPONSE" && jDoc.RootElement.GetProperty("error").GetString() != "")
138137
{
139138
throw new Exception("Unable to connect");
140139
} else if (messageType == "RESPONSE") {
@@ -165,7 +164,7 @@ private async Task StartListening(IEnumerable<TwitchTopic> topics)
165164
};
166165

167166
await _Socket.ConnectAsync(new Uri("wss://pubsub-edge.twitch.tv:443"), CancellationToken.None)
168-
.ContinueWith(t => SendMessageOnSocket(JsonConvert.SerializeObject(message)));
167+
.ContinueWith(t => SendMessageOnSocket(JsonSerializer.Serialize(message)));
169168

170169
}
171170

@@ -245,16 +244,16 @@ private bool HandleReconnectMessage(string message) {
245244

246245
private bool HandleChannelPointsMessage(string message) {
247246

248-
var jDoc = JObject.Parse(message);
247+
var jDoc = JsonDocument.Parse(message);
249248

250-
if (jDoc["type"].Value<string>() == "MESSAGE" && jDoc["data"]["topic"].Value<string>().StartsWith("channel-points-channel-v1") ) {
249+
if (jDoc.RootElement.GetProperty("type").GetString() == "MESSAGE" && jDoc.RootElement.GetProperty("data").GetProperty("topic").GetString().StartsWith("channel-points-channel-v1") ) {
251250

252-
var innerMessage = jDoc["data"]["message"].Value<string>();
251+
var innerMessage = jDoc.RootElement.GetProperty("data").GetProperty("message").GetString();
253252

254253
PubSubRedemptionMessage messageObj = null;
255254
try
256255
{
257-
messageObj = JsonConvert.DeserializeObject<PubSubRedemptionMessage>(innerMessage);
256+
messageObj = JsonSerializer.Deserialize<PubSubRedemptionMessage>(innerMessage);
258257
} catch (Exception e) {
259258
_Logger.LogError(e, "Error while deserializing the message");
260259
_Logger.LogInformation("Message contents: " + innerMessage);

‎Fritz.Twitch/PubSub/UnhandledPubSubMessageException.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,5 @@ public UnhandledPubSubMessageException(string message) : base(message)
1717
public UnhandledPubSubMessageException(string message, Exception innerException) : base(message, innerException)
1818
{
1919
}
20-
21-
protected UnhandledPubSubMessageException(SerializationInfo info, StreamingContext context) : base(info, context)
22-
{
23-
}
2420
}
25-
}
21+
}

‎Fritz.Twitch/StreamData.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Newtonsoft.Json.Linq;
2-
using System;
1+
using System;
2+
using System.Text.Json.Nodes;
33

44
namespace Fritz.Twitch
55
{
@@ -22,19 +22,19 @@ public class StreamData
2222

2323
public string Language { get; set; }
2424

25-
public static explicit operator StreamData(JToken obj)
25+
public static explicit operator StreamData(JsonNode obj)
2626
{
2727

2828
return new StreamData
2929
{
30-
Id = obj["id"].Value<long>(),
31-
UserId = obj["user_id"].Value<long>(),
32-
GameId = obj["game_id"].Value<long>(),
33-
Type = obj["type"].Value<string>(),
34-
Title = obj["title"].Value<string>(),
35-
ViewerCount = obj["viewer_count"].Value<int>(),
36-
StartedAt = obj["started_at"].Value<DateTime>(),
37-
Language = obj["language"].Value<string>()
30+
Id = obj["id"].GetValue<long>(),
31+
UserId = obj["user_id"].GetValue<long>(),
32+
GameId = obj["game_id"].GetValue<long>(),
33+
Type = obj["type"].GetValue<string>(),
34+
Title = obj["title"].GetValue<string>(),
35+
ViewerCount = obj["viewer_count"].GetValue<int>(),
36+
StartedAt = obj["started_at"].GetValue<DateTime>(),
37+
Language = obj["language"].GetValue<string>()
3838
};
3939

4040
}

0 commit comments

Comments
 (0)