WIP Make Paket work with dotnet cli preview3

.paket/Paket.Restore.targets

@@ -0,0 +1,22 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Mark that this target file has been loaded.  -->
+    <IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>    
+  </PropertyGroup>
+
+  <UsingTask TaskName="Paket.Build.Tasks.PaketRestoreTask" AssemblyFile="PaketRestoreTask.dll" />
+
+  <Target Name="PaketRestore" BeforeTargets="_GenerateRestoreGraphWalkPerFramework" >
+    <Exec Command="$(MSBuildThisFileDirectory)\paket.exe restore --project $(MSBuildProjectFullPath)" />
+
+     <!-- Write out package references for NETCore -->
+    <PaketRestoreTask
+      ProjectUniqueName="$(MSBuildProjectFullPath)"
+      PackageReferences="@(PackageReference)"
+      TargetFrameworks="$(TargetFramework)">
+      <Output
+        TaskParameter="NewPackageReferences"
+        ItemName="PackageReference" />
+    </PaketRestoreTask>
+   </Target>
+</Project>

RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+#### 4.0.0-alpha007 - 24.10.2016
+* Make Paket compatible with dotnet sdk preview3
+* New Command: paket why - https://github.com/fsprojects/Paket/pull/1960
+* USABILITY: Bootstraper magic mode & run - https://github.com/fsprojects/Paket/pull/1961
+* USABILITY: Added option to have paket restore fail on check failure - https://github.com/fsprojects/Paket/pull/1963
+
 #### 3.23.2 - 11.10.2016
 * USABILITY: Specify Chessie version - https://github.com/fsprojects/Paket/issues/1958
 

build.cmd

@@ -1,11 +1,6 @@
 @echo off
 cls
 
-.paket\paket.bootstrapper.exe prerelease
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
 .paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%

build.fsx

@@ -114,7 +114,7 @@ Target "AssemblyInfo" (fun _ ->
     let fsProjs =  !! "src/**/*.fsproj"
     let csProjs = !! "src/**/*.csproj"
     fsProjs |> Seq.iter genFSAssemblyInfo
-    csProjs |> Seq.iter genCSAssemblyInfo
+    csProjs |> Seq.filter (fun s -> s.Contains "PaketRestoreTask") |> Seq.iter genCSAssemblyInfo
 )
 
 // --------------------------------------------------------------------------------------
@@ -477,6 +477,7 @@ Target "ReleaseGitHub" (fun _ ->
     |> uploadFile "./bin/merged/paket.exe"
     |> uploadFile "./bin/paket.bootstrapper.exe"
     |> uploadFile ".paket/paket.targets"
+    |> uploadFile ".paket/Paket.Restore.targets"
     |> releaseDraft
     |> Async.RunSynchronously
 )

build.sh

@@ -3,12 +3,6 @@ if test "$OS" = "Windows_NT"
 then
   # use .Net
 
-  .paket/paket.bootstrapper.exe prerelease
-  exit_code=$?
-  if [ $exit_code -ne 0 ]; then
-  	exit $exit_code
-  fi
-
   .paket/paket.exe restore
   exit_code=$?
   if [ $exit_code -ne 0 ]; then
@@ -17,25 +11,6 @@ then
 
   packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
 else
-  # use mono
-  mono .paket/paket.bootstrapper.exe prerelease
-  exit_code=$?
-  if [ $exit_code -ne 0 ]; then
-    certificate_count=$(certmgr -list -c Trust | grep X.509 | wc -l)
-    if [ $certificate_count -le 1 ]; then
-      echo "Couldn't download Paket. This might be because your Mono installation"
-      echo "doesn't have the right SSL root certificates installed. One way"
-      echo "to fix this would be to download the list of SSL root certificates"
-      echo "from the Mozilla project by running the following command:"
-      echo ""
-      echo "    mozroots --import --sync"
-      echo ""
-      echo "This will import over 100 SSL root certificates into your Mono"
-      echo "certificate repository. Then try running the build script again."
-    fi
-  	exit $exit_code
-  fi
-
   mono .paket/paket.exe restore
   exit_code=$?
   if [ $exit_code -ne 0 ]; then

