Remove local DisposeWith use System.Reactive.Disposables.Fluent (#4164)

ChrisPulman · renovate[bot] · glennawatson · web-flow · commit ba46af7d0057 · 2025-10-04T11:09:02.000+10:00
Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
Co-authored-by: Glenn &lt;5834289+glennawatson@users.noreply.github.com&gt;
diff --git a/src/ReactiveUI.AOTTests/AOTCompatibilityTests.cs b/src/ReactiveUI.AOTTests/AOTCompatibilityTests.cs
@@ -3,9 +3,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive.Linq;
-
 namespace ReactiveUI.AOTTests;
 
 /// <summary>
diff --git a/src/ReactiveUI.AOTTests/AdvancedAOTTests.cs b/src/ReactiveUI.AOTTests/AdvancedAOTTests.cs
@@ -3,11 +3,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Diagnostics.CodeAnalysis;
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Splat;
 
 namespace ReactiveUI.AOTTests;
 
diff --git a/src/ReactiveUI.AOTTests/AssemblyInfo.Parallel.cs b/src/ReactiveUI.AOTTests/AssemblyInfo.Parallel.cs
@@ -3,7 +3,5 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using NUnit.Framework;
-
 [assembly: Parallelizable(ParallelScope.Fixtures)]
 [assembly: LevelOfParallelism(4)]
diff --git a/src/ReactiveUI.AOTTests/ComprehensiveAOTMarkupTests.cs b/src/ReactiveUI.AOTTests/ComprehensiveAOTMarkupTests.cs
@@ -3,12 +3,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Diagnostics.CodeAnalysis;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Splat;
 
 namespace ReactiveUI.AOTTests;
 
diff --git a/src/ReactiveUI.AOTTests/ComprehensiveAOTTests.cs b/src/ReactiveUI.AOTTests/ComprehensiveAOTTests.cs
@@ -3,12 +3,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Diagnostics.CodeAnalysis;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Splat;
 
 namespace ReactiveUI.AOTTests;
 
diff --git a/src/ReactiveUI.AOTTests/FinalAOTValidationTests.cs b/src/ReactiveUI.AOTTests/FinalAOTValidationTests.cs
@@ -3,13 +3,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Splat;
 
 namespace ReactiveUI.AOTTests;
 
diff --git a/src/ReactiveUI.AOTTests/GlobalUsings.cs b/src/ReactiveUI.AOTTests/GlobalUsings.cs
@@ -9,6 +9,6 @@
 global using global::System.Collections.Generic;
 global using global::System.Diagnostics.CodeAnalysis;
 global using global::System.Linq;
+global using global::System.Reactive.Disposables.Fluent;
 global using global::System.Reactive.Linq;
-global using global::System.Threading;
-global using global::System.Threading.Tasks;
+global using global::System.Threading.Tasks;
diff --git a/src/ReactiveUI.AOTTests/StringBasedObservationTests.cs b/src/ReactiveUI.AOTTests/StringBasedObservationTests.cs
@@ -3,10 +3,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-
 namespace ReactiveUI.AOTTests;
 
 /// <summary>
diff --git a/src/ReactiveUI.AOTTests/StringBasedSemanticsTests.cs b/src/ReactiveUI.AOTTests/StringBasedSemanticsTests.cs
@@ -3,8 +3,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Reactive.Linq;
-
 namespace ReactiveUI.AOTTests;
 
 /// <summary>
diff --git a/src/ReactiveUI.AOTTests/TestReactiveObject.cs b/src/ReactiveUI.AOTTests/TestReactiveObject.cs
@@ -3,9 +3,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive.Linq;
-
 namespace ReactiveUI.AOTTests;
 
 /// <summary>
diff --git a/src/ReactiveUI.AOTTests/ViewLocatorAOTMappingTests.cs b/src/ReactiveUI.AOTTests/ViewLocatorAOTMappingTests.cs
@@ -3,8 +3,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Reactive.Linq;
-
 namespace ReactiveUI.AOTTests;
 
 /// <summary>
diff --git a/src/ReactiveUI.Blazor/GlobalUsings.cs b/src/ReactiveUI.Blazor/GlobalUsings.cs
@@ -11,5 +11,6 @@
 global using global::System.Reactive;
 global using global::System.Reactive.Concurrency;
 global using global::System.Reactive.Disposables;
+global using global::System.Reactive.Disposables.Fluent;
 global using global::System.Reactive.Linq;
 global using global::System.Reactive.Subjects;
diff --git a/src/ReactiveUI.Builder.WpfApp/Views/ChatRoomView.xaml.cs b/src/ReactiveUI.Builder.WpfApp/Views/ChatRoomView.xaml.cs
@@ -4,6 +4,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System.Reactive.Disposables;
+using System.Reactive.Disposables.Fluent;
 using System.Windows;
 using ReactiveUI.Builder.WpfApp.ViewModels;
 
diff --git a/src/ReactiveUI.Builder.WpfApp/Views/LobbyView.xaml.cs b/src/ReactiveUI.Builder.WpfApp/Views/LobbyView.xaml.cs
@@ -4,6 +4,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System.Reactive.Disposables;
+using System.Reactive.Disposables.Fluent;
 using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Input;
diff --git a/src/ReactiveUI.Maui/GlobalUsings.cs b/src/ReactiveUI.Maui/GlobalUsings.cs
@@ -10,6 +10,7 @@
 global using System.Reactive;
 global using System.Reactive.Concurrency;
 global using System.Reactive.Disposables;
+global using System.Reactive.Disposables.Fluent;
 global using System.Reactive.Linq;
 global using System.Reactive.Subjects;
 global using System.Threading.Tasks;
diff --git a/src/ReactiveUI/GlobalUsings.cs b/src/ReactiveUI/GlobalUsings.cs
@@ -17,6 +17,7 @@
 global using global::System.Reactive;
 global using global::System.Reactive.Concurrency;
 global using global::System.Reactive.Disposables;
+global using global::System.Reactive.Disposables.Fluent;
 global using global::System.Reactive.Linq;
 global using global::System.Reactive.Subjects;
 global using global::System.Reactive.Threading.Tasks;
diff --git a/src/ReactiveUI/Mixins/DisposableMixins.cs b/src/ReactiveUI/Mixins/DisposableMixins.cs
