Release 5.14.1

RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 5.14.1 - 2019-06-13
+
+* BUGFIX: Fake 5 native libraries support now works on unix - https://github.com/fsharp/FAKE/pull/2334
+
 ## 5.14.0 - 2019-06-12
 
 * BREAKING: Renamed `CliVersion.Lkg` to `CliVersion.Coherent` as it was renamed on the installer. If you use an old installer with this flag you can still use `CliVersion.Version "lkg"` - https://github.com/fsharp/FAKE/pull/2318

src/app/Fake.Runtime/CoreCache.fs

@@ -331,30 +331,30 @@ This can happen for various reasons:
                     tracefn "Redirect assembly load to previously loaded assembly: %A" loadedName         
         result
 
-let findAndLoadUnmanagedInRuntimeDeps (loadFromPath:string -> nativeint) (unmanagedDllName:string) (logLevel:Trace.VerboseLevel) (nativeLibraries:NativeLibrary list) =
+let findUnmanagedInRuntimeDeps (loadFromPath:string -> nativeint) (unmanagedDllName:string) (logLevel:Trace.VerboseLevel) (nativeLibraries:NativeLibrary list) =
     if logLevel.PrintVerbose then tracefn "Trying to resolve native library: %s" unmanagedDllName
     match nativeLibraries |> Seq.tryFind (fun l ->
             let fnExt = Path.GetFileName l.File
             let fn = Path.GetFileNameWithoutExtension l.File
             unmanagedDllName = fn || unmanagedDllName = fnExt) with
     | Some lib ->
         let path = lib.File
-        let ptr = loadFromPath path
         if logLevel.PrintVerbose then tracefn "Redirect native library '%s' to known path: %s" unmanagedDllName path
-        ptr, path
+        path
     | None ->
         // will failwithf later anyway.
         if logLevel.PrintVerbose then tracefn "Could not resolve native library '%s'!" unmanagedDllName
-        IntPtr.Zero, null
+        null
 
 let resolveUnmanagedDependencyCached =
-    let libCache = System.Collections.Concurrent.ConcurrentDictionary<_,nativeint * string>()
+    let libCache = System.Collections.Concurrent.ConcurrentDictionary<_,string>()
     fun (loadFromPath:string -> nativeint) (unmanagedDllName:string) (logLevel:Trace.VerboseLevel) (nativeLibraries:NativeLibrary list) ->
         let mutable wasCalled = false
-        let ptr, path = libCache.GetOrAdd(unmanagedDllName, (fun _ ->
+        let path = libCache.GetOrAdd(unmanagedDllName, (fun _ ->
             wasCalled <- true
-            findAndLoadUnmanagedInRuntimeDeps loadFromPath unmanagedDllName logLevel nativeLibraries))
-        if wasCalled && ptr = IntPtr.Zero then
+            findUnmanagedInRuntimeDeps loadFromPath unmanagedDllName logLevel nativeLibraries))
+
+        if wasCalled && isNull path then
             let available =
                 if nativeLibraries.Length > 0 then
                     "Available native libraries:\n - " + String.Join("\n - ", nativeLibraries |> Seq.map (fun n -> n.File))
@@ -372,10 +372,10 @@ This can happen for various reasons:
   - the package should be downloaded again
 
 -> If the above doesn't apply or you need help please open an issue!""" unmanagedDllName available unmanagedDllName
-        if not wasCalled && not (ptr = IntPtr.Zero) then
+        if not wasCalled && not (isNull path) then
             if logLevel.PrintVerbose then
                 tracefn "Redirect native library '%s' to previous loaded library '%s'" unmanagedDllName path
-        ptr
+        loadFromPath path
 
 #if NETSTANDARD1_6
 // See https://github.com/dotnet/coreclr/issues/6411

src/test/Fake.Core.IntegrationTests/SimpleHelloWorldTests.fs

@@ -81,5 +81,4 @@ let tests =
     testCase "issue #2007 - native libs work" <| fun _ ->
         handleAndFormat <| fun () ->
             fakeRunAndCheck "build.fsx" "build.fsx" "i002007-native-libs" |> ignore
-
   ]