Skip to content

Commit ebedd70

Browse files
committed
rename Exclude property to ExcludeByFile
1 parent 9d09fde commit ebedd70

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
using System;
2-
using Coverlet.Core;
3-
using Microsoft.Build.Framework;
4-
using Microsoft.Build.Utilities;
5-
6-
namespace Coverlet.MSbuild.Tasks
7-
{
8-
public class InstrumentationTask : Task
9-
{
10-
private static Coverage _coverage;
11-
private string _path;
12-
private string _filter;
13-
private string _exclude;
14-
15-
internal static Coverage Coverage
16-
{
17-
get { return _coverage; }
18-
}
19-
20-
[Required]
21-
public string Path
22-
{
23-
get { return _path; }
24-
set { _path = value; }
25-
}
26-
27-
public string Filter
28-
{
29-
get { return _filter; }
30-
set { _filter = value; }
31-
}
32-
33-
public string Exclude
34-
{
35-
get { return _exclude; }
36-
set { _exclude = value; }
37-
}
38-
39-
public override bool Execute()
40-
{
41-
try
42-
{
43-
var excludes = _exclude?.Split(',');
44-
var filters = _filter?.Split(',');
45-
46-
_coverage = new Coverage(_path, Guid.NewGuid().ToString(), filters, excludes);
47-
_coverage.PrepareModules();
48-
}
49-
catch (Exception ex)
50-
{
51-
Log.LogErrorFromException(ex);
52-
return false;
53-
}
54-
55-
return true;
56-
}
57-
}
58-
}
1+
using System;
2+
using Coverlet.Core;
3+
using Microsoft.Build.Framework;
4+
using Microsoft.Build.Utilities;
5+
6+
namespace Coverlet.MSbuild.Tasks
7+
{
8+
public class InstrumentationTask : Task
9+
{
10+
private static Coverage _coverage;
11+
private string _path;
12+
private string _filter;
13+
private string _excludeByFile;
14+
15+
internal static Coverage Coverage
16+
{
17+
get { return _coverage; }
18+
}
19+
20+
[Required]
21+
public string Path
22+
{
23+
get { return _path; }
24+
set { _path = value; }
25+
}
26+
27+
public string Filter
28+
{
29+
get { return _filter; }
30+
set { _filter = value; }
31+
}
32+
33+
public string ExcludeByFile
34+
{
35+
get { return _excludeByFile; }
36+
set { _excludeByFile = value; }
37+
}
38+
39+
public override bool Execute()
40+
{
41+
try
42+
{
43+
var excludes = _excludeByFile?.Split(',');
44+
var filters = _filter?.Split(',');
45+
46+
_coverage = new Coverage(_path, Guid.NewGuid().ToString(), filters, excludes);
47+
_coverage.PrepareModules();
48+
}
49+
catch (Exception ex)
50+
{
51+
Log.LogErrorFromException(ex);
52+
return false;
53+
}
54+
55+
return true;
56+
}
57+
}
58+
}

src/coverlet.msbuild/coverlet.msbuild.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<CoverletOutputName Condition=" '$(CoverletOutputName)' == '' ">coverage</CoverletOutputName>
77
<CoverletOutput>$([MSBuild]::EnsureTrailingSlash('$(CoverletOutputDirectory)'))$(CoverletOutputName)</CoverletOutput>
88
<Filter Condition="$(Filter) == ''"></Filter>
9-
<Exclude Condition="$(Exclude) == ''"></Exclude>
9+
<ExcludeByFile Condition="$(ExcludeByFile) == ''"></ExcludeByFile>
1010
<Threshold Condition="$(Threshold) == ''">0</Threshold>
1111
<ThresholdType Condition="$(ThresholdType) == ''">line,branch,method</ThresholdType>
1212
<CollectCoverage Condition="$(CollectCoverage) == ''">false</CollectCoverage>
1313
</PropertyGroup>
1414

15-
</Project>
15+
</Project>

src/coverlet.msbuild/coverlet.msbuild.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<Target Name="InstrumentModulesNoBuild" BeforeTargets="VSTest">
77
<Coverlet.MSbuild.Tasks.InstrumentationTask
88
Condition="'$(VSTestNoBuild)' == 'true' and $(CollectCoverage) == 'true'"
9-
Exclude="$(Exclude)"
9+
ExcludeByFile="$(ExcludeByFile)"
1010
Path="$(TargetPath)" />
1111
</Target>
1212

1313
<Target Name="InstrumentModulesAfterBuild" AfterTargets="BuildProject">
1414
<Coverlet.MSbuild.Tasks.InstrumentationTask
1515
Condition="'$(VSTestNoBuild)' != 'true' and $(CollectCoverage) == 'true'"
1616
Filter="$(Filter)"
17-
Exclude="$(Exclude)"
17+
ExcludeByFile="$(ExcludeByFile)"
1818
Path="$(TargetPath)" />
1919
</Target>
2020

0 commit comments

Comments
 (0)