Bump version

SabreTools.Hashing.Test/SabreTools.Hashing.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net462;net472;net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IsPackable>false</IsPackable>
         <LangVersion>latest</LangVersion>
@@ -20,14 +20,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
         <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-        <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

SabreTools.Hashing/Checksum/Adler32.cs

@@ -136,9 +136,9 @@ namespace SabreTools.Hashing.Checksum
         /// <inheritdoc/>
         protected override byte[] HashFinal()
         {
-            byte[] hashArr =  BitConverter.GetBytes(_hash);
+            byte[] hashArr = BitConverter.GetBytes(_hash);
             Array.Reverse(hashArr);
             return hashArr;
         }
     }
-}
+}

SabreTools.Hashing/Checksum/BitOperations.cs

@@ -19,4 +19,4 @@ namespace SabreTools.Hashing.Checksum
             return bytes;
         }
     }
-}
+}

SabreTools.Hashing/Checksum/ChecksumBase.cs

@@ -47,4 +47,4 @@ namespace SabreTools.Hashing.Checksum
             return hashArr;
         }
     }
-}
+}

SabreTools.Hashing/Checksum/Constants.cs

@@ -30,4 +30,4 @@ namespace SabreTools.Hashing.Checksum
 
         #endregion
     }
-}
+}

SabreTools.Hashing/Checksum/Crc.cs

@@ -56,4 +56,4 @@ namespace SabreTools.Hashing.Checksum
             return BitOperations.ClampValueToBytes(localHash, Def.Width);
         }
     }
-}
+}

SabreTools.Hashing/Checksum/CrcDefinition.cs

@@ -62,4 +62,4 @@ namespace SabreTools.Hashing.Checksum
         /// </summary>
         public ulong XorOut { get; set; }
     }
-}
+}

SabreTools.Hashing/Checksum/CrcTable.cs

@@ -330,4 +330,4 @@ namespace SabreTools.Hashing.Checksum
             hash = local;
         }
     }
-}
+}

SabreTools.Hashing/Checksum/Fletcher16.cs

@@ -41,4 +41,4 @@ namespace SabreTools.Hashing.Checksum
             _hash = (ushort)((c1 << 8) | c0);
         }
     }
-}
+}

SabreTools.Hashing/Checksum/Fletcher32.cs

@@ -125,4 +125,4 @@ namespace SabreTools.Hashing.Checksum
             _hash = (c1 << 16) | c0;
         }
     }
-}
+}

SabreTools.Hashing/Checksum/Fletcher64.cs

@@ -125,4 +125,4 @@ namespace SabreTools.Hashing.Checksum
             _hash = (c1 << 32) | c0;
         }
     }
-}
+}

SabreTools.Hashing/Checksum/StandardDefinitions.cs

@@ -1687,4 +1687,4 @@ namespace SabreTools.Hashing.Checksum
 
         #endregion
     }
-}
+}

SabreTools.Hashing/Constants.cs

@@ -19,4 +19,4 @@ namespace SabreTools.Hashing
 
         #endregion
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Constants.cs

@@ -694,4 +694,4 @@ namespace SabreTools.Hashing.CryptographicHash
 
         #endregion
     }
-}
+}

SabreTools.Hashing/CryptographicHash/MD2.cs

@@ -126,7 +126,7 @@ namespace SabreTools.Hashing.CryptographicHash
 
             // Pad the block
             byte[] padding = new byte[padLength];
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0
             for (int i = 0; i < padLength; i++)
             {
                 padding[i] = padLength;
@@ -166,4 +166,4 @@ namespace SabreTools.Hashing.CryptographicHash
             }
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/MD4.cs

@@ -211,4 +211,4 @@ namespace SabreTools.Hashing.CryptographicHash
         /// </summary>
         private static uint H(uint x, uint y, uint z) => x ^ y ^ z;
     }
-}
+}

SabreTools.Hashing/CryptographicHash/MessageDigestBase.cs

@@ -59,4 +59,4 @@ namespace SabreTools.Hashing.CryptographicHash
             Array.Clear(_block, 0, _block.Length);
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/RipeMD128.cs

@@ -444,4 +444,4 @@ namespace SabreTools.Hashing.CryptographicHash
         /// </summary>
         private static uint G48_63(uint x, uint y, uint z) => (x & z) | (y & ~z);
     }
-}
+}

SabreTools.Hashing/CryptographicHash/RipeMD160.cs

@@ -680,4 +680,4 @@ namespace SabreTools.Hashing.CryptographicHash
         /// </summary>
         private static uint G64_79(uint x, uint y, uint z) => x ^ (y | ~z);
     }
-}
+}

SabreTools.Hashing/CryptographicHash/RipeMD256.cs

@@ -464,4 +464,4 @@ namespace SabreTools.Hashing.CryptographicHash
         /// </summary>
         private static uint G48_63(uint x, uint y, uint z) => (x & z) | (y & ~z);
     }
