From 7850c09d3b2655ed2bc57e26a7adef88ec62ec73 Mon Sep 17 00:00:00 2001 From: Ian Griffiths Date: Mon, 1 Sep 2025 16:15:04 +0100 Subject: [PATCH 1/5] Upgrade test package versions --- .../Benchmarks.System.Reactive.csproj | 6 +++--- .../Microsoft.Reactive.Testing.csproj | 2 +- .../Tests.System.Reactive.ApiApprovals.csproj | 6 +++--- .../Tests.System.Reactive/Tests.System.Reactive.csproj | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj index 03b9f4423e..063dc295bb 100644 --- a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj +++ b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj @@ -38,9 +38,9 @@ - - - + + + diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj index ec490d46cc..8271eb4bb4 100644 --- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj +++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj @@ -18,7 +18,7 @@ - + diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj index 94ef8aea40..38c494a967 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj @@ -25,9 +25,9 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -37,7 +37,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj index a0e56af6c8..26a583acd4 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj @@ -30,17 +30,17 @@ Before that PR was merged, the test runner wouldn't work if the host specified a TFM with a specific Windows version. --> - - - - + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From a08b90a933a0131464b62d8d1ea33d97380a5dcf Mon Sep 17 00:00:00 2001 From: Ian Griffiths Date: Mon, 1 Sep 2025 16:22:18 +0100 Subject: [PATCH 2/5] Upgrade test packages --- Rx.NET/Source/Directory.build.props | 2 +- .../Tests.System.Reactive.ApiApprovals.csproj | 7 ------- .../Tests.System.Reactive/Tests.System.Reactive.csproj | 6 ------ 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props index 22c92594d2..f84baa2cb6 100644 --- a/Rx.NET/Source/Directory.build.props +++ b/Rx.NET/Source/Directory.build.props @@ -49,7 +49,7 @@ - + diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj index 38c494a967..fe5d161f77 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj @@ -36,11 +36,4 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj index 26a583acd4..80bb0a4d10 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj @@ -39,10 +39,4 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - \ No newline at end of file From 6951b90fe89a48097831502815194518cb69b4eb Mon Sep 17 00:00:00 2001 From: Ian Griffiths Date: Mon, 1 Sep 2025 16:37:50 +0100 Subject: [PATCH 3/5] Upgrade libraries used by Api approval tests --- .../Api/ApiApprovalTests.cs | 2 +- .../Tests.System.Reactive.ApiApprovals.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.cs b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.cs index c406a107f4..34613512d9 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.cs +++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.cs @@ -17,7 +17,7 @@ public class ApiApprovalTests : VerifyBase { static ApiApprovalTests() { - VerifierSettings.OnVerifyMismatch((filePair, message) => DiffPlexReporter.Report(filePair.ReceivedPath, filePair.VerifiedPath, message)); + VerifierSettings.OnVerifyMismatch((filePair, message, autoVerify) => DiffPlexReporter.Report(filePair.ReceivedPath, filePair.VerifiedPath, message)); } public ApiApprovalTests() diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj index fe5d161f77..0949026f87 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj @@ -1,4 +1,4 @@ - + net48 @@ -26,14 +26,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + From 0a560a8a9a2f1d0c2b9df5cd848b30790a42703e Mon Sep 17 00:00:00 2001 From: Ian Griffiths Date: Mon, 1 Sep 2025 16:56:32 +0100 Subject: [PATCH 4/5] Update benchmark pcackage reference --- Rx.NET/Source/Directory.build.targets | 2 +- .../Benchmarks.System.Reactive.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets index e9d84da44c..e68f1e5883 100644 --- a/Rx.NET/Source/Directory.build.targets +++ b/Rx.NET/Source/Directory.build.targets @@ -22,7 +22,7 @@ $(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT - + diff --git a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj index 063dc295bb..1f045a2045 100644 --- a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj +++ b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj @@ -37,7 +37,7 @@ - + From 77e433e70e101fd4cbe4ca92ba624c5484fb1c79 Mon Sep 17 00:00:00 2001 From: Ian Griffiths Date: Mon, 1 Sep 2025 16:58:22 +0100 Subject: [PATCH 5/5] Deal with new diagnostic arising from test package upgrades --- .../Tests.System.Reactive/Tests.System.Reactive.csproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj index 80bb0a4d10..ace433290b 100644 --- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj +++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj @@ -3,8 +3,10 @@ net472;net8.0;net8.0-windows10.0.19041;net9.0;net9.0-windows10.0.19041 - - $(NoWarn);CS0618;IDE0330 + + $(NoWarn);CS0618;IDE0330;MSTEST0049