Release Candidate 1

.fake/build.fsx/intellisense.fsx

@@ -59,41 +59,41 @@
 #r "C:\\Users\\matth\\.nuget\\packages\\system.runtime\\4.3.0\\lib\\net462\\System.Runtime.dll" 
 #r "C:\\Users\\matth\\.nuget\\packages\\system.security.principal.windows\\4.4.1\\lib\\net461\\System.Security.Principal.Windows.dll" 
 #r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.4.0\\lib\\net461\\System.Security.Cryptography.ProtectedData.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.xml\\5.0.0-beta028\\lib\\net46\\Fake.Core.Xml.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.semver\\5.0.0-beta028\\lib\\net46\\Fake.Core.SemVer.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.xml\\5.0.0-beta029\\lib\\net46\\Fake.Core.Xml.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.semver\\5.0.0-beta029\\lib\\net46\\Fake.Core.SemVer.dll" 
 #r "C:\\Users\\matth\\.nuget\\packages\\paket.core\\5.153.0\\lib\\net45\\Paket.Core.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.api.github\\5.0.0-beta028\\lib\\net46\\Fake.Api.GitHub.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.context\\5.0.0-beta028\\lib\\net46\\Fake.Core.Context.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.environment\\5.0.0-beta028\\lib\\net46\\Fake.Core.Environment.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.string\\5.0.0-beta028\\lib\\net46\\Fake.Core.String.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.api.github\\5.0.0-beta029\\lib\\net46\\Fake.Api.GitHub.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.context\\5.0.0-beta029\\lib\\net46\\Fake.Core.Context.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.environment\\5.0.0-beta029\\lib\\net46\\Fake.Core.Environment.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.string\\5.0.0-beta029\\lib\\net46\\Fake.Core.String.dll" 
 #r "C:\\Users\\matth\\.nuget\\packages\\system.reflection.metadata\\1.5.0\\lib\\netstandard2.0\\System.Reflection.Metadata.dll" 
 #r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Rocks.dll" 
 #r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Pdb.dll" 
 #r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0\\lib\\net40\\Mono.Cecil.Mdb.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.releasenotes\\5.0.0-beta028\\lib\\net46\\Fake.Core.ReleaseNotes.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.filesystem\\5.0.0-beta028\\lib\\net46\\Fake.IO.FileSystem.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.trace\\5.0.0-beta028\\lib\\net46\\Fake.Core.Trace.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamfoundation\\5.0.0-beta028\\lib\\net46\\Fake.BuildServer.TeamFoundation.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.travis\\5.0.0-beta028\\lib\\net46\\Fake.BuildServer.Travis.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.tasks\\5.0.0-beta028\\lib\\net46\\Fake.Core.Tasks.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.testing.common\\5.0.0-beta028\\lib\\net46\\Fake.Testing.Common.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.process\\5.0.0-beta028\\lib\\net46\\Fake.Core.Process.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.assemblyinfofile\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.AssemblyInfoFile.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.zip\\5.0.0-beta028\\lib\\net46\\Fake.IO.Zip.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.target\\5.0.0-beta028\\lib\\net46\\Fake.Core.Target.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.net.http\\5.0.0-beta028\\lib\\net46\\Fake.Net.Http.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.appveyor\\5.0.0-beta028\\lib\\net46\\Fake.BuildServer.AppVeyor.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamcity\\5.0.0-beta028\\lib\\net46\\Fake.BuildServer.TeamCity.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.nuget\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.NuGet.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.mspec\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.Testing.MSpec.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.nunit\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.Testing.NUnit.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.xunit2\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.Testing.XUnit2.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.cli\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.Cli.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.fsformatting\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.FSFormatting.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.msbuild\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.MsBuild.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.paket\\5.0.0-beta028\\lib\\net46\\Fake.DotNet.Paket.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.tools.git\\5.0.0-beta028\\lib\\net46\\Fake.Tools.Git.dll" 
