Upgrade nuget packages

AoxeTech · Aug 17, 2023 · b764841 · b764841
1 parent 7adc21d
commit b764841
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 43 deletions.
diff --git a/src/Zaabee.Brotli/Zaabee.Brotli.csproj b/src/Zaabee.Brotli/Zaabee.Brotli.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2023.6.2</PackageVersion>
-        <Version>2023.6.2</Version>
+        <PackageVersion>2023.6.4</PackageVersion>
+        <Version>2023.6.4</Version>
         <Authors>Mutuduxf</Authors>
         <Company>Mutuduxf</Company>
         <PackageTags>Zaabee;Brotli.NET;Brotli;Compression</PackageTags>
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="Brotli.NET" Version="2.1.1" />
-        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.2" />
+        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.3" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Zaabee.Compressor.Abstractions/GlobalUsings.cs b/src/Zaabee.Compressor.Abstractions/GlobalUsings.cs
@@ -3,4 +3,5 @@
 global using System.IO;
 global using System.Linq;
 global using System.Threading;
-global using System.Threading.Tasks;
+global using System.Threading.Tasks;
+global using Zaabee.Extensions;
diff --git a/src/Zaabee.Compressor.Abstractions/ICompressor.Stream.Async.cs b/src/Zaabee.Compressor.Abstractions/ICompressor.Stream.Async.cs
@@ -3,7 +3,7 @@
 public partial interface ICompressor
 {
     Task<MemoryStream> CompressAsync(Stream rawStream, CancellationToken cancellationToken = default);
-    Task<MemoryStream> DecompressAsync(Stream compressedStream, CancellationToken cancellationToken = default);
     Task CompressAsync(Stream inputStream, Stream outputStream, CancellationToken cancellationToken = default);
+    Task<MemoryStream> DecompressAsync(Stream compressedStream, CancellationToken cancellationToken = default);
     Task DecompressAsync(Stream inputStream, Stream outputStream, CancellationToken cancellationToken = default);
 }
diff --git a/src/Zaabee.Compressor.Abstractions/ICompressor.Stream.cs b/src/Zaabee.Compressor.Abstractions/ICompressor.Stream.cs
@@ -3,7 +3,7 @@
 public partial interface ICompressor
 {
     MemoryStream Compress(Stream rawStream);
-    MemoryStream Decompress(Stream compressedStream);
     void Compress(Stream inputStream, Stream outputStream);
+    MemoryStream Decompress(Stream compressedStream);
     void Decompress(Stream inputStream, Stream outputStream);
 }
diff --git a/src/Zaabee.Compressor.Abstractions/NullCompressor.cs b/src/Zaabee.Compressor.Abstractions/NullCompressor.cs
@@ -1,6 +1,4 @@
-using Zaabee.Extensions;
-
-namespace Zaabee.Compressor.Abstractions;
+namespace Zaabee.Compressor.Abstractions;
 
 public class NullCompressor : ICompressor
 {
@@ -70,6 +68,13 @@ public MemoryStream Compress(Stream rawStream)
         return memoryStream;
     }
 
+    public void Compress(Stream inputStream, Stream outputStream)
+    {
+        inputStream.CopyTo(outputStream);
+        inputStream.TrySeek(0, SeekOrigin.Begin);
+        outputStream.TrySeek(0, SeekOrigin.Begin);
+    }
+
     public MemoryStream Decompress(Stream compressedStream)
     {
         var memoryStream = new MemoryStream();
@@ -79,13 +84,6 @@ public MemoryStream Decompress(Stream compressedStream)
         return memoryStream;
     }
 
