Skip to content

Commit 07bfd1f

Browse files
idg10idg10
authored
Feature/test packages 2025 (#2219)
* Upgrade test package versions * Upgrade libraries used by Api approval tests * Update benchmark package * Deal with new diagnostics arising from test package upgrades
1 parent fda1bbc commit 07bfd1f

7 files changed

Lines changed: 22 additions & 33 deletions

File tree

‎Rx.NET/Source/Directory.build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</ItemGroup>
5050

5151
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
52-
<PackageReference Include="coverlet.collector" Version="3.2.0" />
52+
<PackageReference Include="coverlet.collector" Version="6.0.4" />
5353
</ItemGroup>
5454

5555

‎Rx.NET/Source/Directory.build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT</DefineConstants>
2323
</PropertyGroup>
2424

25-
<ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'uap10.0.18362' or '$(TargetFramework)' == 'netstandard2.0'">
25+
<ItemGroup Condition="('$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'uap10.0.18362' or '$(TargetFramework)' == 'netstandard2.0') and $(IsPackable)">
2626
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
2727
</ItemGroup>
2828

‎Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
41-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
42-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
43-
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
40+
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
42+
<PackageReference Include="MSTest.TestAdapter" Version="3.10.3" />
43+
<PackageReference Include="MSTest.TestFramework" Version="3.10.3" />
4444
<PackageReference Include="WindowsBase" Version="4.6.1055" />
4545
</ItemGroup>
4646

‎Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj‎

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

1919
<ItemGroup>
2020
<EmbeddedResource Include="Properties\*.xml" />
21-
<PackageReference Include="xunit.assert.source" Version="2.8.1" PrivateAssets="All" />
21+
<PackageReference Include="xunit.assert.source" Version="2.9.3" PrivateAssets="All" />
2222
<ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
2323
</ItemGroup>
2424

‎Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ApiApprovalTests : VerifyBase
1717
{
1818
static ApiApprovalTests()
1919
{
20-
VerifierSettings.OnVerifyMismatch((filePair, message) => DiffPlexReporter.Report(filePair.ReceivedPath, filePair.VerifiedPath, message));
20+
VerifierSettings.OnVerifyMismatch((filePair, message, autoVerify) => DiffPlexReporter.Report(filePair.ReceivedPath, filePair.VerifiedPath, message));
2121
}
2222

2323
public ApiApprovalTests()

‎Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net48</TargetFrameworks>
@@ -25,22 +25,15 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
29-
<PackageReference Include="Verify.Xunit" Version="20.4.0" />
30-
<PackageReference Include="xunit" Version="2.8.0" />
28+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
29+
<PackageReference Include="Verify.Xunit" Version="30.10.0" />
30+
<PackageReference Include="xunit" Version="2.9.3" />
3131
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>
35-
<PackageReference Include="DiffPlex" Version="1.7.2" />
36-
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
37-
</ItemGroup>
38-
39-
<ItemGroup>
40-
<PackageReference Update="coverlet.collector" Version="6.0.2">
41-
<PrivateAssets>all</PrivateAssets>
42-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43-
</PackageReference>
35+
<PackageReference Include="DiffPlex" Version="1.8.0" />
36+
<PackageReference Include="PublicApiGenerator" Version="11.3.0" />
4437
</ItemGroup>
4538

4639
</Project>

‎Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
<PropertyGroup>
44
<TargetFrameworks>net472;net8.0;net8.0-windows10.0.19041;net9.0;net9.0-windows10.0.19041</TargetFrameworks>
55

6-
<!-- IDE0330: Prefer 'System.Threading.Lock': not applicable for as long as we support .NET 8.0 or .NET FX, because it is unavailable on those targets. -->
7-
<NoWarn>$(NoWarn);CS0618;IDE0330</NoWarn>
6+
<!-- IDE0330: Prefer 'System.Threading.Lock': not applicable for as long as we support .NET 8.0 or .NET FX, because it is unavailable on those targets.
7+
MSTEST0049: Consider overload accepting a CancellationToken - there are 136 of these, and since I've not yet run into a situation that this would have helped in, it's not a priority.
8+
-->
9+
<NoWarn>$(NoWarn);CS0618;IDE0330;MSTEST0049</NoWarn>
810
</PropertyGroup>
911

1012
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows')) or '$(TargetFramework)' == 'net472'">
@@ -30,19 +32,13 @@
3032
Before that PR was merged, the test runner wouldn't work if the host specified a TFM with a
3133
specific Windows version.
3234
-->
33-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
34-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
35-
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
36-
<PackageReference Include="xunit.assert" Version="2.8.0" />
35+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
36+
<PackageReference Include="MSTest.TestAdapter" Version="3.10.3" />
37+
<PackageReference Include="MSTest.TestFramework" Version="3.10.3" />
38+
<PackageReference Include="xunit.assert" Version="2.9.3" />
3739
<ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
3840
<ProjectReference Include="..\..\src\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" />
3941
<ProjectReference Include="..\..\src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" />
4042
</ItemGroup>
4143

42-
<ItemGroup>
43-
<PackageReference Update="coverlet.collector" Version="6.0.2">
44-
<PrivateAssets>all</PrivateAssets>
45-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
46-
</PackageReference>
47-
</ItemGroup>
4844
</Project>

0 commit comments

Comments
 (0)