Skip to content

Commit cbe4644

Browse files
BertkdaveMueller
Bertk
and
daveMueller
authored
use .NET SDK 8.0 for tests (#1559)
* initial commit (rebase) * use net8.0 for tests * update integration tests * update Microsoft.CodeAnalysis.CSharp version * detect runtime patch version * create coverlet.msbuild.tasks with netstandard2.0 and net6.0 .NET framework target * fix deterministic build and tests * eliminate redundant log files * disable msbuild node reuse * restructure coverlet.msbuild nuget package https://learn.microsoft.com/en-us/nuget/concepts/msbuild-props-and-targets#projects-consuming-packages-with-build-files * dotnet format whitespace * coverlet.core use multitarget "netstandard2.0;net6.0" * activate `LogInformation($"_mapping file name: '{_mappingFileName}'", true);` * update .gitignore * remove empty file --------- Co-authored-by: David Müller <muellerdavid4@gmail.com>
1 parent 71c202b commit cbe4644

File tree

96 files changed

+910
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+910
-447
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-reportgenerator-globaltool": {
6-
"version": "5.1.26",
6+
"version": "5.2.0",
77
"commands": [
88
"reportgenerator"
99
]

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ charset = utf-8-bom
5555
dotnet_sort_system_directives_first = true
5656
## IDE0005: Using directive is unnecessary.
5757
dotnet_diagnostic.IDE0005.severity = warning
58+
## IDE0007 use 'var' instead of explicit type
59+
dotnet_diagnostic.IDE0007.severity = none
5860
# License header
5961
file_header_template = Copyright (c) Toni Solarin-Sodara\nLicensed under the MIT license. See LICENSE file in the project root for full license information.
6062
## IDE0073: The file header is missing or not located at the top of the file

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,11 @@ DeterministicTest.props
305305
test/coverlet.integration.determisticbuild/*.txt
306306
test/coverlet.integration.determisticbuild/runsettings
307307

308+
coverage.xml
308309
coverage.cobertura.xml
309310
coverage.opencover.xml
311+
coverage.*.xml
310312
coverage.*.cobertura.xml
311313
coverage.*.opencover.xml
314+
315+
FolderProfile.pubxml

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Contributions are highly welcome, however, except for very small changes, kindly
44

55
## Requirements
66

7-
.NET SDK 2.2 https://dotnet.microsoft.com/download/dotnet-core/2.2
8-
.NET SDK 3.1 https://dotnet.microsoft.com/download/dotnet-core/3.1
7+
[.NET SDK 6.0](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
8+
[.NET SDK 7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
9+
[.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
910

1011
## Building the Project
1112

‎Directory.Build.props‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,30 @@
22
<Project>
33
<PropertyGroup>
44
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
5+
<!-- enforce CamelCase case string-->
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\Packages\</PackageOutputPath>
7+
<!-- SourceLink Setup -->
78
<PublishRepositoryUrl>true</PublishRepositoryUrl>
89
<EmbedUntrackedSources>true</EmbedUntrackedSources>
910
<IncludeSymbols>true</IncludeSymbols>
1011
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
12+
<!-- Build properties -->
1113
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
1214
<AnalysisLevel>preview</AnalysisLevel>
1315
<CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
1416
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1517
<LangVersion>preview</LangVersion>
16-
<NoWarn>$(NoWarn);NU5105;CS1591</NoWarn>
18+
<NoWarn>$(NoWarn);NU1507;NU5105;CS1591</NoWarn>
1719
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1820
<RestoreSources>
1921
https://api.nuget.org/v3/index.json;
2022
</RestoreSources>
23+
<!--<UsingMicrosoftArtifactsSdk>true</UsingMicrosoftArtifactsSdk>-->
24+
<!-- https://learn.microsoft.com/en-us/dotnet/core/sdk/artifacts-output -->
25+
<!-- C:\Program Files\dotnet\sdk\8.0.100\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.DefaultOutputPaths.targets -->
26+
<UseArtifactsOutput>true</UseArtifactsOutput>
27+
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
28+
<CoverletVersion Condition="'$(CoverletVersion)'==''">6.0.0</CoverletVersion>
2129
</PropertyGroup>
2230

2331
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
@@ -31,7 +39,7 @@
3139
</ItemGroup>
3240

3341
<PropertyGroup>
34-
<VSTestResultsDirectory>$(RepoRoot)artifacts/tests</VSTestResultsDirectory>
42+
<VSTestResultsDirectory>$(RepoRoot)artifacts/testresults/$(Configuration.ToLowerInvariant())</VSTestResultsDirectory>
3543
<VSTestLogger>@(VSTestLogger)</VSTestLogger>
3644
</PropertyGroup>
3745

@@ -42,9 +50,9 @@
4250
-->
4351
<!-- VSTest dependency versions -->
4452
<!-- https://github.com/microsoft/vstest/blob/fde8bf79d3f0f80e3548f873a56ffb4100c0ae49/eng/Versions.props#L22C1-L54C2 -->
53+
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
4554
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
4655
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
47-
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
4856
</PropertyGroup>
4957

5058
</Project>

‎Directory.Packages.props‎

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
7+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
88
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
12-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0" />
13-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.5.0" />
14-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
15-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
16-
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
17-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
18-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
11+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
12+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
13+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.3" />
14+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
16+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
1919
<!--For test TestInstrument_NetstandardAwareAssemblyResolver_PreserveCompilationContext-->
20-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
21-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
22-
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.5.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
21+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
22+
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" />
2323
<!-- Microsoft.TestPlatform.ObjectModel has a dependency to NuGet.Frameworks with specific version -->
2424
<!-- https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L35-->
2525
<!-- wrong configuration will create "build\coverlet.msbuild.targets(72,5): error : Unable to read beyond the end of the stream." -->
@@ -29,40 +29,32 @@
2929
vstest 17.8 version
3030
NuGetFrameworksVersion is defined here https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/eng/Versions.props#L94C1-L94C1
3131
-->
32-
<PackageVersion Include="NuGet.Frameworks" Version="6.6.1" />
33-
<PackageVersion Include="NuGet.Packaging" Version="6.5.0" />
32+
<PackageVersion Include="NuGet.Frameworks" Version="6.8.0" />
33+
<PackageVersion Include="NuGet.Packaging" Version="6.8.0" />
34+
<PackageVersion Include="NuGet.Versioning" Version="6.8.0" />
3435
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
3536
<PackageVersion Include="Moq" Version="4.20.69" />
36-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
37-
<PackageVersion Include="ReportGenerator.Core" Version="5.1.26" />
37+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
38+
<PackageVersion Include="ReportGenerator.Core" Version="5.2.0" />
3839
<!--For test issue 809 https://github.com/coverlet-coverage/coverlet/issues/809-->
3940
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="7.1.4" />
4041
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
4142
<!--To test issue 1104 https://github.com/coverlet-coverage/coverlet/issues/1104-->
42-
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
43+
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
44+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
4345
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
44-
<!--
45-
Do not change System.Reflection.Metadata version since we need to support VSTest DataCollectors. Goto https://www.nuget.org/packages/System.Reflection.Metadata to check versions.
46-
We need to load assembly version 1.6.0 to properly work
47-
We can check minimum supported package version here https://github.com/Microsoft/vstest/blob/master/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L34
48-
-->
49-
<PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" />
50-
<PackageVersion Include="System.Text.Json" Version="7.0.3" />
51-
<!-- Coverlet.Core.Tests executed in Visual Studio will fail with Tmds.ExecFunction version > 0.4.0 => use "dotnet test"
52-
System.TypeInitializationException : The type initializer for 'Tmds.Utils.ExecFunction' threw an exception.
53-
System.NotSupportedException : Application is running as testhost, unable to determine parent 'dotnet' process.
54-
-->
46+
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
47+
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
5548
<PackageVersion Include="Tmds.ExecFunction" Version="0.6.0" />
56-
<PackageVersion Include="xunit" Version="2.5.3" />
49+
<PackageVersion Include="xunit" Version="2.6.2" />
5750
<PackageVersion Include="xunit.assemblyfixture" Version="2.2.0" />
58-
<PackageVersion Include="xunit.assert" Version="2.5.3" />
59-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
60-
<PackageVersion Include="envdte" Version="17.7.37355" />
51+
<PackageVersion Include="xunit.assert" Version="2.6.2" />
52+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
6153
<PackageVersion Include="System.Buffers" Version="4.5.1" />
6254
<PackageVersion Include="System.Memory" Version="4.5.5" />
6355
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
6456
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
65-
<PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
57+
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
6658
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
6759
</ItemGroup>
68-
</Project>
60+
</Project>

‎Documentation/DeterministicBuild.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Finally, thanks to deterministic CI builds (with the `ContinuousIntegrationBuild
1212

1313
## Deterministic report
1414

15-
Coverlet supports also deterministic reports(for now only for cobertura coverage format).
15+
Coverlet supports also deterministic reports(for now only for __Cobertura__ coverage format).
1616
If you include `DeterministicReport` parameters for `msbuild` and `collectors` integrations resulting report will be like:
1717

1818
```xml

‎Documentation/Examples/MSBuild/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
11-
<PackageReference Include="xunit" Version="2.5.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
11+
<PackageReference Include="xunit" Version="2.6.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
1313
<PackageReference Include="coverlet.msbuild" Version="ADD VERSION FROM bin\Debug\Packages generated running 'dotnet pack' from repo root" >
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/XUnitTestProject1.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
15-
<PackageReference Include="xunit" Version="2.5.0" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
15+
<PackageReference Include="xunit" Version="2.6.2" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/XUnitTestProject2.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
15-
<PackageReference Include="xunit" Version="2.5.0" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
15+
<PackageReference Include="xunit" Version="2.6.2" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)