docs/content/paket-push.md

@@ -15,6 +15,7 @@ OPTIONS:
     --log-file <path>     Specify a log file for the paket process.
     --silent, -s          Suppress console output for the paket process.
     --version             Display the version.
+    --from-bootstrapper   Call comming from the '--run' feature of the bootstrapper.
     --help                display this list of options.
 If you add the `-v` flag, then Paket will run in verbose mode and show detailed information.
 

integrationtests/Paket.IntegrationTests/InstallSpecs.fs

@@ -374,55 +374,6 @@ let ``#1507 allows to download remote dependencies``() =
     File.Exists (Path.Combine(scenarioTempPath scenario, "paket-files", "forki", "PrivateEye", "privateeye.fsx")) |> shouldEqual true
     File.Exists (Path.Combine(scenarioTempPath scenario, "paket-files", "forki", "PrivateEye", "bin", "PrivateEye.Bridge.dll")) |> shouldEqual true
 
-[<Test>]
-let ``#1552 install mvvmlightlibs again``() =
-    let scenarioName = "i001552-install-mvvmlightlibs-again"
-    let scenarioPath = scenarioTempPath scenarioName
-
-    let expected = File.ReadAllText (Path.Combine(originalScenarioPath scenarioName,"paket.locktemplate")) |> normalizeLineEndings
-
-    let oldProjectFile = Path.Combine(originalScenarioPath scenarioName,"CSharp","CSharp.csprojtemplate")
-    let oldProjectFileText = File.ReadAllText oldProjectFile |> normalizeLineEndings
-
-    let newLockFilePath = Path.Combine(scenarioPath,"paket.lock")
-    let lockFileShouldBeConsistentAfterCommand command =
-        directPaketInPath command scenarioPath |> ignore
-
-        File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected
-
-        let newProjectFile = Path.Combine(scenarioPath,"CSharp","CSharp.csproj")
-        File.ReadAllText newProjectFile
-        |> normalizeLineEndings |> shouldEqual oldProjectFileText
-
-    prepare scenarioName
-    let commands =
-        ["install -f"
-         "update -f"
-         "install"
-         "update"]
-    let rnd = new Random((int)DateTime.Now.Ticks)
-    for x in [1..10] do
-        let ind = if x<=4 then x-1 else rnd.Next(commands.Length)
-        let command = commands.[ind]
-        lockFileShouldBeConsistentAfterCommand command
-
-[<Test>]
-let ``#1552 install mvvmlightlibs first time``() =
-    let scenarioName = "i001552-install-mvvmlightlibs-first-time"
-
-    let expected = File.ReadAllText (Path.Combine(originalScenarioPath scenarioName,"paket.locktemplate")) |> normalizeLineEndings
-
-    install scenarioName |> ignore
-
-    let newLockFilePath = Path.Combine(scenarioTempPath scenarioName,"paket.lock")
-    File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected
-
-    directPaketInPath "install" (scenarioTempPath scenarioName) |> ignore
-    File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected
-
-    directPaketInPath "install -f" (scenarioTempPath scenarioName) |> ignore
-    File.ReadAllText newLockFilePath |> normalizeLineEndings |> shouldEqual expected
-
 [<Test>]
 [<Ignore("very slow test")>]
 let ``#1589 http dep restore in parallel``() =
@@ -549,7 +500,7 @@ let ``#1815 duplicate fsharp core reference when using netstandard1.6``() =
     let lockFilePath = Paket.DependenciesFile.FindLockfile paketDependencies.DependenciesFile
 
     // Restore
-    paketDependencies.Restore(false, group, [], false, true)
+    paketDependencies.Restore(false, group, [], false, true, false)
     |> ignore
     let lockFile = paketDependencies.GetLockFile()
     let lockGroup = lockFile.GetGroup groupName