Better parsing of framework restrictions - references #1232

fsprojects · Nov 17, 2015 · 565cbf9 · 565cbf9
1 parent ab3ed8a
commit 565cbf9
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,6 @@
-#### 2.26.0-alpha006 - 17.11.2015
+#### 2.26.0-alpha007 - 17.11.2015
 * Try all 4 NuGet APIs for "GetPackageDetails" in parallel - https://github.com/fsprojects/Paket/issues/1225
+* BUGFIX: Better parsing of framework restrictions - https://github.com/fsprojects/Paket/issues/1232
 * BUGFIX: Fix props files - https://github.com/fsprojects/Paket/issues/1233
 * BUGFIX: Detect AssemblyName from project file name if empty - https://github.com/fsprojects/Paket/issues/1234
 * BUGFIX: Fixed issue with V3 feeds doing api requests even when the paket.lock is fully specified - https://github.com/fsprojects/Paket/pull/1231

diff --git a/integrationtests/scenarios/i001232-sql-lite/before/paket.dependencies b/integrationtests/scenarios/i001232-sql-lite/before/paket.dependencies
@@ -0,0 +1,5 @@
+source https://nuget.org/api/v2
+
+framework: >=net40
+
+nuget System.Data.SQLite 1.0.98.1 content: none
diff --git a/src/Paket.Core/DependenciesFile.fs b/src/Paket.Core/DependenciesFile.fs
@@ -235,7 +235,10 @@ module DependenciesFileParser =
                 | _ -> None
 
             ParserOptions(ParserOption.ResolverStrategy(setting))
-        | String.StartsWith "framework" trimmed -> ParserOptions(ParserOption.FrameworkRestrictions(trimmed.Replace(":","").Trim() |> Requirements.parseRestrictions))
+        | String.StartsWith "framework" trimmed -> 
+            let text = trimmed.Replace(":","").Trim() 
+            let restriction = Requirements.parseRestrictions text
+            ParserOptions(ParserOption.FrameworkRestrictions restriction)
         | String.StartsWith "content" trimmed -> 
             let setting =
                 match trimmed.Replace(":","").Trim().ToLowerInvariant() with
@@ -492,7 +495,7 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
                           Settings = group.Options.Settings })
                 |> Seq.toList
 
-            { ResolvedPackages = 
+            let resolution =
                 PackageResolver.Resolve(
                     groupName,
                     group.Sources,
@@ -502,6 +505,8 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
                     group.Options.Settings.FrameworkRestrictions,
                     remoteDependencies @ group.Packages |> Set.ofList,
                     updateMode)
+
+            { ResolvedPackages = resolution
               ResolvedSourceFiles = remoteFiles }
 
         groupsToResolve

diff --git a/src/Paket.Core/Requirements.fs b/src/Paket.Core/Requirements.fs
@@ -37,9 +37,13 @@ type FrameworkRestrictions = FrameworkRestriction list
 
 
 let parseRestrictions(text:string) =
+    let text =
+        // workaround missing spaces
+        text.Replace("<=","<= ").Replace(">=",">= ").Replace("=","= ")
+
     let commaSplit = text.Trim().Split(',')
     [for p in commaSplit do
-        let operatorSplit = p.Trim().Split(' ')
+        let operatorSplit = p.Trim().Split([|' '|],StringSplitOptions.RemoveEmptyEntries)
         let framework =
             if operatorSplit.Length < 2 then 
                 operatorSplit.[0] 

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -45,7 +45,7 @@
     <StartWorkingDirectory>d:\code\paketkopie</StartWorkingDirectory>
     <StartWorkingDirectory>d:\code\paketbug</StartWorkingDirectory>
     <StartWorkingDirectory>d:\code\paketrepro</StartWorkingDirectory>
-    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001233-props-files\temp\</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001232-sql-lite\temp\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs b/tests/Paket.Tests/DependenciesFile/ParserSpecs.fs
@@ -966,4 +966,18 @@ let ``should read config with very similar feeds``() =
     cfg.Groups.[Constants.MainDependencyGroup].Sources.Head.Url |> shouldEqual "http://nexus1:8081/nexus/service/local/nuget/nuget-repo"
 
     cfg.Groups.[Constants.MainDependencyGroup].Sources.Tail.Head.Auth |> shouldNotEqual None
-    cfg.Groups.[Constants.MainDependencyGroup].Sources.Tail.Head.Url |> shouldEqual "http://nexus2:8081/nexus/service/local/nuget/nuget-repo"
+    cfg.Groups.[Constants.MainDependencyGroup].Sources.Tail.Head.Url |> shouldEqual "http://nexus2:8081/nexus/service/local/nuget/nuget-repo"
+
+let configTargetFramework = """source https://nuget.org/api/v2
+
+framework: >=net40
+
+nuget System.Data.SQLite 1.0.98.1 content: none
+"""
+
+[<Test>]
+let ``should read config with target framework``() = 
+    let cfg = DependenciesFile.FromCode(configTargetFramework)
+
+    cfg.Groups.[Constants.MainDependencyGroup].Options.Settings.FrameworkRestrictions
+    |> shouldEqual [FrameworkRestriction.AtLeast(FrameworkIdentifier.DotNetFramework(FrameworkVersion.V4_Client))]