add support for .NET Framework 3.5/4

XieJJ99 · Mar 3, 2019 · e23b1d5 · e23b1d5
1 parent b14f8a1
commit e23b1d5
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 14 deletions.
diff --git a/Brotli.NET/Brotli.Core/Brotli.Core.csproj b/Brotli.NET/Brotli.Core/Brotli.Core.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
-    <Version>2.0.3.2</Version>
+    <TargetFrameworks>net35;net40;net45;netstandard2.0</TargetFrameworks>
+    <Version>2.0.4.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Brotli.NET</PackageId>
     <Authors>Jinjun Xie</Authors>
     <Company>Jinjun Xie</Company>
     <Copyright>Copyright Jinjun Xie 2016</Copyright>
-    <PackageLicenseUrl></PackageLicenseUrl>
+    <PackageLicenseUrl>https://mit-license.org/</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/XieJJ99/brotli.net</PackageProjectUrl>
     <PackageTags>Brotli Compress Decompress .NET Standard Stream</PackageTags>
     <PackageReleaseNotes>Fix load issues on .NET Framework Projets.

diff --git a/Brotli.NET/Brotli.Core/Implement/BrotliStream.cs b/Brotli.NET/Brotli.Core/Implement/BrotliStream.cs
@@ -215,9 +215,10 @@ protected override void Dispose(bool disposing)
             }
         }
 
+
         public void TruncateBeginning(MemoryStream ms, int numberOfBytesToRemove)
         {
-#if NETCORE
+#if NETSTANDARD2_0
             ArraySegment<byte> buf;
             if(ms.TryGetBuffer(out buf))
             {
@@ -369,4 +370,42 @@ public override void Write(byte[] buffer, int offset, int count)
             }
         }
     }
+
+#if NET35
+    /// <summary>
+    /// Improve compability issue on FX35
+    /// </summary>
+    public static class StreamCopyExtension
+    {
+        public static void CopyTo(this Stream source,Stream destination, int bufferSize=4*1024)
+        {
+            if (source==null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+            if (destination==null)
+            {
+                throw new ArgumentNullException(nameof(destination));
+            }
+            if (!source.CanRead)
+            {
+                throw new InvalidOperationException("source stream is not readable");
+            }
+            if (!destination.CanWrite)
+            {
+                throw new InvalidOperationException("destination stream is not writeable");
+            }
+            if (bufferSize<=0)
+            {
+                throw new InvalidOperationException("buffer size should be greate than zero");
+            }
+
+
+            byte[] buffer = new byte[bufferSize];
+            int read;
+            while ((read = source.Read(buffer, 0, buffer.Length)) > 0)
+                destination.Write(buffer, 0, read);
+        }
+    }
+#endif
 }
