Skip to content

Commit eca5e8c

Browse files
committed
Update package versions to use property references
Refactor project files to replace hardcoded package version numbers with property references for improved maintainability. New properties added in `Directory.Packages.props` include `MicrosoftBuildVersion`, `MicrosoftCodeAnalysisVersion`, `MicrosoftNETTestSdkVersion`, `NugetPackageVersion`, `XunitV3Version`, and `XunitRunnerVisualstudioVersion`. Updated `PackageVersion` and `PackageReference` entries in relevant project files to utilize these properties, enhancing consistency and simplifying future version updates.
1 parent adf41b1 commit eca5e8c

File tree

4 files changed

+28
-23
lines changed

4 files changed

+28
-23
lines changed

Directory.Packages.props

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,29 @@
77
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
88
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
99
</ItemGroup>
10+
<PropertyGroup>
11+
<MicrosoftBuildVersion>17.13.9</MicrosoftBuildVersion>
12+
<MicrosoftCodeAnalysisVersion>4.12.0</MicrosoftCodeAnalysisVersion>
13+
<!-- Test Platform, .NET Test SDK and Object Model -->
14+
<MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
15+
<NugetPackageVersion>6.13.1</NugetPackageVersion>
16+
<XunitV3Version>1.1.0</XunitV3Version>
17+
<XunitRunnerVisualstudioVersion>3.0.2</XunitRunnerVisualstudioVersion>
18+
</PropertyGroup>
1019
<ItemGroup>
1120
<PackageVersion Include="DotNetConfig" Version="1.2.0" />
1221
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
13-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
14-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.12.6" />
22+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
23+
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
1524
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
16-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
25+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
1726
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
1827
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
1928
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
2029
<!--For test TestInstrument_NetstandardAwareAssemblyResolver_PreserveCompilationContext-->
2130
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
22-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
23-
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
31+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
32+
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkVersion)" />
2433
<!-- Microsoft.TestPlatform.ObjectModel has a dependency to NuGet.Frameworks with specific version -->
2534
<!-- https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L36-->
2635
<!-- wrong configuration will create "build\coverlet.msbuild.targets(72,5): error : Unable to read beyond the end of the stream." -->
@@ -31,9 +40,9 @@
3140
NuGetFrameworksVersion is defined here https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/eng/Versions.props#L94C1-L94C1
3241
-->
3342
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
34-
<PackageVersion Include="NuGet.Frameworks" Version="6.12.1" />
35-
<PackageVersion Include="NuGet.Packaging" Version="6.12.1" />
36-
<PackageVersion Include="NuGet.Versioning" Version="6.12.1" />
43+
<PackageVersion Include="NuGet.Frameworks" Version="$(NugetPackageVersion)" />
44+
<PackageVersion Include="NuGet.Packaging" Version="$(NugetPackageVersion)" />
45+
<PackageVersion Include="NuGet.Versioning" Version="$(NugetPackageVersion)" />
3746
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
3847
<PackageVersion Include="Moq" Version="4.20.72" />
3948
<PackageVersion Include="ReportGenerator.Core" Version="5.3.11" />
@@ -43,8 +52,8 @@
4352
<!--To test issue 1104 https://github.com/coverlet-coverage/coverlet/issues/1104-->
4453
<!-- latest Tmds.ExecFunction package uses EnvDTE V17.8.37221 -->
4554
<PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
46-
<PackageVersion Include="xunit.v3" Version="1.0.1" />
47-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
55+
<PackageVersion Include="xunit.v3" Version="1.1.0" />
56+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
4857

4958
<PackageVersion Include="System.Buffers" Version="4.6.0" />
5059
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
1919
<PackageReference Include="coverlet.msbuild" Version="$(coverletMsbuildVersion)">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -24,13 +24,11 @@
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="xunit.v3" Version="1.0.1" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
27+
<PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3131
</PackageReference>
32-
<PackageReference Include="System.Buffers" Version="4.6.0" />
33-
<PackageReference Include="System.Memory" Version="4.6.0" />
3432
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
3533
</ItemGroup>
3634
</Project>

test/coverlet.integration.template/coverlet.integration.template.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="xunit.v3" Version="1.0.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
14+
<PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
1414
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
1515
<PackageReference Include="Moq" Version="4.20.72" />
16-
<PackageReference Include="NuGet.Packaging" Version="6.12.1" />
17-
<PackageReference Include="xunit.v3" Version="1.0.1" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
16+
<PackageReference Include="NuGet.Packaging" Version="$(NugetPackageVersion)" />
17+
<PackageReference Include="xunit.v3" Version="$(XunitV3Version)" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2121
</PackageReference>
22-
<PackageReference Include="System.Buffers" Version="4.6.0" />
23-
<PackageReference Include="System.Memory" Version="4.6.0" />
2422
<PackageReference Include="System.Reflection.Metadata" Version="8.0.1" />
2523
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
2624
<PackageReference Include="System.Text.Json" Version="8.0.5" />

0 commit comments

Comments
 (0)