From 8231e3535bc32acdb49a97bec2a59238f7fe370e Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 14 Mar 2016 17:54:55 +0100 Subject: [PATCH] Emit net40-full moniker --- RELEASE_NOTES.md | 3 +++ paket.lock | 18 +++++++++--------- src/Paket.Core/FrameworkHandling.fs | 2 +- .../ProjectFile/TargetFrameworkSpecs.fs | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d92613f330..701bcd8498 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 2.52.7 - 14.03.2016 +* USABILITY: Emit net40-full moniker + #### 2.52.6 - 14.03.2016 * USABILITY: Content:once doesn't add paket flags to the csproj file in order to make Orleans tools happy - https://github.com/fsprojects/Paket/issues/1513 diff --git a/paket.lock b/paket.lock index 0f4d4142f7..32fbda2267 100644 --- a/paket.lock +++ b/paket.lock @@ -5,11 +5,11 @@ NUGET Chessie (0.4.0) FSharp.Core FSharp.Core (4.0.0.1) - redirects: force - Newtonsoft.Json (8.0.2) - redirects: force + Newtonsoft.Json (8.0.3) - redirects: force GITHUB remote: fsharp/FAKE specs: - src/app/FakeLib/Globbing/Globbing.fs (58dce73f9a069ae7fbfbae993f5e6f06ed9218d5) + src/app/FakeLib/Globbing/Globbing.fs (5bcf8d23e8f29314b31b728b6549e02dbec999b2) remote: fsharp/FSharp.Data specs: src/CommonProviderImplementation/AssemblyReader.fs (f815de5e8108bb7de25dde75135707719afd8e09) @@ -17,7 +17,7 @@ GROUP Build NUGET remote: https://www.nuget.org/api/v2 specs: - FAKE (4.21.4) + FAKE (4.22.0) FSharp.Compiler.Service (2.0.0.6) FSharp.Formatting (2.14.0) FSharp.Compiler.Service (>= 2.0.0.3 < 2.1.0) @@ -25,18 +25,18 @@ NUGET FSharpVSPowerTools.Core (2.3.0) FSharp.Compiler.Service (>= 2.0.0.3) ILRepack (2.0.10) - Microsoft.Bcl (1.1.10) + Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full Microsoft.Bcl.Build (>= 1.0.14) - Microsoft.Bcl.Build (1.0.21) - import_targets: false - Microsoft.Net.Http (2.2.29) + Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full + Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full Microsoft.Bcl (>= 1.1.10) Microsoft.Bcl.Build (>= 1.0.14) - Octokit (0.18.0) - Microsoft.Net.Http + Octokit (0.19.0) + Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full GITHUB remote: fsharp/FAKE specs: - modules/Octokit/Octokit.fsx (58dce73f9a069ae7fbfbae993f5e6f06ed9218d5) + modules/Octokit/Octokit.fsx (5bcf8d23e8f29314b31b728b6549e02dbec999b2) Octokit GROUP Test NUGET diff --git a/src/Paket.Core/FrameworkHandling.fs b/src/Paket.Core/FrameworkHandling.fs index 3a8dada13e..c61c72d72a 100644 --- a/src/Paket.Core/FrameworkHandling.fs +++ b/src/Paket.Core/FrameworkHandling.fs @@ -45,7 +45,7 @@ type FrameworkVersion = | FrameworkVersion.V3 -> "30" | FrameworkVersion.V3_5 -> "35" | FrameworkVersion.V4_Client -> "40" - | FrameworkVersion.V4 -> "40" + | FrameworkVersion.V4 -> "40-full" | FrameworkVersion.V4_5 -> "45" | FrameworkVersion.V4_5_1 -> "451" | FrameworkVersion.V4_5_2 -> "452" diff --git a/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs b/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs index c3f59c9be6..ef4cc52d8b 100644 --- a/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs +++ b/tests/Paket.Tests/ProjectFile/TargetFrameworkSpecs.fs @@ -12,7 +12,7 @@ let ``should detect TargetFramework in Project2 proj file``() = [] let ``should detect net40 in empty proj file``() = ProjectFile.TryLoad("./ProjectFile/TestData/Empty.fsprojtest").Value.GetTargetProfile().ToString() - |> shouldEqual "net40" + |> shouldEqual "net40-full" [] let ``should detect silverlight framework in new silverlight project2``() =