Merge branch 'rc_6' into newDocFxModule

fsprojects · Apr 22, 2018 · 7258d1d · 7258d1d
2 parents 8a0274c + 44d0b6d
commit 7258d1d
Show file tree

Hide file tree

Showing 41 changed files with 3,566 additions and 3,324 deletions.
diff --git a/Fake.sln b/Fake.sln
@@ -32,6 +32,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.MSBuild", "src/
 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
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.Expecto", "src/app/Fake.DotNet.Testing.Expecto/Fake.DotNet.Testing.Expecto.fsproj", "{819E2756-7BEE-4FCD-BA08-7BF323405CBE}"
+EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.MSpec", "src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj", "{C1B87E1F-8D0D-4A78-9A24-9D5D38B7E9A8}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.NUnit", "src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj", "{75C9DD21-B4EA-4117-BF4F-AFE777A80B5B}"
@@ -684,6 +686,18 @@ Global
 		{77E0066D-A04D-445B-B036-9008A40F8A44}.Release|x64.Build.0 = Release|Any CPU
 		{77E0066D-A04D-445B-B036-9008A40F8A44}.Release|x86.ActiveCfg = Release|Any CPU
 		{77E0066D-A04D-445B-B036-9008A40F8A44}.Release|x86.Build.0 = Release|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Debug|x64.Build.0 = Debug|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Debug|x86.Build.0 = Debug|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Release|x64.ActiveCfg = Release|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Release|x64.Build.0 = Release|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Release|x86.ActiveCfg = Release|Any CPU
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE}.Release|x86.Build.0 = Release|Any CPU
 		{B636A082-4DB4-439D-8A37-E5214BDC00A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B636A082-4DB4-439D-8A37-E5214BDC00A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B636A082-4DB4-439D-8A37-E5214BDC00A3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -762,6 +776,7 @@ Global
 		{E09B72E4-D890-46A8-8D14-7367C2E23E9D} = {539D7B9A-18A1-4D79-86AB-C8B48090CA84}
 		{8561A35A-C2A4-43C7-A938-CB35A7747121} = {E09B72E4-D890-46A8-8D14-7367C2E23E9D}
 		{77E0066D-A04D-445B-B036-9008A40F8A44} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
+		{819E2756-7BEE-4FCD-BA08-7BF323405CBE} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
 		{B636A082-4DB4-439D-8A37-E5214BDC00A3} = {901F162F-8925-4390-89C5-9EE2C343F744}
 		{DE7579F2-C20F-4C35-BC04-C10362912243} = {901F162F-8925-4390-89C5-9EE2C343F744}
 	EndGlobalSection

diff --git a/help/markdown/core-targets.md b/help/markdown/core-targets.md
@@ -162,7 +162,7 @@ However when a fast build is desired (and the project is e.g. known to build suc
 
 ## Example
 
-When using this parallel option, Fake resolves the build dependency hierearchies from the described paths and builds independend paths as parallel if you have multiple CPUs available.
+When using this parallel option, Fake resolves the build dependency hierarchies from the described paths and builds independend paths as parallel if you have multiple CPUs available.
 For example this dependency tree:
 
 ```fsharp
@@ -226,4 +226,4 @@ Target.create "Rebuild" Target.DoNothing
 "Clean" ==> "Rebuild"
 // Make sure "Clean" happens before "Build", if "Clean" is executed during a build.
 "Clean" ?=> "Build"
-```
+```
diff --git a/help/markdown/dotnet-assemblyinfo.md b/help/markdown/dotnet-assemblyinfo.md
@@ -11,27 +11,28 @@ If you succeeded with the [Getting Started tutorial](gettingstarted.html), then
 nuget Fake.DotNet.AssemblyInfo
 nuget Fake.DotNet.MSBuild
 nuget Fake.Core.Target //"
+open Fake.Core
 open Fake.DotNet
 
-Target.Create "BuildApp" (fun _ ->
-    AssemblyInfoFile.CreateCSharp "./src/app/Calculator/Properties/AssemblyInfo.cs"
+Target.create "BuildApp" (fun _ ->
+    AssemblyInfoFile.createCSharp "./src/app/Calculator/Properties/AssemblyInfo.cs"
         [AssemblyInfo.Title "Calculator Command line tool"
             AssemblyInfo.Description "Sample project for FAKE - F# MAKE"
             AssemblyInfo.Guid "A539B42C-CB9F-4a23-8E57-AF4E7CEE5BAA"
             AssemblyInfo.Product "Calculator"
             AssemblyInfo.Version version
             AssemblyInfo.FileVersion version]
 
-    AssemblyInfoFile.CreateFSharp "./src/app/CalculatorLib/Properties/AssemblyInfo.fs"
+    AssemblyInfoFile.createFSharp "./src/app/CalculatorLib/Properties/AssemblyInfo.fs"
         [AssemblyInfo.Title "Calculator library"
             AssemblyInfo.Description "Sample project for FAKE - F# MAKE"
             AssemblyInfo.Guid "EE5621DB-B86B-44eb-987F-9C94BCC98441"
             AssemblyInfo.Product "Calculator"
             AssemblyInfo.Version version
             AssemblyInfo.FileVersion version]
 
-    MSBuild.RunRelease buildDir "Build" appReferences
-        |> Log "AppBuild-Output: "
+    MSBuild.runRelease id buildDir "Build" appReferences
+        |> Trace.logItems "AppBuild-Output: "
 )
 ```
 
@@ -43,7 +44,7 @@ The version parameter can be declared as a property or fetched from a build serv
 
 ```fsharp
 let version =
-  match buildServer with
+  match BuildServer.buildServer with
   | TeamCity -> buildVersion
   | _ -> "0.2"
 ```

diff --git a/help/markdown/fake-debugging.md b/help/markdown/fake-debugging.md
@@ -13,7 +13,7 @@ Currently debugging support (and documentation around it) is limited. Please hel
 
 Debugging works (on windows) in the following way:
 
-- Download the portable fake distribution `fake-portable.zip` and extract it somewhere (for example `E:\fake-portable`)
+- Download the portable fake distribution `fake-dotnetcore-portable.zip` and extract it somewhere (for example `E:\fake-dotnetcore-portable`)
 - Open Visual Studio Code
 - Open "The Debugger" view and add the following configuration
 
@@ -22,15 +22,16 @@ Debugging works (on windows) in the following way:
             "name": "Debug My Build Script",
             "type": "coreclr",
             "request": "launch",
-            "program": "E:\\fake-portable\\fake.dll",
-            "args": ["run", "build.fsx", "--fsiargs", "--debug:portable --optimize-"],
+            "program": "E:\\fake-dotnetcore-portable\\fake.dll",
+            "args": ["run", "--fsiargs", "--debug:portable --optimize-", "build.fsx"],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,
             "console": "internalConsole"
         }
   ```
 
-  > It is important to specify `--debug:portable --optimize-`
+  > It is important to specify `--debug:portable --optimize-`<br>
+  > To get debugging support for .NET Core you need [C# for Visual Studio Code](https://github.com/OmniSharp/omnisharp-vscode) 
 
 - Delete the `.fake` directory
 - Set a breakpoint in your script and run the new configuration
@@ -74,4 +75,4 @@ To start a new context or cleanup the old one you can use (execute interactively
 execContext.Dispose()
 let execContext = Fake.Core.Context.FakeExecutionContext.Create false "build.fsx" []
 Fake.Core.Context.setExecutionContext (Fake.Core.Context.RuntimeContext.Fake execContext)
-```
+```
diff --git a/help/templates/template.cshtml b/help/templates/template.cshtml
@@ -81,7 +81,6 @@
 															<a href="@(prefix)core.html">Core</a>
 															<ul>
 																<li><a href="@(prefix)core-targets.html">Targets</a></li>
-																<li><a href="@(prefix)apidocs/fake-core-globbing-operators.html">Globbing</a></li>
 																<li><a href="@(prefix)apidocs/fake-core-environment.html.html">Environment</a></li>
 																<li><a href="@(prefix)core-process.html">Process</a></li>
 																<li><a href="@(prefix)apidocs/fake-core-string.html">String</a></li>
@@ -97,6 +96,7 @@
 															<a href="@(prefix)apidocs/index.html#Fake.IO">IO</a>
 															<ul>
 																<li><a href="@(prefix)apidocs/index.html#Fake.IO">FileSystem</a></li>
+																<li><a href="@(prefix)apidocs/fake-io-globbing-operators.html">Globbing</a></li>
 																<li><a href="@(prefix)apidocs/fake-io-zip.html#Functions and values">Zip</a></li>
 															</ul>
 														</li>