From 6ea540dc4fb42e8da7092de50fe9001a65cc8ce3 Mon Sep 17 00:00:00 2001
From: Peter Tsuprun <peter@alignment-labs.com>
Date: Fri, 23 Feb 2024 12:07:41 +0200
Subject: [PATCH 1/2] upgrade nuget packages

---
 src/ClamAV.Net/ClamAV.Net.csproj               |  2 +-
 tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ClamAV.Net/ClamAV.Net.csproj b/src/ClamAV.Net/ClamAV.Net.csproj
index f13ec6d..b232cf3 100644
--- a/src/ClamAV.Net/ClamAV.Net.csproj
+++ b/src/ClamAV.Net/ClamAV.Net.csproj
@@ -25,6 +25,6 @@
 	  <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
 	</PropertyGroup>
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
+	  <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj b/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj
index 4c6a9d3..7c33bd2 100644
--- a/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj
+++ b/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj
@@ -7,19 +7,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 3709e125ae3b2b41276c93bac8e2e032bc10a01b Mon Sep 17 00:00:00 2001
From: Peter Tsuprun <peter@alignment-labs.com>
Date: Fri, 23 Feb 2024 19:52:36 +0200
Subject: [PATCH 2/2] upgrade fixes

---
 src/ClamAV.Net/ClamAV.Net.csproj               |  3 ++-
 src/ClamAV.Net/Commands/InStreamCommand.cs     |  4 ++++
 src/ClamAV.Net/Socket/TcpSocketClient.cs       |  2 +-
 tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj |  2 +-
 .../Exceptions/ClamAvExceptionTests.cs         | 18 ------------------
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/ClamAV.Net/ClamAV.Net.csproj b/src/ClamAV.Net/ClamAV.Net.csproj
index b232cf3..c97251b 100644
--- a/src/ClamAV.Net/ClamAV.Net.csproj
+++ b/src/ClamAV.Net/ClamAV.Net.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFrameworks>netstandard2.1;netstandard2.0;</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>petertsu@github</Authors>
 		<Product>ClamAV.Net</Product>
@@ -19,6 +19,7 @@
 		<Copyright>Copyright 2020 petertsu@github</Copyright>
 		<Summary>The ClamAV server .NETStandard client</Summary>
 		<ProjectGuid>4E284927-EFC1-443E-BC27-D598404ACE71</ProjectGuid>
+		<LangVersion>12.0</LangVersion>
 	</PropertyGroup>
 	<PropertyGroup>
 	  <DocumentationFile>ClamAV.Net.xml</DocumentationFile>
diff --git a/src/ClamAV.Net/Commands/InStreamCommand.cs b/src/ClamAV.Net/Commands/InStreamCommand.cs
index 2f3e066..8082f19 100644
--- a/src/ClamAV.Net/Commands/InStreamCommand.cs
+++ b/src/ClamAV.Net/Commands/InStreamCommand.cs
@@ -69,7 +69,11 @@ public ScanResult ProcessRawResponse(byte[] rawResponse)
                     new ClamAvException($"Invalid raw response '{actualResponse}'");
             }
 
+#if NETSTANDARD2_0
+            return new ScanResult(true, responseParts[responseParts.Length - 2]);
+#else
             return new ScanResult(true, responseParts[^2]);
+#endif
         }
     }
 }
\ No newline at end of file
diff --git a/src/ClamAV.Net/Socket/TcpSocketClient.cs b/src/ClamAV.Net/Socket/TcpSocketClient.cs
index 7b37cac..cffac9e 100644
--- a/src/ClamAV.Net/Socket/TcpSocketClient.cs
+++ b/src/ClamAV.Net/Socket/TcpSocketClient.cs
@@ -44,7 +44,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default)
 
         private async Task<byte[]> ReadResponse(CancellationToken cancellationToken)
         {
-            await using MemoryStream memoryStream = new MemoryStream();
+            using MemoryStream memoryStream = new MemoryStream();
 
             do
             {
diff --git a/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj b/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj
index 7c33bd2..536c3d2 100644
--- a/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj
+++ b/tests/ClamAV.Net.Tests/ClamAV.Net.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>netcoreapp8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/tests/ClamAV.Net.Tests/Exceptions/ClamAvExceptionTests.cs b/tests/ClamAV.Net.Tests/Exceptions/ClamAvExceptionTests.cs
index b321102..ab98fed 100644
--- a/tests/ClamAV.Net.Tests/Exceptions/ClamAvExceptionTests.cs
+++ b/tests/ClamAV.Net.Tests/Exceptions/ClamAvExceptionTests.cs
@@ -23,23 +23,5 @@ public void Ctor_Validation()
             clamAvException.Message.Should().Be(expectedMessage);
             clamAvException.InnerException.Should().NotBeNull();
         }
-
-        [Fact]
-        public void Serialization_Test()
-        {
-            const string expectedMessage = "Some error";
-            ClamAvException clamAvException = new ClamAvException(expectedMessage, new Exception("Error"));
-
-            BinaryFormatter binaryFormatter = new BinaryFormatter();
-
-            using MemoryStream memoryStream = new MemoryStream();
-            binaryFormatter.Serialize(memoryStream, clamAvException);
-            memoryStream.Seek(0, SeekOrigin.Begin);
-
-            ClamAvException actual = binaryFormatter.Deserialize(memoryStream) as ClamAvException;
-
-            actual.Should().NotBeNull();
-            actual.Should().BeEquivalentTo(clamAvException);
-        }
     }
 }
\ No newline at end of file