be careful with distinction between .NET 4.0 client and .NET 4.0 full…

… profile - fixes #1830
fsprojects · Jul 26, 2016 · 08480c3 · 08480c3
1 parent c39ee8d
commit 08480c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 3.9.5 - 26.07.2016
+* BUGFIX: be careful with distinction between .NET 4.0 client and .NET 4.0 full profile - https://github.com/fsprojects/Paket/issues/1830
+
 #### 3.9.4 - 26.07.2016
 * BUGFIX: Don't allow empty string as description in template file - https://github.com/fsprojects/Paket/pull/1831
 

diff --git a/src/Paket.Core/PlatformMatching.fs b/src/Paket.Core/PlatformMatching.fs
@@ -167,6 +167,8 @@ let getTargetCondition (target:TargetProfile) =
     match target with
     | SinglePlatform(platform) -> 
         match platform with
+        | DotNetFramework(version) when version = FrameworkVersion.V4_Client ->
+            "$(TargetFrameworkIdentifier) == '.NETFramework'", sprintf "($(TargetFrameworkVersion) == '%O' And $(TargetFrameworkProfile) == 'Client')" version
         | DotNetFramework(version) ->"$(TargetFrameworkIdentifier) == '.NETFramework'", sprintf "$(TargetFrameworkVersion) == '%O'" version
         | DNX(version) ->"$(TargetFrameworkIdentifier) == 'DNX'", sprintf "$(TargetFrameworkVersion) == '%O'" version
         | DNXCore(version) ->"$(TargetFrameworkIdentifier) == 'DNXCore'", sprintf "$(TargetFrameworkVersion) == '%O'" version
@@ -216,6 +218,8 @@ let getCondition (referenceCondition:string option) (targets : TargetProfile lis
             |> List.filter (function
                            | SinglePlatform(Native("", "")) -> false
                            | SinglePlatform(Runtimes(_)) -> false
+                           | SinglePlatform(DotNetFramework(FrameworkVersion.V4_Client)) -> 
+                                targets |> List.contains (SinglePlatform(DotNetFramework(FrameworkVersion.V4))) |> not
                            | _ -> true)
         |> List.map getTargetCondition
         |> List.filter (fun (_, v) -> v <> "false")