Fix performance

.gitignore

@@ -60,6 +60,7 @@ tools/SourceLink.Fake
 
 release.cmd
 release.sh
+*.pfx
 Samples/typescript/out/
 help/markdown/RELEASE_NOTES.md
 paket.exe

RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+#### 5.0.0-beta004 - 30.09.2017
+* BUILD: Remove hardcoded paths to FSharpTargets, replace with FSharp.Compiler.Tools - https://github.com/fsharp/FAKE/pull/1693
+* ENHANCEMENT: Fake.IO.FileSystem Rework, functionality moved from `Fake.IO.FileSystem` to `Fake.IO` and APIs have been adapted to the new design guideline - https://github.com/fsharp/FAKE/pull/1670
+* PERFORMANCE: Fake should be a lot faster now - https://github.com/fsharp/FAKE/pull/1694
+
 #### 5.0.0-beta003 - 26.09.2017
 * ENHANCEMENT: Fix some migration warnings, Docs and bugs - https://github.com/fsharp/FAKE/pull/1686
 

build.fsx

@@ -5,9 +5,6 @@
 
 open System.Reflection
 
-// Remove '#load' once released
-#load "src/app/Fake.DotNet.AssemblyInfoFile/AssemblyInfoFile.fs"
-
 #else
 // Load this before FakeLib, see https://github.com/fsharp/FSharp.Compiler.Service/issues/763
 #r "packages/Mono.Cecil/lib/net40/Mono.Cecil.dll"
@@ -25,12 +22,21 @@ open System.Reflection
 
 #endif
 
+// TODO Remove '#load' once released
+#load "src/app/Fake.IO.FileSystem/Path.fs"
+#load "src/app/Fake.IO.FileSystem/FileInfo.fs"
+#load "src/app/Fake.IO.FileSystem/FileSystemOperators.fs"
+#load "src/app/Fake.IO.FileSystem/DirectoryInfo.fs"
+#load "src/app/Fake.IO.FileSystem/File.fs"
+#load "src/app/Fake.IO.FileSystem/Directory.fs"
+#load "src/app/Fake.IO.FileSystem/FileSystemInfo.fs"
+#load "src/app/Fake.IO.FileSystem/Shell.fs"
+
 open System.IO
 open Fake.Core
 open Fake.Tools
 open Fake.IO
-open Fake.IO.FileSystem
-open Fake.IO.FileSystem.Operators
+open Fake.IO.FileSystemOperators
 open Fake.Core.Globbing.Operators
 open Fake.Windows
 open Fake.DotNet
