Revert "References fsprojects#1779"

This reverts commit 15256bd.
matthid · Jul 10, 2016 · f76cfc6 · f76cfc6
1 parent c085835
commit f76cfc6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,3 @@
-#### 3.5.0-alpha001 - 01.07.2016
-* BUGFIX: Install older frameworks if things don't work out - https://github.com/fsprojects/Paket/issues/1779
-
 #### 3.4.0 - 30.06.2016
 * Inaccessible caches are excluded for the duration of running a command - https://github.com/fsprojects/Paket/pull/1770
 * BUGFIX: NuGet OData search is now case-insensitive - https://github.com/fsprojects/Paket/issues/1775

diff --git a/src/Paket.Core/Requirements.fs b/src/Paket.Core/Requirements.fs
@@ -443,29 +443,9 @@ let isTargetMatchingRestrictions =
                     | _ -> false)
 
 /// Get all targets that should be considered with the specified restrictions
-let rec applyRestrictionsToTargets (restrictions:FrameworkRestriction list) (targets: TargetProfile list) =
-    let filtered =
-        targets 
-        |> List.filter (fun t -> isTargetMatchingRestrictions(restrictions,t))
-
-    if filtered = [] then
-        match restrictions with
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_6_2))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_6_1))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_6_1))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_6))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_6))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5_3))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5_3))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5_2))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5_2))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5_1))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5_1))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_5))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_Client))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V4_Client))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V3_5))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V3_5))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V3))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V3))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V2))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V2))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V1_1))] targets
-        | [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V1_1))] -> applyRestrictionsToTargets [FrameworkRestriction.Exactly(DotNetFramework(FrameworkVersion.V1))] targets
-        | _ -> filtered
-    else
-        filtered
+let applyRestrictionsToTargets (restrictions:FrameworkRestriction list) (targets: TargetProfile list) =
+    targets 
+    |> List.filter (fun t -> isTargetMatchingRestrictions(restrictions,t))
 
 type ContentCopySettings =
 | Omit

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -51,8 +51,8 @@
     <StartWorkingDirectory>D:\code\PaketKopie</StartWorkingDirectory>
     <StartArguments>update -f</StartArguments>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001117-aws\temp</StartWorkingDirectory>
-    <StartArguments>install</StartArguments>
-    <StartWorkingDirectory>D:\code\paket-net20-library-problem</StartWorkingDirectory>
+    <StartArguments>auto-restore on</StartArguments>
+    <StartWorkingDirectory>D:\code\Paket.ImportTargets</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>