Skip to content

Commit 9dc2408

Browse files
committed
define nuget package versions only in Directory.Packages.props
1 parent 009b7ac commit 9dc2408

File tree

3 files changed

+12
-45
lines changed

3 files changed

+12
-45
lines changed

Directory.Build.props

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -48,35 +48,4 @@
4848
<VSTestLogger>@(VSTestLogger)</VSTestLogger>
4949
</PropertyGroup>
5050

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

Directory.Packages.props

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
99
</ItemGroup>
1010
<PropertyGroup>
11-
<MicrosoftBuildVersion>17.13.9</MicrosoftBuildVersion>
11+
<MicrosoftBuildUtilitiesCorePackageVersion>17.11.31</MicrosoftBuildUtilitiesCorePackageVersion>
12+
<MicrosoftBuildVersion>17.13.26</MicrosoftBuildVersion>
1213
<MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
1314
<!-- Test Platform, .NET Test SDK and Object Model -->
1415
<MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
15-
<NugetPackageVersion>6.13.2</NugetPackageVersion>
16+
<NugetPackageVersion>6.14.0</NugetPackageVersion>
1617
<XunitV3Version>2.0.0</XunitV3Version>
1718
<XunitRunnerVisualstudioVersion>3.1.0</XunitRunnerVisualstudioVersion>
1819
</PropertyGroup>
@@ -53,11 +54,12 @@
5354
<PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
5455
<PackageVersion Include="xunit.v3" Version="$(XunitV3Version)" />
5556
<PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)" />
56-
<PackageVersion Include="System.Buffers" Version="4.6.0" />
57+
<PackageVersion Include="System.Buffers" Version="4.6.1" />
5758
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
5859
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
60+
<PackageVersion Include="System.Diagnostics.EventLog" Version="8.0.2" />
5961
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
60-
<PackageVersion Include="System.Memory" Version="4.6.0" />
62+
<PackageVersion Include="System.Memory" Version="4.6.3" />
6163
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
6264
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
6365
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />

src/coverlet.core/coverlet.core.csproj

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,20 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
12-
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
1311
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
12+
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
1413
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
1514
<PackageReference Include="Mono.Cecil" />
1615
<PackageReference Include="NuGet.Versioning" />
1716
<PackageReference Include="System.Text.Json" />
18-
<PackageReference Include="System.Threading.Tasks.Extensions" />
1917
</ItemGroup>
2018

21-
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
22-
<PackageReference Include="System.Reflection.Metadata" />
19+
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' ">
20+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
2321
<PackageReference Include="System.Collections.Immutable" />
24-
</ItemGroup>
25-
26-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
27-
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
28-
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutableVersion)" />
22+
<PackageReference Include="System.Memory" />
23+
<PackageReference Include="System.Reflection.Metadata" />
24+
<PackageReference Include="System.Threading.Tasks.Extensions" />
2925
</ItemGroup>
3026

3127
</Project>

0 commit comments

Comments
 (0)