diff --git a/README.md b/README.md index 3d45218..65ed728 100644 --- a/README.md +++ b/README.md @@ -278,6 +278,7 @@ Issues / PRs welcome. Please keep additions dependency - Added liveness operators (`Heartbeat`, `DetectStale`, `BufferUntilInactive`). - Added resilience (`RetryWithBackoff`, expanded `OnErrorRetry` overloads). - Added flow control (`Conflate`, `ThrottleFirst`, `DebounceImmediate`). +- Removed DisposeWith extension use System.Reactive.Disposables.Fluent from System.Reactive. --- Happy reactive coding! diff --git a/src/ReactiveUI.Extensions.Tests/DisposableExtensionsTests.cs b/src/ReactiveUI.Extensions.Tests/DisposableExtensionsTests.cs index 6b0bc2a..7ab185a 100644 --- a/src/ReactiveUI.Extensions.Tests/DisposableExtensionsTests.cs +++ b/src/ReactiveUI.Extensions.Tests/DisposableExtensionsTests.cs @@ -4,6 +4,7 @@ using System; using System.Reactive.Disposables; +using System.Reactive.Disposables.Fluent; using FluentAssertions; using Xunit; diff --git a/src/ReactiveUI.Extensions/DisposableExtensions.cs b/src/ReactiveUI.Extensions/DisposableExtensions.cs deleted file mode 100644 index 06c7811..0000000 --- a/src/ReactiveUI.Extensions/DisposableExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2019-2025 ReactiveUI Association Incorporated. All rights reserved. -// ReactiveUI Association Incorporated licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -namespace ReactiveUI.Extensions; - -/// -/// Extension methods associated with the IDisposable interface. -/// -public static class DisposableExtensions -{ - /// - /// Ensures the provided disposable is disposed with the specified . - /// - /// The type of the disposable. - /// The disposable we are going to want to be disposed by the CompositeDisposable. - /// The to which will be added. - /// The disposable. - public static T DisposeWith(this T item, CompositeDisposable compositeDisposable) - where T : IDisposable - { -#if NETSTANDARD - if (compositeDisposable is null) - { - throw new ArgumentNullException(nameof(compositeDisposable)); - } -#else - ArgumentNullException.ThrowIfNull(compositeDisposable); -#endif - - compositeDisposable.Add(item); - return item; - } -} diff --git a/src/directory.packages.props b/src/directory.packages.props index e0a908c..aacbefa 100644 --- a/src/directory.packages.props +++ b/src/directory.packages.props @@ -15,7 +15,7 @@ - +