fix compability issue with NUnit

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

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Brotli.NET/Brotli.Core/Brotli.Core.csproj b/Brotli.NET/Brotli.Core/Brotli.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
-    <Version>2.0.3.1</Version>
+    <Version>2.0.3.2</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Brotli.NET</PackageId>
     <Authors>Jinjun Xie</Authors>

diff --git a/Brotli.NET/Brotli.Core/Interop/NativeLibraryLoader.cs b/Brotli.NET/Brotli.Core/Interop/NativeLibraryLoader.cs
@@ -121,9 +121,10 @@ internal static string[] GetPossibleRuntimeDirectories()
             {
                 platform= "osx";
             }
-            string runtimesDirectory = string.Format("runtimes/{0}/native", platform).Replace('/',System.IO.Path.DirectorySeparatorChar);
-            var netCoreAppStyleDirectory = Path.Combine(assemblyDirectory, "../..", runtimesDirectory).Replace('/', System.IO.Path.DirectorySeparatorChar);
-            string[] paths = new[] { assemblyDirectory, runtimesDirectory, netCoreAppStyleDirectory };
+            string runtimesDirectory = string.Format("runtimes/{0}/native", platform).Replace('/',Path.DirectorySeparatorChar);
+            string runtimesFullDirectory = Path.Combine(assemblyDirectory,runtimesDirectory).Replace('/', Path.DirectorySeparatorChar);
+            var netCoreAppStyleDirectory = Path.Combine(assemblyDirectory, "../..", runtimesDirectory).Replace('/', Path.DirectorySeparatorChar);
+            string[] paths = new[] { assemblyDirectory, runtimesFullDirectory, runtimesDirectory, netCoreAppStyleDirectory };
             return paths;
         }
 

diff --git a/Brotli.NET/Brotli.Core/build/Brotli.NET.targets b/Brotli.NET/Brotli.Core/build/Brotli.NET.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <NativeLibs Include="$(MSBuildThisFileDirectory)..\runtimes\**\*.dll" />
+    <NativeLibs Include="$(MSBuildThisFileDirectory)..\runtimes\**\*.*" />
     <None Include="@(NativeLibs)">
       <Link>runtimes\%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>