Fix native library detection - enables FAKE native library support

appveyor.yml

@@ -14,6 +14,8 @@ artifacts:
     name: bin_netcore
   - path: 'temp\*.nupkg'
     type: NuGetPackage
+  - path: 'paket\tests_result\netcore\Paket.IntegrationTests\TestResult.trx'
+    name: IntegrationTestResults 
 nuget:
   account_feed: false
   project_feed: true

integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs

@@ -17,7 +17,7 @@ let ``#140 windsor should resolve framework dependent dependencies``() =
     |> getExplicitRestriction
     |> shouldEqual (FrameworkRestriction.Between(DotNetFramework(FrameworkVersion.V3_5), DotNetFramework(FrameworkVersion.V4)))
 
-[<Test>]
+[<Test; Ignore "slow test">]
 let ``#1182 framework restrictions overwrite each other``() =
     let lockFile = update "i001182-framework-restrictions"
     let lockFile = lockFile.ToString()

integrationtests/Paket.IntegrationTests/UpdatePackageSpecs.fs

@@ -128,7 +128,7 @@ let ``#1579 update allows unpinned``() =
     directPaket "pack templatefile paket.A.template version 1.0.0-prerelease output bin" scenario |> ignore
     directPaket "update" scenario|> ignore
 
-[<Test>]
+[<Test;Ignore "slow test">]
 let ``#1501 download succeeds``() =
     update "i001510-download" |> ignore
 

src/Paket.Core/PaketConfigFiles/InstallModel.fs

@@ -467,6 +467,12 @@ module InstallModel =
         |> Option.orElseWith (fun _ ->
             (trySscanf "runtimes/%A{rid}/native/%A{noSeperator}" p : (Rid * string) option)
             |> Option.map (fun (rid, _) -> { Path = Tfm.Empty; File = p; Runtime = Some rid }))
+        |> Option.orElseWith (fun _ ->
+            // fallback for some incorrect packages, like https://www.nuget.org/packages/System.Data.SQLite.Core/
+            (trySscanf "runtimes/%A{rid}/native/%A{tfm}/%A{noSeperator}" p : (Rid * Tfm * string) option)
+            |> Option.map (fun (rid, l,_) ->
+                traceWarnIfNotBefore ("File", p.BasePath) "Could detect native library in '%s' which is incorrectly packaged because it should be directly under 'native' or in the 'nativeassets' folder, please tell the package authors" p.FullPath
+                { Path = l; File = p; Runtime = Some rid }))
 
     let getMsbuildFile (p:UnparsedPackageFile) =
         (trySscanf "build/%A{tfm}/%A{noSeperator}" p : (Tfm * string) option)
@@ -533,7 +539,7 @@ module InstallModel =
 
     let removeIfCompletelyEmpty (this:InstallModel) =
         let foldersEmpty =
-            isEmpty this.CompileRefFolders && isEmpty this.TargetsFileFolders && isEmpty this.RuntimeAssemblyFolders &&
+            isEmpty this.CompileRefFolders && isEmpty this.TargetsFileFolders && isEmpty this.RuntimeAssemblyFolders && isEmpty this.RuntimeLibFolders &&
             this.CompileLibFolders
             |> Seq.map (fun c -> c.FolderContents.Libraries |> Set.toSeq, c.FolderContents.FrameworkReferences |> Set.toSeq)
             |> Seq.forall (fun (libs, refs) -> Seq.isEmpty libs && Seq.isEmpty refs)

tests/Paket.Tests.preview3/Paket.Tests.fsproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <PaketTestsSourcesDir>..\Paket.Tests</PaketTestsSourcesDir>
@@ -167,6 +167,9 @@
     <Compile Include="$(PaketTestsSourcesDir)\ProjectFile\LocalizationSpecs.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\ProjectFile\UpdateFromNugetSpecs.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\FrameworkIdentifierSpecs.fs" />
+    <None Include="$(PaketTestsSourcesDir)\InstallModel\runtimeJsonMsNetCorePlatforms2_2_1.json" />
+    <None Include="$(PaketTestsSourcesDir)\InstallModel\runtimeJsonMsNetCoreTargets2_1_0.json" />
+    <Compile Include="$(PaketTestsSourcesDir)\InstallModel\RuntimeGraphTests.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\ProcessingSpecs.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\Xml\ControlzEx.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\Xml\Fantomas.fs" />
@@ -198,7 +201,6 @@
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\AnalyzerSpecs.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\UpdateProcessSpecs.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\BindingRedirect.fs" />
-    <Compile Include="$(PaketTestsSourcesDir)\InstallModel\RuntimeGraphTests.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\InstallModel\InstallNuGetContentsTests.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\Packaging\PackageProcessSpecs.fs" />
     <Compile Include="$(PaketTestsSourcesDir)\Packaging\NuspecWriterSpecs.fs" />

tests/Paket.Tests/InstallModel/ProcessingSpecs.fs

@@ -16,6 +16,19 @@ let fromLegacyList (prefix:string) l =
             { Paket.NuGet.UnparsedPackageFile.FullPath = i; Paket.NuGet.UnparsedPackageFile.PathWithinPackage = i.Substring(prefix.Length).Replace("\\", "/") }
         else failwithf "Expected '%s' to start with '%s'" i prefix)
 