-}
+}

SabreTools.Hashing/CryptographicHash/RipeMD320.cs

@@ -705,4 +705,4 @@ namespace SabreTools.Hashing.CryptographicHash
         /// </summary>
         private static uint G64_79(uint x, uint y, uint z) => x ^ (y | ~z);
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger128_3.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger128_4.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger160_3.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger160_4.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger192_3.cs

@@ -14,4 +14,4 @@ namespace SabreTools.Hashing.CryptographicHash
             _padStart = 0x01;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger192_4.cs

@@ -14,4 +14,4 @@ namespace SabreTools.Hashing.CryptographicHash
             _padStart = 0x01;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger2_128_3.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger2_128_4.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger2_160_3.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger2_160_4.cs

@@ -25,4 +25,4 @@ namespace SabreTools.Hashing.CryptographicHash
             return trimmedHash;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger2_192_3.cs

@@ -14,4 +14,4 @@ namespace SabreTools.Hashing.CryptographicHash
             _padStart = 0x80;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/Tiger2_192_4.cs

@@ -14,4 +14,4 @@ namespace SabreTools.Hashing.CryptographicHash
             _padStart = 0x80;
         }
     }
-}
+}

SabreTools.Hashing/CryptographicHash/TigerHashBase.cs

@@ -234,4 +234,4 @@ namespace SabreTools.Hashing.CryptographicHash
             _block[7] -= _block[6] ^ 0x0123456789ABCDEF;
         }
     }
-}
+}

SabreTools.Hashing/HashOperations.cs

@@ -178,4 +178,4 @@ namespace SabreTools.Hashing
 
         #endregion
     }
-}
+}

SabreTools.Hashing/HashTool.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-#if NET40_OR_GREATER || NETCOREAPP
+#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
 using System.Threading.Tasks;
 #endif
 
@@ -753,4 +753,4 @@ namespace SabreTools.Hashing
 
         #endregion
     }
-}
+}

SabreTools.Hashing/HashType.cs

@@ -947,4 +947,4 @@ namespace SabreTools.Hashing
 
         #endregion
     }
-}
+}

SabreTools.Hashing/HashWrapper.cs

@@ -373,4 +373,4 @@ namespace SabreTools.Hashing
 
         #endregion
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/Constants.cs

@@ -40,4 +40,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
 
         #endregion
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/FNV0_32.cs

@@ -23,4 +23,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             }
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/FNV0_64.cs

@@ -23,4 +23,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             }
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/FNV1_32.cs

@@ -23,4 +23,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             }
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/FNV1_64.cs

@@ -23,4 +23,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             }
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/FNV1a_32.cs

@@ -23,4 +23,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             }
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/FNV1a_64.cs

@@ -23,4 +23,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             }
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/FnvBase.cs

@@ -57,4 +57,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             return hashArr;
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/XxHash32.cs

@@ -43,4 +43,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             return hashArr;
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/XxHash32State.cs

@@ -147,7 +147,7 @@ namespace SabreTools.Hashing.NonCryptographicHash
         private static uint Round(uint acc, uint input)
         {
             acc += input * XXH_PRIME32_2;
-            acc  = RotateLeft32(acc, 13);
+            acc = RotateLeft32(acc, 13);
             acc *= XXH_PRIME32_1;
             return acc;
         }
@@ -201,4 +201,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             return Avalanche(hash);
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/XxHash64.cs

@@ -43,4 +43,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             return hashArr;
         }
     }
-}
+}

SabreTools.Hashing/NonCryptographicHash/XxHash64State.cs

@@ -144,7 +144,7 @@ namespace SabreTools.Hashing.NonCryptographicHash
         private static ulong Round(ulong acc, ulong input)
         {
             acc += unchecked(input * XXH_PRIME64_2);
-            acc  = RotateLeft64(acc, 31);
+            acc = RotateLeft64(acc, 31);
             acc *= XXH_PRIME64_1;
             return acc;
         }
@@ -199,7 +199,7 @@ namespace SabreTools.Hashing.NonCryptographicHash
 
             return Avalanche(hash);
         }
-    
+
         /// <summary>
         /// Mixes all bits to finalize the hash.
         /// 
@@ -216,4 +216,4 @@ namespace SabreTools.Hashing.NonCryptographicHash
             return hash;
         }
     }
-}
+}

SabreTools.Hashing/SabreTools.Hashing.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <IncludeSymbols>true</IncludeSymbols>
@@ -11,7 +11,7 @@
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.4.2</Version>
+        <Version>1.5.0</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
@@ -28,12 +28,10 @@
         <None Include="../README.md" Pack="true" PackagePath="" />
     </ItemGroup>
 
