Skip to content

Commit c7e25b2

Browse files
BertkBertk
committed
Update SDK and Directory.Packages.props
1 parent afda748 commit c7e25b2

File tree

14 files changed

+50
-67
lines changed

14 files changed

+50
-67
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-reportgenerator-globaltool": {
6-
"version": "5.4.3",
6+
"version": "5.4.7",
77
"commands": [
88
"reportgenerator"
99
],
1010
"rollForward": false
1111
}
1212
}
13-
}
13+
}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,3 +318,4 @@ FolderProfile.pubxml
318318
/NuGet.config
319319
nuget.config
320320
*.dmp
321+
Playground*/

‎CONTRIBUTING.md

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

55
## Requirements
66

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)
7+
STS version [.NET SDK 9.0](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) for development environment
8+
9+
LTS version [.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) for runtime environment
1010

1111
## Building the Project
1212

‎Directory.Build.props

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,35 +51,4 @@
5151
<VSTestLogger>@(VSTestLogger)</VSTestLogger>
5252
</PropertyGroup>
5353

54-
<PropertyGroup>
55-
<!--
56-
Do not change versions since we need to support VSTest DataCollectors. We need to load assembly version 1.6.0 to properly work
57-
We can check minimum supported package version here https://github.com/Microsoft/vstest/blob/master/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L34
58-
-->
59-
<!-- VSTest dependency versions -->
60-
<!-- https://github.com/microsoft/vstest/blob/fde8bf79d3f0f80e3548f873a56ffb4100c0ae49/eng/Versions.props#L22C1-L54C2 -->
61-
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
62-
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
63-
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
64-
65-
<!-- some additional information about dependency management limitations for MSBuild tasks (coverlet.msbuild.tasks)
66-
- msBuild task with dependencies https://natemcmaster.com/blog/2017/11/11/msbuild-task-with-dependencies/
67-
- Aligning versions with MSBuild
68-
- If you need a dependency that is also used in MSBuild itself, you have to align with the version MSBuild uses.
69-
- This includes System.Reflection.Metadata, System.Collections.Immutable, NuGet, Newtonsoft.Json, and others.
70-
- See example: dependencies.props (https://github.com/aspnet/BuildTools/blob/1f3f14382764e06b7e691e5ee89d12a280249284/build/dependencies.props#L19-L29)"
71-
72-
.NET 8.0.3xx (MSBuild) core-sdk-tasks version details https://github.com/dotnet/installer/blob/release/8.0.3xx/src/core-sdk-tasks/core-sdk-tasks.csproj
73-
74-
ALIGN PACKAGE VERSIONS of coverlet.core with coverlet.collector (vstest) and coverlet.msbuild.tasks (.NET SDK MSBuild)
75-
76-
e.g. candidates for version conflicts:
77-
<MicrosoftBuildTaskVersion>15.7.179</MicrosoftBuildTaskVersion>
78-
<MicrosoftBuildTaskUtilitiesCoreVersion>15.7.179</MicrosoftBuildTaskUtilitiesCoreVersion>
79-
<NuGetBuildTasksPackageVersion>6.9.0-rc.86</NuGetBuildTasksPackageVersion>
80-
<MicrosoftBuildTaskSystemReflectionMetaData>1.4.2</MicrosoftBuildTaskSystemReflectionMetaData>
81-
<MicrosoftBuildTaskSystemCollectionImmutable>1.5.0</MicrosoftBuildTaskSystemCollectionImmutable> >= 1.3.1
82-
-->
83-
</PropertyGroup>
84-
8554
</Project>

‎Directory.Packages.props

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
87
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
98
</ItemGroup>
109
<PropertyGroup>
11-
<MicrosoftBuildVersion>17.11.4</MicrosoftBuildVersion>
10+
<MicrosoftBuildVersion>17.13.26</MicrosoftBuildVersion>
1211
<MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
12+
<NugetPackageVersion>6.14.0</NugetPackageVersion>
1313
<!-- Test Platform, .NET Test SDK and Object Model -->
1414
<MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
15-
<NugetPackageVersion>6.13.2</NugetPackageVersion>
1615
<XunitV3Version>2.0.0</XunitV3Version>
17-
<XunitRunnerVisualstudioVersion>3.0.2</XunitRunnerVisualstudioVersion>
18-
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
19-
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
20-
<MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
16+
<XunitRunnerVisualstudioVersion>3.1.0</XunitRunnerVisualstudioVersion>
2117
</PropertyGroup>
2218
<ItemGroup>
2319
<PackageVersion Include="DotNetConfig" Version="1.2.0" />
@@ -47,15 +43,17 @@
4743
<PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
4844
<PackageVersion Include="xunit.v3" Version="$(XunitV3Version)" />
4945
<PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)" />
50-
<PackageVersion Include="System.Buffers" Version="4.6.0" />
46+
<PackageVersion Include="System.Buffers" Version="4.6.1" />
5147
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
5248
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
49+
<PackageVersion Include="System.Diagnostics.EventLog" Version="8.0.2" />
5350
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
5451
<PackageVersion Include="System.Memory" Version="4.6.3" />
5552
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
5653
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
5754
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
58-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
55+
<PackageVersion Include="System.Security.AccessControl" Version="6.0.1" />
56+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
5957
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
6058
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
6159
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />

