Skip to content

Commit 3b0f6e1

Browse files
committed
Merge remote-tracking branch 'DotNetAnalyzers/stabilization'
2 parents bc94339 + 9bc308e commit 3b0f6e1

5 files changed

Lines changed: 60 additions & 49 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/DiagnosticVerifier.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected Task VerifyCSharpDiagnosticAsync(string source, DiagnosticResult expec
9494
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
9595
protected Task VerifyCSharpDiagnosticAsync(string source, DiagnosticResult[] expected, CancellationToken cancellationToken, string filename = null)
9696
{
97-
return this.VerifyDiagnosticsAsync(new[] { source }, LanguageNames.CSharp, this.GetCSharpDiagnosticAnalyzers().ToImmutableArray(), expected, cancellationToken, new[] { filename });
97+
return this.VerifyDiagnosticsAsync(new[] { source }, LanguageNames.CSharp, this.GetCSharpDiagnosticAnalyzers().ToImmutableArray(), expected, cancellationToken, filename != null ? new[] { filename } : null);
9898
}
9999

100100
/// <summary>

StyleCopAnalyzers.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{A0840AD0
2727
build\build.ps1 = build\build.ps1
2828
build\check-key.ps1 = build\check-key.ps1
2929
build\keys.ps1 = build\keys.ps1
30+
build\opencover-report.ps1 = build\opencover-report.ps1
3031
build\push.ps1 = build\push.ps1
3132
build\version.ps1 = build\version.ps1
3233
EndProjectSection

build/build.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ If (-not (Test-Path $nuget)) {
4747

4848
# build the main project
4949
$msbuild = "${env:ProgramFiles(x86)}\MSBuild\$VisualStudioVersion\Bin\MSBuild.exe"
50+
If (-not (Test-Path $msbuild)) {
51+
$host.UI.WriteErrorLine("Couldn't find MSBuild.exe")
52+
exit 1
53+
}
5054

5155
# Attempt to restore packages up to 3 times, to improve resiliency to connection timeouts and access denied errors.
5256
$maxAttempts = 3

build/opencover-report.ps1

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
param (
2+
[switch]$Debug
3+
)
4+
5+
# Run a build to ensure everything is up-to-date
6+
If ($Debug) {
7+
.\build.ps1 -Debug -Incremental
8+
} Else {
9+
.\build.ps1 -Incremental
10+
}
11+
12+
If (-not $?) {
13+
$host.UI.WriteErrorLine('Build failed; coverage analysis aborted.')
14+
Exit $LASTEXITCODE
15+
}
16+
17+
If ($Debug) {
18+
$Configuration = 'Debug'
19+
} Else {
20+
$Configuration = 'Release'
21+
}
22+
23+
$packageConfig = [xml](Get-Content ..\.nuget\packages.config)
24+
$opencover_version = $packageConfig.SelectSingleNode('/packages/package[@id="OpenCover"]').version
25+
$reportgenerator_version = $packageConfig.SelectSingleNode('/packages/package[@id="ReportGenerator"]').version
26+
$xunitrunner_version = $packageConfig.SelectSingleNode('/packages/package[@id="xunit.runner.console"]').version
27+
28+
$packages_folder = '..\packages'
29+
$opencover_console = "$packages_folder\OpenCover.$opencover_version\tools\OpenCover.Console.exe"
30+
$xunit_runner_console = "$packages_folder\xunit.runner.console.$xunitrunner_version\tools\xunit.console.x86.exe"
31+
$report_generator = "$packages_folder\ReportGenerator.$reportgenerator_version\tools\ReportGenerator.exe"
32+
$report_folder = '.\OpenCover.Reports'
33+
$target_dll = "..\StyleCop.Analyzers\StyleCop.Analyzers.Test\bin\$Configuration\StyleCop.Analyzers.Test.dll"
34+
35+
If (Test-Path $report_folder) {
36+
Remove-Item -Recurse -Force $report_folder
37+
}
38+
39+
mkdir $report_folder | Out-Null
40+
41+
&$opencover_console `
42+
-register:user `
43+
-threshold:1 `
44+
-returntargetcode `
45+
-hideskipped:All `
46+
-filter:"+[StyleCop*]*" `
47+
-excludebyattribute:*.ExcludeFromCodeCoverage* `
48+
-output:"$report_folder\OpenCover.StyleCopAnalyzers.xml" `
49+
-target:"$xunit_runner_console" `
50+
-targetargs:"$target_dll -noshadow"
51+
52+
&$report_generator -targetdir:$report_folder -reports:$report_folder\OpenCover.*.xml
53+
54+
$host.UI.WriteLine("Open $report_folder\index.htm to see code coverage results.")

opencover-report.bat

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)