Removed dependency on Nuget.Versioning.

fsprojects · Nov 11, 2015 · f6e92c3 · f6e92c3
1 parent 2414c63
commit f6e92c3
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 91 deletions.
diff --git 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
@@ -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
@@ -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
@@ -271,18 +271,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
-      <ItemGroup>
-        <Reference Include="NuGet.Versioning">
-          <HintPath>..\..\packages\NuGet.Versioning\lib\net45\NuGet.Versioning.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="Microsoft.CSharp">
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
 </Project>
diff --git 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<NuGet.Versioning.VersionRange>)
-
-        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
@@ -1,5 +1,4 @@
 Newtonsoft.Json
 FSharp.Core
 File:ErrorHandling.fs .
-File:Globbing.fs .
-NuGet.Versioning
+File:Globbing.fs .