Merge branch 'master' into WiX-DirectoryHierarchy

Conflicts: src/app/FakeLib/WiXHelper.fs
fsprojects · Feb 3, 2016 · fa25b97 · fa25b97
2 parents 2d46154 + 8c566a1
commit fa25b97
Show file tree

Hide file tree

Showing 16 changed files with 535 additions and 83 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,13 @@
-#### 4.17.1 - 26.01.2016
+#### 4.19.0 - 02.02.2016
+* New FSC task- https://github.com/fsharp/FAKE/pull/1122
+* Disable warning from #1082 for now because it created lots of confusion 
+
+#### 4.18.0 - 02.02.2016
+* New helpers which allow to send .NET coverage settings to TeamCity - https://github.com/fsharp/FAKE/pull/1117
 * Disabled NodeReuse on TeamCity, it can lead to consecutive builds failing - https://github.com/fsharp/FAKE/pull/1110
 * Added IncludeReferencedProjects property to the Packet.Pack params - https://github.com/fsharp/FAKE/pull/1112
+* BUGFIX: Ensure that traceEndTask is called in DotCover - https://github.com/fsharp/FAKE/pull/1118
+* BUGFIX: WiXHelper: fixed typos in WiXDir.ToString - https://github.com/fsharp/FAKE/pull/1120
 
 #### 4.17.0 - 23.01.2016
 * Renamed internal FSharp.Compiler.Service to avoid clashes - https://github.com/fsharp/FAKE/pull/1097