-#r "C:\\Users\\matth\\.nuget\\packages\\fake.windows.chocolatey\\5.0.0-beta028\\lib\\net46\\Fake.Windows.Chocolatey.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.releasenotes\\5.0.0-beta029\\lib\\net46\\Fake.Core.ReleaseNotes.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.filesystem\\5.0.0-beta029\\lib\\net46\\Fake.IO.FileSystem.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.trace\\5.0.0-beta029\\lib\\net46\\Fake.Core.Trace.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamfoundation\\5.0.0-beta029\\lib\\net46\\Fake.BuildServer.TeamFoundation.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.travis\\5.0.0-beta029\\lib\\net46\\Fake.BuildServer.Travis.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.tasks\\5.0.0-beta029\\lib\\net46\\Fake.Core.Tasks.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.testing.common\\5.0.0-beta029\\lib\\net46\\Fake.Testing.Common.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.process\\5.0.0-beta029\\lib\\net46\\Fake.Core.Process.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.assemblyinfofile\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.AssemblyInfoFile.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.zip\\5.0.0-beta029\\lib\\net46\\Fake.IO.Zip.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.target\\5.0.0-beta029\\lib\\net46\\Fake.Core.Target.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.net.http\\5.0.0-beta029\\lib\\net46\\Fake.Net.Http.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.appveyor\\5.0.0-beta029\\lib\\net46\\Fake.BuildServer.AppVeyor.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.buildserver.teamcity\\5.0.0-beta029\\lib\\net46\\Fake.BuildServer.TeamCity.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.nuget\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.NuGet.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.mspec\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.Testing.MSpec.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.nunit\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.Testing.NUnit.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.xunit2\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.Testing.XUnit2.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.cli\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.Cli.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.fsformatting\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.FSFormatting.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.msbuild\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.MsBuild.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.paket\\5.0.0-beta029\\lib\\net46\\Fake.DotNet.Paket.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.tools.git\\5.0.0-beta029\\lib\\net46\\Fake.Tools.Git.dll" 
+#r "C:\\Users\\matth\\.nuget\\packages\\fake.windows.chocolatey\\5.0.0-beta029\\lib\\net46\\Fake.Windows.Chocolatey.dll" 
 #r "System" 
 #r "System.Core" 
 #r "System.Security" 

Fake.sln

@@ -28,7 +28,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.AssemblyInfoFil
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Cli", "src/app/Fake.DotNet.Cli/Fake.DotNet.Cli.fsproj", "{B2C0063A-FC66-4883-BB69-B1DBE6BF9CA2}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.MsBuild", "src/app/Fake.DotNet.MsBuild/Fake.DotNet.MsBuild.fsproj", "{64195C50-E138-4218-A7CE-13CD4565B87E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.MSBuild", "src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj", "{64195C50-E138-4218-A7CE-13CD4565B87E}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.NuGet", "src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj", "{93F1A71E-54E2-4C65-BB1E-1D499890317F}"
 EndProject
@@ -98,6 +98,12 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.BuildServer.Travis", "
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.BuildServer.TeamFoundation", "src/app/Fake.BuildServer.TeamFoundation/Fake.BuildServer.TeamFoundation.fsproj", "{5E1B10FE-3F7A-4D10-A804-3C11EC82C21D}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Core.CommandLineParsing", "src/app/Fake.Core.CommandLineParsing/Fake.Core.CommandLineParsing.fsproj", "{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E09B72E4-D890-46A8-8D14-7367C2E23E9D}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Core.CommandLine.UnitTests", "src/test/Fake.Core.CommandLine.UnitTests/Fake.Core.CommandLine.UnitTests.fsproj", "{8561A35A-C2A4-43C7-A938-CB35A7747121}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -636,6 +642,30 @@ Global
 		{5E1B10FE-3F7A-4D10-A804-3C11EC82C21D}.Release|x64.Build.0 = Release|x64
 		{5E1B10FE-3F7A-4D10-A804-3C11EC82C21D}.Release|x86.ActiveCfg = Release|x86
 		{5E1B10FE-3F7A-4D10-A804-3C11EC82C21D}.Release|x86.Build.0 = Release|x86
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Debug|x64.ActiveCfg = Debug|x64
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Debug|x64.Build.0 = Debug|x64
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Debug|x86.ActiveCfg = Debug|x86
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Debug|x86.Build.0 = Debug|x86
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Release|x64.ActiveCfg = Release|x64
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Release|x64.Build.0 = Release|x64
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Release|x86.ActiveCfg = Release|x86
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}.Release|x86.Build.0 = Release|x86
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Debug|x64.ActiveCfg = Debug|x64
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Debug|x64.Build.0 = Debug|x64
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Debug|x86.ActiveCfg = Debug|x86
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Debug|x86.Build.0 = Debug|x86
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Release|x64.ActiveCfg = Release|x64
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Release|x64.Build.0 = Release|x64
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Release|x86.ActiveCfg = Release|x86
+		{8561A35A-C2A4-43C7-A938-CB35A7747121}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -686,6 +716,9 @@ Global
 		{486FA49B-D395-42C5-AFB0-FA85B6D9FDBC} = {901F162F-8925-4390-89C5-9EE2C343F744}
 		{31F61589-E899-4C58-AF91-371AC6149032} = {901F162F-8925-4390-89C5-9EE2C343F744}
 		{5E1B10FE-3F7A-4D10-A804-3C11EC82C21D} = {901F162F-8925-4390-89C5-9EE2C343F744}
