Skip to content

Commit 734801e

Browse files
committed
run integration test for net8.0 and net9.0
1 parent 003bfdb commit 734801e

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
99
</ItemGroup>
1010
<PropertyGroup>
11-
<MicrosoftBuildVersion>17.13.9</MicrosoftBuildVersion>
12-
<MicrosoftCodeAnalysisVersion>4.12.0</MicrosoftCodeAnalysisVersion>
11+
<MicrosoftBuildVersion>17.11.4</MicrosoftBuildVersion>
12+
<MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
1313
<!-- Test Platform, .NET Test SDK and Object Model -->
1414
<MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
1515
<NugetPackageVersion>6.13.2</NugetPackageVersion>
@@ -21,7 +21,7 @@
2121
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
2222
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
2323
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
24-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
24+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.9.1" />
2525
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
2626
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
2727
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
@@ -65,6 +65,6 @@
6565
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
6666
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
6767
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
68-
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
68+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.2" />
6969
</ItemGroup>
7070
</Project>

eng/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ steps:
3434
dotnet test test/coverlet.core.coverage.tests/coverlet.core.coverage.tests.csproj -c $(BuildConfiguration) --no-build -bl:test.core.coverage.binlog /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.projectsample]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" -- --results-directory "$(Build.SourcesDirectory)/artifacts/Reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.core.coverage.tests.trx" --diagnostic --diagnostic-output-directory "$(Build.SourcesDirectory)/artifacts/log/$(buildConfiguration)" --diagnostic-output-fileprefix "coverlet.core.coverage.tests"
3535
dotnet test test/coverlet.msbuild.tasks.tests/coverlet.msbuild.tasks.tests.csproj -c $(BuildConfiguration) --no-build -bl:test.msbuild.binlog --results-directory:"$(Build.SourcesDirectory)\artifacts\Reports" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.xunit.extensions]*%2c[coverlet.tests.projectsample]*%2c[testgen_]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" --diag:"$(Build.SourcesDirectory)\artifacts\log\$(buildConfiguration)\coverlet.msbuild.test.diag.log;tracelevel=verbose"
3636
dotnet test test/coverlet.collector.tests/coverlet.collector.tests.csproj -c $(BuildConfiguration) --no-build -bl:test.collector.binlog /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.projectsample]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" --diag:"$(Build.SourcesDirectory)/artifacts/log/$(buildConfiguration)/coverlet.collector.test.diag.log;tracelevel=verbose"
37-
dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -c $(BuildConfiguration) --no-build -bl:test.integration.binlog -- --results-directory "$(Build.SourcesDirectory)/artifacts/Reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "$(Build.SourcesDirectory)/artifacts/log/$(buildConfiguration)" --diagnostic-output-fileprefix "coverlet.integration.tests"
37+
dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -c $(BuildConfiguration) -f net8.0 --no-build -bl:test.integration.binlog -- --results-directory "$(Build.SourcesDirectory)/artifacts/Reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "$(Build.SourcesDirectory)/artifacts/log/$(buildConfiguration)" --diagnostic-output-fileprefix "coverlet.integration.tests"
38+
dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -c $(BuildConfiguration) -f net9.0 --no-build -bl:test.integration.binlog -- --results-directory "$(Build.SourcesDirectory)/artifacts/Reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "$(Build.SourcesDirectory)/artifacts/log/$(buildConfiguration)" --diagnostic-output-fileprefix "coverlet.integration.tests"
39+
3840
displayName: Run unit tests with coverage
3941
env:
4042
MSBUILDDISABLENODEREUSE: 1

src/coverlet.console/coverlet.console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>$(NetCurrent);$(NetMinimum)</TargetFrameworks>
5+
<TargetFrameworks>$(NetMinimum)</TargetFrameworks>
66
<ToolCommandName>coverlet</ToolCommandName>
77
<PackAsTool>true</PackAsTool>
88
<AssemblyTitle>coverlet.console</AssemblyTitle>

src/coverlet.core/coverlet.core.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>$(NetCurrent);$(NetMinimum);netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>$(NetMinimum);netstandard2.0</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<NoWarn>$(NoWarn);IDE0057</NoWarn>
88
</PropertyGroup>
@@ -15,6 +15,7 @@
1515
<PackageReference Include="Mono.Cecil" />
1616
<PackageReference Include="NuGet.Versioning" />
1717
<PackageReference Include="System.Text.Json" />
18+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
1819
</ItemGroup>
1920

2021
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">

src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>netstandard2.0;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;$(NetMinimum)</TargetFrameworks>
66
<AssemblyTitle>coverlet.msbuild.tasks</AssemblyTitle>
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
88
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>

test/coverlet.integration.determisticbuild/coverlet.integration.determisticbuild.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3131
</PackageReference>
32-
<!-- <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.5" /> -->
3332
</ItemGroup>
3433
</Project>

test/coverlet.integration.tests/coverlet.integration.tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFrameworks>$(NetCurrent);$(NetMinimum)</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
66
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>

test/coverlet.msbuild.tasks.tests/coverlet.msbuild.tasks.tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>$(NetMinimum);$(NetCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum)</TargetFrameworks>
55
<!-- This section should be enabled after using SDK 8.0.0 requirement (Microsoft.Bcl.AsyncInterfaces) -->
66
<OutputType>Exe</OutputType>
77
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
@@ -38,6 +38,7 @@
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
<PrivateAssets>all</PrivateAssets>
4040
</PackageReference>
41+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
4142
</ItemGroup>
4243

4344
<ItemGroup>

0 commit comments

Comments
 (0)