DotCoverMSTest support

src/app/FakeLib/DotCover.fs

@@ -6,6 +6,7 @@ open System
 open System.IO
 open System.Text
 open Fake.Testing.XUnit2
+open Fake.MSTest
 
 type DotCoverReportType = 
   | Html = 0
@@ -208,6 +209,52 @@ let DotCoverXUnit2 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setXUn
 
     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. 
+/// [omit]
+let internal buildMSTestArgsForDotCover parameters assemblies = 
+    let testcontainers = assemblies |>  Array.map (fun a -> "/testcontainer:" + a) |> String.concat " "
+
+    let testResultsFile = 
+        if parameters.ResultsDir <> null then 
+            sprintf @"%s\%s.trx" parameters.ResultsDir (DateTime.Now.ToString("yyyyMMdd-HHmmss.ff"))
+        else null
+    new StringBuilder()
+    |> appendWithoutQuotesIfNotNull testcontainers ""
+    |> appendWithoutQuotesIfNotNull parameters.Category "/category:"
+    |> appendWithoutQuotesIfNotNull parameters.TestMetadataPath "/testmetadata:"
+    |> appendWithoutQuotesIfNotNull parameters.TestSettingsPath "/testsettings:"
+    |> appendWithoutQuotesIfNotNull testResultsFile "/resultsfile:"
+    |> appendIfTrueWithoutQuotes parameters.NoIsolation "/noisolation"
+    |> toText
+
+/// Runs the dotCover "cover" command against the MSTest test runner.
+/// ## Parameters
+///
+///  - `setDotCoverParams` - Function used to overwrite the dotCover report default parameters.
+///  - `setMSTestParams` - Function used to overwrite the MSTest default parameters.
+///
+/// ## Sample
+///
+///     !! (buildDir @@ buildMode @@ "/*.Unit.Tests.dll") 
+///         |> MSTest 
+///             (fun  -> dotCoverOptions )
+///             (fun MSTestOptions -> MSTestOptions) 
+let DotCoverMSTest (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMSTestParams: MSTestParams -> MSTestParams) (assemblies: string seq) =
+    let assemblies = assemblies |> Seq.toArray
+    let details =  assemblies |> separated ", "
+    traceStartTask "DotCoverMSTest " details
+
+    let parameters = MSTestDefaults |> setMSTestParams
+    let args = buildMSTestArgsForDotCover parameters assemblies
+
+    DotCover (fun p ->
+                  {p with
+                     TargetExecutable = parameters.ToolPath 
+                     TargetArguments = args
+                  } |> setDotCoverParams)
+
+    traceEndTask "DotCoverMSTest" details
 
 /// Runs the dotCover "cover" command against the MSpec test runner.
 /// ## Parameters

src/app/FakeLib/StringHelper.fs

@@ -78,6 +78,12 @@ let inline appendIfTrueWithoutQuotes p s builder =
 /// Appends a text if the predicate is false.
 let inline appendIfFalse p = appendIfTrue (not p)
 
+/// Appends a text without quoting if the value is not null.
+let inline appendWithoutQuotesIfNotNull (value : Object) s = 
+    appendIfTrueWithoutQuotes (value <> null) (match value with
+                                  | :? String as sv -> (sprintf "%s%s" s sv)
+                                  | _ -> (sprintf "%s%A" s value))
+
 /// Appends a text if the value is not null.
 let inline appendIfNotNull (value : Object) s = 
     appendIfTrue (value <> null) (match value with