+		{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1} = {901F162F-8925-4390-89C5-9EE2C343F744}
+		{E09B72E4-D890-46A8-8D14-7367C2E23E9D} = {539D7B9A-18A1-4D79-86AB-C8B48090CA84}
+		{8561A35A-C2A4-43C7-A938-CB35A7747121} = {E09B72E4-D890-46A8-8D14-7367C2E23E9D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {058A0C5E-2216-4306-8AFB-0AE28320C26A}

RELEASE_NOTES.md

@@ -1,5 +1,21 @@
 # Release Notes
 
+## 5.0.0-rc001
+
+* [BREAKING] New runner is not compatible with old `Fake.Core.Target` package. Make sure to upgrade your packages before updating the runner!
+* [BREAKING] Fix inconsistent naming of MSBuild package (MsBuild -> MSBuild), add setParams to run* methods - https://github.com/fsharp/FAKE/pull/1837
+* [BREAKING] Update to the CLI, see https://fake.build/fake-commandline.html
+* [FAKE 5] Implement MSBuild /nowarn command line option (https://github.com/fsharp/FAKE/pull/1840)
+* [FAKE 5] Target Parameters (closes https://github.com/fsharp/FAKE/issues/1830)
+* [FAKE 5] Scripts can now have/use their own CLI.
+* [FAKE 5] Performance numbers (closes https://github.com/fsharp/FAKE/issues/1831)
+* [FAKE 5] new module `Fake.Core.CommandLineParsing`, see https://fake.build/core-commandlineparsing.html
+* [DOCS] fixes https://github.com/fsharp/FAKE/issues/1845
+* [BUGFIX] fix various migration messages and fix ChangeWatcher according to API-Guideline
+* [BUGFIX] Remove content-disposition from Azure.Webjobs - https://github.com/fsharp/FAKE/pull/1844
+* [BUGFIX] Don't alter global shell var $cur - https://github.com/fsharp/FAKE/pull/1844
+* [BUGFIX] Fix docs and traces for dotnet version (https://github.com/fsharp/FAKE/pull/1835)
+
 ## 5.0.0-beta029
 
 * BUGFIX: Fix mono version detection on netcore.

bash-completion/fake

@@ -1,7 +1,7 @@
 _fake_completion()
 {
     COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
+    local cur="${COMP_WORDS[COMP_CWORD]}"
 
     if [ -f build.fsx ] ; then
         # egrep doesn't have the -P switch to match group on OSX

build.fsx

@@ -17,7 +17,7 @@ nuget Fake.IO.FileSystem prerelease
 nuget Fake.IO.Zip prerelease
 nuget Fake.Core.ReleaseNotes prerelease
 nuget Fake.DotNet.AssemblyInfoFile prerelease
-nuget Fake.DotNet.MsBuild prerelease
+nuget Fake.DotNet.MSBuild prerelease
 nuget Fake.DotNet.Cli prerelease
 nuget Fake.DotNet.NuGet prerelease
 nuget Fake.DotNet.Paket prerelease
@@ -176,7 +176,7 @@ Target.create "Clean" (fun _ ->
 
     // Workaround https://github.com/fsprojects/Paket/issues/2830
     // https://github.com/fsprojects/Paket/issues/2689
-    // Basically paket fails if there is already an existing nuspec in obj/ dir because then MsBuild will call paket with multiple nuspec file arguments separated by ';'
+    // Basically paket fails if there is already an existing nuspec in obj/ dir because then MSBuild will call paket with multiple nuspec file arguments separated by ';'
     !! "src/*/*/obj/**/*.nuspec"
     -- (sprintf "src/*/*/obj/**/*%s.nuspec" release.NugetVersion)
     //-- "src/*/*/obj/*.references"
@@ -256,6 +256,7 @@ let dotnetAssemblyInfos =
       "Fake.BuildServer.Travis", "Integration into Travis buildserver"
       "Fake.BuildServer.TeamFoundation", "Integration into TeamFoundation buildserver"
       "Fake.Core.Context", "Core Context Infrastructure"
+      "Fake.Core.CommandLineParsing", "Core commandline parsing support via docopt like syntax"
       "Fake.Core.Environment", "Environment Detection"
       "Fake.Core.Process", "Starting and managing Processes"
       "Fake.Core.ReleaseNotes", "Parsing ReleaseNotes"
@@ -267,7 +268,7 @@ let dotnetAssemblyInfos =
       "Fake.Core.Xml", "Core Xml functionality"
       "Fake.DotNet.AssemblyInfoFile", "Writing AssemblyInfo files"
       "Fake.DotNet.Cli", "Running the dotnet cli"
-      "Fake.DotNet.MsBuild", "Running msbuild"
+      "Fake.DotNet.MSBuild", "Running msbuild"
       "Fake.DotNet.NuGet", "Running NuGet Client and interacting with NuGet Feeds"
       "Fake.DotNet.Paket", "Running Paket and publishing packages"
       "Fake.DotNet.FSFormatting", "Running fsformatting.exe and generating documentation"
@@ -349,7 +350,11 @@ Target.create "UnskipAndRevertAssemblyInfo" (fun _ ->
 )
 
 Target.create "BuildSolution_" (fun _ ->
+#if BOOTSTRAP
+    MSBuild.runWithDefaults "Build" ["./src/Legacy-FAKE.sln"; "./src/Legacy-FAKE.Deploy.Web.sln"]
+#else
     MsBuild.runWithDefaults "Build" ["./src/Legacy-FAKE.sln"; "./src/Legacy-FAKE.Deploy.Web.sln"]
+#endif
     |> Trace.logItems "AppBuild-Output: "
 )
 
@@ -364,6 +369,7 @@ Target.create "GenerateDocs" (fun _ ->
         "page-author", String.separated ", " authors
         "project-author", String.separated ", " authors
         "github-link", githubLink
+        "version", release.NugetVersion
         "project-github", "http://github.com/fsharp/fake"
         "project-nuget", "https://www.nuget.org/packages/FAKE"
         "root", "http://fsharp.github.io/FAKE"
@@ -457,6 +463,12 @@ Target.create "DotNetCoreUnitTests" (fun _ ->
         DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.UnitTests/bin/Release/netcoreapp2.0/Fake.Core.UnitTests.dll" "--summary"
 
     if processResult.ExitCode <> 0 then failwithf "Unit-Tests failed."
+
+    // dotnet run --project src/test/Fake.Core.CommandLine.UnitTests/Fake.Core.CommandLine.UnitTests.fsproj
+    let processResult =
+        DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.CommandLine.UnitTests/bin/Release/netcoreapp2.0/Fake.Core.CommandLine.UnitTests.dll" "--summary"
+
+    if processResult.ExitCode <> 0 then failwithf "Unit-Tests for Fake.Core.CommandLine failed."
 )
 
 Target.create "BootstrapTest" (fun _ ->
@@ -537,7 +549,7 @@ Target.create "BootstrapTestDotNetCore" (fun _ ->
                 { info with
                     FileName = fileName
                     WorkingDirectory = "."
-                    Arguments = sprintf "run %s --fsiargs \"--define:BOOTSTRAP\" --target %s" script target }
+                    Arguments = sprintf "run --fsiargs \"--define:BOOTSTRAP\" %s --target %s" script target }
                 |> Process.setEnvironmentVariable "FAKE_DETAILED_ERRORS" "true"
                 )
                 timeout
@@ -721,10 +733,10 @@ Target.create "DotNetPackage_" (fun _ ->
         { c with
             Configuration = DotNet.Release
             OutputPath = Some nugetDir
-            Common = 
+            Common =
                 if CircleCi.isCircleCi then
                     { c.Common with CustomParams = Some "/m:1" }
-                else c.Common                                
+                else c.Common
         } |> dtntSmpl) "Fake.sln"
 
     let info = DotNet.info dtntSmpl
@@ -956,13 +968,13 @@ Target.create "FastRelease" (fun _ ->
         | s when not (System.String.IsNullOrWhiteSpace s) -> s
         | _ -> failwith "please set the github_token environment variable to a github personal access token with repro access."
 
-    let files = 
+    let files =
         runtimes @ [ "portable"; "packages" ]
         |> List.map (fun n -> sprintf "nuget/dotnetcore/Fake.netcore/fake-dotnetcore-%s.zip" n)
-    
+
     GitHub.createClientWithToken token
     |> GitHub.draftNewRelease gitOwner gitName release.NugetVersion (release.SemVer.PreRelease <> None) release.Notes
-    |> GitHub.uploadFiles files    
+    |> GitHub.uploadFiles files
     |> GitHub.publishDraft
     |> Async.RunSynchronously
 )
@@ -1007,21 +1019,25 @@ open Fake.Core.TargetOperators
     ?=> "DownloadPaket"
     ?=> "SetAssemblyInfo"
     ==> "DotNetPackage_"
-    ==> "UnskipAndRevertAssemblyInfo"
+    ?=> "UnskipAndRevertAssemblyInfo"
     ==> "DotNetPackage"
 "StartDnc"
     ==> "DotNetPackage_"
 "DownloadPaket"
     ==> "DotNetPackage_"
+"DotNetPackage_"
+    ==> "DotNetPackage"
 // Full framework build
 "Clean"
     ?=> "RenameFSharpCompilerService"
     ?=> "SetAssemblyInfo"
     ==> "BuildSolution_"
-    ==> "UnskipAndRevertAssemblyInfo"
+    ?=> "UnskipAndRevertAssemblyInfo"
     ==> "BuildSolution"
 "RenameFSharpCompilerService"
     ==> "BuildSolution_"
+"BuildSolution_"
+    ==> "BuildSolution"
 // AfterBuild -> Both Builds completed
 "BuildSolution"
     ==> "AfterBuild"