update streamline options to specify coverage output file

Author: tonerdo

src/coverlet.msbuild.tasks/CoverageResultTask.cs

@@ -12,16 +12,16 @@ namespace Coverlet.MSbuild.Tasks
 {
     public class CoverageResultTask : Task
     {
-        private string _filename;
+        private string _output;
         private string _format;
         private int _threshold;
         private string _thresholdType;
 
         [Required]
         public string Output
         {
-            get { return _filename; }
-            set { _filename = value; }
+            get { return _output; }
+            set { _output = value; }
         }
 
         [Required]
@@ -54,11 +54,9 @@ public override bool Execute()
                 var coverage = InstrumentationTask.Coverage;
                 var result = coverage.GetCoverageResult();
 
-                var directory = Path.GetDirectoryName(_filename);
+                var directory = Path.GetDirectoryName(_output);
                 if (!Directory.Exists(directory))
-                {
                     Directory.CreateDirectory(directory);
-                }
 
                 var formats = _format.Split(',');
                 foreach (var format in formats)
@@ -67,7 +65,10 @@ public override bool Execute()
                     if (reporter == null)
                         throw new Exception($"Specified output format '{format}' is not supported");
 
-                    var report = _filename + "." + reporter.Extension;
+                    var filename = Path.GetFileName(_output);
+                    filename = (filename == string.Empty) ? $"coverage.{reporter.Extension}" : filename;
+
+                    var report = Path.Combine(directory, filename);
                     Console.WriteLine($"  Generating report '{report}'");
                     File.WriteAllText(report, reporter.Report(result));
                 }

src/coverlet.msbuild/coverlet.msbuild.props

@@ -1,15 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
   <PropertyGroup>
+    <CollectCoverage Condition="$(CollectCoverage) == ''">false</CollectCoverage>
     <CoverletOutputFormat Condition="$(CoverletOutputFormat) == ''">json</CoverletOutputFormat>
-    <CoverletOutputDirectory Condition="$(CoverletOutputDirectory) == ''">$(MSBuildProjectDirectory)</CoverletOutputDirectory>
-    <CoverletOutputName Condition=" '$(CoverletOutputName)' == '' ">coverage</CoverletOutputName>
-    <CoverletOutput>$([MSBuild]::EnsureTrailingSlash('$(CoverletOutputDirectory)'))$(CoverletOutputName)</CoverletOutput>
+    <CoverletOutput Condition="$(CoverletOutput) == ''">$([MSBuild]::EnsureTrailingSlash('$(MSBuildProjectDirectory)'))</CoverletOutput>
     <Exclude Condition="$(Exclude) == ''"></Exclude>
     <ExcludeByFile Condition="$(ExcludeByFile) == ''"></ExcludeByFile>
     <Threshold Condition="$(Threshold) == ''">0</Threshold>
     <ThresholdType Condition="$(ThresholdType) == ''">line,branch,method</ThresholdType>
-    <CollectCoverage Condition="$(CollectCoverage) == ''">false</CollectCoverage>
   </PropertyGroup>
-
 </Project>