-    public void Compress(Stream inputStream, Stream outputStream)
-    {
-        inputStream.CopyTo(outputStream);
-        inputStream.TrySeek(0, SeekOrigin.Begin);
-        outputStream.TrySeek(0, SeekOrigin.Begin);
-    }
-
     public void Decompress(Stream inputStream, Stream outputStream)
     {
         inputStream.CopyTo(outputStream);

diff --git a/src/Zaabee.Compressor.Abstractions/Zaabee.Compressor.Abstractions.csproj b/src/Zaabee.Compressor.Abstractions/Zaabee.Compressor.Abstractions.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2023.10.2</PackageVersion>
-        <Version>2023.10.2</Version>
+        <PackageVersion>2023.10.3</PackageVersion>
+        <Version>2023.10.3</Version>
         <Authors>Mutuduxf</Authors>
         <Company>Mutuduxf</Company>
         <PackageProjectUrl>https://github.com/PicoHex/Zaabee.Compression</PackageProjectUrl>
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Zaabee.Extensions" Version="2023.1.2" />
+      <PackageReference Include="Zaabee.Extensions" Version="2023.2.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Zaabee.LZ4/Zaabee.LZ4.csproj b/src/Zaabee.LZ4/Zaabee.LZ4.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2023.6.2</PackageVersion>
-        <Version>2023.6.2</Version>
+        <PackageVersion>2023.6.4</PackageVersion>
+        <Version>2023.6.4</Version>
         <Authors>Mutuduxf</Authors>
         <Company>Mutuduxf</Company>
         <PackageTags>Zaabee;K4os.Compression.LZ4;LZ4;Compression</PackageTags>
@@ -17,9 +17,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="K4os.Compression.LZ4" Version="1.3.5" />
-        <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.5" />
-        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.2" />
+        <PackageReference Include="K4os.Compression.LZ4" Version="1.3.6" />
+        <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.6" />
+        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.3" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Zaabee.LZMA/Zaabee.LZMA.csproj b/src/Zaabee.LZMA/Zaabee.LZMA.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2023.6.2</PackageVersion>
-        <Version>2023.6.2</Version>
+        <PackageVersion>2023.6.4</PackageVersion>
+        <Version>2023.6.4</Version>
         <Authors>Mutuduxf</Authors>
         <Company>Mutuduxf</Company>
         <PackageTags>Zaabee;LZMA-SDK;LZMA;Compression</PackageTags>
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="LZMA-SDK" Version="22.1.1" />
-        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.2" />
+        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.3" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Zaabee.SharpZipLib/Zaabee.SharpZipLib.csproj b/src/Zaabee.SharpZipLib/Zaabee.SharpZipLib.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2023.6.2</PackageVersion>
-        <Version>2023.6.2</Version>
+        <PackageVersion>2023.6.4</PackageVersion>
+        <Version>2023.6.4</Version>
         <Authors>Mutuduxf</Authors>
         <Company>Mutuduxf</Company>
         <PackageTags>Zaabee;SharpZipLib;BZip2;GZip;Compression</PackageTags>
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="SharpZipLib" Version="1.4.2" />
-        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.2" />
+        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.3" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Zaabee.XZ/Zaabee.XZ.csproj b/src/Zaabee.XZ/Zaabee.XZ.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2023.6.4</PackageVersion>
-        <Version>2023.6.4</Version>
+        <PackageVersion>2023.6.6</PackageVersion>
+        <Version>2023.6.6</Version>
         <Authors>Mutuduxf</Authors>
         <Company>Mutuduxf</Company>
         <PackageTags>Zaabee;XZ.NET-netstandard;XZ;Compression</PackageTags>
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="XZ.NET-netstandard" Version="2.0.0.2" />
-        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.2" />
+        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.3" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Zaabee.Zstd/Zaabee.Zstd.csproj b/src/Zaabee.Zstd/Zaabee.Zstd.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2023.6.2</PackageVersion>
-        <Version>2023.6.2</Version>
+        <PackageVersion>2023.6.4</PackageVersion>
+        <Version>2023.6.4</Version>
         <Authors>Mutuduxf</Authors>
         <Company>Mutuduxf</Company>
         <PackageTags>Zaabee;ZstdNet;Zstd;Compression</PackageTags>
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="ZstdNet" Version="1.4.5" />
-        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.2" />
+        <PackageReference Include="Zaabee.Compressor.Abstractions" Version="2023.10.3" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Zaabee.BrotliNET.UnitTest/Zaabee.BrotliNET.UnitTest.csproj b/tests/Zaabee.BrotliNET.UnitTest/Zaabee.BrotliNET.UnitTest.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="xunit" Version="2.5.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Zaabee.Compressor.UnitTest/Zaabee.Compressor.UnitTest.csproj b/tests/Zaabee.Compressor.UnitTest/Zaabee.Compressor.UnitTest.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="xunit" Version="2.5.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Zaabee.LZ4.UnitTest/Zaabee.LZ4.UnitTest.csproj b/tests/Zaabee.LZ4.UnitTest/Zaabee.LZ4.UnitTest.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="xunit" Version="2.5.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Zaabee.LZMA.UnitTest/Zaabee.LZMA.UnitTest.csproj b/tests/Zaabee.LZMA.UnitTest/Zaabee.LZMA.UnitTest.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="xunit" Version="2.5.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Zaabee.SharpZipLib.UnitTest/Zaabee.SharpZipLib.UnitTest.csproj b/tests/Zaabee.SharpZipLib.UnitTest/Zaabee.SharpZipLib.UnitTest.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="xunit" Version="2.5.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Zaabee.XZ.UnitTest/Zaabee.XZ.UnitTest.csproj b/tests/Zaabee.XZ.UnitTest/Zaabee.XZ.UnitTest.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="xunit" Version="2.5.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Zaabee.Zstd.UnitTest/Zaabee.Zstd.UnitTest.csproj b/tests/Zaabee.Zstd.UnitTest/Zaabee.Zstd.UnitTest.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
         <PackageReference Include="xunit" Version="2.5.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>