Merge branch 'master' of https://github.com/BayardRock/IfSharp.git

fsprojects · Aug 25, 2014 · 5a36462 · 5a36462
2 parents 80fd683 + 379e892
commit 5a36462
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/IfSharp.Kernel/NuGetManager.fs b/src/IfSharp.Kernel/NuGetManager.fs
@@ -181,10 +181,12 @@ type NuGetManager (executingDirectory : string) =
                         if retval then compatibleItems else Seq.empty
 
                     let maxFramework =
-                        pkg.GetSupportedFrameworks()
-                        |> Seq.maxBy (fun x -> x.Version)
+                        // try full framework first - if none is supported, fall back
+                        let fullFrameworks = pkg.GetSupportedFrameworks() |> Seq.filter (fun x -> x.Identifier = ".NETFramework") |> Seq.toArray
+                        if Array.length fullFrameworks > 0 then fullFrameworks |> Array.maxBy (fun x -> x.Version)
+                        else pkg.GetSupportedFrameworks() |> Seq.maxBy (fun x -> x.Version)
 
-                    let assemblies = 
+                    let assemblies =
                         if not(pkg.PackageAssemblyReferences.IsEmpty()) then
                             let compatibleAssemblyReferences =
                                 getCompatibleItems maxFramework pkg.PackageAssemblyReferences
@@ -195,9 +197,8 @@ type NuGetManager (executingDirectory : string) =
                         elif pkg.AssemblyReferences.IsEmpty() then
                             Seq.empty
                         else
-                            pkg.AssemblyReferences
-                            |> Seq.filter (fun x -> x.TargetFramework = maxFramework)
-
+                            getCompatibleItems maxFramework pkg.AssemblyReferences
+
                     let frameworkAssemblyReferences = getCompatibleItems maxFramework pkg.FrameworkAssemblies
 
                     packagesCache.Add(key, { Package = Some pkg; Assemblies = assemblies; FrameworkAssemblies = frameworkAssemblyReferences; Error = ""; })