Merge branch 'develop'

ied206 · Apr 18, 2019 · 11918e5 · 11918e5
2 parents a903005 + 7f91cba
commit 11918e5
Show file tree

Hide file tree

Showing 48 changed files with 1,530 additions and 1,842 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,12 @@ bld/
 [Oo]bj/
 [Ll]og/
 
+# Do not ignore Precompiled directory
+!/**/Precompiled/x86/
+!/**/Precompiled/x64/
+!/**/Precompiled/armhf/
+!/**/Precompiled/arm64/
+
 # Visual Studio 2015 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot

diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.1" />
-    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.0.3" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
+    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.1.1" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
   </ItemGroup>
 

diff --git a/Benchmark/Program.cs b/Benchmark/Program.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
+// ReSharper disable InconsistentNaming
 
 namespace Benchmark
 {
@@ -18,7 +19,7 @@ public class CompBench
         // SrcFiles
         [ParamsSource(nameof(SrcFileNames))]
         public string SrcFileName { get; set; }
-        public string[] SrcFileNames { get; set; } = new string[3]
+        public string[] SrcFileNames { get; set; } = 
         {
             "Banner.bmp",
             "Banner.svg",
@@ -29,7 +30,7 @@ public class CompBench
         // Levels
         [ParamsSource(nameof(Levels))]
         public string Level { get; set; }
-        public string[] Levels { get; set; } = new string[3]
+        public string[] Levels { get; set; } = 
         {
             "Fastest",
             "Default",
@@ -225,7 +226,7 @@ public class DecompBench
         // SrcFiles
         [ParamsSource(nameof(SrcFileNames))]
         public string SrcFileName { get; set; }
-        public string[] SrcFileNames { get; set; } = new string[3]
+        public string[] SrcFileNames { get; set; } = 
         {
             "Banner.bmp",
             "Banner.svg",
@@ -236,7 +237,7 @@ public class DecompBench
         // Levels
         [ParamsSource(nameof(Levels))]
         public string Level { get; set; }
-        public string[] Levels { get; set; } = new string[3]
+        public string[] Levels { get; set; } = 
         {
             "Fastest",
             "Default",
@@ -446,7 +447,7 @@ public static void NativeGlobalInit()
 
             Joveler.Compression.ZLib.ZLibInit.GlobalInit(zlibPath, 64 * 1024);
             Joveler.Compression.XZ.XZInit.GlobalInit(xzPath, 64 * 1024);
-            Joveler.Compression.LZ4.LZ4Init.GlobalInit(lz4Path, 64 * 1024);
+            Joveler.Compression.LZ4.LZ4Init.GlobalInit(lz4Path, 16 * 1024);
         }
 
         public static void NativeGlobalCleanup()

diff --git a/Joveler.Compression.LZ4.Tests/CompressTests.cs b/Joveler.Compression.LZ4.Tests/CompressTests.cs
diff --git a/Joveler.Compression.LZ4.Tests/DecompressTests.cs b/Joveler.Compression.LZ4.Tests/DecompressTests.cs
diff --git a/Joveler.Compression.LZ4.Tests/Joveler.Compression.LZ4.Tests.csproj b/Joveler.Compression.LZ4.Tests/Joveler.Compression.LZ4.Tests.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>
 
   <ItemGroup>