@@ -120,7 +126,7 @@ Target.Create "Clean" (fun _ ->
     //-- "src/*/*/obj/*.props"
     //-- "src/*/*/obj/*.paket.references.cached"
     //-- "src/*/*/obj/*.NuGet.Config"
-    |> File.DeleteFiles
+    |> File.deleteAll
 
     Shell.CleanDirs [buildDir; testDir; docsDir; apidocsDir; nugetDncDir; nugetLegacyDir; reportDir]
 
@@ -134,7 +140,7 @@ Target.Create "RenameFSharpCompilerService" (fun _ ->
     for framework in ["netstandard1.6"; "net45"] do
       let dir = __SOURCE_DIRECTORY__ </> "packages"</>packDir</>"lib"</>framework
       let targetFile = dir </>  "FAKE.FSharp.Compiler.Service.dll"
-      File.DeleteFile targetFile
+      File.delete targetFile
 
 #if DOTNETCORE
       let reader =
@@ -270,7 +276,7 @@ Target.Create "UnskipAndRevertAssemblyInfo" (fun _ ->
         Git.CommandHelper.directRunGitCommandAndFail "." (sprintf "checkout HEAD %s" assemblyFile)
 )
 
-Target.Create "BuildSolution" (fun _ ->
+Target.Create "BuildSolution_" (fun _ ->
     MsBuild.MSBuildWithDefaults "Build" ["./FAKE.sln"; "./FAKE.Deploy.Web.sln"]
     |> Trace.Log "AppBuild-Output: "
 )
@@ -293,8 +299,8 @@ Target.Create "GenerateDocs" (fun _ ->
     let layoutroots = [ "./help/templates"; "./help/templates/reference" ]
 
     Shell.CopyDir (docsDir) "help/content" FileFilter.allFiles
-    File.WriteStringToFile false "./docs/.nojekyll" ""
-    File.WriteStringToFile false "./docs/CNAME" "fake.build"
+    File.writeString false "./docs/.nojekyll" ""
+    File.writeString false "./docs/CNAME" "fake.build"
     //CopyDir (docsDir @@ "pics") "help/pics" FileFilter.allFiles
 
     Shell.Copy (source @@ "markdown") ["RELEASE_NOTES.md"]
@@ -331,7 +337,7 @@ Target.Create "GenerateDocs" (fun _ ->
           -- "./build/**/Fake.IIS.dll"
           -- "./build/**/Fake.Deploy.Lib.dll"
 
-    Shell.ensureDirectory apidocsDir
+    Directory.ensure apidocsDir
     dllFiles
     |> FSFormatting.CreateDocsForDlls (fun s -> 
         { s with 
@@ -376,7 +382,7 @@ Target.Create "BootstrapTest" (fun _ ->
     let buildScript = "build.fsx"
     let testScript = "testbuild.fsx"
     // Check if we can build ourself with the new binaries.
-    let test clearCache script =
+    let test clearCache (script:string) =
         let clear () =
             // Will make sure the test call actually compiles the script.
             // Note: We cannot just clean .fake here as it might be locked by the currently executing code :)
@@ -482,7 +488,7 @@ Target.Create "SourceLink" (fun _ ->
 )
 
 Target.Create "ILRepack" (fun _ ->
-    Directory.CreateDir buildMergedDir
+    Directory.ensure buildMergedDir
 
     let internalizeIn filename =
         let toPack =
@@ -503,7 +509,7 @@ Target.Create "ILRepack" (fun _ ->
     internalizeIn "FAKE.exe"
 
     !! (buildDir </> "FSharp.Compiler.Service.**")
-    |> Seq.iter File.DeleteFile
+    |> Seq.iter File.delete
 
     Shell.DeleteDir buildMergedDir
 )
@@ -536,7 +542,7 @@ Target.Create "CreateNuGet" (fun _ ->
         Shell.CleanDir nugetLibDir
         Shell.DeleteDir nugetLibDir
 
-        File.DeleteFile "./build/FAKE.Gallio/Gallio.dll"
+        File.delete "./build/FAKE.Gallio/Gallio.dll"
 
         let deleteFCS _ =
           //!! (dir </> "FSharp.Compiler.Service.**")
@@ -564,7 +570,7 @@ Target.Create "CreateNuGet" (fun _ ->
         | _ ->
             Shell.CopyDir nugetToolsDir (buildDir @@ package) FileFilter.allFiles
             Shell.CopyTo nugetToolsDir additionalFiles
-        !! (nugetToolsDir @@ "*.srcsv") |> File.DeleteFiles
+        !! (nugetToolsDir @@ "*.srcsv") |> File.deleteAll
 
         let setParams (p:NuGet.NuGet.NuGetParams) =
             {p with
@@ -608,6 +614,7 @@ let appDir = srcDir</>"app"
 
 let netCoreProjs =
     !! "src/app/Fake.Core.*/*.fsproj"
+    ++ "src/app/Fake.Api.*/*.fsproj"
     ++ "src/app/Fake.DotNet.*/*.fsproj"
     ++ "src/app/Fake.Windows.*/*.fsproj"
     ++ "src/app/Fake.IO.*/*.fsproj"
@@ -627,7 +634,7 @@ Target.Create "DotnetRestore" (fun _ ->
     // Workaround bug where paket integration doesn't generate
     // .nuget\packages\.tools\dotnet-compile-fsc\1.0.0-preview2-020000\netcoreapp1.0\dotnet-compile-fsc.deps.json
     let t = Path.GetFullPath "workaround"
-    Shell.ensureDirectory t
+    Directory.ensure t
     Cli.Dotnet { Cli.DotnetOptions.Default with WorkingDirectory = t } "new console --language f#"
         |> ignore
     Cli.Dotnet { Cli.DotnetOptions.Default with WorkingDirectory = t } "restore"
@@ -640,7 +647,7 @@ Target.Create "DotnetRestore" (fun _ ->
     !! "lib/nupgks/**/*.nupkg"
     |> Seq.iter (fun file ->
         let dir = nugetDncDir //@@ "dotnetcore"
-        Shell.ensureDirectory dir
+        Directory.ensure dir
         File.Copy(file, dir @@ Path.GetFileName file, true))
 
     let result = Cli.Dotnet { Cli.DotnetOptions.Default with WorkingDirectory = root } "sln src/Fake-netcore.sln list"
@@ -722,6 +729,7 @@ Target.Create "DotnetPackage" (fun _ ->
             Framework = Some "netcoreapp2.0"
             OutputPath = Some outDir
         }) netcoreFsproj
+
 )
 
 Target.Create "DotnetCoreCreateZipPackages" (fun _ ->
@@ -742,7 +750,7 @@ Target.Create "DotnetCoreCreateZipPackages" (fun _ ->
 
 Target.Create "DotnetCoreCreateChocolateyPackage" (fun _ ->
     // !! ""
-    Shell.ensureDirectory "nuget/dotnetcore/chocolatey"
+    Directory.ensure "nuget/dotnetcore/chocolatey"
     Choco.PackFromTemplate (fun p ->
         { p with
             PackageId = "fake"
@@ -941,49 +949,76 @@ Target.Create "EnsureTestsRun" (fun _ ->
 Target.Create "Default" ignore
 Target.Create "StartDnc" ignore
 Target.Create "Release" ignore
+Target.Create "BuildSolution" ignore
+Target.Create "AfterBuild" ignore
 
 open Fake.Core.TargetOperators
 
+
+// DotNet Core Build
 "Clean"
-    ==> "StartDnc"
+    ?=> "StartDnc"
     ==> "InstallDotnetCore"
     ==> "DownloadPaket"
-    //==> "DotnetRestore"
     ==> "DotnetPackage"
 
-// Dependencies
+// Full framework build
 "Clean"
-    ==> "RenameFSharpCompilerService"
+    ?=> "RenameFSharpCompilerService"
     ==> "SetAssemblyInfo"
-    ==> "BuildSolution"
-    ==> "DotnetPackage"
+    ==> "BuildSolution_"
     ==> "UnskipAndRevertAssemblyInfo"
-    ==> "DotnetCoreCreateZipPackages"
-    =?> ("TestDotnetCore", not <| Environment.hasEnvironVar "SkipIntegrationTests" && not <| Environment.hasEnvironVar "SkipTests")
-    ////==> "ILRepack"
-    =?> ("Test", not <| Environment.hasEnvironVar "SkipTests")
-    =?> ("BootstrapTest",not <| Environment.hasEnvironVar "SkipTests")
-    =?> ("BootstrapTestDotnetCore",not <| Environment.hasEnvironVar "SkipTests")
-    //=?> ("SourceLink", isLocalBuild && not isLinux)
+    ==> "BuildSolution"
+
+// AfterBuild -> Both Builds completed
+"BuildSolution"
+    ==> "AfterBuild"
+"DotnetPackage"
+    ==> "AfterBuild"
+
+// Create artifacts when build is finished
+"AfterBuild"
     =?> ("CreateNuGet", not Environment.isLinux)
     ==> "CopyLicense"
     =?> ("DotnetCoreCreateChocolateyPackage", not Environment.isLinux)
     =?> ("GenerateDocs", BuildServer.isLocalBuild && not Environment.isLinux)
     ==> "Default"
 
+// Test the full framework build
+"BuildSolution"
+    =?> ("Test", not <| Environment.hasEnvironVar "SkipTests")
+    =?> ("BootstrapTest",not <| Environment.hasEnvironVar "SkipTests")
+    ==> "Default"
+
+// Test the dotnetcore build
+"DotnetPackage"
+    ==> "DotnetCoreCreateZipPackages"
+    =?> ("TestDotnetCore", not <| Environment.hasEnvironVar "SkipIntegrationTests" && not <| Environment.hasEnvironVar "SkipTests")
+    =?> ("BootstrapTestDotnetCore",not <| Environment.hasEnvironVar "SkipTests")
+    ==> "Default"
+
+// Release stuff ('FastRelease' is to release after running 'Default')
 "EnsureTestsRun"
     =?> ("DotnetCorePushChocolateyPackage", not Environment.isLinux)
     =?> ("ReleaseDocs", BuildServer.isLocalBuild && not Environment.isLinux)
     ==> "DotnetCorePushNuGet"
     ==> "PublishNuget"
     ==> "FastRelease"
 
+// If 'Default' happens it needs to happen before 'EnsureTestsRun'
+"Default"
+    ?=> "EnsureTestsRun"
+
+// A 'Default' includes a 'Clean'
+"Clean"
+    ==> "Default"
+
+// A 'Release' includes a 'Default'
 "Default"
     ==> "Release"
+// A 'Release' includes a 'FastRelease'
 "FastRelease"
     ==> "Release"
-"Default"
-    ?=> "EnsureTestsRun"
 
 // start build
 Target.RunOrDefault "Default"

help/markdown/contributing.md

@@ -52,6 +52,15 @@ to automatically deploy a preconfigured virtual machine. See the [Vagrant docs](
 
 > Note: The vagrant file might be outdated at this time, please help updating it and removing this banner.
 
+* Ubuntu / Windows Subsystem for Linux:
+  - Install Mono, as of today 2017-09-30 you need at least alpha to have the msbuild package (http://www.mono-project.com/download/beta/#download-lin)
+  - `apt-get install msbuild mono-complete`
+  - `apt-cache search libunwind`
+  - `# apt-get Install the libunwind runtime (one of the search results)`
+  - `apt-cache search libcurl # Install`
+  - `# apt-get Install the libcurl library (one of the search results)`
+  - `./build.sh`
+
 ### Programming
 
 * Checkout the `master` branch.
@@ -107,7 +116,9 @@ to automatically deploy a preconfigured virtual machine. See the [Vagrant docs](
 We [learned from our mistakes](fake-fake5-learn-more.html), so we use the following guidelines, **please read them very carefully** (ask if you don't understand any rule):
 
  - AutoOpen is no longer used
- - we replace `<verb><module>` functions with `<module>.<verb>`
+ - We replace `<verb><module>` functions with `<module>.<verb>`
+    - Use Verbs as much as possible for functions
+    - In order, to have a more consistent API we propose to always use camelCase naming for functions
  - We assume the caller is not opening the module but only the global namespaces `Fake.Core`, `Fake.IO`, ...
    and make sure the code looks nice and structured on the caller side.
  - For compatibility reasons (migration from legacy). We assume the user doesn't open the global `Fake` namespace.

help/markdown/core-targets.md

@@ -2,9 +2,11 @@
 
 **Note:  This documentation is for FAKE 5. The old documentation can be found [here](legacy-core-targets.html)! **
 
+[API-Reference](apidocs/fake-core-target.html), [Operators](apidocs/fake-core-targetoperators.html)
+
 ## Listing targets
 
-Not jet available in FAKE 5
+Not yet available in FAKE 5
 
 > Note: This feature still makes sense, but a good CLI has not been found jet, please propose one.
 > For not you can run the target with name '--listTargets' or '-lt'. `fake run build.fsx -t '--list-Targets'`
@@ -16,7 +18,6 @@ FAKE has a special param "target" which can be used to run specific targets in a
 	// include Fake modules, see Fake modules section
 
 	open Fake.Core
-	open Fake.Core.TargetOperators
 
 	// *** Define Targets ***
 	Target.Create "Clean" (fun _ -> 
@@ -31,6 +32,8 @@ FAKE has a special param "target" which can be used to run specific targets in a
 		trace " --- Deploying app --- "
 	)
 
+	open Fake.Core.TargetOperators
+
 	// *** Define Dependencies ***
 	"Clean"
 	  ==> "Build"

help/markdown/core.md

@@ -0,0 +1,6 @@
+# Fake.Core
+
+This namespace bundles some "core" modules which are useful in most scenarios where FAKE is used.
+
+- [Targets](core-targets.html), [API-Reference](apidocs/fake-core-target.html), [Operators](apidocs/fake-core-targetoperators.html)
+- To be continued...

help/markdown/fake-fake5-modules.md

@@ -2,7 +2,7 @@
 
 ## Requirements to modules
 
-You can use any NuGet packages which are compatible with `netcore10`, for example all packages targeting `netstandard16` or lower.
+You can use any NuGet packages which are compatible with `netcoreapp20`, for example all packages targeting `netstandard20` or lower.
 
 ## Declaring module dependencies
 

help/templates/reference/module.cshtml

@@ -31,7 +31,7 @@
   var nestTypes = (IEnumerable<FSharp.MetadataFormat.Type>)Model.Module.NestedTypes;
 }
 
-<h1>@Model.Module.Name</h1>
+<a name="@Model.Module.Name" class="anchor" href="#@Model.Module.Name"><h1>@Model.Module.Name</h1></a>
 <div class="xmldoc">
   @foreach (var sec in comment.Sections) {
     // XML comment for the type has multiple sections that can be labelled

help/templates/reference/namespaces.cshtml

@@ -3,13 +3,13 @@
   Title = "Namespaces - " + Properties["project-name"];
 }
 
-<h1>@Model.Name</h1>
+<a name="@Model.Name" class="anchor" href="#@Model.Name"><h1>@Model.Name</h1></a>
 
 @foreach (var ns in Model.Namespaces)
 {
   if (ns.Types.Length + ns.Modules.Length > 0)
   {
-    <h2>@ns.Name Namespace</h2>
+    <a name="@ns.Name" class="anchor" href="#@ns.Name"><h2>@ns.Name Namespace</h2></a>
     <div>
       @RenderPart("part-nested", new {
          Types = ns.Types,

help/templates/reference/part-members.cshtml

@@ -1,5 +1,5 @@
 @if (Enumerable.Count(Model.Members) > 0) {
-  <h3>@Model.Header</h3>
+  <a name="@Model.Header" class="anchor" href="#@Model.Header"><h3>@Model.Header</h3></a>
   <table class="table table-bordered member-list">
     <thead>
       <tr><td>@Model.TableHeader</td><td>Description</td></tr>

help/templates/reference/type.cshtml

@@ -27,7 +27,7 @@
     });
 }
 
-<h1>@Model.Type.Name</h1>
+<a name="@Model.Type.Name" class="anchor" href="#@Model.Type.Name" ><h1>@Model.Type.Name</h1></a>
 <div class="xmldoc">
   @foreach (var sec in comment.Sections) {
     // XML comment for the type has multiple sections that can be labelled