Update System.Text.Json (addressing Dependabot alerts), migrate NUnit…

… to 4.x

build/FastRsync.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>FastRsyncNet</id>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <authors>Grzegorz Blok</authors>
         <owners>Grzegorz Blok</owners>
         <license type="expression">Apache-2.0</license>
@@ -12,17 +12,17 @@
         <description>.NET library for file synchronization based on Rsync algorithm. Optimized for speed and data size to achieve best network performance.</description>
         <dependencies>
           <group targetFramework=".NETFramework4.6.2">
-             <dependency id="System.Text.Json" version="8.0.0" exclude="Build,Analyzers"  />
+             <dependency id="System.Text.Json" version="8.0.4" exclude="Build,Analyzers"  />
              <dependency id="System.IO.Hashing" version="8.0.0" exclude="Build,Analyzers"  />
           </group>
 
           <group targetFramework=".NETStandard2.0">
-             <dependency id="System.Text.Json" version="8.0.0" exclude="Build,Analyzers"  />
+             <dependency id="System.Text.Json" version="8.0.4" exclude="Build,Analyzers"  />
              <dependency id="System.IO.Hashing" version="8.0.0" exclude="Build,Analyzers"  />
           </group>
 
           <group targetFramework="net7.0">
-             <dependency id="System.Text.Json" version="8.0.0" exclude="Build,Analyzers"  />
+             <dependency id="System.Text.Json" version="8.0.4" exclude="Build,Analyzers"  />
              <dependency id="System.IO.Hashing" version="8.0.0" exclude="Build,Analyzers"  />
           </group>
         </dependencies>

source/FastRsync.BackwardCompatibilityTests/BackwardCompatibilityTests.cs

@@ -7,6 +7,7 @@
 using FastRsync.Signature;
 using NSubstitute;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace FastRsync.BackwardCompatibilityTests
 {

source/FastRsync.BackwardCompatibilityTests/FastRsync.BackwardCompatibilityTests.csproj

@@ -6,9 +6,9 @@
 
   <ItemGroup>
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Data.HashFunction.Core" Version="2.0.0" />
     <PackageReference Include="System.Data.HashFunction.Interfaces" Version="2.0.0" />

source/FastRsync.Benchmarks/FastRsync.Benchmarks.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
     <PackageReference Include="System.Data.HashFunction.Core" Version="2.0.0" />
     <PackageReference Include="System.Data.HashFunction.Interfaces" Version="2.0.0" />

source/FastRsync.Tests/Adler32RollingChecksumTests.cs

@@ -23,10 +23,10 @@ public void Adler32RollingChecksum_CalculatesChecksum()
             var checksum4 = new Adler32RollingChecksum().Calculate(data4, 0, data4.Length);
 
             // Assert
-            Assert.AreEqual(0x4ff907a1, checksum1);
-            Assert.AreEqual(0x5206079b, checksum2);
-            //Assert.AreEqual(0x040f0fc1, checksum3); // bug in adler32 implementation https://github.com/OctopusDeploy/Octodiff/issues/16
-            //Assert.AreEqual(0x2d10357d, checksum4);
+            Assert.That(checksum1, Is.EqualTo(0x4ff907a1));
+            Assert.That(checksum2, Is.EqualTo(0x5206079b));
+            //Assert.That(checksum3, Is.EqualTo(0x040f0fc1)); // bug in adler32 implementation https://github.com/OctopusDeploy/Octodiff/issues/16
+            //Assert.That(checksum4, Is.EqualTo(0x2d10357d));
         }
     }
 }

source/FastRsync.Tests/Adler32RollingChecksumV2Tests.cs

@@ -23,10 +23,10 @@ public void Adler32RollingChecksumV2_CalculatesChecksum()
             var checksum4 = new Adler32RollingChecksumV2().Calculate(data4, 0, data4.Length);
 
             // Assert
-            Assert.AreEqual(0x4ff907a1, checksum1);
-            Assert.AreEqual(0x5206079b, checksum2);
-            Assert.AreEqual(0x040f0fc1, checksum3);
-            Assert.AreEqual(0x2d10357d, checksum4);
+            Assert.That(checksum1, Is.EqualTo(0x4ff907a1));
+            Assert.That(checksum2, Is.EqualTo(0x5206079b));
+            Assert.That(checksum3, Is.EqualTo(0x040f0fc1));
+            Assert.That(checksum4, Is.EqualTo(0x2d10357d));
         }
     }
 }

