Make the copy task more robust if we can't parse target framework - r…

…eferences #1756
fsprojects · Jun 25, 2016 · 2ed3f8c · 2ed3f8c
1 parent 23b5485
commit 2ed3f8c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 3.3.1 - 25.06.2016
+* BUGFIX: Make the copy task more robust if we can't parse target framework - https://github.com/fsprojects/Paket/issues/1756
+
 #### 3.3.0 - 25.06.2016
 * Paket fails on dependencies file that has same package twice in same group - https://github.com/fsprojects/Paket/issues/1757
 * Paket.SemVer.Parse is now in PublicAPI.fs - https://github.com/fsprojects/Paket/pull/1754

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -51,7 +51,7 @@
     <StartWorkingDirectory>D:\code\PaketKopie</StartWorkingDirectory>
     <StartArguments>update -f</StartArguments>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001117-aws\temp</StartWorkingDirectory>
-    <StartArguments>restore</StartArguments>
+    <StartArguments>convert-from-nuget</StartArguments>
     <StartWorkingDirectory>D:\temp\paket</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/Paket/PlatformTask.fs b/src/Paket/PlatformTask.fs
@@ -70,24 +70,27 @@ type CopyRuntimeDependencies() =
 
                 let packagesToInstall = 
                     if not <| String.IsNullOrEmpty targetFramework then
-                        let s = targetFramework.Split([|" - "|],StringSplitOptions.None)
-                        let restriction =
-                            match FrameworkDetection.Extract(s.[0] + s.[1].Replace("v","")) with
-                            | None -> SinglePlatform(DotNetFramework FrameworkVersion.V4)
-                            | Some x -> SinglePlatform(x)
-
-                        packagesToInstall
-                        |> Array.filter (fun (groupName,packageName) ->
-                            try
-                                let g = lockFile.Groups.[groupName]
-                                let p = g.Resolution.[packageName]
-                                let restrictions =
-                                    filterRestrictions g.Options.Settings.FrameworkRestrictions p.Settings.FrameworkRestrictions 
-                                    |> getRestrictionList
+                        try
+                            let s = targetFramework.Split([|" - "|],StringSplitOptions.None)
+                            let restriction =
+                                match FrameworkDetection.Extract(s.[0] + s.[1].Replace("v","")) with
+                                | None -> SinglePlatform(DotNetFramework FrameworkVersion.V4)
+                                | Some x -> SinglePlatform(x)
+
+                            packagesToInstall
+                            |> Array.filter (fun (groupName,packageName) ->
+                                try
+                                    let g = lockFile.Groups.[groupName]
+                                    let p = g.Resolution.[packageName]
+                                    let restrictions =
+                                        filterRestrictions g.Options.Settings.FrameworkRestrictions p.Settings.FrameworkRestrictions 
+                                        |> getRestrictionList
 
-                                isTargetMatchingRestrictions(restrictions,restriction)
-                            with
-                            | _ -> true)
+                                    isTargetMatchingRestrictions(restrictions,restriction)
+                                with
+                                | _ -> true)
+                        with
+                        | _ -> packagesToInstall
                     else 
                         packagesToInstall