+// for testing you can temporarily replace fromLegacyList to get the "real" deal.
+let fromNuGetFolder (f:string) =
+    let nuspecFile = Directory.EnumerateFiles(f, "*.nuspec") |> Seq.exactlyOne
+    let packageName = Path.GetFileName nuspecFile
+    let nuspec = Nuspec.Load nuspecFile
+    let content = (NuGet.GetContentWithNuSpec nuspec f).Force()
+    InstallModel.CreateFromContent(
+        PackageName packageName, 
+        SemVer.Parse nuspec.Version, 
+        InstallModelKind.Package,
+        Paket.Requirements.FrameworkRestriction.NoRestriction, 
+        content)
+
 [<Test>]
 let ``Library.ofFile should not crash on files without extension``() =
     let frameworkDepFile = {
@@ -61,6 +74,47 @@ let ``should understand libuv in runtimes``() =
     model.GetRuntimeLibraries RuntimeGraph.Empty (Rid.Of "win7-x64") (TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V4))
        |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldContain @"..\Microsoft.AspNetCore.Server.Kestrel\runtimes\win7-x64\native\libuv.dll"
 
+[<Test>]
+let ``should understand incorrect SQLite packaging``() = 
+    let model =
+      emptymodel.AddReferences
+        ([ @"..\System.Data.SQLite.Core\runtimes\linux-x64\native\netstandard2.0\SQLite.Interop.dll"
+           @"..\System.Data.SQLite.Core\runtimes\os-x64\native\netstandard2.0\SQLite.Interop.dll"
+           @"..\System.Data.SQLite.Core\runtimes\win-x64\native\netstandard2.0\SQLite.Interop.dll"
+           @"..\System.Data.SQLite.Core\runtimes\win-x86\native\netstandard2.0\SQLite.Interop.dll"
+         ] |> fromLegacyList @"..\System.Data.SQLite.Core\")
+
+    // Not sure, for now undefined -> and contained, lets see
+    //model.GetRuntimeLibraries RuntimeGraph.Empty (Rid.Of "win-x64") (TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V4))
+    //   |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldNotContain @"..\System.Data.SQLite.Core\runtimes\win-x64\native\netstandard2.0\SQLite.Interop.dll"
+
+    model.GetRuntimeLibraries RuntimeGraph.Empty (Rid.Of "win-x64") (TargetProfile.SinglePlatform (DotNetStandard DotNetStandardVersion.V2_0))
+       |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldContain @"..\System.Data.SQLite.Core\runtimes\win-x64\native\netstandard2.0\SQLite.Interop.dll"
+    model.GetRuntimeLibraries RuntimeGraph.Empty (Rid.Of "win-x86") (TargetProfile.SinglePlatform (DotNetCoreApp DotNetCoreAppVersion.V2_2))
+       |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldContain @"..\System.Data.SQLite.Core\runtimes\win-x86\native\netstandard2.0\SQLite.Interop.dll"
+    model.GetRuntimeLibraries RuntimeGraph.Empty (Rid.Of "os-x64") (TargetProfile.SinglePlatform (DotNetCoreApp DotNetCoreAppVersion.V2_2))
+       |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldContain @"..\System.Data.SQLite.Core\runtimes\os-x64\native\netstandard2.0\SQLite.Interop.dll"
+
+[<Test>]
+let ``should understand sni packaging``() =
+    let graph = 
+        RuntimeGraph.merge RuntimeGraphTests.runtimeGraphMsNetCorePlatforms2_2_1 RuntimeGraphTests.runtimeGraphMsNetCoreTargets2_1_0
+    let rs, _ = Requirements.parseRestrictions "== netstandard2.0"
+    let model = 
+      //(fromNuGetFolder @"C:\Users\matth\.nuget\packages\runtime.win-x64.runtime.native.system.data.sqlclient.sni\4.4.0")
+      emptymodel.AddReferences(
+         [ @"..\runtime.win-x64.runtime.native.system.data.sqlclient.sni\runtimes\win-x64\native\sni.dll"
+         ] |> fromLegacyList @"..\runtime.win-x64.runtime.native.system.data.sqlclient.sni\")
+        .RemoveIfCompletelyEmpty()
+    model.GetRuntimeLibraries graph (Rid.Of "os-x64") (TargetProfile.SinglePlatform (DotNetCoreApp DotNetCoreAppVersion.V2_2))
+       |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldNotContain @"..\runtime.win-x64.runtime.native.system.data.sqlclient.sni\runtimes\win-x64\native\sni.dll"
+    model.GetRuntimeLibraries graph (Rid.Of "win10-x64") (TargetProfile.SinglePlatform (DotNetStandard (DotNetStandardVersion.V2_0)))
+       |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldContain @"..\runtime.win-x64.runtime.native.system.data.sqlclient.sni\runtimes\win-x64\native\sni.dll"
+    model.GetRuntimeLibraries graph (Rid.Of "win-x64") (TargetProfile.SinglePlatform (DotNetStandard (DotNetStandardVersion.V2_0)))
+       |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldContain @"..\runtime.win-x64.runtime.native.system.data.sqlclient.sni\runtimes\win-x64\native\sni.dll"
+    model.GetRuntimeLibraries graph (Rid.Of "win") (TargetProfile.SinglePlatform (DotNetStandard (DotNetStandardVersion.V2_0)))
+       |> Seq.map (fun (r:RuntimeLibrary) -> r.Library.Path) |> shouldNotContain @"..\runtime.win-x64.runtime.native.system.data.sqlclient.sni\runtimes\win-x64\native\sni.dll"
+
 [<Test>]
 let ``should understand reference folder``() =
     let model =