source/FastRsync.Tests/BackwardCompatibilityTests.cs

@@ -7,6 +7,7 @@
 using FastRsync.Diagnostics;
 using FastRsync.Signature;
 using NSubstitute;
+using NUnit.Framework.Legacy;
 
 namespace FastRsync.Tests
 {

source/FastRsync.Tests/CommonAsserts.cs

@@ -11,14 +11,14 @@ public static void ValidateSignature(Stream signatureStream, IHashAlgorithm hash
         {
             signatureStream.Seek(0, SeekOrigin.Begin);
             var sig = new SignatureReader(signatureStream, null).ReadSignature();
-            Assert.AreEqual(RsyncFormatType.FastRsync, sig.Type);
-            Assert.AreEqual(hashAlgorithm.Name, sig.HashAlgorithm.Name);
-            Assert.AreEqual(hashAlgorithm.Name, sig.Metadata.ChunkHashAlgorithm);
-            Assert.AreEqual(hashAlgorithm.HashLengthInBytes, sig.HashAlgorithm.HashLengthInBytes);
-            Assert.AreEqual(rollingAlgorithm.Name, sig.RollingChecksumAlgorithm.Name);
-            Assert.AreEqual(rollingAlgorithm.Name, sig.Metadata.RollingChecksumAlgorithm);
-            Assert.AreEqual("MD5", sig.Metadata.BaseFileHashAlgorithm);
-            Assert.AreEqual(baseFileHash, sig.Metadata.BaseFileHash);
+            Assert.That(sig.Type, Is.EqualTo(RsyncFormatType.FastRsync));
+            Assert.That(sig.HashAlgorithm.Name, Is.EqualTo(hashAlgorithm.Name));
+            Assert.That(sig.Metadata.ChunkHashAlgorithm, Is.EqualTo(hashAlgorithm.Name));
+            Assert.That(sig.HashAlgorithm.HashLengthInBytes, Is.EqualTo(hashAlgorithm.HashLengthInBytes));
+            Assert.That(sig.RollingChecksumAlgorithm.Name, Is.EqualTo(rollingAlgorithm.Name));
+            Assert.That(sig.Metadata.RollingChecksumAlgorithm, Is.EqualTo(rollingAlgorithm.Name));
+            Assert.That(sig.Metadata.BaseFileHashAlgorithm, Is.EqualTo("MD5"));
+            Assert.That(sig.Metadata.BaseFileHash, Is.EqualTo(baseFileHash));
         }
     }
 }

source/FastRsync.Tests/DeltaReaderTests.cs

@@ -39,14 +39,14 @@ public void BinaryDeltaReader_ReadsLegacyDelta()
 
             // Assert
             var hashAlgorithm = SupportedAlgorithms.Hashing.Default();
-            Assert.AreEqual(RsyncFormatType.FastRsync, target.Type);
-            Assert.AreEqual(hashAlgorithm.Name, target.HashAlgorithm.Name);
-            Assert.AreEqual(hashAlgorithm.HashLengthInBytes, target.HashAlgorithm.HashLengthInBytes);
-            Assert.AreEqual(FastRsyncLegacyDeltaExpectedFileHash, target.Metadata.ExpectedFileHash);
-            Assert.AreEqual("MD5", target.Metadata.ExpectedFileHashAlgorithm);
-            Assert.AreEqual(hashAlgorithm.Name, target.Metadata.HashAlgorithm);
-            Assert.Null(target.Metadata.BaseFileHash);
-            Assert.Null(target.Metadata.BaseFileHashAlgorithm);
+            Assert.That(target.Type, Is.EqualTo(RsyncFormatType.FastRsync));
+            Assert.That(target.HashAlgorithm.Name, Is.EqualTo(hashAlgorithm.Name));
+            Assert.That(target.HashAlgorithm.HashLengthInBytes, Is.EqualTo(hashAlgorithm.HashLengthInBytes));
+            Assert.That(target.Metadata.ExpectedFileHash, Is.EqualTo(FastRsyncLegacyDeltaExpectedFileHash));
+            Assert.That(target.Metadata.ExpectedFileHashAlgorithm, Is.EqualTo("MD5"));
+            Assert.That(target.Metadata.HashAlgorithm, Is.EqualTo(hashAlgorithm.Name));
+            Assert.That(target.Metadata.BaseFileHash, Is.Null);
+            Assert.That(target.Metadata.BaseFileHashAlgorithm, Is.Null);
         }
 
         [Test]
