Skip to content

Commit bd902a0

Browse files
committed
remove altcover
all this stuff is inlined and can't generate sane coverage reports
1 parent 3175ac9 commit bd902a0

File tree

6 files changed

+5
-64
lines changed

6 files changed

+5
-64
lines changed

.config/dotnet-tools.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
"version": 1,
33
"isRoot": true,
44
"tools": {
5-
"dotnet-reportgenerator-globaltool": {
6-
"version": "4.8.13",
7-
"commands": [
8-
"reportgenerator"
9-
]
10-
},
115
"paket": {
126
"version": "8.0.3",
137
"commands": [

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Authors>TheAngryByrd</Authors>
99
<RepositoryUrl>https://github.com/TheAngryByrd/IcedTasks</RepositoryUrl>
1010
<!-- owners is not supported in MSBuild -->
11-
<OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelIlxGen --test:ParallelOptimization</OtherFlags>
11+
<OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelIlxGen --test:ParallelOptimization </OtherFlags>
1212
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1313
</PropertyGroup>
1414
</Project>

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,6 @@ or
291291
- `CONFIGURATION=Debug ./build.sh` will result in `-c` additions to commands such as in `dotnet build -c Debug`
292292
- `GITHUB_TOKEN` will be used to upload release notes and Nuget packages to GitHub.
293293
- Be sure to set this before releasing
294-
- `DISABLE_COVERAGE` Will disable running code coverage metrics. AltCover can have [severe performance degradation](https://github.com/SteveGilham/altcover/issues/57) so it's worth disabling when looking to do a quicker feedback loop.
295-
- `DISABLE_COVERAGE=1 ./build.sh`
296-
297294
---
298295

299296
### Building

build/build.fs

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@ let distGlob =
6161
distDir
6262
</> "*.nupkg"
6363

64-
let coverageThresholdPercent = 80
65-
66-
let coverageReportDir =
67-
rootDirectory
68-
</> "docs"
69-
</> "coverage"
70-
7164
let docsDir =
7265
rootDirectory
7366
</> "docs"
@@ -122,8 +115,6 @@ let publishUrl = "https://www.nuget.org"
122115

123116
let docsSiteBaseUrl = sprintf "https://%s.github.io/%s" gitOwner gitRepoName
124117

125-
let disableCodeCoverage = environVarAsBoolOrDefault "DISABLE_COVERAGE" true
126-
127118
let githubToken = Environment.environVarOrNone "GITHUB_TOKEN"
128119

129120
let nugetToken = Environment.environVarOrNone "NUGET_TOKEN"
@@ -293,7 +284,6 @@ let clean _ =
293284
"bin"
294285
"temp"
295286
distDir
296-
coverageReportDir
297287
]
298288
|> Shell.cleanDirs
299289

@@ -370,11 +360,6 @@ let fsharpAnalyzers _ =
370360
)
371361

372362
let dotnetTest ctx =
373-
let excludeCoverage =
374-
!!testsGlob
375-
|> Seq.map IO.Path.GetFileNameWithoutExtension
376-
|> String.concat "|"
377-
378363
DotNet.test
379364
(fun c ->
380365

@@ -385,42 +370,10 @@ let dotnetTest ctx =
385370
MSBuildParams = {
386371
c.MSBuildParams with
387372
MaxCpuCount = maxCpuCount.Value
388-
Properties = [
389-
"AltCover", $"%b{not disableCodeCoverage}"
390-
// "AltCoverThreshold", $"%d{coverageThresholdPercent}"
391-
"AltCoverAssemblyExcludeFilter", excludeCoverage
392-
"AltCoverLocalSource", "true"
393-
]
394373
}
395374
})
396375
sln
397376

398-
let generateCoverageReport _ =
399-
let coverageReports =
400-
!! "tests/**/coverage*.xml"
401-
|> String.concat ";"
402-
403-
let sourceDirs =
404-
!!srcGlob
405-
|> Seq.map Path.getDirectory
406-
|> String.concat ";"
407-
408-
let independentArgs = [
409-
sprintf "-reports:\"%s\"" coverageReports
410-
sprintf "-targetdir:\"%s\"" coverageReportDir
411-
// Add source dir
412-
sprintf "-sourcedirs:\"%s\"" sourceDirs
413-
// Ignore Tests and if AltCover.Recorder.g sneaks in
414-
sprintf "-assemblyfilters:\"%s\"" "-*.Tests;-AltCover.Recorder.g"
415-
sprintf "-Reporttypes:%s" "Html"
416-
]
417-
418-
let args =
419-
independentArgs
420-
|> String.concat " "
421-
422-
dotnet.reportGenerator id args
423-
424377
let watchTests _ =
425378
!!testsGlob
426379
|> Seq.map (fun proj ->
@@ -673,7 +626,6 @@ let initTargets () =
673626
Target.create "DotnetBuild" dotnetBuild
674627
Target.create "FSharpAnalyzers" fsharpAnalyzers
675628
Target.create "DotnetTest" dotnetTest
676-
Target.create "GenerateCoverageReport" generateCoverageReport
677629
Target.create "WatchTests" watchTests
678630
Target.create "GenerateAssemblyInfo" generateAssemblyInfo
679631
Target.create "DotnetPack" dotnetPack

paket.dependencies

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ group Test
1818
nuget TimeProviderExtensions
1919
nuget YoloDev.Expecto.TestSdk >= 0.14.2
2020
nuget Microsoft.NET.Test.Sdk >= 17.7.2
21-
nuget altcover >= 8.6.68
2221
nuget FSharp.Control.TaskSeq
2322

2423
// [ FAKE GROUP ]

paket.lock

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,14 +361,13 @@ GROUP Test
361361
STORAGE: NONE
362362
NUGET
363363
remote: https://www.nuget.org/api/v2
364-
altcover (8.6.68)
365364
Expecto (10.1)
366365
FSharp.Core (>= 7.0.200) - restriction: >= net6.0
367366
Mono.Cecil (>= 0.11.4 < 1.0) - restriction: >= net6.0
368367
FSharp.Control.TaskSeq (0.3)
369368
FSharp.Core (>= 6.0.2) - restriction: >= netstandard2.1
370369
FSharp.Core (7.0.401) - restriction: >= netstandard2.1
371-
Microsoft.Bcl.AsyncInterfaces (7.0) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netstandard2.0)) (&& (>= net6.0) (< net8.0)) (&& (< net6.0) (>= netstandard2.0))
370+
Microsoft.Bcl.AsyncInterfaces (7.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
372371
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
373372
Microsoft.Bcl.TimeProvider (8.0)
374373
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
@@ -395,10 +394,10 @@ NUGET
395394
System.Reflection.Metadata (7.0.2) - restriction: >= netcoreapp3.1
396395
System.Collections.Immutable (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
397396
System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net6.0) (>= netstandard2.0))
398-
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= net6.0) (< netstandard1.0)) (&& (< monoandroid) (>= net6.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.1) (>= netcoreapp3.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard2.0)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (>= net6.0) (< netstandard2.0)) (&& (>= net45) (>= netcoreapp3.1) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (>= net461) (>= net6.0)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net461) (>= netstandard2.0)) (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net462) (>= netstandard2.0)) (&& (>= net6.0) (< net7.0)) (&& (>= net6.0) (< netcoreapp2.1) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (>= net6.0) (< netstandard1.0) (>= win8)) (&& (>= net6.0) (< netstandard2.0) (>= wpa81)) (&& (>= net6.0) (>= wp8)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinios)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinmac)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarintvos)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinwatchos)) (&& (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< netstandard1.1) (>= win8)) (&& (>= netcoreapp3.1) (< netstandard2.0) (>= wpa81)) (&& (>= netcoreapp3.1) (>= uap10.1)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (>= wp8))
399-
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netstandard2.0)) (&& (>= net6.0) (< netstandard2.1)) (&& (>= netstandard2.0) (< netstandard2.1))
397+
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (< netcoreapp2.1) (>= netcoreapp3.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard2.0)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (>= netcoreapp3.1) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net461) (>= netstandard2.0)) (>= net462) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinios)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinmac)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarintvos)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinwatchos)) (&& (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< netstandard1.1) (>= win8)) (&& (>= netcoreapp3.1) (< netstandard2.0) (>= wpa81)) (&& (>= netcoreapp3.1) (>= uap10.1)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (>= wp8))
398+
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
400399
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< win8)) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net461) (&& (< netstandard1.0) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= wp8)
401-
System.ValueTuple (4.5) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netstandard2.0))
400+
System.ValueTuple (4.5) - restriction: >= net462
402401
TimeProviderExtensions (1.0)
403402
Microsoft.Bcl.TimeProvider (>= 8.0) - restriction: || (&& (>= net6.0) (< net8.0)) (&& (< net6.0) (>= netstandard2.0))
404403
YoloDev.Expecto.TestSdk (0.14.2)

0 commit comments

Comments
 (0)