Don't report warnings for packages that are not installed for current…

… target framework - fixes #1693
fsprojects · Jun 23, 2016 · 7413053 · 7413053
1 parent b1da96a
commit 7413053
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 174 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,5 @@
-#### 3.2.0-alpha001 - 23.06.2016
+#### 3.2.0-alpha002 - 23.06.2016
+* BUGFIX: Don't report warnings for packages that are not installed for current target framework - https://github.com/fsprojects/Paket/issues/1693
 * BUGFIX: Runtime deps are copied based on TargetFramework - https://github.com/fsprojects/Paket/issues/1751
 * BUGFIX: Do not take over control over manual nodes - https://github.com/fsprojects/Paket/issues/1746
 * BUGFIX: Better error message when log file is missing - https://github.com/fsprojects/Paket/issues/1743

diff --git a/integrationtests/Paket.IntegrationTests/InstallSpecs.fs b/integrationtests/Paket.IntegrationTests/InstallSpecs.fs
@@ -361,12 +361,6 @@ let ``#1458 should not install conflicting deps from different groups``() =
     with
     | exn when exn.Message.Contains "Package Nancy is referenced in different versions" -> ()
 
-
-[<Test>]
-let ``#1442 warn if install finds no libs``() = 
-    let result = paket "install" "i001442-warn-if-empty"
-    result |> shouldContainText "contains libraries, but not for the selected TargetFramework"
-
 [<Test>]
 let ``#1442 should not warn on SonarLint``() = 
     let result = paket "install" "i001442-dont-warn"

