DotNetCore is not PCL

fsprojects · Mar 26, 2019 · 7b939eb · 7b939eb
1 parent 377994b
commit 7b939eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Paket.Core/Versioning/FrameworkHandling.fs b/src/Paket.Core/Versioning/FrameworkHandling.fs
@@ -1468,9 +1468,9 @@ module SupportCalculation =
                     | XamariniOS
                     | XamarinTV
                     | XamarinWatch
-                    | XamarinMac -> false
                     | DotNetCoreApp _
                     | DotNetStandard _
+                    | XamarinMac -> false
                     | Tizen _ -> failwithf "Unexpected framework while trying to resolve PCL Profile"
                     | _ -> true)
             if minimal.Length > 0 then

diff --git a/tests/Paket.Tests/Nuspec/NuspecSpecs.fs b/tests/Paket.Tests/Nuspec/NuspecSpecs.fs
@@ -273,7 +273,8 @@ let ``can detect framework assemblies for Microsoft.Framework.Logging``() =
     nuspec.FrameworkAssemblyReferences.[0].FrameworkRestrictions 
         |> shouldEqual
             (makeOrList
-              [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))])
+              [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))
+               FrameworkRestriction.Exactly(DotNetCoreApp(DotNetCoreAppVersion.V1_0))])
 
     let name,_,_restrictions = nuspec.Dependencies.Value.[0]
     name  |> shouldEqual (PackageName "Microsoft.Framework.DependencyInjection.Interfaces")