changing the output format to receive a list of formats

TheAngryByrd · Dec 23, 2020 · 02774d6 · 02774d6
1 parent 0b6b25f
commit 02774d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/help/markdown/dotnet-testing-coverlet.md b/help/markdown/dotnet-testing-coverlet.md
@@ -47,7 +47,7 @@ DotNet.test (fun p ->
     }
     |> Coverlet.withDotNetTestOptions (fun p ->
         { p with
-            OutputFormat = Coverlet.OutputFormat.OpenCover
+            OutputFormat = [Coverlet.OutputFormat.OpenCover]
             Output = "coverage.xml"
             Include = [
                 // Include all namespaces from assemblies whose name starts with MyProject

diff --git a/src/app/Fake.DotNet.Testing.Coverlet/Coverlet.fs b/src/app/Fake.DotNet.Testing.Coverlet/Coverlet.fs
@@ -27,7 +27,7 @@ type ThresholdStat =
 /// Coverlet MSBuild parameters. For more details see: https://github.com/tonerdo/coverlet/blob/master/Documentation/MSBuildIntegration.md
 type CoverletParams =
     { /// (Required) Format of the generated output.
-        OutputFormat : OutputFormat
+        OutputFormat : OutputFormat list
         /// (Required) Path to the generated output file, or directory if it ends with a `/`.
         Output : string
         /// Namespaces to include, as (AssemblyName, Namespace) pairs. Supports `*` and `?` globbing.
@@ -51,7 +51,7 @@ type CoverletParams =
 
 /// The default parameters.
 let private defaults =
-    { OutputFormat = OutputFormat.Json
+    { OutputFormat = [OutputFormat.Json]
       Output = "./"
       Include = []
       Exclude = []
@@ -70,6 +70,10 @@ let private outputFormatToString = function
     | OutputFormat.Cobertura -> "cobertura"
     | OutputFormat.TeamCity -> "teamcity"
 
+let private outputFormatListToString =
+    List.map outputFormatToString
+    >> String.concat ","
+
 let private namespacesToString =
     Seq.map (fun (asm, ns) -> "[" + asm + "]" + ns)
     >> String.concat ","
@@ -90,7 +94,7 @@ let withMSBuildArguments (param: CoverletParams -> CoverletParams) (args: MSBuil
     let properties =
         [
             yield "CollectCoverage", "true"
-            yield "CoverletOutputFormat", outputFormatToString param.OutputFormat
+            yield "CoverletOutputFormat", outputFormatListToString param.OutputFormat
             yield "CoverletOutput", param.Output
             if not (List.isEmpty param.Include) then
                 yield "Include", namespacesToString param.Include

diff --git a/src/test/Fake.Core.UnitTests/Fake.DotNet.Testing.Coverlet.fs b/src/test/Fake.Core.UnitTests/Fake.DotNet.Testing.Coverlet.fs
@@ -16,7 +16,7 @@ let tests =
         testCase "Test that full properties are converted" <| fun _ ->
             let props = getProps (fun p ->
                 {
-                    OutputFormat = Coverlet.OutputFormat.Cobertura
+                    OutputFormat = [Coverlet.OutputFormat.Cobertura; Coverlet.OutputFormat.Json]
                     Output = "coverage.json"
                     Include = [
                         "Incl.Asm1", "Incl.Ns1"
@@ -38,7 +38,7 @@ let tests =
             Expect.containsAll props [
                 "CollectCoverage", "true"
                 "CoverletOutput", "coverage.json"
-                "CoverletOutputFormat", "cobertura"
+                "CoverletOutputFormat", "cobertura,json"
                 "Include", "[Incl.Asm1]Incl.Ns1,[Incl.Asm2]Incl.Ns2"
                 "Exclude", "[Excl.Asm1]Excl.Ns1,[Excl.Asm2]Excl.Ns2"
                 "ExcludeByAttribute", "Attr1,Attr2"