‎eng/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
steps:
22
- task: UseDotNet@2
33
inputs:
4-
version: 8.0.408
5-
displayName: Install .NET Core SDK 8.0.408
4+
version: 8.0.411
5+
displayName: Install .NET Core SDK 8.0.411
66

77
- task: UseDotNet@2
88
inputs:
99
useGlobalJson: true
10-
displayName: Install .NET Core SDK 9.0.203
10+
displayName: Install .NET Core SDK 9.0.301
1111

1212
# create artifact/package folder
1313
- pwsh: |
@@ -25,10 +25,10 @@ steps:
2525
displayName: Pack
2626

2727
- script: |
28-
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/coverlet.collector.tests.diag.$(buildConfiguration).log;tracelevel=verbose"
2928
dotnet test test/coverlet.core.tests/coverlet.core.tests.csproj -c $(BuildConfiguration) --no-build -bl:test.core.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/coverlet.core.tests.diag.$(buildConfiguration).log;tracelevel=verbose"
3029
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-verbosity debug --diagnostic --diagnostic-output-directory "$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)"
3130
dotnet test test/coverlet.msbuild.tasks.tests\coverlet.msbuild.tasks.tests.csproj -c $(BuildConfiguration) --no-build -bl:test.msbuild.tasks.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/coverlet.msbuild.tasks.tests.diag.$(buildConfiguration).log;tracelevel=verbose"
31+
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/coverlet.collector.tests.diag.$(buildConfiguration).log;tracelevel=verbose"
3232
dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -c $(BuildConfiguration) -f net8.0 --no-build -bl:test.integration.binlog --diag:"$(Build.SourcesDirectory)/artifacts/log/coverlet.integration.tests.diag.net8.0.$(buildConfiguration).log;tracelevel=verbose"
3333
dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -c $(BuildConfiguration) -f net9.0 --no-build -bl:test.integration.binlog --diag:"$(Build.SourcesDirectory)/artifacts/log/coverlet.integration.tests.diag.net9.0.$(buildConfiguration).log;tracelevel=verbose"
3434
displayName: Run unit tests with coverage

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "9.0.300"
3+
"version": "9.0.301"
44
}
55
}

‎src/coverlet.core/Instrumentation/CecilAssemblyResolver.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,10 @@ public RuntimeConfigurationReader(string runtimeConfigFile)
304304
using var configuration = JsonDocument.Parse(jsonString, documentOptions);
305305

306306
JsonElement rootElement = configuration.RootElement;
307-
JsonElement runtimeOptionsElement = rootElement.GetProperty("runtimeOptions");
307+
if (!rootElement.TryGetProperty("runtimeOptions", out JsonElement runtimeOptionsElement))
308+
{
309+
throw new InvalidOperationException($"The 'runtimeOptions' property is missing in the runtime configuration file {_runtimeConfigFile}.");
310+
}
308311

309312
if (runtimeOptionsElement.TryGetProperty("framework", out JsonElement frameworkElement))
310313
{

‎src/coverlet.core/coverlet.core.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
1211
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
12+
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
1314
<PackageReference Include="Mono.Cecil" />
1415
<PackageReference Include="NuGet.Versioning" />
1516
<PackageReference Include="System.Text.Json" />
1617
</ItemGroup>
1718

1819
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' ">
19-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="$(MicrosoftBclAsyncInterfacesVersion)" />
20-
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutableVersion)" />
21-
<PackageReference Include="System.Memory" VersionOverride="$(SystemMemoryVersion)" />
22-
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
20+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
21+
<PackageReference Include="System.Collections.Immutable" />
22+
<PackageReference Include="System.Memory" />
23+
<PackageReference Include="System.Reflection.Metadata" />
2324
<PackageReference Include="System.Threading.Tasks.Extensions" />
2425
</ItemGroup>
2526

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

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

4242
<ItemGroup>
4343
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
44-
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildUtilitiesCorePackageVersion)" PrivateAssets="all" ExcludeAssets="Runtime" />
44+
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildVersion)" PrivateAssets="all" ExcludeAssets="Runtime" />
4545
</ItemGroup>
4646

4747
<ItemGroup>

0 commit comments

Comments
 (0)