diff --git a/integrationtests/scenarios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary.sln b/integrationtests/scenarios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary.sln
diff --git a/...ationtests/scenarios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/Class1.cs b/...ationtests/scenarios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/Class1.cs
diff --git a/.../i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate b/.../i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
diff --git a/...ios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/Properties/AssemblyInfo.cs b/...ios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/Properties/AssemblyInfo.cs
diff --git a/...sts/scenarios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/paket.references b/...sts/scenarios/i001442-warn-if-empty/before/MyClassLibrary/MyClassLibrary/paket.references
diff --git a/integrationtests/scenarios/i001442-warn-if-empty/before/paket.dependencies b/integrationtests/scenarios/i001442-warn-if-empty/before/paket.dependencies
diff --git a/nupkgs/NUnit.3.2.0.nupkg b/nupkgs/NUnit.3.2.0.nupkg
diff --git a/nupkgs/NUnit.3.3.0-CI-2857-issue-1593.nupkg b/nupkgs/NUnit.3.3.0-CI-2857-issue-1593.nupkg
diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs
@@ -6,10 +6,10 @@
 [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")]
 [assembly: AssemblyVersionAttribute("3.2.0")]
 [assembly: AssemblyFileVersionAttribute("3.2.0")]
-[assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha001")]
+[assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha002")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "3.2.0";
-        internal const string InformationalVersion = "3.2.0-alpha001";
+        internal const string InformationalVersion = "3.2.0-alpha002";
     }
 }
diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs
@@ -7,9 +7,9 @@ open System.Reflection
 [<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
 [<assembly: AssemblyVersionAttribute("3.2.0")>]
 [<assembly: AssemblyFileVersionAttribute("3.2.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha001")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha002")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] Version = "3.2.0"
-    let [<Literal>] InformationalVersion = "3.2.0-alpha001"
+    let [<Literal>] InformationalVersion = "3.2.0-alpha002"
diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -882,23 +882,25 @@ module ProjectFile =
         |> Seq.map (fun kv -> 
             deleteCustomModelNodes (snd kv.Value) project
             let installSettings = snd usedPackages.[kv.Key]
+            let restrictionList = installSettings.FrameworkRestrictions |> getRestrictionList
             let projectModel =
                 (snd kv.Value)
-                    .ApplyFrameworkRestrictions(installSettings.FrameworkRestrictions |> getRestrictionList)
+                    .ApplyFrameworkRestrictions(restrictionList)
                     .FilterExcludes(installSettings.Excludes)
                     .RemoveIfCompletelyEmpty()
 
             match getTargetFramework project with 
             | Some targetFramework ->
-                if projectModel.GetLibReferences targetFramework |> Seq.isEmpty then
-                    let libReferences = 
-                        projectModel.GetLibReferencesLazy |> force
-                        |> Seq.filter (fun l -> match l with | Reference.Library _ -> true | _ -> false)
-
-                    if not (Seq.isEmpty libReferences) then
-                        traceWarnfn "Package %O contains libraries, but not for the selected TargetFramework %O in project %s."
-                            (snd kv.Key) targetFramework project.FileName
-            | None -> ()
+                if isTargetMatchingRestrictions(restrictionList,SinglePlatform targetFramework) then
+                    if projectModel.GetLibReferences targetFramework |> Seq.isEmpty then
+                        let libReferences = 
+                            projectModel.GetLibReferencesLazy |> force
+                            |> Seq.filter (fun l -> match l with | Reference.Library _ -> true | _ -> false)
+
+                        if not (Seq.isEmpty libReferences) then
+                            traceWarnfn "Package %O contains libraries, but not for the selected TargetFramework %O in project %s."
+                                (snd kv.Key) targetFramework project.FileName
+            | _ -> ()
 
             let copyLocal = defaultArg installSettings.CopyLocal true
             let importTargets = defaultArg installSettings.ImportTargets true

diff --git a/src/Paket.Core/Requirements.fs b/src/Paket.Core/Requirements.fs
@@ -378,6 +378,7 @@ let filterRestrictions (list1:FrameworkRestrictions) (list2:FrameworkRestriction
 /// Get if a target should be considered with the specified restrictions
 let isTargetMatchingRestrictions =
     memoize <| fun (restrictions:FrameworkRestriction list, target) ->
+        if List.isEmpty restrictions then true else
         match target with
         | SinglePlatform (Runtimes _ ) -> true
         | SinglePlatform pf ->

diff --git a/src/Paket.PowerShell/AssemblyInfo.fs b/src/Paket.PowerShell/AssemblyInfo.fs
@@ -7,9 +7,9 @@ open System.Reflection
 [<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
 [<assembly: AssemblyVersionAttribute("3.2.0")>]
 [<assembly: AssemblyFileVersionAttribute("3.2.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha001")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha002")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] Version = "3.2.0"
-    let [<Literal>] InformationalVersion = "3.2.0-alpha001"
+    let [<Literal>] InformationalVersion = "3.2.0-alpha002"
diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs
@@ -7,9 +7,9 @@ open System.Reflection
 [<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
 [<assembly: AssemblyVersionAttribute("3.2.0")>]
 [<assembly: AssemblyFileVersionAttribute("3.2.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha001")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.2.0-alpha002")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] Version = "3.2.0"
-    let [<Literal>] InformationalVersion = "3.2.0-alpha001"
+    let [<Literal>] InformationalVersion = "3.2.0-alpha002"
diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -52,7 +52,7 @@
     <StartArguments>update -f</StartArguments>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001117-aws\temp</StartWorkingDirectory>
     <StartArguments>update</StartArguments>
-    <StartWorkingDirectory>D:\code\paket3dotnetcoreissue</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001442-warn-Rx\temp</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>

diff --git a/src/Paket/PlatformTask.fs b/src/Paket/PlatformTask.fs
@@ -81,10 +81,11 @@ type CopyRuntimeDependencies() =
                             try
                                 let g = lockFile.Groups.[groupName]
                                 let p = g.Resolution.[packageName]
-                                match filterRestrictions g.Options.Settings.FrameworkRestrictions p.Settings.FrameworkRestrictions with
-                                | FrameworkRestrictionList restrictions ->
-                                    isTargetMatchingRestrictions(restrictions,restriction)
-                                | _ -> true
+                                let restrictions =
+                                    filterRestrictions g.Options.Settings.FrameworkRestrictions p.Settings.FrameworkRestrictions 
+                                    |> getRestrictionList
+
+                                isTargetMatchingRestrictions(restrictions,restriction)
                             with
                             | _ -> true)
                     else