@@ -65,12 +65,12 @@ public void LegacyBinaryDeltaReader_ReadsDelta()
 
             // Assert
             var hashAlgorithm = SupportedAlgorithms.Hashing.Default();
-            Assert.AreEqual(hashAlgorithm.Name, target.HashAlgorithm.Name);
-            Assert.AreEqual(hashAlgorithm.HashLengthInBytes, target.HashAlgorithm.HashLengthInBytes);
-            Assert.AreEqual(RsyncFormatType.FastRsync, target.Type); 
-            Assert.IsNotEmpty(target.Metadata.ExpectedFileHash);
-            Assert.AreEqual("MD5", target.Metadata.ExpectedFileHashAlgorithm);
-            Assert.AreEqual(hashAlgorithm.Name, target.Metadata.HashAlgorithm);
+            Assert.That(target.HashAlgorithm.Name, Is.EqualTo(hashAlgorithm.Name));
+            Assert.That(target.HashAlgorithm.HashLengthInBytes, Is.EqualTo(hashAlgorithm.HashLengthInBytes));
+            Assert.That(target.Type, Is.EqualTo(RsyncFormatType.FastRsync));
+            Assert.That(target.Metadata.ExpectedFileHash, Is.Not.Null.And.Not.Empty);
+            Assert.That(target.Metadata.ExpectedFileHashAlgorithm, Is.EqualTo("MD5"));
+            Assert.That(target.Metadata.HashAlgorithm, Is.EqualTo(hashAlgorithm.Name));
         }
     }
 }

source/FastRsync.Tests/FastRsync.Tests.csproj

@@ -44,10 +44,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageReference Include="NUnit" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
     <PackageReference Include="System.Data.HashFunction.Core" Version="2.0.0" />
     <PackageReference Include="System.Data.HashFunction.Interfaces" Version="2.0.0" />

source/FastRsync.Tests/GZipTests.cs

@@ -37,7 +37,7 @@ public void GZip_CompressData()
             var destStream = CompressData(data);
 
             // Additional asserts
-            Assert.AreEqual(6982738, destStream.Length);
+            Assert.That(destStream.Length, Is.EqualTo(6982738));
         }
 
         private static MemoryStream CompressData(byte[] data)
@@ -58,7 +58,7 @@ private static MemoryStream CompressData(byte[] data)
             }
 
             var dataOutput = decompressedStream.ToArray();
-            Assert.AreEqual(data, dataOutput);
+            Assert.That(dataOutput, Is.EqualTo(data));
             return destStream;
         }
 
@@ -98,7 +98,7 @@ public void GZip_CompressData_RsyncSignatureAndPatch()
             var deltaStream = FullCompressedRsyncFlow(basisStream, newFileStream);
 
             // Not calculated, taken from the valid flow
-            Assert.AreEqual(662628, deltaStream.Length);
+            Assert.That(deltaStream.Length, Is.EqualTo(662628));
         }
 
         private static MemoryStream FullCompressedRsyncFlow(MemoryStream basisStream, MemoryStream newFileStream)
@@ -135,7 +135,7 @@ private static MemoryStream FullCompressedRsyncFlow(MemoryStream basisStream, Me
             deltaApplier.HashCheck(deltaReader, patchedCompressedStream);
 
             // Assert
-            Assert.AreEqual(newFileStreamCompressed.ToArray(), patchedCompressedStream.ToArray());
+            Assert.That(newFileStreamCompressed.ToArray(), Is.EqualTo(patchedCompressedStream.ToArray()));
 
             patchedCompressedStream.Seek(0, SeekOrigin.Begin);
             var decompressedStream = new MemoryStream();
@@ -145,7 +145,7 @@ private static MemoryStream FullCompressedRsyncFlow(MemoryStream basisStream, Me
             }
 
             var dataOutput = decompressedStream.ToArray();
-            Assert.AreEqual(newFileStream.ToArray(), dataOutput);
+            Assert.That(dataOutput, Is.EqualTo(newFileStream.ToArray()));
             return deltaStream;
         }
 