-    <!-- Support for old .NET versions -->
-    <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net45`))">
-        <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
-    </ItemGroup>
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
-        <PackageReference Include="Blake3" Version="1.1.0" />
+    <ItemGroup>
+        <PackageReference Include="Blake3" Version="1.1.0" Condition="$(TargetFramework.StartsWith(`net7`))" />
+        <PackageReference Include="Blake3" Version="2.0.0" Condition="$(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))" />
+        <PackageReference Include="System.IO.Hashing" Version="9.0.7" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net45`))" />
     </ItemGroup>
 
 </Project>

SabreTools.Hashing/SpamSum/BlockhashContext.cs

@@ -42,4 +42,4 @@ namespace SabreTools.Hashing.SpamSum
             Digest = new byte[SPAMSUM_LENGTH];
         }
     }
-}
+}

SabreTools.Hashing/SpamSum/Constants.cs

@@ -443,4 +443,4 @@ namespace SabreTools.Hashing.SpamSum
 
         #endregion
     }
-}
+}

SabreTools.Hashing/SpamSum/FuzzyState.cs

@@ -63,7 +63,7 @@ namespace SabreTools.Hashing.SpamSum
                 LastH = BH[obh].H;
             }
         }
-    
+
         public void TryReduceBlockhash()
         {
             if (BHStart >= BHEnd)
@@ -88,4 +88,4 @@ namespace SabreTools.Hashing.SpamSum
             RollMask = RollMask * 2 + 1;
         }
     }
-}
+}

SabreTools.Hashing/SpamSum/RollState.cs

@@ -47,10 +47,10 @@ namespace SabreTools.Hashing.SpamSum
             H3 <<= 5;
             H3 ^= c;
         }
-    
+
         /// <summary>
         /// Return the current rolling sum
         /// </summary>
         public uint RollSum() => H1 + H2 + H3;
     }
-}
+}

SabreTools.Hashing/SpamSum/SpamSum.cs

@@ -353,4 +353,4 @@ namespace SabreTools.Hashing.SpamSum
             return n;
         }
     }
-}
+}

SabreTools.Hashing/XxHash/Constants.cs

@@ -67,4 +67,4 @@ namespace SabreTools.Hashing.XxHash
 
         #endregion
     }
-}
+}

SabreTools.Hashing/XxHash/Enums.cs

@@ -71,4 +71,4 @@ namespace SabreTools.Hashing.XxHash
         /// </summary>
         XXH_SVE = 6,
     }
-}
+}

SabreTools.Hashing/XxHash/Utility.cs

@@ -249,4 +249,4 @@ namespace SabreTools.Hashing.XxHash
 
         #endregion
     }
-}
+}

SabreTools.Hashing/XxHash/XXH3_128Hash.cs

@@ -3,7 +3,7 @@ namespace SabreTools.Hashing.XxHash
     internal class XXH3_128Hash
     {
         public ulong Low { get; set; }
-        
+
         public ulong High { get; set; }
     }
-}
+}

SabreTools.Hashing/XxHash/XXH3_128State.cs

@@ -1,9 +1,9 @@
 namespace SabreTools.Hashing.XxHash
 {
     // Handle unused private fields
-    #pragma warning disable CS0169
-    #pragma warning disable CS0414
-    #pragma warning disable CS0649
+#pragma warning disable CS0169
+#pragma warning disable CS0414
+#pragma warning disable CS0649
 
     /// <summary>
     /// Structure for XXH3 streaming API.
@@ -106,7 +106,7 @@ namespace SabreTools.Hashing.XxHash
         {
             // TODO: XXH3_128bits_reset_withSecret
         }
-    
+
         /// <summary>
         /// Hash a block of data and append it to the existing hash
         /// </summary>
@@ -128,4 +128,4 @@ namespace SabreTools.Hashing.XxHash
             return ulong.MaxValue;
         }
     }
-}
+}

SabreTools.Hashing/XxHash/XXH3_64State.cs

@@ -1,9 +1,9 @@
 namespace SabreTools.Hashing.XxHash
 {
     // Handle unused private fields
-    #pragma warning disable CS0169
-    #pragma warning disable CS0414
-    #pragma warning disable CS0649
+#pragma warning disable CS0169
+#pragma warning disable CS0414
+#pragma warning disable CS0649
 
     /// <summary>
     /// Structure for XXH3 streaming API.
@@ -111,7 +111,7 @@ namespace SabreTools.Hashing.XxHash
         {
             // TODO: XXH3_64bits_reset_withSecret
         }
-    
+
         /// <summary>
         /// Hash a block of data and append it to the existing hash
         /// </summary>
@@ -133,4 +133,4 @@ namespace SabreTools.Hashing.XxHash
             return ulong.MaxValue;
         }
     }
-}
+}

SabreTools.Hashing/ZeroHash.cs

@@ -620,4 +620,4 @@ namespace SabreTools.Hashing
             return _strings[hashType];
         }
     }
-}
+}