fix /restore not given in the msbuild command line

fsprojects · Oct 15, 2018 · 871c298 · 871c298
1 parent 919b7c7
commit 871c298
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,8 +1,8 @@
 # Release Notes
 
-## 5.9.3-alpha - tbd
+## 5.9.3 - 2018-10-15
 
-* tbd
+* BUGFIX: `/restore` was missing from msbuild command line - https://github.com/fsharp/FAKE/issues/2160
 
 ## 5.9.2 - 2018-10-14
 

diff --git a/src/app/Fake.DotNet.MSBuild/MSBuild.fs b/src/app/Fake.DotNet.MSBuild/MSBuild.fs
@@ -521,6 +521,10 @@ module MSBuild =
                  | Some v -> v.ToString()
                  | _ -> "")
 
+    let restoreFlag =
+        if p.DoRestore then Some("restore", "")
+        else None
+
     let noLogo =
         if p.NoLogo then Some("nologo", "")
         else None
@@ -638,7 +642,8 @@ module MSBuild =
             dfls
             |> List.map(fun (cl, fl) -> Some("dl", createLoggerString cl fl))
 
-    [ yield targets;
+    [ yield restoreFlag
+      yield targets
       if not Environment.isUnix then
           yield maxcpu
           yield noLogo

diff --git a/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs b/src/test/Fake.Core.UnitTests/Fake.DotNet.MSBuild.fs
@@ -17,4 +17,14 @@ let tests =
         if Environment.isUnix then "/p:RestorePackages=False /p:OutputPath=C:%5CTest%5C"    
         else "/m /nodeReuse:False /p:RestorePackages=False /p:OutputPath=C:%5CTest%5C"    
       Expect.equal cmdLine expected "Expected a given cmdline."
+    testCase "Test that /restore is included #2160" <| fun _ ->
+      let _, cmdLine =
+        MSBuild.buildArgs (fun defaults ->
+          { defaults with
+              ConsoleLogParameters = []
+              DoRestore = true })
+      let expected =
+        if Environment.isUnix then "/restore /p:RestorePackages=False"    
+        else "/restore /m /nodeReuse:False /p:RestorePackages=False"    
+      Expect.equal cmdLine expected "Expected a given cmdline."
   ]