@@ -185,7 +185,7 @@ public async Task GZip_CompressDataAsync_RsyncSignatureAndPatch()
             var deltaStream = await FullCompressedRsyncFlowAsync(basisStream, newFileStream);
 
             // Not calculated, taken from the valid flow
-            Assert.AreEqual(662628, deltaStream.Length);
+            Assert.That(deltaStream.Length, Is.EqualTo(662628));
         }
 
         private static async Task<MemoryStream> FullCompressedRsyncFlowAsync(MemoryStream basisStream, MemoryStream newFileStream)
@@ -224,7 +224,7 @@ await deltaBuilder.BuildDeltaAsync(newFileStreamCompressed,
             await deltaApplier.HashCheckAsync(deltaReader, patchedCompressedStream);
 
             // Assert
-            Assert.AreEqual(newFileStreamCompressed.ToArray(), patchedCompressedStream.ToArray());
+            Assert.That(newFileStreamCompressed.ToArray(), Is.EqualTo(patchedCompressedStream.ToArray()));
 
             patchedCompressedStream.Seek(0, SeekOrigin.Begin);
             var decompressedStream = new MemoryStream();
@@ -233,7 +233,7 @@ await deltaBuilder.BuildDeltaAsync(newFileStreamCompressed,
                 await gz.CopyToAsync(decompressedStream);
             }
 
-            Assert.AreEqual(newFileStream.ToArray(), decompressedStream.ToArray());
+            Assert.That(newFileStream.ToArray(), Is.EqualTo(decompressedStream.ToArray()));
             return deltaStream;
         }
     }

source/FastRsync.Tests/HashTests.cs

@@ -35,7 +35,7 @@ public void XxHash64StaticBackwardCompatibility(int dataLength)
         Array.Reverse(systemXxHash64Dest);
 
         // Assert
-        Assert.AreEqual(dataXxHash64Dest, systemXxHash64Dest);
+        Assert.That(systemXxHash64Dest, Is.EqualTo(dataXxHash64Dest));
     }
 
     [Test]
@@ -65,7 +65,7 @@ public void XxHash64BackwardCompatibility(int dataLength)
         Array.Reverse(systemXxHash64Dest);
 
         // Assert
-        Assert.AreEqual(dataXxHash64Dest, systemXxHash64Dest);
+        Assert.That(systemXxHash64Dest, Is.EqualTo(dataXxHash64Dest));
     }
 
     [Test]
@@ -104,7 +104,7 @@ public async Task XxHash64StreamBackwardCompatibility(int dataLength)
         Array.Reverse(systemXxHash64Dest);
 
         // Assert
-        Assert.AreEqual(dataXxHash64Dest, systemXxHash64Dest);
+        Assert.That(systemXxHash64Dest, Is.EqualTo(dataXxHash64Dest));
     }
 }
 

source/FastRsync.Tests/PatchingAsyncTests.cs

