Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 4, 2025
+7 −66
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0794afb
chore(deps): update rx.net (system.reactive) to 6.1.0
renovate[bot] Oct 4, 2025
d41e277
Refactor disposables: use System.Reactive.Disposables.Fluent
ChrisPulman Oct 4, 2025
7ee73c8
Add System.Reactive.Disposables.Fluent imports
ChrisPulman Oct 4, 2025
9f1df3f
Merge branch 'main' into RemoveDisposeWith
ChrisPulman Oct 4, 2025
2bee727
Merge branch 'main' into RemoveDisposeWith
glennawatson Oct 4, 2025
3a8c3f5
Fix missing newline at end of Directory.Packages.props
glennawatson Oct 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/ReactiveUI.AOTTests/AOTCompatibilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions src/ReactiveUI.AOTTests/AdvancedAOTTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/ReactiveUI.AOTTests/AssemblyInfo.Parallel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
3 changes: 0 additions & 3 deletions src/ReactiveUI.AOTTests/ComprehensiveAOTMarkupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions src/ReactiveUI.AOTTests/ComprehensiveAOTTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions src/ReactiveUI.AOTTests/FinalAOTValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI.AOTTests/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
4 changes: 0 additions & 4 deletions src/ReactiveUI.AOTTests/StringBasedObservationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/ReactiveUI.AOTTests/StringBasedSemanticsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions src/ReactiveUI.AOTTests/TestReactiveObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/ReactiveUI.AOTTests/ViewLocatorAOTMappingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Blazor/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
1 change: 1 addition & 0 deletions src/ReactiveUI.Builder.WpfApp/Views/ChatRoomView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Builder.WpfApp/Views/LobbyView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Maui/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
36 changes: 0 additions & 36 deletions src/ReactiveUI/Mixins/DisposableMixins.cs
View file
Open in desktop

This file was deleted.

Loading