feat: added support to .net 7 (#178)

lucasratske · web-flow · commit 7f18414efe85 · 2023-01-26T19:07:21.000+01:00
diff --git a/FireSharp.Core/FireSharp.Core.csproj b/FireSharp.Core/FireSharp.Core.csproj
@@ -1,10 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>FireSharp.Core</AssemblyName>
     <RootNamespace>FireSharp.Core</RootNamespace>
-    <Version>5.0.0</Version>
+    <Version>7.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/FireSharp.Core/Response/EventStreamResponse.cs b/FireSharp.Core/Response/EventStreamResponse.cs
@@ -64,7 +64,9 @@ await Task.Factory.StartNew(async () =>
                     {
                         token.ThrowIfCancellationRequested();
 
-                        string? read = await sr.ReadLineAsync();
+                        var read = await sr.ReadLineAsync(token);
+                        if (read == null)
+                            continue;
 
                         Debug.WriteLine(read);
 
@@ -109,7 +111,7 @@ private void Update(string eventName, string p)
                         reader.DateParseHandling = DateParseHandling.None;
                         ReadToNamedPropertyValue(reader, "path");
                         reader.Read();
-                        string? path = reader.Value.ToString();
+                        var path = reader.Value?.ToString();
 
                         if (eventName == "put")
                         {
@@ -131,7 +133,7 @@ private JsonReader ReadToNamedPropertyValue(JsonReader reader, string property)
                 // skip the property
             }
 
-            string? prop = reader.Value.ToString();
+            var prop = reader.Value?.ToString();
             if (property != prop)
             {
                 throw new InvalidOperationException("Error parsing response.  Expected json property named: " + property);
diff --git a/FireSharp.Serialization.JsonNet.Core/FireSharp.Serialization.JsonNet.Core.csproj b/FireSharp.Serialization.JsonNet.Core/FireSharp.Serialization.JsonNet.Core.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FireSharp.Serialization.ServiceStack.Core/FireSharp.Serialization.ServiceStack.Core.csproj b/FireSharp.Serialization.ServiceStack.Core/FireSharp.Serialization.ServiceStack.Core.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/FireSharp.Test.Console.Core/FireSharp.Test.Console.Core.csproj b/FireSharp.Test.Console.Core/FireSharp.Test.Console.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/FireSharp.Tests.Core/FireSharp.Tests.Core.csproj b/FireSharp.Tests.Core/FireSharp.Tests.Core.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ await Task.Factory.StartNew(async () =>`
`64`	`64`	`{`
`65`	`65`	`token.ThrowIfCancellationRequested();`
`66`	`66`
`67`		`- string? read = await sr.ReadLineAsync();`
	`67`	`+ var read = await sr.ReadLineAsync(token);`
	`68`	`+ if (read == null)`
	`69`	`+ continue;`
`68`	`70`
`69`	`71`	`Debug.WriteLine(read);`
`70`	`72`
`@@ -109,7 +111,7 @@ private void Update(string eventName, string p)`
`109`	`111`	`reader.DateParseHandling = DateParseHandling.None;`
`110`	`112`	`ReadToNamedPropertyValue(reader, "path");`
`111`	`113`	`reader.Read();`
`112`		`- string? path = reader.Value.ToString();`
	`114`	`+ var path = reader.Value?.ToString();`
`113`	`115`
`114`	`116`	`if (eventName == "put")`
`115`	`117`	`{`
`@@ -131,7 +133,7 @@ private JsonReader ReadToNamedPropertyValue(JsonReader reader, string property)`
`131`	`133`	`// skip the property`
`132`	`134`	`}`
`133`	`135`
`134`		`- string? prop = reader.Value.ToString();`
	`136`	`+ var prop = reader.Value?.ToString();`
`135`	`137`	`if (property != prop)`
`136`	`138`	`{`
`137`	`139`	`throw new InvalidOperationException("Error parsing response. Expected json property named: " + property);`