diff --git a/src/app/FAKE/AssemblyInfo.fs b/src/app/FAKE/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Runtime.InteropServices
 [<assembly: AssemblyTitleAttribute("FAKE - F# Make Command line tool")>]
 [<assembly: GuidAttribute("fb2b540f-d97a-4660-972f-5eeff8120fba")>]
 [<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
-[<assembly: AssemblyVersionAttribute("4.17.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.17.1")>]
-[<assembly: AssemblyFileVersionAttribute("4.17.1")>]
+[<assembly: AssemblyVersionAttribute("4.19.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.19.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.19.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "4.17.1"
+    let [<Literal>] Version = "4.19.0"
diff --git a/src/app/FAKE/Program.fs b/src/app/FAKE/Program.fs
@@ -124,9 +124,9 @@ try
         | Choice2Of2(ex) ->
 
             // #1082 print a warning as we've been invoked with invalid OR old-style args.
-            traceImportant "Error parsing command line arguments.  You have a mistake in your args, or are using the pre-2.1.8 argument style:"
-            exceptionAndInnersToString ex |> traceImportant
-            trace "Attempting to run with pre-version 2.18 argument style, for backwards compat."
+            // traceImportant "Error parsing command line arguments.  You have a mistake in your args, or are using the pre-2.1.8 argument style:"
+            // exceptionAndInnersToString ex |> traceImportant
+            // trace "Attempting to run with pre-version 2.18 argument style, for backwards compat."
 
             if (cmdArgs.Length = 2 && paramIsHelp cmdArgs.[1]) || (cmdArgs.Length = 1 && List.length buildScripts = 0) then printUsage () else
             match Boot.ParseCommandLine(cmdArgs) with

diff --git a/src/app/Fake.Deploy.Lib/AssemblyInfo.fs b/src/app/Fake.Deploy.Lib/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Runtime.InteropServices
 [<assembly: AssemblyTitleAttribute("FAKE - F# Make Deploy Lib")>]
 [<assembly: GuidAttribute("AA284C42-1396-42CB-BCAC-D27F18D14AC7")>]
 [<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
-[<assembly: AssemblyVersionAttribute("4.17.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.17.1")>]
-[<assembly: AssemblyFileVersionAttribute("4.17.1")>]
+[<assembly: AssemblyVersionAttribute("4.19.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.19.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.19.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "4.17.1"
+    let [<Literal>] Version = "4.19.0"
diff --git a/src/app/Fake.Deploy/AssemblyInfo.fs b/src/app/Fake.Deploy/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Runtime.InteropServices
 [<assembly: AssemblyTitleAttribute("FAKE - F# Make Deploy tool")>]
 [<assembly: GuidAttribute("413E2050-BECC-4FA6-87AA-5A74ACE9B8E1")>]
 [<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
-[<assembly: AssemblyVersionAttribute("4.17.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.17.1")>]
-[<assembly: AssemblyFileVersionAttribute("4.17.1")>]
+[<assembly: AssemblyVersionAttribute("4.19.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.19.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.19.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "4.17.1"
+    let [<Literal>] Version = "4.19.0"
diff --git a/src/app/Fake.Experimental/AssemblyInfo.fs b/src/app/Fake.Experimental/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Runtime.InteropServices
 [<assembly: AssemblyTitleAttribute("FAKE - F# Make Experimental Lib")>]
 [<assembly: GuidAttribute("5AA28AED-B9D8-4158-A594-32FE5ABC5713")>]
 [<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
-[<assembly: AssemblyVersionAttribute("4.17.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.17.1")>]
-[<assembly: AssemblyFileVersionAttribute("4.17.1")>]
+[<assembly: AssemblyVersionAttribute("4.19.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.19.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.19.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "4.17.1"
+    let [<Literal>] Version = "4.19.0"
diff --git a/src/app/Fake.FluentMigrator/AssemblyInfo.fs b/src/app/Fake.FluentMigrator/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Runtime.InteropServices
 [<assembly: AssemblyTitleAttribute("FAKE - F# Make FluentMigrator Lib")>]
 [<assembly: GuidAttribute("E18BDD6F-1AF8-42BB-AEB6-31CD1AC7E56D")>]
 [<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
-[<assembly: AssemblyVersionAttribute("4.17.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.17.1")>]
-[<assembly: AssemblyFileVersionAttribute("4.17.1")>]
+[<assembly: AssemblyVersionAttribute("4.19.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.19.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.19.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "4.17.1"
+    let [<Literal>] Version = "4.19.0"
diff --git a/src/app/Fake.SQL/AssemblyInfo.fs b/src/app/Fake.SQL/AssemblyInfo.fs
@@ -5,10 +5,10 @@ open System.Runtime.InteropServices
 [<assembly: AssemblyTitleAttribute("FAKE - F# Make SQL Lib")>]
 [<assembly: GuidAttribute("A161EAAF-EFDA-4EF2-BD5A-4AD97439F1BE")>]
 [<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
-[<assembly: AssemblyVersionAttribute("4.17.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.17.1")>]
-[<assembly: AssemblyFileVersionAttribute("4.17.1")>]
+[<assembly: AssemblyVersionAttribute("4.19.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.19.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.19.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "4.17.1"
+    let [<Literal>] Version = "4.19.0"
diff --git a/src/app/FakeLib/AssemblyInfo.fs b/src/app/FakeLib/AssemblyInfo.fs
@@ -7,10 +7,10 @@ open System.Runtime.InteropServices
 [<assembly: InternalsVisibleToAttribute("Test.FAKECore")>]
 [<assembly: GuidAttribute("d6dd5aec-636d-4354-88d6-d66e094dadb5")>]
 [<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
-[<assembly: AssemblyVersionAttribute("4.17.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.17.1")>]
-[<assembly: AssemblyFileVersionAttribute("4.17.1")>]
+[<assembly: AssemblyVersionAttribute("4.19.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.19.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.19.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "4.17.1"
+    let [<Literal>] Version = "4.19.0"
diff --git a/src/app/FakeLib/DotCover.fs b/src/app/FakeLib/DotCover.fs
@@ -184,16 +184,17 @@ let DotCoverNUnit (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUni
     let details =  assemblies |> separated ", "
     traceStartTask "DotCoverNUnit" details
 
-    let parameters = NUnitDefaults |> setNUnitParams
-    let args = buildNUnitdArgs parameters assemblies
+    try
+        let parameters = NUnitDefaults |> setNUnitParams
+        let args = buildNUnitdArgs parameters assemblies
 
-    DotCover (fun p ->
-                  {p with
-                     TargetExecutable = parameters.ToolPath @@ parameters.ToolName
-                     TargetArguments = args
-                  } |> setDotCoverParams)
-
-    traceEndTask "DotCoverNUnit" details
+        DotCover (fun p ->
+                      {p with
+                         TargetExecutable = parameters.ToolPath @@ parameters.ToolName
+                         TargetArguments = args
+                      } |> setDotCoverParams)
+    finally
+        traceEndTask "DotCoverNUnit" details
 
 /// Runs the dotCover "cover" command against the NUnit test runner.
 /// ## Parameters
@@ -212,18 +213,19 @@ let DotCoverNUnit (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUni
 let DotCoverNUnit3 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUnitParams: NUnit3Params -> NUnit3Params) (assemblies: string seq) =
     let assemblies = assemblies |> Seq.toArray
     let details =  assemblies |> separated ", "
-    traceStartTask "DotCoverNUnit" details
+    traceStartTask "DotCoverNUnit3" details
 
-    let parameters = NUnit3Defaults |> setNUnitParams
-    let args = buildNUnit3Args parameters assemblies
+    try
+        let parameters = NUnit3Defaults |> setNUnitParams
+        let args = buildNUnit3Args parameters assemblies
 
-    DotCover (fun p ->
-                  {p with
-                     TargetExecutable = parameters.ToolPath
-                     TargetArguments = args
-                  } |> setDotCoverParams)
-
-    traceEndTask "DotCoverNUnit" details
+        DotCover (fun p ->
+                      {p with
+                         TargetExecutable = parameters.ToolPath
+                         TargetArguments = args
+                      } |> setDotCoverParams)
+    finally
+        traceEndTask "DotCoverNUnit3" details
 
 /// Runs the dotCover "cover" command against the XUnit2 test runner.
 /// ## Parameters
@@ -242,16 +244,17 @@ let DotCoverXUnit2 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setXUn
     let details =  assemblies |> separated ", "
     traceStartTask "DotCoverXUnit2" details
 
-    let parameters = XUnit2Defaults |> setXUnit2Params
-    let args = buildXUnit2Args assemblies parameters 
+    try
+        let parameters = XUnit2Defaults |> setXUnit2Params
+        let args = buildXUnit2Args assemblies parameters 
 
-    DotCover (fun p ->
-                  {p with
-                     TargetExecutable = parameters.ToolPath 
-                     TargetArguments = args
-                  } |> setDotCoverParams)
-
-    traceEndTask "DotCoverXUnit2" details
+        DotCover (fun p ->
+                      {p with
+                         TargetExecutable = parameters.ToolPath 
+                         TargetArguments = args
+                      } |> setDotCoverParams)
+    finally
+        traceEndTask "DotCoverXUnit2" details
 
 /// Builds the command line arguments from the given parameter record and the given assemblies.
 /// Runs all test assemblies in the same run for easier coverage management. 
@@ -289,16 +292,17 @@ let DotCoverMSTest (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMST
     let details =  assemblies |> separated ", "
     traceStartTask "DotCoverMSTest " details
 
-    let parameters = MSTestDefaults |> setMSTestParams
-    let args = buildMSTestArgsForDotCover parameters assemblies
+    try
+        let parameters = MSTestDefaults |> setMSTestParams
+        let args = buildMSTestArgsForDotCover parameters assemblies
 
-    DotCover (fun p ->
-                  {p with
-                     TargetExecutable = parameters.ToolPath 
-                     TargetArguments = args
-                  } |> setDotCoverParams)
-
-    traceEndTask "DotCoverMSTest" details
+        DotCover (fun p ->
+                      {p with
+                         TargetExecutable = parameters.ToolPath 
+                         TargetArguments = args
+                      } |> setDotCoverParams)
+    finally
+        traceEndTask "DotCoverMSTest" details
 
 /// Runs the dotCover "cover" command against the MSpec test runner.
 /// ## Parameters
@@ -319,14 +323,15 @@ let DotCoverMSpec (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMSpe
     let details =  assemblies |> separated ", "
     traceStartTask "DotCoverMSpec" details
 
-    let parameters = MSpecDefaults |> setMSpecParams            
+    try
+        let parameters = MSpecDefaults |> setMSpecParams            
 
-    let args = buildMSpecArgs parameters assemblies
+        let args = buildMSpecArgs parameters assemblies
 
-    DotCover (fun p ->
-                  {p with
-                     TargetExecutable = parameters.ToolPath
-                     TargetArguments = args
-                  } |> setDotCoverParams)
-
-    traceEndTask "DotCoverMSpec" details
+        DotCover (fun p ->
+                      {p with
+                         TargetExecutable = parameters.ToolPath
+                         TargetArguments = args
+                      } |> setDotCoverParams)
+    finally
+        traceEndTask "DotCoverMSpec" details