diff --git a/Brotli.NET/Brotli.Core/Interop/NativeLibraryLoader.cs b/Brotli.NET/Brotli.Core/Interop/NativeLibraryLoader.cs
@@ -17,10 +17,14 @@ internal class NativeLibraryLoader
         internal static bool Is64Bit = false;
         static NativeLibraryLoader()
         {
+#if NET35 || NET40
+            IsWindows=true;
+#else
             IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
             IsLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
             IsMacOSX = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
-            IsNetCore= RuntimeInformation.FrameworkDescription.StartsWith(".NET Core");
+            IsNetCore = RuntimeInformation.FrameworkDescription.StartsWith(".NET Core");
+#endif
             if (!IsWindows && !IsLinux && !IsMacOSX)
             {
                 throw new InvalidOperationException("Unsupported platform.");
@@ -111,7 +115,11 @@ public T GetNativeMethodDelegate<T>(string methodName) where T : class
 
         internal static string[] GetPossibleRuntimeDirectories()
         {
+#if NET35 || NET40
+            var assemblyDirectory = Path.GetDirectoryName(typeof(LibPathBootStrapper).Assembly.Location);
+#else
             var assemblyDirectory = Path.GetDirectoryName(typeof(LibPathBootStrapper).GetTypeInfo().Assembly.Location);
+#endif
             var platform = "win";
             if (IsLinux)
             {
@@ -123,7 +131,11 @@ internal static string[] GetPossibleRuntimeDirectories()
             }
             string runtimesDirectory = string.Format("runtimes/{0}/native", platform).Replace('/',Path.DirectorySeparatorChar);
             string runtimesFullDirectory = Path.Combine(assemblyDirectory,runtimesDirectory).Replace('/', Path.DirectorySeparatorChar);
+#if NET35
+            var netCoreAppStyleDirectory = Path.Combine(Path.Combine(assemblyDirectory, "../.."), runtimesDirectory).Replace('/', Path.DirectorySeparatorChar);
+#else
             var netCoreAppStyleDirectory = Path.Combine(assemblyDirectory, "../..", runtimesDirectory).Replace('/', Path.DirectorySeparatorChar);
+#endif
             string[] paths = new[] { assemblyDirectory, runtimesFullDirectory, runtimesDirectory, netCoreAppStyleDirectory };
             return paths;
         }

diff --git a/Brotli.NET/Brotli.NET.sln b/Brotli.NET/Brotli.NET.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Brotli.Core", "Brotli.Core\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBrotli", "TestBrotli\TestBrotli.csproj", "{1BB4F249-0ED5-49E8-97EC-4A5FF495B296}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FXTestBrotli", "FXTestBrotli\FXTestBrotli.csproj", "{4AF58FA9-B499-424B-BFF7-B8DDDF6481B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FX45TestBrotli", "FX45TestBrotli\FX45TestBrotli.csproj", "{4AF58FA9-B499-424B-BFF7-B8DDDF6481B7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Brotli.NET/FXTestBrotli/FXBroltliTest.cs → Brotli.NET/FX45TestBrotli/FX45BroltliTest.cs b/Brotli.NET/FXTestBrotli/FXBroltliTest.cs → Brotli.NET/FX45TestBrotli/FX45BroltliTest.cs
@@ -5,7 +5,7 @@
 namespace FXTestBrotli
 {
     [TestClass]
-    public class FXBroltliTest
+    public class FX45BroltliTest
     {
         public Boolean ArrayEqual(Byte[] a1, Byte[] a2)
         {

diff --git a/Brotli.NET/FXTestBrotli/FXTestBrotli.csproj → ....NET/FX45TestBrotli/FX45TestBrotli.csproj b/Brotli.NET/FXTestBrotli/FXTestBrotli.csproj → ....NET/FX45TestBrotli/FX45TestBrotli.csproj
@@ -40,8 +40,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Brotli.Core, Version=2.0.3.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Brotli.NET.2.0.3.1\lib\net45\Brotli.Core.dll</HintPath>
+    <Reference Include="Brotli.Core, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Brotli.NET.2.0.4\lib\net45\Brotli.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
@@ -56,7 +56,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FXBroltliTest.cs" />
+    <Compile Include="FX45BroltliTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -72,8 +72,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets'))" />
-    <Error Condition="!Exists('..\packages\Brotli.NET.2.0.3.1\build\Brotli.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Brotli.NET.2.0.3.1\build\Brotli.NET.targets'))" />
+    <Error Condition="!Exists('..\packages\Brotli.NET.2.0.4\build\Brotli.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Brotli.NET.2.0.4\build\Brotli.NET.targets'))" />
   </Target>
   <Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" />
-  <Import Project="..\packages\Brotli.NET.2.0.3.1\build\Brotli.NET.targets" Condition="Exists('..\packages\Brotli.NET.2.0.3.1\build\Brotli.NET.targets')" />
+  <Import Project="..\packages\Brotli.NET.2.0.4\build\Brotli.NET.targets" Condition="Exists('..\packages\Brotli.NET.2.0.4\build\Brotli.NET.targets')" />
 </Project>
diff --git a/...T/FXTestBrotli/Properties/AssemblyInfo.cs → ...FX45TestBrotli/Properties/AssemblyInfo.cs b/...T/FXTestBrotli/Properties/AssemblyInfo.cs → ...FX45TestBrotli/Properties/AssemblyInfo.cs
diff --git a/Brotli.NET/FXTestBrotli/packages.config → Brotli.NET/FX45TestBrotli/packages.config b/Brotli.NET/FXTestBrotli/packages.config → Brotli.NET/FX45TestBrotli/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Brotli.NET" version="2.0.3.1" targetFramework="net45" />
+  <package id="Brotli.NET" version="2.0.4" targetFramework="net45" />
   <package id="MSTest.TestAdapter" version="1.4.0" targetFramework="net471" />
   <package id="MSTest.TestFramework" version="1.4.0" targetFramework="net471" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />

diff --git a/Brotli.NET/TestBrotli/TestBrotli.csproj b/Brotli.NET/TestBrotli/TestBrotli.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Brotli.NET" Version="2.0.3.1" />
+    <PackageReference Include="Brotli.NET" Version="2.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />