Merge pull request #2022 from fsharp/release/next

Next Release
fsprojects · Jul 30, 2018 · a050473 · a050473
2 parents 3faee4d + 6d7927c
commit a050473
Show file tree

Hide file tree

Showing 66 changed files with 4,095 additions and 1,245 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -27,4 +27,6 @@ Please provide a description of any known workarounds.
 * Operating system
 * Branch
 * .NET Runtime, CoreCLR or Mono Version
-* Performance information, links to performance testing scripts
+* Indications of severity
+* Version of FAKE (4.X, 5.X)
+* (if performance issue) Performance information, links to performance testing scripts
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+### Description
+
+Please give a brief explanation about your change.
+
+If available, link to an existing issue this PR fixes. For example:
+
+- fixes #1234
+
+## TODO
+
+- [] New (API-)documentation for new features exist (Note: API-docs are enough, additional docs are in `help/markdown`)
+- [] unit or integration test exists (or short reasoning why it doesn't make sense)
+- [] (if new module) the module has been linked from the "Modules" menu, edit `help/templates/template.cshtml`, linking to the API-reference is fine.
+- [] (if new module) the module is in the correct namespace
+- [] (if new module) the module is added to Fake.sln (`dotnet sln Fake.sln add src/app/Fake.*/Fake.*.fsproj`)
+- [] Fake 5 [API guideline](https://fake.build/contributing.html#API-Design) is honored
diff --git a/Fake.sln b/Fake.sln
@@ -156,8 +156,14 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fake-template", "src\templa
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Cli.IntegrationTests", "src\test\Fake.DotNet.Cli.IntegrationTests\Fake.DotNet.Cli.IntegrationTests.fsproj", "{48ECC58D-468C-4D44-98B3-854C21EB0D40}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Installer.Wix", "src\app\Fake.Installer.Wix\Fake.Installer.Wix.fsproj", "{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}"
+EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.UserInput", "src\app\Fake.Core.UserInput\Fake.Core.UserInput.fsproj", "{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.VSTest", "src\app\Fake.DotNet.Testing.VSTest\Fake.DotNet.Testing.VSTest.fsproj", "{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Tools.Rsync", "src\app\Fake.Tools.Rsync\Fake.Tools.Rsync.fsproj", "{26367457-80C0-44C9-9020-56F4013C13E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -960,6 +966,18 @@ Global
 		{48ECC58D-468C-4D44-98B3-854C21EB0D40}.Release|x64.Build.0 = Release|Any CPU
 		{48ECC58D-468C-4D44-98B3-854C21EB0D40}.Release|x86.ActiveCfg = Release|Any CPU
 		{48ECC58D-468C-4D44-98B3-854C21EB0D40}.Release|x86.Build.0 = Release|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x64.Build.0 = Debug|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Debug|x86.Build.0 = Debug|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x64.ActiveCfg = Release|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x64.Build.0 = Release|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x86.ActiveCfg = Release|Any CPU
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A}.Release|x86.Build.0 = Release|Any CPU
 		{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -972,6 +990,30 @@ Global
 		{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Release|x64.Build.0 = Release|Any CPU
 		{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Release|x86.ActiveCfg = Release|Any CPU
 		{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040}.Release|x86.Build.0 = Release|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Debug|x86.Build.0 = Debug|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Release|x64.Build.0 = Release|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Release|x86.ActiveCfg = Release|Any CPU
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922}.Release|x86.Build.0 = Release|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Debug|x86.Build.0 = Debug|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Release|x64.Build.0 = Release|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Release|x86.ActiveCfg = Release|Any CPU
+		{26367457-80C0-44C9-9020-56F4013C13E1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1045,7 +1087,10 @@ Global
 		{872B282D-8A3E-459A-B63D-C43C5D73506D} = {539D7B9A-18A1-4D79-86AB-C8B48090CA84}
 		{29B66A06-1A45-4D65-AC31-7D746449E5D6} = {872B282D-8A3E-459A-B63D-C43C5D73506D}
 		{48ECC58D-468C-4D44-98B3-854C21EB0D40} = {E09B72E4-D890-46A8-8D14-7367C2E23E9D}
+		{648CD0F4-4A99-4EF1-AF56-4FBEA410B57A} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
 		{3B0A5EE3-6696-4EBA-BCF9-8136C7F17040} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
+		{C4C9D7EE-6A52-42F1-9E04-7C44F0EA8922} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
+		{26367457-80C0-44C9-9020-56F4013C13E1} = {901F162F-8925-4390-89C5-9EE2C343F744}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {058A0C5E-2216-4306-8AFB-0AE28320C26A}

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,21 @@
 # Release Notes
 
+## 5.3.0 - 2018-07-30
+
+* NEW: module Fake.Tools.Rsync - https://github.com/fsharp/FAKE/pull/1987
+* NEW: module Fake.Installer.Wix - https://github.com/fsharp/FAKE/pull/2002
+* NEW: module Fake.DotNet.Testing.VSTest - https://github.com/fsharp/FAKE/pull/2008
+* ENHANCEMENT: Add .NET Sdk 2.1.302 version to Fake.DotNet.Cli - https://github.com/fsharp/FAKE/pull/2034
+* ENHANCEMENT: Add extended commit message to Fake.Tools.Git - https://github.com/fsharp/FAKE/pull/2038
+* ENHANCEMENT: GlobbingPattern.createFrom in Fake.IO.FileSystem - https://github.com/fsharp/FAKE/pull/2030
+* ENHANCEMENT: Add `BuildConfiguration.fromEnvironmentVarOrDefault` to Fake.DotNet.Cli - https://github.com/fsharp/FAKE/pull/2031
+* ENHANCEMENT: Add `withAdditionalArgs` helper to Fake.DotNet.Cli - https://github.com/fsharp/FAKE/pull/2044
+* BUGFIX: Unbreak outdir on older mono - https://github.com/fsharp/FAKE/pull/2021
+* BUGFIX: Fix Expecto ParallelWorkers - https://github.com/fsharp/FAKE/pull/2028
+* BUGFIX: Environment setup error when running fake from a subdirectory - https://github.com/fsharp/FAKE/issues/2025
+* BUGFIX: Fix signature of `Zip.createZip` - https://github.com/fsharp/FAKE/issues/2024
+* BUGFIX: Call gitversion with mono if required - https://github.com/fsharp/FAKE/issues/2041
+
 ## 5.2.0 - 2018-07-10
 
 * ENHANCEMENT: Improve output around empty target descriptions - https://github.com/fsharp/FAKE/pull/1996

diff --git a/build.fsx b/build.fsx
@@ -214,7 +214,7 @@ Trace.setBuildNumber nugetVersion
 //    CoreTracing.setTraceListeners (CoreTracing.defaultConsoleTraceListener :: current)
 
 
-let dotnetSdk = lazy DotNet.install DotNet.Release_2_1_300
+let dotnetSdk = lazy DotNet.install DotNet.Versions.Release_2_1_300
 let inline dtntWorkDir wd =
     DotNet.Options.lift dotnetSdk.Value
     >> DotNet.Options.withWorkingDirectory wd
@@ -365,12 +365,14 @@ let dotnetAssemblyInfos =
       "Fake.DotNet.Testing.Expecto", "Running expecto test runner"
       "Fake.DotNet.Testing.MSpec", "Running mspec test runner"
       "Fake.DotNet.Testing.MSTest", "Running mstest test runner"
+      "Fake.DotNet.Testing.VSTest", "Running vstest test runner"
       "Fake.DotNet.Testing.NUnit", "Running nunit test runner"
       "Fake.DotNet.Testing.OpenCover", "Code coverage with OpenCover"
       "Fake.DotNet.Testing.SpecFlow", "BDD with Gherkin and SpecFlow"
       "Fake.DotNet.Testing.XUnit2", "Running xunit test runner"
       "Fake.DotNet.Xamarin", "Running Xamarin builds"
       "Fake.Installer.InnoSetup", "Creating installers with InnoSetup"
+      "Fake.Installer.Wix", "WiX helper to create msi installers"
       "Fake.IO.FileSystem", "Core Filesystem utilities and globbing support"
       "Fake.IO.Zip", "Core Zip functionality"
       "Fake.JavaScript.Npm", "Running npm commands"
@@ -383,8 +385,9 @@ let dotnetAssemblyInfos =
       "Fake.Testing.ReportGenerator", "Convert XML coverage output to various formats"
       "Fake.Testing.SonarQube", "Analyzing your project with SonarQube"
       "Fake.Tools.Git", "Running git commands"
-      "Fake.Tools.Pickles", "Convert Gherkin to HTML"
       "Fake.Tools.GitVersion", "GitVersion helper"
+      "Fake.Tools.Pickles", "Convert Gherkin to HTML"
+      "Fake.Tools.Rsync", "Running Rsync commands"
       "Fake.Tracing.NAntXml", "NAntXml"
       "Fake.Windows.Chocolatey", "Running and packaging with Chocolatey"
       "Fake.Windows.Registry", "CRUD functionality for Windows registry" ]
@@ -1149,9 +1152,9 @@ let rec nugetPush tries nugetpackage =
                     if not ignore_conflict ||
                        not (r.Errors |> Seq.exists (fun err -> err.Contains "409"))
                     then
-                        let msgs = r.Results |> Seq.map (fun c -> (if c.IsError then "(Err) " else "") + c.Message)                    
+                        let msgs = r.Results |> Seq.map (fun c -> (if c.IsError then "(Err) " else "") + c.Message)
                         let msg = System.String.Join ("\n", msgs)
-                 
+
                         failwithf "failed to push package %s (code %d): \n%s" nugetpackage r.ExitCode msg
                     else Trace.traceFAKE "ignore conflict error because IGNORE_CONFLICT=true!")
         else Trace.traceFAKE "could not push '%s', because api key was not set" nugetpackage
@@ -1412,7 +1415,7 @@ let mutable prev = None
 for runtime in "current" :: "portable" :: runtimes do
     let rawTargetName = sprintf "_DotNetPublish_%s" runtime
     let targetName = sprintf "DotNetPublish_%s" runtime
-    Target.Description (sprintf "publish fake 5 runner for %s" runtime)
+    Target.description (sprintf "publish fake 5 runner for %s" runtime)
     Target.create targetName ignore
     "SetAssemblyInfo"
         ==> rawTargetName

diff --git a/help/markdown/fake-gettingstarted.md b/help/markdown/fake-gettingstarted.md
@@ -185,7 +185,7 @@ Target.runOrDefault "Default"
 ```
 <div class="alert alert-info">
     <h5>HINT</h5>
-    You can explore the APIs for example by writing <code>Fake.IO.</code> and waiting for intellisense (or pressing <code>Strg+Space</code>).
+    You can explore the APIs for example by writing <code>Fake.IO.</code> and waiting for intellisense (or pressing <code>Ctrl+Space</code>).
     You can remove <code>Fake.IO</code> once you put <code>open Fake.IO</code> on top.
 </div>
 

diff --git a/help/markdown/fake-migrate-to-fake-5.md b/help/markdown/fake-migrate-to-fake-5.md
@@ -26,7 +26,7 @@ Upgrading to FAKE 5 is a multi step process and has various manual steps in betw
 * Fix all the (obsolete) warnings in your build-script to use the new API (see the [Use the new FAKE-API](#Use-the-new-FAKE-API) section).
   This should still not break your build. If things break here or you have difficulties after reading the 'Use the new FAKE-API' section
   please open an issue.
-  * Becareful if you update only some warning, it could break. For example, if you use `Target.Create`, but continue to use old operators definition, you will probably experiment some errors like "Target [...] is not defined".  
+  * Be careful if you update only some warnings, it could break. For example, if you use `Target.create`, but continue to use old operators definition, you will probably experiment some errors like "Target [...] is not defined".  
 * Change to the new version of FAKE 5.
 
   * This is for example done by installing FAKE as dependency on your build infrastructure.

diff --git a/help/templates/template.cshtml b/help/templates/template.cshtml
@@ -135,6 +135,7 @@
 																<li><a href="/apidocs/v5/fake-dotnet-testing-mspec.html">Testing - MSpec</a></li>
 																<li><a href="/apidocs/v5/fake-dotnet-testing-xunit2.html">Testing - XUnit2</a></li>
 																<li><a href="/apidocs/v5/fake-dotnet-testing-expecto.html">Testing - Expecto</a></li>
+																<li><a href="/apidocs/v5/fake-dotnet-testing-vstest.html">Testing - VSTest</a></li>
 																<li><a href="/fake-dotnet-testing-specflow.html">Testing - SpecFlow</a></li>
 																<li><a href="/dotnet-testing-opencover.html">Testing - OpenCover</a></li>
 																<li><a href="/dotnet-nuget.html">NuGet</a></li>
@@ -151,7 +152,8 @@
 														<li>
 															<a href="/apidocs/index.html#Fake.Installer">Installer</a>
 															<ul>
-																<li><a href="/apidocs/fake-installer-innosetup.html">InnoSetup</a></li>
+																<li><a href="/apidocs/v5/fake-installer-innosetup.html">InnoSetup</a></li>
+																<li><a href="/apidocs/v5/fake-installer-wix.html">Wix</a></li>
 															</ul>
 														</li>
 														<li>
@@ -190,10 +192,11 @@
 															</ul>
 														</li>
 														<li>
-															<a href="/apidocs/v5/index.html#Fake.Tools.Git">Tools</a>
+															<a href="/apidocs/v5/index.html#Fake.Tools">Tools</a>
 															<ul>
 																<li><a href="/apidocs/v5/index.html#Fake.Tools.Git">Git</a></li>
 																<li><a href="/fake-tools-pickles.html">Pickles</a></li>
+																<li><a href="/fake-tools-rsync.html">Rsync</a></li>
 															</ul>
 														</li>
 														<li>

diff --git a/integrationtests/i002025/before/paket.dependencies b/integrationtests/i002025/before/paket.dependencies
@@ -0,0 +1,6 @@
+// [ FAKE GROUP ]
+group Build
+    source https://api.nuget.org/v3/index.json
+    nuget Fake.DotNet.Cli
+    nuget Fake.IO.FileSystem
+    nuget Fake.Core.Target
diff --git a/integrationtests/i002025/before/script/build.fsx b/integrationtests/i002025/before/script/build.fsx
@@ -0,0 +1,26 @@
+
+#r "paket: groupref build //"
+#load ".fake/build.fsx/intellisense.fsx"
+
+open Fake.Core
+open Fake.DotNet
+open Fake.IO
+open Fake.IO.FileSystemOperators
+open Fake.IO.Globbing.Operators
+open Fake.Core.TargetOperators
+
+Target.create "Clean" (fun _ ->
+    printfn ".. CLEAN .."
+)
+
+Target.create "Build" (fun _ ->
+    printfn ".. Build .."
+)
+
+Target.create "All" ignore
+
+"Clean"
+  ==> "Build"
+  ==> "All"
+
+Target.runOrDefault "All"