Merge branch 'master' of https://github.com/fsharp/FAKE

help/gettingstarted.md

@@ -45,6 +45,61 @@ If you run this batch file from the command line then the latest FAKE version wi
 
 ![alt text](pics/gettingstarted/afterdownload.png "Run the batch file")
 
+### Paket Setup
+
+Alternatively you can configure [Paket](http://fsprojects.github.io/Paket) to install and manage FAKE as a dependency. You will have to [setup Paket](http://fsprojects.github.io/Paket/installation.html) following the instructions specified in its documentation. In this example, the [installation per repository](http://fsprojects.github.io/Paket/installation.html#Installation-per-repository) will be used.
+
+  * Create a `.paket` folder in the root of the `FAKE-Calculator` solution.
+  * Download the latest [paket.bootstrapper.exe](https://github.com/fsprojects/Paket/releases/latest) into that folder.
+  * Run `$ .paket/paket.bootstrapper.exe` This will download the latest `paket.exe`.
+  * Commit `.paket/paket.bootstrapper.exe` into your repo and add `.paket/paket.exe` to your `.gitignore` file.
+
+### Specifying dependencies
+
+Create a [`paket.dependencies` file](http://fsprojects.github.io/Paket/dependencies-file.html) in your project's root and specify FAKE as a dependency in it.
+The file might look like this:
+
+    source https://nuget.org/api/v2
+
+    nuget FAKE
+
+You can now run Paket from the command line:
+
+    $ .paket/paket.exe install
+
+This will create the [`paket.lock` file](http://fsprojects.github.io/Paket/lock-file.html) in your project's root. The file might look like this:
+
+    NUGET
+        remote: https://nuget.org/api/v2
+        specs:
+            FAKE (4.7.2)
+
+You will have to replace the `build.bat` file contents with the following:
+
+    [lang=batchfile]
+    @echo off
+    cls
+
+    .paket\paket.bootstrapper.exe
+    if errorlevel 1 (
+        exit /b %errorlevel%
+    )
+
+    .paket\paket.exe restore
+    if errorlevel 1 (
+        exit /b %errorlevel%
+    )
+
+    packages\FAKE\tools\FAKE.exe build.fsx %*
+
+If you run this batch file from the command line, Paket will be bootstrapped and the paket dependencies will be restored before running the build script.
+In this case, then the latest FAKE version will be [downloaded via nuget](http://nuget.org/packages/FAKE/).
+If everything works fine you will get the following output:
+
+![alt text](pics/gettingstarted/afterdownloadpaket.png "Run the batch file")
+
+### The build script
+
 Now open the *build.fsx* in Visual Studio or any text editor. It should look like this:
 
 	// include Fake lib

paket.lock

@@ -87,7 +87,7 @@ CONTENT: NONE
 NUGET
   remote: http://nuget.org/api/v2
   specs:
-    FAKE (4.6.0)
+    FAKE (4.7.0)
     FSharp.Compiler.Service (0.0.90)
     FSharp.Formatting (2.11.0)
       FSharp.Compiler.Service (>= 0.0.90 <= 1.3)

src/app/FakeLib/UnitTest/ProcessTestRunner.fs

@@ -14,7 +14,7 @@ type ProcessTestRunnerParams =
       /// Option which allows to specify if a test runner error should break the build.
       ErrorLevel : TestRunnerErrorLevel }
 
-/// The ProcessTestRunner defeaults.
+/// The ProcessTestRunner defaults.
 let ProcessTestRunnerDefaults = 
     { WorkingDir = null
       TimeOut = TimeSpan.FromMinutes 5.