Skip to content

Commit cceb71d

Browse files
BertkBertk
authored
coverlet.msbuild.tasks unit tests (#1534)
* add CoverletCoverageCollector.cs * add .runsettings * update build pipeline * remove Console.WriteLine * enable coverage report * remove .runsettings * use MSBuildLogger * remove BaseTask class name * add message "Generating report ..." * update changelog.md * remove condition variable EnableCoverage * update assert statements * fix build pipeline * remove IConsole from serviceCollection * use _logger instead of Log
1 parent 89f2f3e commit cceb71d

23 files changed

+106123
-624
lines changed

‎Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<IncludeSymbols>true</IncludeSymbols>
1010
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1111
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
12-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
1312
<AnalysisLevel>preview</AnalysisLevel>
13+
<CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
1414
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1515
<LangVersion>preview</LangVersion>
1616
<NoWarn>$(NoWarn);NU5105;CS1591</NoWarn>
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<PropertyGroup>
34-
<VSTestResultsDirectory>$(RepoRoot)/artifacts/tests</VSTestResultsDirectory>
34+
<VSTestResultsDirectory>$(RepoRoot)artifacts/tests</VSTestResultsDirectory>
3535
<VSTestLogger>@(VSTestLogger)</VSTestLogger>
3636
</PropertyGroup>
3737

‎Directory.Packages.props

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
9-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
8+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
9+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
1313
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
1414
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0"/>
15+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.5.0"/>
16+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
1517
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
1618
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
1719
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
@@ -54,9 +56,9 @@
5456
-->
5557
<PackageVersion Include="Tmds.ExecFunction" Version="0.6.0" />
5658
<PackageVersion Include="xunit" Version="2.5.0" />
59+
<PackageVersion Include="xunit.assemblyfixture" Version="2.2.0" />
5760
<PackageVersion Include="xunit.assert" Version="2.5.0" />
5861
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0"/>
59-
60-
62+
<PackageVersion Include="envdte" Version="17.7.37355" />
6163
</ItemGroup>
6264
</Project>

‎Documentation/Changelog.md

+125-123
Large diffs are not rendered by default.

‎coverlet.sln

+6-5
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.tests.projectsampl
7272
{6ACF69B1-C01F-44A4-8F8E-2501884238D4} = {6ACF69B1-C01F-44A4-8F8E-2501884238D4}
7373
EndProjectSection
7474
EndProject
75-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.msbuild.tasks.tests", "test\coverlet.msbuild.tasks.tests\coverlet.msbuild.tasks.tests.csproj", "{3ABC2066-D1C5-4CAA-8867-9C5DC777CBF8}"
75+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.msbuild.tasks.tests", "test\coverlet.msbuild.tasks.tests\coverlet.msbuild.tasks.tests.csproj", "{351A034E-E642-4DB9-A21D-F71C8151C243}"
7676
EndProject
7777
Global
7878
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -164,10 +164,10 @@ Global
164164
{F508CCDD-5BC8-4AB6-97B3-D37498813C41}.Debug|Any CPU.Build.0 = Debug|Any CPU
165165
{F508CCDD-5BC8-4AB6-97B3-D37498813C41}.Release|Any CPU.ActiveCfg = Release|Any CPU
166166
{F508CCDD-5BC8-4AB6-97B3-D37498813C41}.Release|Any CPU.Build.0 = Release|Any CPU
167-
{3ABC2066-D1C5-4CAA-8867-9C5DC777CBF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
168-
{3ABC2066-D1C5-4CAA-8867-9C5DC777CBF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
169-
{3ABC2066-D1C5-4CAA-8867-9C5DC777CBF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
170-
{3ABC2066-D1C5-4CAA-8867-9C5DC777CBF8}.Release|Any CPU.Build.0 = Release|Any CPU
167+
{351A034E-E642-4DB9-A21D-F71C8151C243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
168+
{351A034E-E642-4DB9-A21D-F71C8151C243}.Debug|Any CPU.Build.0 = Debug|Any CPU
169+
{351A034E-E642-4DB9-A21D-F71C8151C243}.Release|Any CPU.ActiveCfg = Release|Any CPU
170+
{351A034E-E642-4DB9-A21D-F71C8151C243}.Release|Any CPU.Build.0 = Release|Any CPU
171171
EndGlobalSection
172172
GlobalSection(SolutionProperties) = preSolution
173173
HideSolutionNode = FALSE
@@ -195,6 +195,7 @@ Global
195195
{988A5FF0-4326-4F5B-9F05-CB165543A555} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
196196
{6ACF69B1-C01F-44A4-8F8E-2501884238D4} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
197197
{F508CCDD-5BC8-4AB6-97B3-D37498813C41} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
198+
{351A034E-E642-4DB9-A21D-F71C8151C243} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
198199
EndGlobalSection
199200
GlobalSection(ExtensibilityGlobals) = postSolution
200201
SolutionGuid = {9CA57C02-97B0-4C38-A027-EA61E8741F10}

‎eng/azure-pipelines-nightly.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ pool:
44
steps:
55
- task: UseDotNet@2
66
inputs:
7-
version: 6.0.413
8-
displayName: Install .NET Core SDK 6.0.413
7+
version: 6.0.415
8+
displayName: Install .NET Core SDK 6.0.415
99

1010
- task: UseDotNet@2
1111
inputs:
12-
version: 7.0.400
13-
displayName: Install .NET Core SDK 7.0.400
12+
version: 7.0.402
13+
displayName: Install .NET Core SDK 7.0.402
1414

1515
- task: NuGetAuthenticate@0
1616
displayName: Authenticate with NuGet feeds

‎eng/azure-pipelines.yml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ trigger:
44
paths:
55
exclude: [".github", "Documentation", "*.md"]
66

7+
variables:
8+
system.debug: false
9+
710
jobs:
811
- job: Windows
912
displayName: Windows

‎eng/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
steps:
22
- task: UseDotNet@2
33
inputs:
4-
version: 6.0.413
5-
displayName: Install .NET Core SDK 6.0.413
4+
version: 6.0.415
5+
displayName: Install .NET Core SDK 6.0.415
66

77
- task: UseDotNet@2
88
inputs:
9-
version: 7.0.400
10-
displayName: Install .NET Core SDK 7.0.400
9+
version: 7.0.402
10+
displayName: Install .NET Core SDK 7.0.402
1111

1212
- script: dotnet restore
1313
displayName: Restore packages
@@ -19,7 +19,7 @@ steps:
1919
displayName: Pack
2020

2121
- task: DotNetCoreCLI@2
22-
displayName: Run tests
22+
displayName: Run tests with coverage
2323
inputs:
2424
command: test
2525
arguments: -c $(BuildConfiguration) --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Include="[coverlet.collector]*%2c[coverlet.core]*%2c[coverlet.msbuild.tasks]*" /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.xunit.extensions]*"

‎eng/publish-coverlet-result-files.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ steps:
1919

2020
- task: CopyFiles@2
2121
displayName: Copy trx files
22+
condition: always()
2223
inputs:
2324
SourceFolder: '$(Agent.TempDirectory)'
2425
Contents: '**/*.trx'

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.400"
3+
"version": "7.0.402"
44
}
55
}

‎src/coverlet.core/Exceptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Coverlet.Core.Exceptions
77
{
88
[Serializable]
9-
internal class CoverletException : Exception
9+
public class CoverletException : Exception
1010
{
1111
public CoverletException() { }
1212
public CoverletException(string message) : base(message) { }

‎src/coverlet.msbuild.tasks/BaseTask.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ namespace Coverlet.MSbuild.Tasks
88
{
99
public abstract class BaseTask : Task
1010
{
11-
protected static IServiceProvider ServiceProvider { get; set; }
11+
public static IServiceProvider ServiceProvider { get; protected internal set; }
1212
}
1313
}

0 commit comments

Comments
 (0)