Skip to content

Commit 27ddca2

Browse files
authored
fix(testing): restore .NET Framework targets for the testing packages (#4427)
## What kind of change does this PR introduce? Fix. ## What is the new behavior? `ReactiveUI.Testing` and `ReactiveUI.Testing.Reactive` ship `net462`, `net472` and `net481` again, alongside the modern `net8.0` - `net11.0` targets. Verified by packing both projects and listing the package contents: ``` ReactiveUI.Testing.nupkg ReactiveUI.Testing.Reactive.nupkg lib/net462 lib/net462 lib/net472 lib/net472 lib/net481 lib/net481 lib/net8.0 net9.0 net10.0 net11.0 lib/net8.0 net9.0 net10.0 net11.0 ``` The .NET Framework public surface is byte-identical to the `net8.0` baseline, so nothing is reduced on the older frameworks. ## What is the current behavior? Closes #4420 Since v23 both packages set `<TargetFrameworks>$(ReactiveUIModernTargets)</TargetFrameworks>`, which is `net8.0;net9.0;net10.0;net11.0`. The `ReactiveUI` package they exist to test targets `$(ReactiveUIFinalTargetFrameworks)`, which does include `$(ReactiveUIFrameworkTargets)` (`net462;net472;net481`). So a project on .NET Framework could reference ReactiveUI but not its testing helpers. Note for anyone reading the issue: it points at `ReactiveUITestingTargets` in `Directory.Build.props`. That property is a red herring here - it is consumed only by test projects under `src/tests`, never by the shipped packages. The actual driver was `ReactiveUIModernTargets` in the two csproj files. ## What might this PR break? - No source changed, and no public API changed on any existing target framework. The four modern TFM baselines regenerate byte-identically. - The two packages now build three additional target frameworks each, so pack and CI time grow slightly. - `ReactiveUI.Testing.Reactive` pulls `Microsoft.Reactive.Testing` on the new frameworks; it resolves and compiles clean on all three. ## Checklist - [x] I have read the [Contribute guide](https://www.reactiveui.net/contribute/index.html) - [x] Tests have been added or updated (for bug fixes / features) - [x] Docs have been added or updated (for bug fixes / features) - [x] Changes target the `main` branch - [x] PR title follows [Conventional Commits](https://www.conventionalcommits.org/) ## Additional information The PublicAPI baselines for the six new (project, TFM) pairs were produced with the repo's own `tools/generate-publicapi.sh`, which the tooling README already names as the step for "after adding a new target framework to a tracked library". Running it over both projects regenerated all 14 pairs; the eight pre-existing ones came back unchanged, which is the check that the generator is deterministic here and that no existing surface moved. Verified on Linux: - `dotnet build reactiveui.slnx -c Release -t:Rebuild` - 0 warnings, 0 errors. - Both testing projects rebuild clean across all seven target frameworks. - 4216 tests pass across ReactiveUI.Tests, ReactiveUI.Tests.Reactive, ReactiveUI.Testing.Tests and ReactiveUI.Builder.Tests.
1 parent ad4b00c commit 27ddca2

14 files changed

Lines changed: 351 additions & 2 deletions
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#nullable enable
2+
ReactiveUI.Testing.AppBuilderTestBase
3+
ReactiveUI.Testing.AppBuilderTestBase.AppBuilderTestBase() -> void
4+
ReactiveUI.Testing.IBuilder
5+
ReactiveUI.Testing.IBuilderExtensions
6+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder)
7+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TField>(out TField field, TField value) -> TBuilder
8+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TField>(ref System.Collections.Generic.List<TField>? field, System.Collections.Generic.IEnumerable<TField>! values) -> TBuilder
9+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TField>(ref System.Collections.Generic.List<TField>? field, TField value) -> TBuilder
10+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TKey, TField>(ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.IDictionary<TKey, TField>! keyValuePair) -> TBuilder
11+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TKey, TField>(ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.KeyValuePair<TKey, TField> keyValuePair) -> TBuilder
12+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TKey, TField>(ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, TKey key, TField value) -> TBuilder
13+
ReactiveUI.Testing.MessageBusExtensions
14+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!)
15+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!).With(System.Action! block) -> void
16+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!).With<TRet>(System.Func<TRet>! block) -> TRet
17+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!).WithMessageBus() -> System.IDisposable!
18+
ReactiveUI.Testing.RxTest
19+
ReactiveUI.Testing.SchedulerExtensions
20+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T)
21+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).With(System.Action<T>! block) -> void
22+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).With<TRet>(System.Func<T, TRet>! block) -> TRet
23+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).WithAsync(System.Func<T, System.Threading.Tasks.Task!>! block) -> System.Threading.Tasks.Task!
24+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).WithAsync<TRet>(System.Func<T, System.Threading.Tasks.Task<TRet>!>! block) -> System.Threading.Tasks.Task<TRet>!
25+
ReactiveUI.Testing.TestSchedulerExtensions
26+
ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!)
27+
ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).AdvanceByMs(double milliseconds) -> void
28+
ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).AdvanceToMs(double milliseconds) -> void
29+
ReactiveUI.Testing.TestSequencer
30+
ReactiveUI.Testing.TestSequencer.AdvancePhaseAsync() -> System.Threading.Tasks.Task!
31+
ReactiveUI.Testing.TestSequencer.AdvancePhaseAsync(string! comment) -> System.Threading.Tasks.Task!
32+
ReactiveUI.Testing.TestSequencer.CompletedPhases.get -> long
33+
ReactiveUI.Testing.TestSequencer.CurrentPhase.get -> long
34+
ReactiveUI.Testing.TestSequencer.Dispose() -> void
35+
ReactiveUI.Testing.TestSequencer.TestSequencer() -> void
36+
static ReactiveUI.Testing.AppBuilderTestBase.RunAppBuilderTestAsync(System.Action! testBody) -> System.Threading.Tasks.Task!
37+
static ReactiveUI.Testing.AppBuilderTestBase.RunAppBuilderTestAsync(System.Func<System.Threading.Tasks.Task!>! testBody) -> System.Threading.Tasks.Task!
38+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TField>(this TBuilder builder, out TField field, TField value) -> TBuilder
39+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TField>(this TBuilder builder, ref System.Collections.Generic.List<TField>? field, System.Collections.Generic.IEnumerable<TField>! values) -> TBuilder
40+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TField>(this TBuilder builder, ref System.Collections.Generic.List<TField>? field, TField value) -> TBuilder
41+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TKey, TField>(this TBuilder builder, ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.IDictionary<TKey, TField>! keyValuePair) -> TBuilder
42+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TKey, TField>(this TBuilder builder, ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.KeyValuePair<TKey, TField> keyValuePair) -> TBuilder
43+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TKey, TField>(this TBuilder builder, ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, TKey key, TField value) -> TBuilder
44+
static ReactiveUI.Testing.MessageBusExtensions.With(this ReactiveUI.Reactive.IMessageBus! messageBus, System.Action! block) -> void
45+
static ReactiveUI.Testing.MessageBusExtensions.With<TRet>(this ReactiveUI.Reactive.IMessageBus! messageBus, System.Func<TRet>! block) -> TRet
46+
static ReactiveUI.Testing.MessageBusExtensions.WithMessageBus(this ReactiveUI.Reactive.IMessageBus! messageBus) -> System.IDisposable!
47+
static ReactiveUI.Testing.RxTest.AppBuilderTestAsync(System.Func<System.Threading.Tasks.Task!>! testBody) -> System.Threading.Tasks.Task!
48+
static ReactiveUI.Testing.RxTest.AppBuilderTestAsync(System.Func<System.Threading.Tasks.Task!>! testBody, int maxWaitMs) -> System.Threading.Tasks.Task!
49+
static ReactiveUI.Testing.SchedulerExtensions.With<T, TRet>(this T scheduler, System.Func<T, TRet>! block) -> TRet
50+
static ReactiveUI.Testing.SchedulerExtensions.With<T>(this T scheduler, System.Action<T>! block) -> void
51+
static ReactiveUI.Testing.SchedulerExtensions.WithAsync<T, TRet>(this T scheduler, System.Func<T, System.Threading.Tasks.Task<TRet>!>! block) -> System.Threading.Tasks.Task<TRet>!
52+
static ReactiveUI.Testing.SchedulerExtensions.WithAsync<T>(this T scheduler, System.Func<T, System.Threading.Tasks.Task!>! block) -> System.Threading.Tasks.Task!
53+
static ReactiveUI.Testing.SchedulerExtensions.WithScheduler(System.Reactive.Concurrency.IScheduler! scheduler) -> System.IDisposable!
54+
static ReactiveUI.Testing.TestSchedulerExtensions.AdvanceByMs(this Microsoft.Reactive.Testing.TestScheduler! scheduler, double milliseconds) -> void
55+
static ReactiveUI.Testing.TestSchedulerExtensions.AdvanceToMs(this Microsoft.Reactive.Testing.TestScheduler! scheduler, double milliseconds) -> void
56+
static ReactiveUI.Testing.TestSchedulerExtensions.FromTimeSpan(System.TimeSpan span) -> long
57+
static ReactiveUI.Testing.TestSchedulerExtensions.OnCompletedAt<T>(double milliseconds) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
58+
static ReactiveUI.Testing.TestSchedulerExtensions.OnErrorAt<T>(double milliseconds, System.Exception! ex) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
59+
static ReactiveUI.Testing.TestSchedulerExtensions.OnNextAt<T>(double milliseconds, T value) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
60+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).FromTimeSpan(System.TimeSpan span) -> long
61+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).OnCompletedAt<T>(double milliseconds) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
62+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).OnErrorAt<T>(double milliseconds, System.Exception! ex) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
63+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).OnNextAt<T>(double milliseconds, T value) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
64+
virtual ReactiveUI.Testing.TestSequencer.Dispose(bool disposing) -> void
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#nullable enable
2+
ReactiveUI.Testing.AppBuilderTestBase
3+
ReactiveUI.Testing.AppBuilderTestBase.AppBuilderTestBase() -> void
4+
ReactiveUI.Testing.IBuilder
5+
ReactiveUI.Testing.IBuilderExtensions
6+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder)
7+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TField>(out TField field, TField value) -> TBuilder
8+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TField>(ref System.Collections.Generic.List<TField>? field, System.Collections.Generic.IEnumerable<TField>! values) -> TBuilder
9+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TField>(ref System.Collections.Generic.List<TField>? field, TField value) -> TBuilder
10+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TKey, TField>(ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.IDictionary<TKey, TField>! keyValuePair) -> TBuilder
11+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TKey, TField>(ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.KeyValuePair<TKey, TField> keyValuePair) -> TBuilder
12+
ReactiveUI.Testing.IBuilderExtensions.extension<TBuilder>(TBuilder).With<TKey, TField>(ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, TKey key, TField value) -> TBuilder
13+
ReactiveUI.Testing.MessageBusExtensions
14+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!)
15+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!).With(System.Action! block) -> void
16+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!).With<TRet>(System.Func<TRet>! block) -> TRet
17+
ReactiveUI.Testing.MessageBusExtensions.extension(ReactiveUI.Reactive.IMessageBus!).WithMessageBus() -> System.IDisposable!
18+
ReactiveUI.Testing.RxTest
19+
ReactiveUI.Testing.SchedulerExtensions
20+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T)
21+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).With(System.Action<T>! block) -> void
22+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).With<TRet>(System.Func<T, TRet>! block) -> TRet
23+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).WithAsync(System.Func<T, System.Threading.Tasks.Task!>! block) -> System.Threading.Tasks.Task!
24+
ReactiveUI.Testing.SchedulerExtensions.extension<T>(T).WithAsync<TRet>(System.Func<T, System.Threading.Tasks.Task<TRet>!>! block) -> System.Threading.Tasks.Task<TRet>!
25+
ReactiveUI.Testing.TestSchedulerExtensions
26+
ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!)
27+
ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).AdvanceByMs(double milliseconds) -> void
28+
ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).AdvanceToMs(double milliseconds) -> void
29+
ReactiveUI.Testing.TestSequencer
30+
ReactiveUI.Testing.TestSequencer.AdvancePhaseAsync() -> System.Threading.Tasks.Task!
31+
ReactiveUI.Testing.TestSequencer.AdvancePhaseAsync(string! comment) -> System.Threading.Tasks.Task!
32+
ReactiveUI.Testing.TestSequencer.CompletedPhases.get -> long
33+
ReactiveUI.Testing.TestSequencer.CurrentPhase.get -> long
34+
ReactiveUI.Testing.TestSequencer.Dispose() -> void
35+
ReactiveUI.Testing.TestSequencer.TestSequencer() -> void
36+
static ReactiveUI.Testing.AppBuilderTestBase.RunAppBuilderTestAsync(System.Action! testBody) -> System.Threading.Tasks.Task!
37+
static ReactiveUI.Testing.AppBuilderTestBase.RunAppBuilderTestAsync(System.Func<System.Threading.Tasks.Task!>! testBody) -> System.Threading.Tasks.Task!
38+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TField>(this TBuilder builder, out TField field, TField value) -> TBuilder
39+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TField>(this TBuilder builder, ref System.Collections.Generic.List<TField>? field, System.Collections.Generic.IEnumerable<TField>! values) -> TBuilder
40+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TField>(this TBuilder builder, ref System.Collections.Generic.List<TField>? field, TField value) -> TBuilder
41+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TKey, TField>(this TBuilder builder, ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.IDictionary<TKey, TField>! keyValuePair) -> TBuilder
42+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TKey, TField>(this TBuilder builder, ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, System.Collections.Generic.KeyValuePair<TKey, TField> keyValuePair) -> TBuilder
43+
static ReactiveUI.Testing.IBuilderExtensions.With<TBuilder, TKey, TField>(this TBuilder builder, ref System.Collections.Generic.Dictionary<TKey, TField>! dictionary, TKey key, TField value) -> TBuilder
44+
static ReactiveUI.Testing.MessageBusExtensions.With(this ReactiveUI.Reactive.IMessageBus! messageBus, System.Action! block) -> void
45+
static ReactiveUI.Testing.MessageBusExtensions.With<TRet>(this ReactiveUI.Reactive.IMessageBus! messageBus, System.Func<TRet>! block) -> TRet
46+
static ReactiveUI.Testing.MessageBusExtensions.WithMessageBus(this ReactiveUI.Reactive.IMessageBus! messageBus) -> System.IDisposable!
47+
static ReactiveUI.Testing.RxTest.AppBuilderTestAsync(System.Func<System.Threading.Tasks.Task!>! testBody) -> System.Threading.Tasks.Task!
48+
static ReactiveUI.Testing.RxTest.AppBuilderTestAsync(System.Func<System.Threading.Tasks.Task!>! testBody, int maxWaitMs) -> System.Threading.Tasks.Task!
49+
static ReactiveUI.Testing.SchedulerExtensions.With<T, TRet>(this T scheduler, System.Func<T, TRet>! block) -> TRet
50+
static ReactiveUI.Testing.SchedulerExtensions.With<T>(this T scheduler, System.Action<T>! block) -> void
51+
static ReactiveUI.Testing.SchedulerExtensions.WithAsync<T, TRet>(this T scheduler, System.Func<T, System.Threading.Tasks.Task<TRet>!>! block) -> System.Threading.Tasks.Task<TRet>!
52+
static ReactiveUI.Testing.SchedulerExtensions.WithAsync<T>(this T scheduler, System.Func<T, System.Threading.Tasks.Task!>! block) -> System.Threading.Tasks.Task!
53+
static ReactiveUI.Testing.SchedulerExtensions.WithScheduler(System.Reactive.Concurrency.IScheduler! scheduler) -> System.IDisposable!
54+
static ReactiveUI.Testing.TestSchedulerExtensions.AdvanceByMs(this Microsoft.Reactive.Testing.TestScheduler! scheduler, double milliseconds) -> void
55+
static ReactiveUI.Testing.TestSchedulerExtensions.AdvanceToMs(this Microsoft.Reactive.Testing.TestScheduler! scheduler, double milliseconds) -> void
56+
static ReactiveUI.Testing.TestSchedulerExtensions.FromTimeSpan(System.TimeSpan span) -> long
57+
static ReactiveUI.Testing.TestSchedulerExtensions.OnCompletedAt<T>(double milliseconds) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
58+
static ReactiveUI.Testing.TestSchedulerExtensions.OnErrorAt<T>(double milliseconds, System.Exception! ex) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
59+
static ReactiveUI.Testing.TestSchedulerExtensions.OnNextAt<T>(double milliseconds, T value) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
60+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).FromTimeSpan(System.TimeSpan span) -> long
61+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).OnCompletedAt<T>(double milliseconds) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
62+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).OnErrorAt<T>(double milliseconds, System.Exception! ex) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
63+
static ReactiveUI.Testing.TestSchedulerExtensions.extension(Microsoft.Reactive.Testing.TestScheduler!).OnNextAt<T>(double milliseconds, T value) -> Microsoft.Reactive.Testing.Recorded<System.Reactive.Notification<T>!>
64+
virtual ReactiveUI.Testing.TestSequencer.Dispose(bool disposing) -> void
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable

0 commit comments

Comments
 (0)
⌂ 换网址