PackageResolver Refactor

integrationtests/Paket.IntegrationTests/BasicResolverSpecs.fs

@@ -1,4 +1,15 @@
-module Paket.IntegrationTests.BasicResolverSpecs
+#if INTERACTIVE
+System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
+#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll"
+#r "../../packages/build/FAKE/tools/Fakelib.dll"
+#r "../../packages/Chessie/lib/net40/Chessie.dll"
+#r "../../bin/paket.core.dll"
+#load "../../paket-files/test/forki/FsUnit/FsUnit.fs"
+#load "TestHelper.fs"
+open Paket.IntegrationTests.TestHelpers
+#else
+module Paket.IntegrationTests.BasicResolverSpecs
+#endif
 
 open Fake
 open Paket
@@ -125,3 +136,9 @@ let ``#1450 should resolve with twiddle wakka``() =
     let lockFile = update "i001450-twiddle-wakka"
     lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "EnterpriseLibrary.SemanticLogging"].Version
     |> shouldBeSmallerThan (SemVer.Parse "3")
+
+
+#if INTERACTIVE
+;;
+
+#endif

integrationtests/Paket.IntegrationTests/InstallSpecs.fs

@@ -1,4 +1,16 @@
-module Paket.IntegrationTests.InstallSpecs
+#if INTERACTIVE
+System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
+#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll"
+#r "../../packages/build/FAKE/tools/Fakelib.dll"
+#r "../../packages/Chessie/lib/net40/Chessie.dll"
+#r "../../bin/paket.core.dll"
+#load "../../paket-files/test/forki/FsUnit/FsUnit.fs"
+#load "TestHelper.fs"
+open Paket.IntegrationTests.TestHelpers
+#else
+module Paket.IntegrationTests.InstallSpecs
+#endif
+
 
 open Fake
 open System
@@ -428,3 +440,9 @@ let ``#1860 faulty condition was generated`` () =
     install scenario |> ignore
     let fsprojFile = (scenarioTempPath scenario) </> "Library1" </> "Library1.fsproj" |> File.ReadAllText
     Assert.IsFalse (fsprojFile.Contains(" And ()"))
+
+
+#if INTERACTIVE
+;;
+
+#endif

integrationtests/Paket.IntegrationTests/ResolverSkipsConflictsFastSpecs.fs

@@ -1,4 +1,15 @@
+#if INTERACTIVE
+System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
+#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll"
+#r "../../packages/build/FAKE/tools/Fakelib.dll"
+#r "../../packages/Chessie/lib/net40/Chessie.dll"
+#r "../../bin/paket.core.dll"
+#load "../../paket-files/test/forki/FsUnit/FsUnit.fs"
+#load "TestHelper.fs"
+open Paket.IntegrationTests.TestHelpers
+#else
 module Paket.IntegrationTests.ResolverSkipsConflictsFastSpecs
+#endif
 
 open Fake
 open Paket
@@ -17,4 +28,9 @@ let ``#1166 Should resolve Nancy without timeout``() =
 
 [<Test>]
 let ``#1174 Should find Ninject error``() =
-    updateShouldFindPackageConflict "Ninject" "i001174-resolve-fast-conflict"
+    updateShouldFindPackageConflict "Ninject" "i001174-resolve-fast-conflict"
+
+#if INTERACTIVE
+;;
+
+#endif

integrationtests/Paket.IntegrationTests/TestHelper.fs

@@ -66,11 +66,19 @@ let paket command scenario =
     directPaket command scenario
 
 let update scenario =
+    #if INTERACTIVE
+    paket "update --verbose" scenario |> printfn "%s"
+    #else
     paket "update" scenario |> ignore
+    #endif
     LockFile.LoadFrom(Path.Combine(scenarioTempPath scenario,"paket.lock"))
 
 let install scenario =
+    #if INTERACTIVE
+    paket "install --verbose" scenario |> printfn "%s"
+    #else
     paket "install" scenario |> ignore
+    #endif
     LockFile.LoadFrom(Path.Combine(scenarioTempPath scenario,"paket.lock"))
 
 let restore scenario = paket "restore" scenario |> ignore
@@ -80,4 +88,8 @@ let updateShouldFindPackageConflict packageName scenario =
         update scenario |> ignore
         failwith "No conflict was found."
     with
-    | exn when exn.Message.Contains(sprintf "Could not resolve package %s:" packageName) -> ()
+    | exn when exn.Message.Contains(sprintf "Could not resolve package %s" packageName) -> 
+        #if INTERACTIVE
+        printfn "Ninject conflict test passed"
+        #endif
+        ()