diff --git a/paket.dependencies b/paket.dependencies index 8bfa924c0d..6e80e63777 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,7 +3,6 @@ source https://nuget.org/api/v2 nuget Newtonsoft.Json redirects: on nuget Argu nuget FSharp.Core redirects: on -nuget NuGet.Versioning github fsharp/FAKE src/app/FakeLib/Globbing/Globbing.fs github fsprojects/Chessie src/Chessie/ErrorHandling.fs diff --git a/paket.lock b/paket.lock index b75c1c3f5a..d516266b53 100644 --- a/paket.lock +++ b/paket.lock @@ -4,68 +4,6 @@ NUGET Argu (1.1.2) FSharp.Core (4.0.0.1) - redirects: on Newtonsoft.Json (7.0.1) - redirects: on - NuGet.Versioning (3.2.0) - System.Diagnostics.Debug (>= 4.0.10-beta-23109) - System.Diagnostics.Tools (>= 4.0.0-beta-23109) - System.Linq (>= 4.0.0-beta-23109) - System.Reflection (>= 4.0.10-beta-23109) - System.Resources.ResourceManager (>= 4.0.0-beta-23109) - System.Runtime.Extensions (>= 4.0.10-beta-23109) - System.Collections (4.0.10) - framework: dnxcore50 - System.Diagnostics.Debug (>= 4.0.0) - System.Resources.ResourceManager (>= 4.0.0) - System.Runtime (>= 4.0.0) - System.Runtime (>= 4.0.20) - System.Runtime.Extensions (>= 4.0.0) - System.Threading (>= 4.0.0) - System.Diagnostics.Debug (4.0.11-beta-23409) - framework: dnxcore50 - System.Runtime (>= 4.0.0) - System.Diagnostics.Tools (4.0.1-beta-23409) - framework: dnxcore50 - System.Runtime (>= 4.0.0) - System.Globalization (4.0.10) - framework: dnxcore50 - System.Runtime (>= 4.0.0) - System.IO (4.0.10) - framework: dnxcore50 - System.Globalization (>= 4.0.0) - System.Runtime (>= 4.0.20) - System.Text.Encoding (>= 4.0.0) - System.Text.Encoding (>= 4.0.10) - System.Text.Encoding.Extensions (>= 4.0.0) - System.Threading (>= 4.0.0) - System.Threading.Tasks (>= 4.0.0) - System.Linq (4.0.1-beta-23409) - framework: dnxcore50 - System.Collections (>= 4.0.10) - System.Diagnostics.Debug (>= 4.0.10) - System.Resources.ResourceManager (>= 4.0.0) - System.Runtime (>= 4.0.20) - System.Runtime.Extensions (>= 4.0.10) - System.Private.Uri (4.0.0) - framework: dnxcore50 - System.Reflection (4.1.0-beta-23409) - framework: dnxcore50 - System.IO (>= 4.0.0) - System.Reflection.Primitives (>= 4.0.0) - System.Runtime (>= 4.0.20) - System.Reflection.Primitives (4.0.0) - framework: dnxcore50 - System.Runtime (>= 4.0.0) - System.Threading (>= 4.0.0) - System.Resources.ResourceManager (4.0.0) - framework: dnxcore50 - System.Globalization (>= 4.0.0) - System.Reflection (>= 4.0.0) - System.Reflection (>= 4.0.10) - System.Runtime (>= 4.0.0) - System.Runtime (>= 4.0.20) - System.Runtime (4.0.20) - framework: dnxcore50 - System.Private.Uri (>= 4.0.0) - System.Runtime.Extensions (4.0.11-beta-23409) - framework: dnxcore50 - System.Runtime (>= 4.0.20) - System.Text.Encoding (4.0.10) - framework: dnxcore50 - System.Runtime (>= 4.0.0) - System.Text.Encoding.Extensions (4.0.10) - framework: dnxcore50 - System.Runtime (>= 4.0.0) - System.Text.Encoding (>= 4.0.10) - System.Threading (4.0.10) - framework: dnxcore50 - System.Runtime (>= 4.0.0) - System.Threading.Tasks (>= 4.0.0) - System.Threading.Tasks (4.0.10) - framework: dnxcore50 - System.Runtime (>= 4.0.0) GITHUB remote: fsharp/FAKE specs: diff --git a/src/Paket.Core/NuGetV3.fs b/src/Paket.Core/NuGetV3.fs index 7ce37dc4bf..85584c25a9 100644 --- a/src/Paket.Core/NuGetV3.fs +++ b/src/Paket.Core/NuGetV3.fs @@ -181,7 +181,7 @@ let GetPackageDetails (source : NugetV3Source) (packageName:PackageName) (versio match FrameworkDetection.Extract x with | Some x -> [ FrameworkRestriction.Exactly x ] | None -> [] - (PackageName dep.Id), (VersionRequirement.ParseV3 dep.Range), targetFramework) + (PackageName dep.Id), (VersionRequirement.Parse dep.Range), targetFramework) |> Seq.toList return diff --git a/src/Paket.Core/Paket.Core.fsproj b/src/Paket.Core/Paket.Core.fsproj index b1375f4f23..77174e9e3d 100644 --- a/src/Paket.Core/Paket.Core.fsproj +++ b/src/Paket.Core/Paket.Core.fsproj @@ -271,18 +271,4 @@ - - - - - ..\..\packages\NuGet.Versioning\lib\net45\NuGet.Versioning.dll - True - True - - - True - - - - \ No newline at end of file diff --git a/src/Paket.Core/VersionRange.fs b/src/Paket.Core/VersionRange.fs index 007ecc4d3d..9530c952df 100644 --- a/src/Paket.Core/VersionRange.fs +++ b/src/Paket.Core/VersionRange.fs @@ -181,17 +181,6 @@ type VersionRequirement = VersionRequirement(range,!prereleases) - /// Parses NuGet V3 version range - static member ParseV3 text = - let failParse() = failwithf "unable to parse %s" text - let nversionRange = ref (Unchecked.defaultof) - - if not (NuGet.Versioning.VersionRange.TryParse(text, nversionRange)) then - failParse() - else - (!nversionRange).ToLegacyString() - |> VersionRequirement.Parse - /// Formats a VersionRequirement in NuGet syntax member this.FormatInNuGetSyntax() = match this with diff --git a/src/Paket.Core/paket.references b/src/Paket.Core/paket.references index 4c8c4a5ee5..feebd4da7e 100644 --- a/src/Paket.Core/paket.references +++ b/src/Paket.Core/paket.references @@ -1,5 +1,4 @@ Newtonsoft.Json FSharp.Core File:ErrorHandling.fs . -File:Globbing.fs . -NuGet.Versioning \ No newline at end of file +File:Globbing.fs . \ No newline at end of file