@@ -9,6 +9,7 @@
 using FastRsync.Tests.OctodiffLegacy;
 using NSubstitute;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace FastRsync.Tests
 {

source/FastRsync.Tests/PatchingBigFilesTests.cs

@@ -8,6 +8,7 @@
 using NSubstitute;
 using NUnit.Framework;
 using System.Security.Cryptography;
+using NUnit.Framework.Legacy;
 
 namespace FastRsync.Tests
 {
@@ -44,8 +45,8 @@ public void PatchingSyncXXHash_BigFile(string originalFileName, string newFileNa
                 }
 
                 // Assert
-                Assert.AreEqual(new FileInfo(newFileName).Length, new FileInfo(patchedFileName).Length);
-                Assert.True(CompareFilesByHash(newFileName, patchedFileName));
+                Assert.That(new FileInfo(newFileName).Length, Is.EqualTo(new FileInfo(patchedFileName).Length));
+                Assert.That(CompareFilesByHash(newFileName, patchedFileName), Is.True);
                 progressReporter.Received().Report(Arg.Any<ProgressReport>());
             }
             catch (Exception e)

source/FastRsync.Tests/PatchingSyncTests.cs

@@ -7,6 +7,7 @@
 using FastRsync.Tests.OctodiffLegacy;
 using NSubstitute;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace FastRsync.Tests
 {

source/FastRsync.Tests/SignatureBuilderTests.cs

@@ -7,6 +7,7 @@
 using FastRsync.Signature;
 using NSubstitute;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace FastRsync.Tests
 {

source/FastRsync.Tests/SignatureReaderTests.cs

@@ -27,10 +27,10 @@ public void SignatureReader_ReadsOctodiffSignature()
 
             // Assert
             var hashAlgorithm = SupportedAlgorithms.Hashing.Default();
-            Assert.AreEqual(RsyncFormatType.Octodiff, target.Type);
-            Assert.AreEqual(hashAlgorithm.Name, target.HashAlgorithm.Name);
-            Assert.AreEqual(hashAlgorithm.HashLengthInBytes, target.HashAlgorithm.HashLengthInBytes);
-            Assert.AreEqual(new Adler32RollingChecksum().Name, target.RollingChecksumAlgorithm.Name);
+            Assert.That(target.Type, Is.EqualTo(RsyncFormatType.Octodiff) );
+            Assert.That(target.HashAlgorithm.Name, Is.EqualTo(hashAlgorithm.Name));
+            Assert.That(target.HashAlgorithm.HashLengthInBytes, Is.EqualTo(hashAlgorithm.HashLengthInBytes));
+            Assert.That(target.RollingChecksumAlgorithm.Name, Is.EqualTo(new Adler32RollingChecksum().Name));
 
             progressReporter.Received().Report(Arg.Any<ProgressReport>());
         }

source/FastRsync/FastRsync.csproj

@@ -7,9 +7,9 @@
     <PackageTags>sync rsync synchronization</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <AssemblyVersion>2.4.0</AssemblyVersion>
-    <FileVersion>2.4.0</FileVersion>
-    <Version>2.4.0</Version>
+    <AssemblyVersion>2.4.1</AssemblyVersion>
+    <FileVersion>2.4.1</FileVersion>
+    <Version>2.4.1</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,7 +29,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>

source/Octodiff.Tests/DeltaFixture.cs

@@ -4,6 +4,7 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using Octodiff.Tests.Util;
+using NUnit.Framework.Legacy;
 
 namespace Octodiff.Tests
 {
@@ -62,8 +63,8 @@ public void DeltaOfChangedFileShouldResultInNewDataSegments(string name, int num
             var actualDifference = Math.Abs(newSize - originalSize);
             var deltaToActualRatio = (double) deltaSize/actualDifference;
             Trace.WriteLine(string.Format("Delta ratio: {0:n3}", deltaToActualRatio));
-            Assert.IsTrue(deltaSize * 2 < newSize, "Delta should be at least half the new file size");
-            Assert.IsTrue(0.80 <= deltaToActualRatio && deltaToActualRatio <= 1.60, "Delta should be pretty close to the actual file differences");
+            Assert.That(deltaSize * 2 < newSize, Is.True, "Delta should be at least half the new file size");
+            Assert.That(0.80 <= deltaToActualRatio && deltaToActualRatio <= 1.60, Is.True, "Delta should be pretty close to the actual file differences");
         }
     }
 }

source/Octodiff.Tests/Octodiff.Tests.csproj

@@ -36,8 +36,8 @@
     <ProjectReference Include="..\Octodiff\Octodiff.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Data.DataSetExtensions" />

source/Octodiff.Tests/SignatureFixture.cs

@@ -29,7 +29,7 @@ public void ShouldCreateSignature(string name, int numberOfFiles, OctodiffAppVar
             Trace.WriteLine(string.Format("Basis size: {0:n0}", basisSize));
             Trace.WriteLine(string.Format("Signature size: {0:n0}", signatureSize));
             Trace.WriteLine(string.Format("Signature ratio: {0:n3}", signatureSizePercentageOfBasis));
-            Assert.IsTrue(0.006 <= signatureSizePercentageOfBasis && signatureSizePercentageOfBasis <= 0.014);
+            Assert.That(0.006 <= signatureSizePercentageOfBasis && signatureSizePercentageOfBasis <= 0.014, Is.True);
         }
 
         [Test]