From 178abace00e73298a56b352c06f7b611ba501ed0 Mon Sep 17 00:00:00 2001
From: Glenn <5834289+glennawatson@users.noreply.github.com>
Date: Fri, 14 Jul 2023 13:29:39 +1000
Subject: [PATCH] housekeeping: add global usings (#3585)
change files to be stored in platform specific format
---
.gitattributes | 6 +++---
src/Directory.build.props | 4 ++++
src/GlobalUsings.cs | 20 +++++++++++++++++++
.../ControlFetcherMixin.cs | 3 ++-
.../ReactiveAppCompatActivity.cs | 7 +------
.../ReactiveDialogFragment.cs | 4 ----
.../ReactiveFragment.cs | 4 ----
.../ReactiveFragmentActivity.cs | 7 +------
.../ReactivePagerAdapter.cs | 7 +++----
.../ReactivePreferenceFragment.cs | 5 +----
.../ReactiveRecyclerViewAdapter.cs | 5 ++---
.../ReactiveRecyclerViewViewHolder.cs | 6 +-----
.../ControlFetcherMixin.cs | 3 ++-
.../ReactiveAppCompatActivity.cs | 8 ++------
.../ReactiveDialogFragment.cs | 4 ----
src/ReactiveUI.AndroidX/ReactiveFragment.cs | 4 ----
.../ReactiveFragmentActivity.cs | 8 ++------
.../ReactivePagerAdapter.cs | 8 ++++----
.../ReactivePreferenceFragment.cs | 6 ++----
.../ReactiveRecyclerViewAdapter.cs | 5 ++---
.../ReactiveRecyclerViewViewHolder.cs | 7 ++-----
.../ReactiveComponentBase.cs | 7 +------
.../ReactiveInjectableComponentBase.cs | 7 +------
.../ReactiveLayoutComponentBase.cs | 6 +-----
src/ReactiveUI.Blazor/Registrations.cs | 2 --
.../FollowObservableStateBehavior.cs | 3 ---
.../Platforms/net4/ObservableTrigger.cs | 3 +--
src/ReactiveUI.Drawing/Registrations.cs | 3 ---
.../ActivationForViewFetcher.cs | 3 +--
src/ReactiveUI.Maui/AutoSuspendHelper.cs | 6 ------
.../Common/AutoDataTemplateBindingHook.cs | 1 +
.../Common/BooleanToVisibilityHint.cs | 2 --
.../BooleanToVisibilityTypeConverter.cs | 1 -
.../Common/ReactiveUserControl.cs | 1 +
src/ReactiveUI.Maui/Common/RoutedViewHost.cs | 8 +-------
.../Common/ViewModelViewHost.cs | 2 ++
.../DisableAnimationAttribute.cs | 2 --
src/ReactiveUI.Maui/ReactiveShellContent.cs | 2 --
src/ReactiveUI.Maui/Registrations.cs | 7 -------
src/ReactiveUI.Maui/RoutedViewHost.cs | 8 +-------
src/ReactiveUI.Maui/ViewModelViewHost.cs | 3 ---
.../DependencyObjectObservableForProperty.cs | 2 ++
.../TransitioningContentControl.Empty.cs | 1 +
.../SplatAdapterTests.cs | 9 +++------
src/ReactiveUI.Testing.Tests/TestFixture.cs | 1 -
.../TestFixtureBuilder.cs | 3 ---
.../TestFixtureBuilderExtensionTests.cs | 2 --
src/ReactiveUI.Testing/IBuilderExtensions.cs | 2 --
.../MessageBusExtensions.cs | 4 ----
src/ReactiveUI.Testing/SchedulerExtensions.cs | 6 ------
src/ReactiveUI.Tests/API/ApiApprovalTests.cs | 2 --
.../Activation/ActivatingView.cs | 5 -----
.../Activation/ActivatingViewFetcher.cs | 3 ---
.../Activation/ActivatingViewModel.cs | 2 --
.../Activation/ActivatingViewTests.cs | 2 --
.../Activation/CanActivateViewFetcherTests.cs | 6 ++----
.../Activation/DerivedActivatingViewModel.cs | 2 --
.../Activation/ViewModelActivatorTests.cs | 3 +--
.../AutoPersist/AutoPersistCollectionTests.cs | 7 +++----
.../AutoPersist/AutoPersistHelperTest.cs | 6 ++----
src/ReactiveUI.Tests/AwaiterTest.cs | 7 -------
.../Commands/CombinedReactiveCommandTest.cs | 9 +++------
.../Commands/CreatesCommandBindingTests.cs | 2 +-
.../Commands/Mocks/FakeCommand.cs | 1 -
.../Commands/Mocks/ReactiveCommandHolder.cs | 2 --
.../Commands/ReactiveCommandTest.cs | 12 ++++-------
.../Comparers/OrderedComparerTests.cs | 4 +---
.../InteractionBinderImplementationTests.cs | 6 +-----
src/ReactiveUI.Tests/InteractionsTest.cs | 8 +++-----
.../Locator/DefaultViewLocatorTests.cs | 2 --
.../Locator/Mocks/FooThatThrowsView.cs | 2 --
.../Locator/Mocks/IBarViewModel.cs | 2 --
.../Locator/Mocks/IFooViewModel.cs | 2 --
...IStrangeInterfaceNotFollowingConvention.cs | 2 --
src/ReactiveUI.Tests/MessageBusTest.cs | 8 +++-----
.../Mocks/CommandBindViewModel.cs | 2 --
.../Mocks/FakeNestedViewModel.cs | 2 --
src/ReactiveUI.Tests/Mocks/FakeViewModel.cs | 2 --
.../Mocks/MockBindListView.cs | 2 --
.../Mocks/MockBindListViewModel.cs | 6 +-----
.../Mocks/OAPHIndexerTestFixture.cs | 3 ---
.../ObservableAsPropertyHelperTest.cs | 10 +++-------
.../ObservedChanged/Mocks/NewGameViewModel.cs | 4 ----
.../ObservedChanged/NewGameViewModelTests.cs | 2 --
.../ObservedChangedMixinTest.cs | 7 ++-----
.../common-gui/Mocks/RaceConditionFixture.cs | 2 --
.../Mocks/RaceConditionNameOfFixture.cs | 2 --
.../Platforms/common-gui/ProductionMode.cs | 4 ----
.../windows-xaml/Api/XamlApiApprovalTests.cs | 2 --
.../CommandBindingImplementationTests.cs | 5 -----
...pendencyObjectObservableForPropertyTest.cs | 6 ------
.../windows-xaml/Mocks/CommandBindView.cs | 7 -------
.../windows-xaml/Mocks/CustomClickButton.cs | 7 -------
.../windows-xaml/Mocks/DepObjFixture.cs | 6 ------
.../Mocks/DerivedDepObjFixture.cs | 5 -----
.../Platforms/windows-xaml/Mocks/FakeView.cs | 6 ------
.../Mocks/PropertyBindFakeControl.cs | 5 -----
.../windows-xaml/Mocks/PropertyBindView.cs | 5 -----
.../Mocks/ReactiveObjectCommandBindView.cs | 7 -------
.../windows-xaml/PropertyBindingTest.cs | 12 ++---------
.../RxAppDependencyObjectTests.cs | 2 --
.../Utilities/DispatcherUtilities.cs | 7 -------
.../WhenAnyThroughDependencyObjectTests.cs | 2 --
.../windows-xaml/XamlViewCommandTests.cs | 4 ----
.../XamlViewDependencyResolverTests.cs | 6 ------
.../winforms/API/WinformsApiApprovalTests.cs | 2 --
.../Platforms/winforms/ActivationTests.cs | 3 +--
.../CommandBindingImplementationTests.cs | 2 +-
.../Platforms/winforms/CommandBindingTests.cs | 6 ++----
.../winforms/DefaultPropertyBindingTests.cs | 8 +++-----
.../Mocks/CustomClickableComponent.cs | 1 -
.../winforms/Mocks/CustomClickableControl.cs | 1 -
.../Platforms/winforms/Mocks/ExampleView.cs | 6 ------
.../winforms/Mocks/FakeViewLocator.cs | 2 --
.../Platforms/winforms/Mocks/FakeViewModel.cs | 2 --
.../Platforms/winforms/Mocks/TestForm.cs | 4 ----
.../winforms/Mocks/ThirdPartyControl.cs | 1 -
.../Mocks/WinformCommandBindViewModel.cs | 3 ---
.../winforms/WinFormsRoutedViewHostTests.cs | 4 +---
.../WinFormsViewDependencyResolverTests.cs | 6 ------
.../WinFormsViewModelViewHostTests.cs | 3 +--
.../Platforms/wpf/API/WpfApiApprovalTests.cs | 5 -----
.../CanExecuteMock/AlwaysFalseModeDetector.cs | 3 ---
.../Mocks/CanExecuteMock/LiveModeDetector.cs | 2 --
.../wpf/Mocks/CommandBindingViewModel.cs | 6 ------
.../wpf/Mocks/WpfActiveContentApp.cs | 1 -
.../wpf/Mocks/WpfActiveContentFixture.cs | 3 ---
.../wpf/WpfActivationForViewFetcherTest.cs | 3 ---
.../Platforms/wpf/WpfActiveContentTests.cs | 7 ++-----
.../WpfCommandBindingImplementationTests.cs | 7 +++----
.../wpf/WpfViewDependencyResolverTests.cs | 2 --
src/ReactiveUI.Tests/RandomTests.cs | 2 --
.../ReactiveObject/Mocks/AccountService.cs | 3 ---
.../Mocks/OaphNameOfTestFixture.cs | 1 -
.../ReactiveObject/Mocks/OaphTestFixture.cs | 1 -
.../ReactiveObject/Mocks/ProjectService.cs | 3 ---
.../ReactiveObject/Mocks/TestFixture.cs | 3 +--
.../ReactiveObject/ReactiveObjectTests.cs | 7 ++-----
.../Resolvers/DependencyResolverTests.cs | 5 -----
.../INPCObservableForPropertyTests.cs | 4 ----
.../PocoObservableForPropertyTests.cs | 7 +------
.../Routing/Mocks/TestView.cs | 2 --
.../Routing/RoutableViewModelMixinTests.cs | 2 --
.../Routing/RoutedViewHostTests.cs | 6 +++---
.../Routing/RoutingStateTests.cs | 8 +++-----
.../Routing/ViewModelViewHostTests.cs | 6 +++---
src/ReactiveUI.Tests/RxAppTest.cs | 2 +-
.../SuspensionHostExtensionsTests.cs | 2 --
.../Utilities/ApiApprovalBase.cs | 4 ----
.../Utilities/CompatMixins.cs | 4 ----
.../Utilities/CountingTestScheduler.cs | 4 ----
.../Utilities/EnumerableTestMixin.cs | 4 +---
src/ReactiveUI.Tests/Utilities/JsonHelper.cs | 1 -
src/ReactiveUI.Tests/Utilities/TestLogger.cs | 3 ---
.../Utilities/UseInvariantCulture.cs | 1 -
.../WaitForDispatcherSchedulerTests.cs | 4 ----
.../WhenAny/Mockups/HostTestFixture.cs | 2 --
.../ReactiveNotifyPropertyChangedMixinTest.cs | 11 +++-------
.../WhenAny/TestWhenAnyObsViewModel.cs | 3 ---
.../WhenAny/WhenAnyObservableTests.cs | 8 +-------
.../ActivationForViewFetcher.cs | 3 ---
.../ContentControlBindingHook.cs | 2 --
.../CreatesWinformsCommandBinding.cs | 5 -----
...llectionChangedToListChangedTransformer.cs | 2 --
.../PanelSetMethodBindingConverter.cs | 3 ---
src/ReactiveUI.Winforms/Registrations.cs | 4 ----
src/ReactiveUI.Winforms/RoutedViewHost.cs | 3 ---
.../TableContentSetMethodBindingConverter.cs | 3 ---
src/ReactiveUI.Winforms/ViewModelViewHost.cs | 4 ----
.../WinformsCreatesObservableForProperty.cs | 8 --------
.../ActivationForViewFetcher.cs | 3 ---
src/ReactiveUI.Wpf/AutoSuspendHelper.cs | 6 ------
.../Common/AutoDataTemplateBindingHook.cs | 2 --
.../Common/BooleanToVisibilityHint.cs | 3 ---
.../BooleanToVisibilityTypeConverter.cs | 1 -
.../Common/PlatformOperations.cs | 6 ------
src/ReactiveUI.Wpf/Common/ReactivePage.cs | 2 --
.../Common/ReactiveUserControl.cs | 2 --
src/ReactiveUI.Wpf/Common/RoutedViewHost.cs | 7 -------
.../Common/ViewModelViewHost.cs | 8 --------
.../DependencyObjectObservableForProperty.cs | 5 -----
src/ReactiveUI.Wpf/Registrations.cs | 4 ----
.../TransitioningContentControl.cs | 4 ----
.../ActivatingReactivePagesTests.cs | 3 ++-
.../Activation/Mocks/App.xaml.cs | 2 --
.../Activation/Mocks/AppShell.xaml.cs | 2 --
.../Activation/Mocks/AppShellViewModel.cs | 2 --
.../Activation/Mocks/ApplicationFixture.cs | 2 --
.../Activation/Mocks/CarouselPageView.cs | 2 --
.../Activation/Mocks/CarouselPageViewModel.cs | 2 --
.../Activation/Mocks/ContentPageView.cs | 2 --
.../Activation/Mocks/ContentPageViewModel.cs | 2 --
.../Activation/Mocks/FlyOutPageViewModel.cs | 2 --
.../Activation/Mocks/FlyoutPageView.xaml.cs | 2 --
.../Mocks/FlyoutPageViewFlyoutMenuItem.cs | 2 --
.../Activation/Mocks/ShellView.cs | 2 --
.../Activation/Mocks/ShellViewModel.cs | 2 --
.../Activation/Mocks/TabbedPageView.cs | 2 --
.../Activation/Mocks/TabbedPageViewModel.cs | 2 --
.../Mocks/ChildViewModel.cs | 4 ----
.../Mocks/MainViewModel.cs | 4 ----
.../Mocks/NavigationViewModel.cs | 6 ------
.../RoutedViewHostTest.cs | 5 +----
.../ActivationForViewFetcher.cs | 3 +--
src/ReactiveUI.XamForms/AutoSuspendHelper.cs | 6 ------
.../DisableAnimationAttribute.cs | 2 --
.../ReactiveMasterDetailPage.cs | 1 -
.../ReactiveShellContent.cs | 2 --
src/ReactiveUI.XamForms/Registrations.cs | 2 --
src/ReactiveUI.XamForms/RoutedViewHost.cs | 7 +------
src/ReactiveUI.XamForms/ViewModelViewHost.cs | 3 ---
src/ReactiveUI.sln | 1 +
.../Activation/CanActivateViewFetcher.cs | 2 --
.../Activation/IActivationForViewFetcher.cs | 2 --
src/ReactiveUI/Activation/ViewForMixins.cs | 6 ------
.../Activation/ViewModelActivator.cs | 8 --------
.../Bindings/Command/CommandBinder.cs | 3 ---
.../Command/CommandBinderImplementation.cs | 7 -------
.../CommandBinderImplementationMixins.cs | 3 ---
.../Bindings/Command/CreatesCommandBinding.cs | 3 ---
...reatesCommandBindingViaCommandParameter.cs | 3 ---
.../Command/CreatesCommandBindingViaEvent.cs | 5 -----
.../Command/ICommandBinderImplementation.cs | 3 ---
.../Bindings/Command/RelayCommand.cs | 1 -
.../Converter/ByteToStringTypeConverter.cs | 2 --
.../Converter/DecimalToStringTypeConverter.cs | 2 --
.../Converter/DoubleToStringTypeConverter.cs | 2 --
.../Converter/EqualityTypeConverter.cs | 3 ---
.../Converter/IntegerToStringTypeConverter.cs | 2 --
.../Converter/LongToStringTypeConverter.cs | 2 --
.../NullableByteToStringTypeConverter.cs | 2 --
.../NullableDecimalToStringTypeConverter.cs | 2 --
.../NullableDoubleToStringTypeConverter.cs | 2 --
.../NullableIntegerToStringTypeConverter.cs | 2 --
.../NullableLongToStringTypeConverter.cs | 2 --
.../NullableShortToStringTypeConverter.cs | 2 --
.../NullableSingleToStringTypeConverter.cs | 2 --
.../Converter/ShortToStringTypeConverter.cs | 2 --
.../Converter/SingleToStringTypeConverter.cs | 2 --
.../Bindings/Converter/StringConverter.cs | 2 --
.../Bindings/IBindingTypeConverter.cs | 3 ---
.../Bindings/ISetMethodBindingConverter.cs | 3 ---
.../IInteractionBinderImplementation.cs | 5 -----
.../InteractionBinderImplementation.cs | 7 -------
.../Interaction/InteractionBindingMixins.cs | 4 ----
.../Property/IPropertyBinderImplementation.cs | 5 -----
.../Property/PropertyBinderImplementation.cs | 10 ----------
.../Property/PropertyBindingMixins.cs | 4 ----
.../Bindings/Reactive/IReactiveBinding.cs | 3 ---
.../Bindings/Reactive/ReactiveBinding.cs | 3 ---
src/ReactiveUI/Comparers/ChainedComparer.cs | 3 ---
.../Comparers/ComparerChainingExtensions.cs | 3 ---
src/ReactiveUI/Comparers/IComparerBuilder.cs | 3 ---
src/ReactiveUI/Comparers/OrderedComparer.cs | 2 --
.../EventHandlers/LocalizableAttribute.cs | 2 --
.../Expression/ExpressionRewriter.cs | 5 -----
src/ReactiveUI/Expression/Reflection.cs | 8 --------
src/ReactiveUI/Interactions/Interaction.cs | 10 ----------
.../Interactions/InteractionContext.cs | 3 ---
.../UnhandledInteractionException.cs | 1 -
src/ReactiveUI/Interfaces/ICanActivate.cs | 3 ---
.../Interfaces/ICreatesCommandBinding.cs | 1 -
.../ICreatesObservableForProperty.cs | 4 ----
.../Interfaces/IHandleObservableErrors.cs | 2 --
src/ReactiveUI/Interfaces/IMessageBus.cs | 4 ----
src/ReactiveUI/Interfaces/IObservedChange.cs | 2 --
.../Interfaces/IPropertyBindingHook.cs | 2 --
.../IReactiveNotifyPropertyChanged.cs | 2 --
.../Interfaces/ISuspensionDriver.cs | 3 ---
src/ReactiveUI/Interfaces/ISuspensionHost.cs | 3 ---
src/ReactiveUI/Interfaces/IViewLocator.cs | 2 --
.../Interfaces/IWantsToRegisterStuff.cs | 2 --
src/ReactiveUI/Interfaces/ObservedChange.cs | 2 --
src/ReactiveUI/Legacy/CollectionDebugView.cs | 2 --
.../Legacy/RefcountDisposeWrapper.cs | 3 ---
src/ReactiveUI/Mixins/AutoPersistHelper.cs | 8 --------
src/ReactiveUI/Mixins/ChangeSetMixin.cs | 2 --
src/ReactiveUI/Mixins/CompatMixins.cs | 4 ----
.../Mixins/DependencyResolverMixins.cs | 6 ------
src/ReactiveUI/Mixins/ExpressionMixins.cs | 5 -----
.../Mixins/ObservableLoggingMixin.cs | 3 ---
src/ReactiveUI/Mixins/ObservableMixins.cs | 3 ---
src/ReactiveUI/Mixins/ObservedChangedMixin.cs | 4 ----
src/ReactiveUI/Mixins/PreserveAttribute.cs | 2 --
.../ReactiveNotifyPropertyChangedMixin.cs | 7 -------
.../INPCObservableForProperty.cs | 4 ----
.../IROObservableForProperty.cs | 3 ---
.../OAPHCreationHelperMixin.cs | 4 ----
.../ObservableAsPropertyHelper.cs | 9 ---------
.../POCOObservableForProperty.cs | 5 -----
src/ReactiveUI/ObservableFuncMixins.cs | 4 ----
src/ReactiveUI/PlatformRegistrationManager.cs | 2 --
.../android/AndroidCommandBinders.cs | 3 +--
.../android/AndroidObservableForWidgets.cs | 8 ++------
.../Platforms/android/AutoSuspendHelper.cs | 9 ---------
.../android/BundleSuspensionDriver.cs | 3 ---
.../Platforms/android/ContextExtensions.cs | 2 --
.../Platforms/android/ControlFetcherMixin.cs | 4 +---
.../android/FlexibleCommandBinder.cs | 5 -----
.../Platforms/android/HandlerScheduler.cs | 9 ---------
.../android/IgnoreResourceAttribute.cs | 2 --
.../Platforms/android/JavaHolder.cs | 3 ---
.../Platforms/android/LayoutViewHost.cs | 3 ---
.../Platforms/android/LinkerOverrides.cs | 9 ---------
.../Platforms/android/ObjectExtension.cs | 1 -
.../Platforms/android/PlatformOperations.cs | 1 -
.../android/PlatformRegistrations.cs | 4 ----
.../Platforms/android/ReactiveActivity.cs | 8 +-------
.../Platforms/android/ReactiveFragment.cs | 5 +----
.../android/ReactivePreferenceActivity.cs | 7 +------
.../android/ReactivePreferenceFragment.cs | 5 +----
.../Platforms/android/ReactiveViewHost.cs | 3 +--
.../android/SharedPreferencesExtensions.cs | 3 ---
.../Platforms/android/UsbManagerExtensions.cs | 4 +---
.../android/ViewCommandExtensions.cs | 6 +-----
.../android/WireUpResourceAttribute.cs | 2 --
.../AppSupportJsonSuspensionDriver.cs | 4 +---
.../apple-common/BlockObserveValueDelegate.cs | 1 -
.../Converters/DateTimeNSDateConverter.cs | 1 -
.../Platforms/apple-common/IndexNormalizer.cs | 3 ---
.../apple-common/KVOObservableForProperty.cs | 7 +------
.../apple-common/NSRunloopScheduler.cs | 5 ++---
.../apple-common/ObservableForPropertyBase.cs | 6 ------
.../Platforms/apple-common/ReactiveControl.cs | 6 ------
.../apple-common/ReactiveImageView.cs | 7 -------
.../ReactiveSplitViewController.cs | 8 --------
.../Platforms/apple-common/ReactiveView.cs | 8 --------
.../apple-common/ReactiveViewController.cs | 8 --------
.../apple-common/TargetActionCommandBinder.cs | 5 -----
.../apple-common/UIViewControllerMixins.cs | 9 ---------
.../apple-common/ViewModelViewHost.cs | 6 ------
.../Platforms/ios/LinkerOverrides.cs | 1 -
.../Platforms/ios/UIKitCommandBinders.cs | 2 +-
.../ios/UIKitObservableForProperty.cs | 1 -
.../mac/AppKitObservableForProperty.cs | 1 -
.../Platforms/mac/AutoSuspendHelper.cs | 8 +-------
.../Platforms/mac/PlatformRegistrations.cs | 4 ----
.../Platforms/mac/ReactiveWindowController.cs | 5 ++---
.../netstandard2.0/PlatformRegistrations.cs | 4 ----
.../Platforms/tizen/EcoreMainloopScheduler.cs | 3 ---
.../Platforms/tizen/PlatformRegistrations.cs | 4 ----
.../Platforms/tvos/LinkerOverrides.cs | 1 -
.../Platforms/tvos/UIKitCommandBinders.cs | 2 +-
.../tvos/UIKitObservableForProperty.cs | 1 -
.../uikit-common/AutoSuspendHelper.cs | 10 ++--------
.../CollectionViewSectionInformation.cs | 3 ++-
.../uikit-common/CommonReactiveSource.cs | 11 ++--------
.../uikit-common/FlexibleCommandBinder.cs | 6 +-----
.../uikit-common/ISectionInformation.cs | 2 +-
.../uikit-common/IUICollViewAdapter.cs | 1 -
.../uikit-common/PlatformRegistrations.cs | 4 ----
.../ReactiveCollectionReusableView.cs | 7 +++----
.../uikit-common/ReactiveCollectionView.cs | 8 +++-----
.../ReactiveCollectionViewCell.cs | 8 +++-----
.../ReactiveCollectionViewController.cs | 6 ++----
.../ReactiveCollectionViewSource.cs | 5 ++---
.../ReactiveCollectionViewSourceExtensions.cs | 7 ++-----
.../ReactiveNavigationController.cs | 6 ++----
.../ReactivePageViewController.cs | 6 ++----
.../uikit-common/ReactiveTabBarController.cs | 6 ++----
.../uikit-common/ReactiveTableView.cs | 8 +++-----
.../uikit-common/ReactiveTableViewCell.cs | 8 +++-----
.../ReactiveTableViewController.cs | 6 ++----
.../uikit-common/ReactiveTableViewSource.cs | 4 ----
.../ReactiveTableViewSourceExtensions.cs | 6 ++----
.../Platforms/uikit-common/RoutedViewHost.cs | 5 ++---
.../uikit-common/TableSectionHeader.cs | 1 -
.../uikit-common/TableSectionInformation.cs | 3 ++-
.../uikit-common/UICollectionViewAdapter.cs | 7 +++----
.../UIControlCommandExtensions.cs | 3 +--
.../uikit-common/UITableViewAdapter.cs | 6 ++----
.../ComponentModelTypeConverter.cs | 2 --
.../CombinedReactiveCommand.cs | 6 ------
.../ReactiveCommand/IReactiveCommand.cs | 2 --
.../ReactiveCommand/ReactiveCommand.cs | 10 ----------
.../ReactiveCommand/ReactiveCommandBase.cs | 3 ---
.../ReactiveCommand/ReactiveCommandMixins.cs | 4 ----
.../ReactiveObject/IReactiveObject.cs | 1 -
.../IReactiveObjectExtensions.cs | 9 ---------
.../ReactiveObject/ReactiveObject.cs | 3 ---
.../ReactiveObject/ReactiveRecord.cs | 3 ---
src/ReactiveUI/Registration/Registrations.cs | 2 --
src/ReactiveUI/Routing/MessageBus.cs | 6 ------
.../Routing/RoutableViewModelMixin.cs | 5 -----
src/ReactiveUI/Routing/RoutingState.cs | 6 +-----
src/ReactiveUI/Routing/RoutingStateMixins.cs | 2 --
src/ReactiveUI/RxApp.cs | 5 -----
src/ReactiveUI/Scheduler/ScheduledSubject.cs | 7 -------
.../Scheduler/WaitForDispatcherScheduler.cs | 3 ---
.../Suspension/DummySuspensionDriver.cs | 4 ----
src/ReactiveUI/Suspension/SuspensionHost.cs | 5 -----
.../Suspension/SuspensionHostExtensions.cs | 7 -------
src/ReactiveUI/UnhandledErrorException.cs | 1 -
src/ReactiveUI/View/DefaultViewLocator.cs | 3 ---
.../View/SingleInstanceViewAttribute.cs | 2 --
src/ReactiveUI/View/ViewContractAttribute.cs | 2 --
src/ReactiveUI/View/ViewLocator.cs | 2 --
.../View/ViewLocatorNotFoundException.cs | 1 -
398 files changed, 212 insertions(+), 1417 deletions(-)
create mode 100644 src/GlobalUsings.cs
diff --git a/.gitattributes b/.gitattributes
index 5044446401..724b67d80e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,7 @@
* text=auto
# Text files that should be normalized to LF in odb.
-*.cs text eol=lf diff=csharp
+*.cs text diff=csharp
*.xaml text
*.config text
*.c text
@@ -35,8 +35,8 @@
*.pdb binary
*.sdf binary
*.7z binary
-# Generated file should just use CRLF, it's fiiine
-SolutionInfo.cs text eol=crlf diff=csharp
+
+# lfs files
*.mht filter=lfs diff=lfs merge=lfs -text
*.ppam filter=lfs diff=lfs merge=lfs -text
*.wmv filter=lfs diff=lfs merge=lfs -text
diff --git a/src/Directory.build.props b/src/Directory.build.props
index 71b43a254a..b033036dd6 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -70,6 +70,10 @@
+
+
+
+
diff --git a/src/GlobalUsings.cs b/src/GlobalUsings.cs
new file mode 100644
index 0000000000..d90ce2e7f5
--- /dev/null
+++ b/src/GlobalUsings.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+global using global::Splat;
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.ComponentModel;
+global using global::System.Diagnostics.CodeAnalysis;
+global using global::System.Linq;
+global using global::System.Linq.Expressions;
+global using global::System.Reactive;
+global using global::System.Reactive.Concurrency;
+global using global::System.Reactive.Disposables;
+global using global::System.Reactive.Linq;
+global using global::System.Reactive.Subjects;
+global using global::System.Reactive.Threading.Tasks;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;
diff --git a/src/ReactiveUI.AndroidSupport/ControlFetcherMixin.cs b/src/ReactiveUI.AndroidSupport/ControlFetcherMixin.cs
index 57957b08a4..fa9d8b470c 100644
--- a/src/ReactiveUI.AndroidSupport/ControlFetcherMixin.cs
+++ b/src/ReactiveUI.AndroidSupport/ControlFetcherMixin.cs
@@ -3,9 +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;
using Android.Views;
+
using static ReactiveUI.ControlFetcherMixin;
+
using Fragment = Android.Support.V4.App.Fragment;
namespace ReactiveUI.AndroidSupport;
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveAppCompatActivity.cs b/src/ReactiveUI.AndroidSupport/ReactiveAppCompatActivity.cs
index ebbd212ca0..df2980df31 100644
--- a/src/ReactiveUI.AndroidSupport/ReactiveAppCompatActivity.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactiveAppCompatActivity.cs
@@ -3,14 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using System.Threading.Tasks;
+
using Android.App;
using Android.Content;
using Android.Runtime;
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveDialogFragment.cs b/src/ReactiveUI.AndroidSupport/ReactiveDialogFragment.cs
index 366a3c1d82..59fc50502e 100644
--- a/src/ReactiveUI.AndroidSupport/ReactiveDialogFragment.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactiveDialogFragment.cs
@@ -3,12 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
namespace ReactiveUI.AndroidSupport;
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveFragment.cs b/src/ReactiveUI.AndroidSupport/ReactiveFragment.cs
index f35db426ac..4a9188b917 100644
--- a/src/ReactiveUI.AndroidSupport/ReactiveFragment.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactiveFragment.cs
@@ -3,12 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
namespace ReactiveUI.AndroidSupport;
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs b/src/ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs
index 19603bbf4a..ba035bd412 100644
--- a/src/ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs
@@ -3,14 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using System.Threading.Tasks;
+
using Android.App;
using Android.Content;
using Android.Support.V4.App;
diff --git a/src/ReactiveUI.AndroidSupport/ReactivePagerAdapter.cs b/src/ReactiveUI.AndroidSupport/ReactivePagerAdapter.cs
index bc55aa3e23..1d0be4f8aa 100644
--- a/src/ReactiveUI.AndroidSupport/ReactivePagerAdapter.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactivePagerAdapter.cs
@@ -3,16 +3,15 @@
// 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;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+
using Android.Support.V4.View;
using Android.Views;
+
using DynamicData;
using DynamicData.Binding;
-using Splat;
+
using Object = Java.Lang.Object;
namespace ReactiveUI.AndroidSupport;
diff --git a/src/ReactiveUI.AndroidSupport/ReactivePreferenceFragment.cs b/src/ReactiveUI.AndroidSupport/ReactivePreferenceFragment.cs
index a1aa1f53db..bae00c248a 100644
--- a/src/ReactiveUI.AndroidSupport/ReactivePreferenceFragment.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactivePreferenceFragment.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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Android.Runtime;
using Android.Support.V7.Preferences;
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewAdapter.cs b/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewAdapter.cs
index 5e35a3c690..0cee078098 100644
--- a/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewAdapter.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewAdapter.cs
@@ -3,13 +3,12 @@
// 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;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+
using Android.Support.V7.Widget;
using Android.Views;
+
using DynamicData;
using DynamicData.Binding;
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewViewHolder.cs b/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewViewHolder.cs
index b9aa1e5f59..663ffbb76e 100644
--- a/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewViewHolder.cs
+++ b/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewViewHolder.cs
@@ -3,15 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Reflection;
using System.Runtime.Serialization;
+
using Android.Support.V7.Widget;
using Android.Views;
diff --git a/src/ReactiveUI.AndroidX/ControlFetcherMixin.cs b/src/ReactiveUI.AndroidX/ControlFetcherMixin.cs
index 2359c8a289..6bec97d0dc 100644
--- a/src/ReactiveUI.AndroidX/ControlFetcherMixin.cs
+++ b/src/ReactiveUI.AndroidX/ControlFetcherMixin.cs
@@ -3,9 +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;
using Android.Views;
+
using static ReactiveUI.ControlFetcherMixin;
+
using Fragment = AndroidX.Fragment.App.Fragment;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.AndroidX/ReactiveAppCompatActivity.cs b/src/ReactiveUI.AndroidX/ReactiveAppCompatActivity.cs
index dd136cdfea..3ee71de86a 100644
--- a/src/ReactiveUI.AndroidX/ReactiveAppCompatActivity.cs
+++ b/src/ReactiveUI.AndroidX/ReactiveAppCompatActivity.cs
@@ -3,17 +3,13 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using System.Threading.Tasks;
+
using Android.App;
using Android.Content;
using Android.Runtime;
+
using AndroidX.AppCompat.App;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.AndroidX/ReactiveDialogFragment.cs b/src/ReactiveUI.AndroidX/ReactiveDialogFragment.cs
index a7fbd9e038..b7b3a658e1 100644
--- a/src/ReactiveUI.AndroidX/ReactiveDialogFragment.cs
+++ b/src/ReactiveUI.AndroidX/ReactiveDialogFragment.cs
@@ -3,12 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.AndroidX/ReactiveFragment.cs b/src/ReactiveUI.AndroidX/ReactiveFragment.cs
index 37b0c5b4b1..2c2a4f3c13 100644
--- a/src/ReactiveUI.AndroidX/ReactiveFragment.cs
+++ b/src/ReactiveUI.AndroidX/ReactiveFragment.cs
@@ -3,12 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.AndroidX/ReactiveFragmentActivity.cs b/src/ReactiveUI.AndroidX/ReactiveFragmentActivity.cs
index 08c946baa3..a4b37874da 100644
--- a/src/ReactiveUI.AndroidX/ReactiveFragmentActivity.cs
+++ b/src/ReactiveUI.AndroidX/ReactiveFragmentActivity.cs
@@ -3,16 +3,12 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using System.Threading.Tasks;
+
using Android.App;
using Android.Content;
+
using AndroidX.Fragment.App;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.AndroidX/ReactivePagerAdapter.cs b/src/ReactiveUI.AndroidX/ReactivePagerAdapter.cs
index 783e5c993d..7ee371f0a1 100644
--- a/src/ReactiveUI.AndroidX/ReactivePagerAdapter.cs
+++ b/src/ReactiveUI.AndroidX/ReactivePagerAdapter.cs
@@ -3,16 +3,16 @@
// 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;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+
using Android.Views;
+
using AndroidX.ViewPager.Widget;
+
using DynamicData;
using DynamicData.Binding;
-using Splat;
+
using Object = Java.Lang.Object;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.AndroidX/ReactivePreferenceFragment.cs b/src/ReactiveUI.AndroidX/ReactivePreferenceFragment.cs
index fd437da3b6..047d88d18b 100644
--- a/src/ReactiveUI.AndroidX/ReactivePreferenceFragment.cs
+++ b/src/ReactiveUI.AndroidX/ReactivePreferenceFragment.cs
@@ -3,13 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Android.Runtime;
+
using AndroidX.Preference;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.AndroidX/ReactiveRecyclerViewAdapter.cs b/src/ReactiveUI.AndroidX/ReactiveRecyclerViewAdapter.cs
index 0aa721706e..f7e16cb7b5 100644
--- a/src/ReactiveUI.AndroidX/ReactiveRecyclerViewAdapter.cs
+++ b/src/ReactiveUI.AndroidX/ReactiveRecyclerViewAdapter.cs
@@ -3,12 +3,11 @@
// 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;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+
using AndroidX.RecyclerView.Widget;
+
using DynamicData;
using DynamicData.Binding;
diff --git a/src/ReactiveUI.AndroidX/ReactiveRecyclerViewViewHolder.cs b/src/ReactiveUI.AndroidX/ReactiveRecyclerViewViewHolder.cs
index 5a97ee3069..d4e463caae 100644
--- a/src/ReactiveUI.AndroidX/ReactiveRecyclerViewViewHolder.cs
+++ b/src/ReactiveUI.AndroidX/ReactiveRecyclerViewViewHolder.cs
@@ -3,16 +3,13 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Reflection;
using System.Runtime.Serialization;
+
using Android.Views;
+
using AndroidX.RecyclerView.Widget;
namespace ReactiveUI.AndroidX;
diff --git a/src/ReactiveUI.Blazor/ReactiveComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
index 088cb8a21b..771abde0e8 100644
--- a/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
+++ b/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
@@ -3,15 +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;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Runtime.CompilerServices;
+
using Microsoft.AspNetCore.Components;
namespace ReactiveUI.Blazor;
diff --git a/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
index dd8daddf00..e5edc91cb2 100644
--- a/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
+++ b/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
@@ -3,15 +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;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Runtime.CompilerServices;
+
using Microsoft.AspNetCore.Components;
namespace ReactiveUI.Blazor;
diff --git a/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
index a264fd0dff..96908336e2 100644
--- a/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
+++ b/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
@@ -3,13 +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;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Runtime.CompilerServices;
+
using Microsoft.AspNetCore.Components;
namespace ReactiveUI.Blazor;
diff --git a/src/ReactiveUI.Blazor/Registrations.cs b/src/ReactiveUI.Blazor/Registrations.cs
index b0de4f3e65..292d9de553 100644
--- a/src/ReactiveUI.Blazor/Registrations.cs
+++ b/src/ReactiveUI.Blazor/Registrations.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;
-using System.Reactive.Concurrency;
using System.Reactive.PlatformServices;
namespace ReactiveUI.Blazor;
diff --git a/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs b/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs
index efd48cd9dc..607d88e069 100644
--- a/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs
+++ b/src/ReactiveUI.Blend/FollowObservableStateBehavior.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;
-using System.Reactive.Linq;
-
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
diff --git a/src/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs b/src/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs
index c6eaadf2d3..6e4287a805 100644
--- a/src/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs
+++ b/src/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs
@@ -3,9 +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;
-using System.Reactive.Linq;
using System.Windows;
+
using Microsoft.Xaml.Behaviors;
namespace ReactiveUI.Blend;
diff --git a/src/ReactiveUI.Drawing/Registrations.cs b/src/ReactiveUI.Drawing/Registrations.cs
index 5278c2ea7b..455ef120b5 100644
--- a/src/ReactiveUI.Drawing/Registrations.cs
+++ b/src/ReactiveUI.Drawing/Registrations.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;
-using Splat;
-
namespace ReactiveUI.Drawing;
///
diff --git a/src/ReactiveUI.Maui/ActivationForViewFetcher.cs b/src/ReactiveUI.Maui/ActivationForViewFetcher.cs
index 7b8285fa77..cbe1f3cc61 100644
--- a/src/ReactiveUI.Maui/ActivationForViewFetcher.cs
+++ b/src/ReactiveUI.Maui/ActivationForViewFetcher.cs
@@ -3,11 +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;
-using System.Reactive.Linq;
using System.Reflection;
#if WINUI_TARGET
using Microsoft.UI.Xaml;
+
using Windows.Foundation;
#endif
diff --git a/src/ReactiveUI.Maui/AutoSuspendHelper.cs b/src/ReactiveUI.Maui/AutoSuspendHelper.cs
index d3d22b3104..163acdd6c8 100644
--- a/src/ReactiveUI.Maui/AutoSuspendHelper.cs
+++ b/src/ReactiveUI.Maui/AutoSuspendHelper.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Subjects;
-using Splat;
-
namespace ReactiveUI.Maui;
///
diff --git a/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs b/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs
index db1995f2c3..cab784f68d 100644
--- a/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs
+++ b/src/ReactiveUI.Maui/Common/AutoDataTemplateBindingHook.cs
@@ -7,6 +7,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
+
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Markup;
diff --git a/src/ReactiveUI.Maui/Common/BooleanToVisibilityHint.cs b/src/ReactiveUI.Maui/Common/BooleanToVisibilityHint.cs
index df0b9fee7d..db0c03902b 100644
--- a/src/ReactiveUI.Maui/Common/BooleanToVisibilityHint.cs
+++ b/src/ReactiveUI.Maui/Common/BooleanToVisibilityHint.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;
-
namespace ReactiveUI
{
///
diff --git a/src/ReactiveUI.Maui/Common/BooleanToVisibilityTypeConverter.cs b/src/ReactiveUI.Maui/Common/BooleanToVisibilityTypeConverter.cs
index f5d3c559cf..12d8b8a522 100644
--- a/src/ReactiveUI.Maui/Common/BooleanToVisibilityTypeConverter.cs
+++ b/src/ReactiveUI.Maui/Common/BooleanToVisibilityTypeConverter.cs
@@ -3,7 +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;
#if WINUI_TARGET
using Microsoft.UI.Xaml;
#else
diff --git a/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs b/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
index ae4d50fae6..9887fc4a8f 100644
--- a/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
+++ b/src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
@@ -6,6 +6,7 @@
#if WINUI_TARGET
using System;
using System.Diagnostics.CodeAnalysis;
+
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
diff --git a/src/ReactiveUI.Maui/Common/RoutedViewHost.cs b/src/ReactiveUI.Maui/Common/RoutedViewHost.cs
index 1a2402f9d6..458f8d9efa 100644
--- a/src/ReactiveUI.Maui/Common/RoutedViewHost.cs
+++ b/src/ReactiveUI.Maui/Common/RoutedViewHost.cs
@@ -4,15 +4,9 @@
// See the LICENSE file in the project root for full license information.
#if WINUI_TARGET
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reactive.Linq;
using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
+
using ReactiveUI;
-using Splat;
namespace ReactiveUI
{
diff --git a/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs b/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs
index 51fd43c0fa..1447dfd1eb 100644
--- a/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs
+++ b/src/ReactiveUI.Maui/Common/ViewModelViewHost.cs
@@ -9,8 +9,10 @@
using System.Reactive;
using System.Reactive.Disposables;
using System.Reactive.Linq;
+
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
+
using Splat;
namespace ReactiveUI
diff --git a/src/ReactiveUI.Maui/DisableAnimationAttribute.cs b/src/ReactiveUI.Maui/DisableAnimationAttribute.cs
index 10f0b558b4..7d55410e6d 100644
--- a/src/ReactiveUI.Maui/DisableAnimationAttribute.cs
+++ b/src/ReactiveUI.Maui/DisableAnimationAttribute.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;
-
namespace ReactiveUI.Maui;
///
diff --git a/src/ReactiveUI.Maui/ReactiveShellContent.cs b/src/ReactiveUI.Maui/ReactiveShellContent.cs
index 81bece4985..7a2e2c6bf9 100644
--- a/src/ReactiveUI.Maui/ReactiveShellContent.cs
+++ b/src/ReactiveUI.Maui/ReactiveShellContent.cs
@@ -3,9 +3,7 @@
// 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;
using Microsoft.Maui.Controls;
-using Splat;
namespace ReactiveUI.Maui;
diff --git a/src/ReactiveUI.Maui/Registrations.cs b/src/ReactiveUI.Maui/Registrations.cs
index 1488c538da..cd17239baa 100644
--- a/src/ReactiveUI.Maui/Registrations.cs
+++ b/src/ReactiveUI.Maui/Registrations.cs
@@ -3,13 +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;
-
-#if WINUI_TARGET
-using System.Reactive.Concurrency;
-using Splat;
-#endif
-
#if IS_WINUI
namespace ReactiveUI.WinUI;
#endif
diff --git a/src/ReactiveUI.Maui/RoutedViewHost.cs b/src/ReactiveUI.Maui/RoutedViewHost.cs
index 93bc2e9877..bffebeb44c 100644
--- a/src/ReactiveUI.Maui/RoutedViewHost.cs
+++ b/src/ReactiveUI.Maui/RoutedViewHost.cs
@@ -3,16 +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;
using System.Collections.Specialized;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
-using System.Threading.Tasks;
+
using Microsoft.Maui.Controls;
-using Splat;
namespace ReactiveUI.Maui;
diff --git a/src/ReactiveUI.Maui/ViewModelViewHost.cs b/src/ReactiveUI.Maui/ViewModelViewHost.cs
index 5e9c8de145..c97f31508e 100644
--- a/src/ReactiveUI.Maui/ViewModelViewHost.cs
+++ b/src/ReactiveUI.Maui/ViewModelViewHost.cs
@@ -3,10 +3,7 @@
// 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;
-using System.Reactive.Linq;
using Microsoft.Maui.Controls;
-using Splat;
namespace ReactiveUI.Maui;
diff --git a/src/ReactiveUI.Maui/WinUI/DependencyObjectObservableForProperty.cs b/src/ReactiveUI.Maui/WinUI/DependencyObjectObservableForProperty.cs
index 1a10f3f008..b9bfb1c457 100644
--- a/src/ReactiveUI.Maui/WinUI/DependencyObjectObservableForProperty.cs
+++ b/src/ReactiveUI.Maui/WinUI/DependencyObjectObservableForProperty.cs
@@ -10,7 +10,9 @@
using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Reflection;
+
using Microsoft.UI.Xaml;
+
using Splat;
namespace ReactiveUI
diff --git a/src/ReactiveUI.Maui/WinUI/TransitioningContentControl.Empty.cs b/src/ReactiveUI.Maui/WinUI/TransitioningContentControl.Empty.cs
index 0f0ef978b2..5098f02a76 100644
--- a/src/ReactiveUI.Maui/WinUI/TransitioningContentControl.Empty.cs
+++ b/src/ReactiveUI.Maui/WinUI/TransitioningContentControl.Empty.cs
@@ -5,6 +5,7 @@
#if WINUI_TARGET
using System.Diagnostics.CodeAnalysis;
+
using Microsoft.UI.Xaml.Controls;
namespace ReactiveUI;
diff --git a/src/ReactiveUI.Splat.Tests/SplatAdapterTests.cs b/src/ReactiveUI.Splat.Tests/SplatAdapterTests.cs
index 14f06138bd..6a44efd7ab 100644
--- a/src/ReactiveUI.Splat.Tests/SplatAdapterTests.cs
+++ b/src/ReactiveUI.Splat.Tests/SplatAdapterTests.cs
@@ -3,17 +3,14 @@
// 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;
-using System.Collections.Generic;
-using System.Linq;
using Autofac;
+
using DryIoc;
using FluentAssertions;
using Ninject;
-using Splat;
using Splat.Autofac;
using Splat.DryIoc;
using Splat.Ninject;
@@ -34,7 +31,7 @@ public class SplatAdapterTests
public void DryIocDependencyResolver_Should_Register_ReactiveUI_BindingTypeConverters()
{
// Invoke RxApp which initializes the ReactiveUI platform.
- var container = new Container();
+ var container = new DryIoc.Container();
container.UseDryIocDependencyResolver();
Locator.CurrentMutable.InitializeReactiveUI();
@@ -52,7 +49,7 @@ public void DryIocDependencyResolver_Should_Register_ReactiveUI_BindingTypeConve
public void DryIocDependencyResolver_Should_Register_ReactiveUI_CreatesCommandBinding()
{
// Invoke RxApp which initializes the ReactiveUI platform.
- var container = new Container();
+ var container = new DryIoc.Container();
container.UseDryIocDependencyResolver();
Locator.CurrentMutable.InitializeReactiveUI();
diff --git a/src/ReactiveUI.Testing.Tests/TestFixture.cs b/src/ReactiveUI.Testing.Tests/TestFixture.cs
index b980af5dda..d309a0c83f 100644
--- a/src/ReactiveUI.Testing.Tests/TestFixture.cs
+++ b/src/ReactiveUI.Testing.Tests/TestFixture.cs
@@ -3,7 +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.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
namespace ReactiveUI.Testing.Tests
diff --git a/src/ReactiveUI.Testing.Tests/TestFixtureBuilder.cs b/src/ReactiveUI.Testing.Tests/TestFixtureBuilder.cs
index 84b9cca022..afab6e4f9a 100644
--- a/src/ReactiveUI.Testing.Tests/TestFixtureBuilder.cs
+++ b/src/ReactiveUI.Testing.Tests/TestFixtureBuilder.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;
-using System.Collections.Generic;
-
namespace ReactiveUI.Testing.Tests
{
///
diff --git a/src/ReactiveUI.Testing.Tests/TestFixtureBuilderExtensionTests.cs b/src/ReactiveUI.Testing.Tests/TestFixtureBuilderExtensionTests.cs
index 2263ce3aa3..209f64d895 100644
--- a/src/ReactiveUI.Testing.Tests/TestFixtureBuilderExtensionTests.cs
+++ b/src/ReactiveUI.Testing.Tests/TestFixtureBuilderExtensionTests.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.Collections.Generic;
-
using FluentAssertions;
using Xunit;
diff --git a/src/ReactiveUI.Testing/IBuilderExtensions.cs b/src/ReactiveUI.Testing/IBuilderExtensions.cs
index 1b626078ec..afd56a7ab6 100644
--- a/src/ReactiveUI.Testing/IBuilderExtensions.cs
+++ b/src/ReactiveUI.Testing/IBuilderExtensions.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.Collections.Generic;
-
namespace ReactiveUI.Testing;
#pragma warning disable SA1402, SA1649, CA1040
///
diff --git a/src/ReactiveUI.Testing/MessageBusExtensions.cs b/src/ReactiveUI.Testing/MessageBusExtensions.cs
index d40f010c19..9daad3016d 100644
--- a/src/ReactiveUI.Testing/MessageBusExtensions.cs
+++ b/src/ReactiveUI.Testing/MessageBusExtensions.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;
-using System.Reactive.Disposables;
-using System.Threading;
-
namespace ReactiveUI.Testing;
///
diff --git a/src/ReactiveUI.Testing/SchedulerExtensions.cs b/src/ReactiveUI.Testing/SchedulerExtensions.cs
index dcaece214e..527c0448bb 100644
--- a/src/ReactiveUI.Testing/SchedulerExtensions.cs
+++ b/src/ReactiveUI.Testing/SchedulerExtensions.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Threading;
-using System.Threading.Tasks;
using Microsoft.Reactive.Testing;
namespace ReactiveUI.Testing;
diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.cs b/src/ReactiveUI.Tests/API/ApiApprovalTests.cs
index f06c7acf23..960bad73ab 100644
--- a/src/ReactiveUI.Tests/API/ApiApprovalTests.cs
+++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.cs
@@ -3,9 +3,7 @@
// 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;
using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
using VerifyXunit;
diff --git a/src/ReactiveUI.Tests/Activation/ActivatingView.cs b/src/ReactiveUI.Tests/Activation/ActivatingView.cs
index 2a5b646858..d5709773e6 100644
--- a/src/ReactiveUI.Tests/Activation/ActivatingView.cs
+++ b/src/ReactiveUI.Tests/Activation/ActivatingView.cs
@@ -3,11 +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;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Subjects;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Activation/ActivatingViewFetcher.cs b/src/ReactiveUI.Tests/Activation/ActivatingViewFetcher.cs
index d957174f0e..67bc685cf5 100644
--- a/src/ReactiveUI.Tests/Activation/ActivatingViewFetcher.cs
+++ b/src/ReactiveUI.Tests/Activation/ActivatingViewFetcher.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;
-using System.Reactive.Linq;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Activation/ActivatingViewModel.cs b/src/ReactiveUI.Tests/Activation/ActivatingViewModel.cs
index bc8d7754ea..b6d783c76e 100644
--- a/src/ReactiveUI.Tests/Activation/ActivatingViewModel.cs
+++ b/src/ReactiveUI.Tests/Activation/ActivatingViewModel.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.Disposables;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Activation/ActivatingViewTests.cs b/src/ReactiveUI.Tests/Activation/ActivatingViewTests.cs
index 8f569ee6a2..6b3848aba0 100644
--- a/src/ReactiveUI.Tests/Activation/ActivatingViewTests.cs
+++ b/src/ReactiveUI.Tests/Activation/ActivatingViewTests.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;
-using Splat;
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Activation/CanActivateViewFetcherTests.cs b/src/ReactiveUI.Tests/Activation/CanActivateViewFetcherTests.cs
index ebbbb256dd..075f13e862 100644
--- a/src/ReactiveUI.Tests/Activation/CanActivateViewFetcherTests.cs
+++ b/src/ReactiveUI.Tests/Activation/CanActivateViewFetcherTests.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Tests.Winforms;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Activation/DerivedActivatingViewModel.cs b/src/ReactiveUI.Tests/Activation/DerivedActivatingViewModel.cs
index a0701c535a..68c6946653 100644
--- a/src/ReactiveUI.Tests/Activation/DerivedActivatingViewModel.cs
+++ b/src/ReactiveUI.Tests/Activation/DerivedActivatingViewModel.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.Disposables;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Activation/ViewModelActivatorTests.cs b/src/ReactiveUI.Tests/Activation/ViewModelActivatorTests.cs
index 2bb88fdc37..69c6780ec2 100644
--- a/src/ReactiveUI.Tests/Activation/ViewModelActivatorTests.cs
+++ b/src/ReactiveUI.Tests/Activation/ViewModelActivatorTests.cs
@@ -3,9 +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;
-using System.Reactive.Concurrency;
using DynamicData;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/AutoPersist/AutoPersistCollectionTests.cs b/src/ReactiveUI.Tests/AutoPersist/AutoPersistCollectionTests.cs
index b88e9c918d..0a84e606cb 100644
--- a/src/ReactiveUI.Tests/AutoPersist/AutoPersistCollectionTests.cs
+++ b/src/ReactiveUI.Tests/AutoPersist/AutoPersistCollectionTests.cs
@@ -3,13 +3,12 @@
// 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;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using DynamicData.Binding;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/AutoPersist/AutoPersistHelperTest.cs b/src/ReactiveUI.Tests/AutoPersist/AutoPersistHelperTest.cs
index e276d030fc..02320b6a2a 100644
--- a/src/ReactiveUI.Tests/AutoPersist/AutoPersistHelperTest.cs
+++ b/src/ReactiveUI.Tests/AutoPersist/AutoPersistHelperTest.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/AwaiterTest.cs b/src/ReactiveUI.Tests/AwaiterTest.cs
index 0d8b9f16e7..2c683d3782 100644
--- a/src/ReactiveUI.Tests/AwaiterTest.cs
+++ b/src/ReactiveUI.Tests/AwaiterTest.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Commands/CombinedReactiveCommandTest.cs b/src/ReactiveUI.Tests/Commands/CombinedReactiveCommandTest.cs
index 4d48c98afe..00694a291a 100644
--- a/src/ReactiveUI.Tests/Commands/CombinedReactiveCommandTest.cs
+++ b/src/ReactiveUI.Tests/Commands/CombinedReactiveCommandTest.cs
@@ -3,15 +3,12 @@
// 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;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading.Tasks;
using DynamicData;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Commands/CreatesCommandBindingTests.cs b/src/ReactiveUI.Tests/Commands/CreatesCommandBindingTests.cs
index 714cca6baf..84caf78156 100644
--- a/src/ReactiveUI.Tests/Commands/CreatesCommandBindingTests.cs
+++ b/src/ReactiveUI.Tests/Commands/CreatesCommandBindingTests.cs
@@ -4,7 +4,7 @@
// See the LICENSE file in the project root for full license information.
using System.ComponentModel;
-using System.Reactive.Linq;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Commands/Mocks/FakeCommand.cs b/src/ReactiveUI.Tests/Commands/Mocks/FakeCommand.cs
index 645c2bed5e..e58ae804eb 100644
--- a/src/ReactiveUI.Tests/Commands/Mocks/FakeCommand.cs
+++ b/src/ReactiveUI.Tests/Commands/Mocks/FakeCommand.cs
@@ -3,7 +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;
using System.Windows.Input;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Commands/Mocks/ReactiveCommandHolder.cs b/src/ReactiveUI.Tests/Commands/Mocks/ReactiveCommandHolder.cs
index 134e672313..a84cd1a50b 100644
--- a/src/ReactiveUI.Tests/Commands/Mocks/ReactiveCommandHolder.cs
+++ b/src/ReactiveUI.Tests/Commands/Mocks/ReactiveCommandHolder.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;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Commands/ReactiveCommandTest.cs b/src/ReactiveUI.Tests/Commands/ReactiveCommandTest.cs
index cf4545056d..c5cb8801fe 100644
--- a/src/ReactiveUI.Tests/Commands/ReactiveCommandTest.cs
+++ b/src/ReactiveUI.Tests/Commands/ReactiveCommandTest.cs
@@ -3,18 +3,14 @@
// 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;
-using System.Collections.Generic;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading;
-using System.Threading.Tasks;
using System.Windows.Input;
+
using DynamicData;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Comparers/OrderedComparerTests.cs b/src/ReactiveUI.Tests/Comparers/OrderedComparerTests.cs
index 2ea1420e4c..463ab556b5 100644
--- a/src/ReactiveUI.Tests/Comparers/OrderedComparerTests.cs
+++ b/src/ReactiveUI.Tests/Comparers/OrderedComparerTests.cs
@@ -3,10 +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;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/InteractionBinding/InteractionBinderImplementationTests.cs b/src/ReactiveUI.Tests/InteractionBinding/InteractionBinderImplementationTests.cs
index 513c90f6a9..3273176475 100644
--- a/src/ReactiveUI.Tests/InteractionBinding/InteractionBinderImplementationTests.cs
+++ b/src/ReactiveUI.Tests/InteractionBinding/InteractionBinderImplementationTests.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
-using System.Threading.Tasks;
using FluentAssertions;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/InteractionsTest.cs b/src/ReactiveUI.Tests/InteractionsTest.cs
index c6e513da85..36d39d0f0f 100644
--- a/src/ReactiveUI.Tests/InteractionsTest.cs
+++ b/src/ReactiveUI.Tests/InteractionsTest.cs
@@ -3,14 +3,12 @@
// 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;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
using DynamicData;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Locator/DefaultViewLocatorTests.cs b/src/ReactiveUI.Tests/Locator/DefaultViewLocatorTests.cs
index f49fe637a2..34007010c0 100644
--- a/src/ReactiveUI.Tests/Locator/DefaultViewLocatorTests.cs
+++ b/src/ReactiveUI.Tests/Locator/DefaultViewLocatorTests.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;
-using Splat;
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Locator/Mocks/FooThatThrowsView.cs b/src/ReactiveUI.Tests/Locator/Mocks/FooThatThrowsView.cs
index 963ff63169..aca680ed85 100644
--- a/src/ReactiveUI.Tests/Locator/Mocks/FooThatThrowsView.cs
+++ b/src/ReactiveUI.Tests/Locator/Mocks/FooThatThrowsView.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;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Locator/Mocks/IBarViewModel.cs b/src/ReactiveUI.Tests/Locator/Mocks/IBarViewModel.cs
index 25583ea92b..9a5cabae61 100644
--- a/src/ReactiveUI.Tests/Locator/Mocks/IBarViewModel.cs
+++ b/src/ReactiveUI.Tests/Locator/Mocks/IBarViewModel.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.Diagnostics.CodeAnalysis;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Locator/Mocks/IFooViewModel.cs b/src/ReactiveUI.Tests/Locator/Mocks/IFooViewModel.cs
index 5f03d00bda..72ca9f43bf 100644
--- a/src/ReactiveUI.Tests/Locator/Mocks/IFooViewModel.cs
+++ b/src/ReactiveUI.Tests/Locator/Mocks/IFooViewModel.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.Diagnostics.CodeAnalysis;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Locator/Mocks/IStrangeInterfaceNotFollowingConvention.cs b/src/ReactiveUI.Tests/Locator/Mocks/IStrangeInterfaceNotFollowingConvention.cs
index 90629bff13..eae72ea922 100644
--- a/src/ReactiveUI.Tests/Locator/Mocks/IStrangeInterfaceNotFollowingConvention.cs
+++ b/src/ReactiveUI.Tests/Locator/Mocks/IStrangeInterfaceNotFollowingConvention.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.Diagnostics.CodeAnalysis;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/MessageBusTest.cs b/src/ReactiveUI.Tests/MessageBusTest.cs
index aa80e8321e..8ba563d698 100644
--- a/src/ReactiveUI.Tests/MessageBusTest.cs
+++ b/src/ReactiveUI.Tests/MessageBusTest.cs
@@ -3,14 +3,12 @@
// 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;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading;
using DynamicData;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Mocks/CommandBindViewModel.cs b/src/ReactiveUI.Tests/Mocks/CommandBindViewModel.cs
index dc3ac6b6cb..60c3a5fd79 100644
--- a/src/ReactiveUI.Tests/Mocks/CommandBindViewModel.cs
+++ b/src/ReactiveUI.Tests/Mocks/CommandBindViewModel.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;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Mocks/FakeNestedViewModel.cs b/src/ReactiveUI.Tests/Mocks/FakeNestedViewModel.cs
index 7024ad535c..bc5fe8e47c 100644
--- a/src/ReactiveUI.Tests/Mocks/FakeNestedViewModel.cs
+++ b/src/ReactiveUI.Tests/Mocks/FakeNestedViewModel.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;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Mocks/FakeViewModel.cs b/src/ReactiveUI.Tests/Mocks/FakeViewModel.cs
index 89fe22efb7..1684bdb6c0 100644
--- a/src/ReactiveUI.Tests/Mocks/FakeViewModel.cs
+++ b/src/ReactiveUI.Tests/Mocks/FakeViewModel.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;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Mocks/MockBindListView.cs b/src/ReactiveUI.Tests/Mocks/MockBindListView.cs
index f34f0efd9b..4bf56b2ece 100644
--- a/src/ReactiveUI.Tests/Mocks/MockBindListView.cs
+++ b/src/ReactiveUI.Tests/Mocks/MockBindListView.cs
@@ -4,8 +4,6 @@
// See the LICENSE file in the project root for full license information.
using System.IO;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
diff --git a/src/ReactiveUI.Tests/Mocks/MockBindListViewModel.cs b/src/ReactiveUI.Tests/Mocks/MockBindListViewModel.cs
index fc2b69fac4..445668e4c6 100644
--- a/src/ReactiveUI.Tests/Mocks/MockBindListViewModel.cs
+++ b/src/ReactiveUI.Tests/Mocks/MockBindListViewModel.cs
@@ -3,12 +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;
using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
+
using DynamicData;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ObservableAsPropertyHelper/Mocks/OAPHIndexerTestFixture.cs b/src/ReactiveUI.Tests/ObservableAsPropertyHelper/Mocks/OAPHIndexerTestFixture.cs
index c2fd8b4c53..244ac5623a 100644
--- a/src/ReactiveUI.Tests/ObservableAsPropertyHelper/Mocks/OAPHIndexerTestFixture.cs
+++ b/src/ReactiveUI.Tests/ObservableAsPropertyHelper/Mocks/OAPHIndexerTestFixture.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.Tests
{
///
diff --git a/src/ReactiveUI.Tests/ObservableAsPropertyHelper/ObservableAsPropertyHelperTest.cs b/src/ReactiveUI.Tests/ObservableAsPropertyHelper/ObservableAsPropertyHelperTest.cs
index c041381e5b..5f55a12b98 100644
--- a/src/ReactiveUI.Tests/ObservableAsPropertyHelper/ObservableAsPropertyHelperTest.cs
+++ b/src/ReactiveUI.Tests/ObservableAsPropertyHelper/ObservableAsPropertyHelperTest.cs
@@ -3,16 +3,12 @@
// 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using DynamicData;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ObservedChanged/Mocks/NewGameViewModel.cs b/src/ReactiveUI.Tests/ObservedChanged/Mocks/NewGameViewModel.cs
index 38ad4fbe30..772a356942 100644
--- a/src/ReactiveUI.Tests/ObservedChanged/Mocks/NewGameViewModel.cs
+++ b/src/ReactiveUI.Tests/ObservedChanged/Mocks/NewGameViewModel.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;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
using DynamicData.Binding;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ObservedChanged/NewGameViewModelTests.cs b/src/ReactiveUI.Tests/ObservedChanged/NewGameViewModelTests.cs
index 2189a2d54b..1f64c5d9ab 100644
--- a/src/ReactiveUI.Tests/ObservedChanged/NewGameViewModelTests.cs
+++ b/src/ReactiveUI.Tests/ObservedChanged/NewGameViewModelTests.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;
-using System.Linq;
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ObservedChanged/ObservedChangedMixinTest.cs b/src/ReactiveUI.Tests/ObservedChanged/ObservedChangedMixinTest.cs
index ecfdf41c81..10325585ac 100644
--- a/src/ReactiveUI.Tests/ObservedChanged/ObservedChangedMixinTest.cs
+++ b/src/ReactiveUI.Tests/ObservedChanged/ObservedChangedMixinTest.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;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionFixture.cs b/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionFixture.cs
index f0ae370e52..c8d325fa2d 100644
--- a/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionFixture.cs
+++ b/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionFixture.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.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionNameOfFixture.cs b/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionNameOfFixture.cs
index dcbaa4a1de..ab784e9d18 100644
--- a/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionNameOfFixture.cs
+++ b/src/ReactiveUI.Tests/Platforms/common-gui/Mocks/RaceConditionNameOfFixture.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.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Platforms/common-gui/ProductionMode.cs b/src/ReactiveUI.Tests/Platforms/common-gui/ProductionMode.cs
index 36520c4dc9..7fabfc0c5c 100644
--- a/src/ReactiveUI.Tests/Platforms/common-gui/ProductionMode.cs
+++ b/src/ReactiveUI.Tests/Platforms/common-gui/ProductionMode.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;
-using System.Reactive.Disposables;
-using Splat;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Api/XamlApiApprovalTests.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Api/XamlApiApprovalTests.cs
index 91a8020d4b..c0a4b39274 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Api/XamlApiApprovalTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Api/XamlApiApprovalTests.cs
@@ -3,9 +3,7 @@
// 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;
using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
using Xunit;
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/CommandBindingImplementationTests.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/CommandBindingImplementationTests.cs
index e8855c0150..fb136fc74a 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/CommandBindingImplementationTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/CommandBindingImplementationTests.cs
@@ -3,17 +3,12 @@
// 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;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using Xunit;
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
#else
-using System.Windows.Controls;
-using System.Windows.Input;
using FactAttribute = Xunit.WpfFactAttribute;
#endif
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/DependencyObjectObservableForPropertyTest.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/DependencyObjectObservableForPropertyTest.cs
index a00bd8c8a0..f5c1792597 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/DependencyObjectObservableForPropertyTest.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/DependencyObjectObservableForPropertyTest.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
-
using DynamicData;
using Xunit;
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CommandBindView.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CommandBindView.cs
index 2d7839ec4a..44151c1c36 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CommandBindView.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CommandBindView.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CustomClickButton.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CustomClickButton.cs
index 8fad5e1477..6f48010b5e 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CustomClickButton.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/CustomClickButton.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DepObjFixture.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DepObjFixture.cs
index 33f75237a5..7a3d828e9e 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DepObjFixture.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DepObjFixture.cs
@@ -3,18 +3,12 @@
// 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows;
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
#else
-using System.Windows.Controls;
#endif
namespace ReactiveUI.Tests.Xaml
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DerivedDepObjFixture.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DerivedDepObjFixture.cs
index 8ef2954327..d4f8b271d5 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DerivedDepObjFixture.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/DerivedDepObjFixture.cs
@@ -3,11 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows;
#if NETFX_CORE
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/FakeView.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/FakeView.cs
index ca52824a31..6e8b0b3752 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/FakeView.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/FakeView.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindFakeControl.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindFakeControl.cs
index afcf62a771..537d5bda22 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindFakeControl.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindFakeControl.cs
@@ -3,11 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows;
#if NETFX_CORE
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindView.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindView.cs
index 71604f8e63..6db2ba2639 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindView.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/PropertyBindView.cs
@@ -3,11 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows;
#if NETFX_CORE
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/ReactiveObjectCommandBindView.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/ReactiveObjectCommandBindView.cs
index ac973df936..ea41c01896 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/ReactiveObjectCommandBindView.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Mocks/ReactiveObjectCommandBindView.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/PropertyBindingTest.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/PropertyBindingTest.cs
index 4202a8fb3e..b81f016001 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/PropertyBindingTest.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/PropertyBindingTest.cs
@@ -3,19 +3,11 @@
// 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;
using System.Collections;
using System.Globalization;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Windows;
-using DynamicData;
+
using DynamicData.Binding;
-using ReactiveUI.Tests.Wpf;
+
using Xunit;
#if NETFX_CORE
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/RxAppDependencyObjectTests.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/RxAppDependencyObjectTests.cs
index 8581d30cf9..0e9b13f872 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/RxAppDependencyObjectTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/RxAppDependencyObjectTests.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.Linq;
-using Splat;
using Xunit;
namespace ReactiveUI.Tests.Xaml
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/Utilities/DispatcherUtilities.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/Utilities/DispatcherUtilities.cs
index ee7421823e..09f04de38c 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/Utilities/DispatcherUtilities.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/Utilities/DispatcherUtilities.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
#if !NETFX_CORE
using System.Windows.Threading;
#endif
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/WhenAnyThroughDependencyObjectTests.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/WhenAnyThroughDependencyObjectTests.cs
index 6c5c468b4e..fb95e400aa 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/WhenAnyThroughDependencyObjectTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/WhenAnyThroughDependencyObjectTests.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;
-using System.Collections.Generic;
using Xunit;
#if NETFX_CORE
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewCommandTests.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewCommandTests.cs
index 1e20d743a5..b2b16f1bf5 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewCommandTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewCommandTests.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;
-using System.Reactive.Linq;
-
using Xunit;
#if NETFX_CORE
@@ -19,7 +16,6 @@
using System.Windows.Automation.Peers;
using System.Windows.Automation.Provider;
using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
using FactAttribute = Xunit.WpfFactAttribute;
#endif
diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewDependencyResolverTests.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewDependencyResolverTests.cs
index 93104bd53d..b388049ed1 100644
--- a/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewDependencyResolverTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewDependencyResolverTests.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Splat;
using Xunit;
#if NETFX_CORE
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.cs
index bc2d1bb0f9..a950b60b21 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.cs
@@ -3,9 +3,7 @@
// 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;
using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
using VerifyXunit;
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/ActivationTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/ActivationTests.cs
index 08241a4839..54a21ce34b 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/ActivationTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/ActivationTests.cs
@@ -3,9 +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;
-using System.Runtime.InteropServices;
using System.Windows.Forms;
+
using Xunit;
namespace ReactiveUI.Tests.Winforms
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingImplementationTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingImplementationTests.cs
index 46d45e44ed..debca7bfb3 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingImplementationTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingImplementationTests.cs
@@ -3,8 +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;
using System.Windows.Forms;
+
using Xunit;
namespace ReactiveUI.Tests.Winforms
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingTests.cs
index 6030b45e59..0d90700fdd 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/CommandBindingTests.cs
@@ -3,12 +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;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading.Tasks;
using System.Windows.Forms;
+
using ReactiveUI.Winforms;
+
using Xunit;
namespace ReactiveUI.Tests.Winforms
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/DefaultPropertyBindingTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/DefaultPropertyBindingTests.cs
index 8ec185688a..7e0e61b5d3 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/DefaultPropertyBindingTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/DefaultPropertyBindingTests.cs
@@ -3,15 +3,13 @@
// 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;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq.Expressions;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
using System.Windows.Forms;
+
using DynamicData;
+
using ReactiveUI.Winforms;
+
using Xunit;
namespace ReactiveUI.Tests.Winforms
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableComponent.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableComponent.cs
index bb0f632bae..74ad861648 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableComponent.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableComponent.cs
@@ -3,7 +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;
using System.ComponentModel;
namespace ReactiveUI.Tests.Winforms
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableControl.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableControl.cs
index 43ed7604d2..fc77b63234 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableControl.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/CustomClickableControl.cs
@@ -3,7 +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;
using System.Windows.Forms;
namespace ReactiveUI.Tests.Winforms
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ExampleView.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ExampleView.cs
index 25f19127c1..bf9eded223 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ExampleView.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ExampleView.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
namespace ReactiveUI.Tests.Winforms
{
///
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewLocator.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewLocator.cs
index 8c63518e92..62994dc28a 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewLocator.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewLocator.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;
-
namespace ReactiveUI.Tests.Winforms
{
internal class FakeViewLocator : IViewLocator
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewModel.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewModel.cs
index 9bbef70294..47b3b01573 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewModel.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/FakeViewModel.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;
-
namespace ReactiveUI.Tests.Winforms
{
///
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/TestForm.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/TestForm.cs
index de0129f729..7ebb6c7051 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/TestForm.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/TestForm.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;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Windows.Forms;
namespace ReactiveUI.Tests.Winforms
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ThirdPartyControl.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ThirdPartyControl.cs
index 2866b5fae9..5f44698af6 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ThirdPartyControl.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/ThirdPartyControl.cs
@@ -3,7 +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;
using System.Windows.Forms;
namespace AThirdPartyNamespace
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/WinformCommandBindViewModel.cs b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/WinformCommandBindViewModel.cs
index 8e5c3cf178..26f82598b6 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/Mocks/WinformCommandBindViewModel.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/Mocks/WinformCommandBindViewModel.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.Reactive;
-using System.Reactive.Concurrency;
-
namespace ReactiveUI.Tests.Winforms
{
public class WinformCommandBindViewModel : ReactiveObject
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/WinFormsRoutedViewHostTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/WinFormsRoutedViewHostTests.cs
index e31a0f7669..0a9dd343b2 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/WinFormsRoutedViewHostTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/WinFormsRoutedViewHostTests.cs
@@ -3,10 +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.Linq;
using System.Windows.Forms;
-using ReactiveUI;
-using ReactiveUI.Winforms;
+
using Xunit;
using WinFormsRoutedViewHost = ReactiveUI.Winforms.RoutedControlHost;
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewDependencyResolverTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewDependencyResolverTests.cs
index 5915bf689b..596a775b5a 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewDependencyResolverTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewDependencyResolverTests.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Splat;
using Xunit;
using FactAttribute = Xunit.WpfFactAttribute;
diff --git a/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewModelViewHostTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewModelViewHostTests.cs
index 5e78c89b9c..67ac50e90d 100644
--- a/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewModelViewHostTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewModelViewHostTests.cs
@@ -3,9 +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.Linq;
using System.Windows.Forms;
-using ReactiveUI.Winforms;
+
using Xunit;
using WinFormsViewModelViewHost = ReactiveUI.Winforms.ViewModelControlHost;
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/API/WpfApiApprovalTests.cs b/src/ReactiveUI.Tests/Platforms/wpf/API/WpfApiApprovalTests.cs
index 3446493cf9..fcdf40531e 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/API/WpfApiApprovalTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/API/WpfApiApprovalTests.cs
@@ -3,12 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using VerifyXunit;
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/AlwaysFalseModeDetector.cs b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/AlwaysFalseModeDetector.cs
index d6e69c240c..61e5690c6a 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/AlwaysFalseModeDetector.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/AlwaysFalseModeDetector.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 ReactiveUI;
-using Splat;
-
namespace ReactiveUI.Tests.Wpf
{
///
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/LiveModeDetector.cs b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/LiveModeDetector.cs
index 7b105913e6..d9f42d7b13 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/LiveModeDetector.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CanExecuteMock/LiveModeDetector.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 Splat;
-
namespace ReactiveUI.Tests.Wpf
{
public static class LiveModeDetector
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CommandBindingViewModel.cs b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CommandBindingViewModel.cs
index c32d331377..cfcdcb6b39 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CommandBindingViewModel.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/CommandBindingViewModel.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Threading;
-using System.Threading.Tasks;
-
namespace ReactiveUI.Tests.Wpf
{
public class CommandBindingViewModel : ReactiveObject
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentApp.cs b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentApp.cs
index 1a03633105..383693036b 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentApp.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentApp.cs
@@ -3,7 +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;
using System.Windows;
namespace ReactiveUI.Tests.Wpf
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentFixture.cs b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentFixture.cs
index a61d205113..8bb69e7375 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentFixture.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/Mocks/WpfActiveContentFixture.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;
-using System.Threading;
-using System.Threading.Tasks;
using System.Windows.Threading;
namespace ReactiveUI.Tests.Wpf
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/WpfActivationForViewFetcherTest.cs b/src/ReactiveUI.Tests/Platforms/wpf/WpfActivationForViewFetcherTest.cs
index dc56dea970..118325193d 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/WpfActivationForViewFetcherTest.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/WpfActivationForViewFetcherTest.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;
-using System.Reactive.Concurrency;
using System.Windows;
using DynamicData;
-using Xunit;
using FactAttribute = Xunit.WpfFactAttribute;
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/WpfActiveContentTests.cs b/src/ReactiveUI.Tests/Platforms/wpf/WpfActiveContentTests.cs
index 0772343ea5..a32086f872 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/WpfActiveContentTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/WpfActiveContentTests.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;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
using System.Windows;
+
using DynamicData;
-using Splat;
+
using Xunit;
namespace ReactiveUI.Tests.Wpf
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/WpfCommandBindingImplementationTests.cs b/src/ReactiveUI.Tests/Platforms/wpf/WpfCommandBindingImplementationTests.cs
index d6356cdd86..6fc01ca3c7 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/WpfCommandBindingImplementationTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/WpfCommandBindingImplementationTests.cs
@@ -3,16 +3,15 @@
// 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;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
+
using FluentAssertions;
-using Splat;
+
using Xunit;
+
using FactAttribute = Xunit.WpfFactAttribute;
namespace ReactiveUI.Tests.Wpf
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/WpfViewDependencyResolverTests.cs b/src/ReactiveUI.Tests/Platforms/wpf/WpfViewDependencyResolverTests.cs
index 350e51cfc4..76aaf95a76 100644
--- a/src/ReactiveUI.Tests/Platforms/wpf/WpfViewDependencyResolverTests.cs
+++ b/src/ReactiveUI.Tests/Platforms/wpf/WpfViewDependencyResolverTests.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;
-using Splat;
using Xunit;
using FactAttribute = Xunit.WpfFactAttribute;
diff --git a/src/ReactiveUI.Tests/RandomTests.cs b/src/ReactiveUI.Tests/RandomTests.cs
index 5b28879f3e..3637c5589a 100644
--- a/src/ReactiveUI.Tests/RandomTests.cs
+++ b/src/ReactiveUI.Tests/RandomTests.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;
-using Splat;
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ReactiveObject/Mocks/AccountService.cs b/src/ReactiveUI.Tests/ReactiveObject/Mocks/AccountService.cs
index 7cf6b13189..3e49a3ced7 100644
--- a/src/ReactiveUI.Tests/ReactiveObject/Mocks/AccountService.cs
+++ b/src/ReactiveUI.Tests/ReactiveObject/Mocks/AccountService.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;
-using System.Collections.Generic;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphNameOfTestFixture.cs b/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphNameOfTestFixture.cs
index e4b4f63445..246f0a020c 100644
--- a/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphNameOfTestFixture.cs
+++ b/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphNameOfTestFixture.cs
@@ -3,7 +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;
using System.Runtime.Serialization;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphTestFixture.cs b/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphTestFixture.cs
index b96d5dd2fd..e78ab79c85 100644
--- a/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphTestFixture.cs
+++ b/src/ReactiveUI.Tests/ReactiveObject/Mocks/OaphTestFixture.cs
@@ -3,7 +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;
using System.Runtime.Serialization;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ReactiveObject/Mocks/ProjectService.cs b/src/ReactiveUI.Tests/ReactiveObject/Mocks/ProjectService.cs
index 5ceaf81652..fb3a34d078 100644
--- a/src/ReactiveUI.Tests/ReactiveObject/Mocks/ProjectService.cs
+++ b/src/ReactiveUI.Tests/ReactiveObject/Mocks/ProjectService.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;
-using System.Collections.Generic;
-
namespace ReactiveUI.Tests
{
///
diff --git a/src/ReactiveUI.Tests/ReactiveObject/Mocks/TestFixture.cs b/src/ReactiveUI.Tests/ReactiveObject/Mocks/TestFixture.cs
index 0ef76c561d..543cd61fb1 100644
--- a/src/ReactiveUI.Tests/ReactiveObject/Mocks/TestFixture.cs
+++ b/src/ReactiveUI.Tests/ReactiveObject/Mocks/TestFixture.cs
@@ -3,9 +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.Collections.Generic;
-using System.Linq;
using System.Runtime.Serialization;
+
using DynamicData.Binding;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/ReactiveObject/ReactiveObjectTests.cs b/src/ReactiveUI.Tests/ReactiveObject/ReactiveObjectTests.cs
index 292a3d97bd..1c09b393e3 100644
--- a/src/ReactiveUI.Tests/ReactiveObject/ReactiveObjectTests.cs
+++ b/src/ReactiveUI.Tests/ReactiveObject/ReactiveObjectTests.cs
@@ -3,14 +3,11 @@
// 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;
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
+
using DynamicData;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Resolvers/DependencyResolverTests.cs b/src/ReactiveUI.Tests/Resolvers/DependencyResolverTests.cs
index 837847263e..ec884eca9f 100644
--- a/src/ReactiveUI.Tests/Resolvers/DependencyResolverTests.cs
+++ b/src/ReactiveUI.Tests/Resolvers/DependencyResolverTests.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-
using FluentAssertions;
-using Splat;
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Resolvers/INPCObservableForPropertyTests.cs b/src/ReactiveUI.Tests/Resolvers/INPCObservableForPropertyTests.cs
index 83ce8526c7..612c476880 100644
--- a/src/ReactiveUI.Tests/Resolvers/INPCObservableForPropertyTests.cs
+++ b/src/ReactiveUI.Tests/Resolvers/INPCObservableForPropertyTests.cs
@@ -3,11 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
using System.Runtime.CompilerServices;
using Xunit;
diff --git a/src/ReactiveUI.Tests/Resolvers/PocoObservableForPropertyTests.cs b/src/ReactiveUI.Tests/Resolvers/PocoObservableForPropertyTests.cs
index 1d095e0197..00a2745b54 100644
--- a/src/ReactiveUI.Tests/Resolvers/PocoObservableForPropertyTests.cs
+++ b/src/ReactiveUI.Tests/Resolvers/PocoObservableForPropertyTests.cs
@@ -3,13 +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;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
-using System.Linq.Expressions;
-using FluentAssertions;
-using Splat;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Routing/Mocks/TestView.cs b/src/ReactiveUI.Tests/Routing/Mocks/TestView.cs
index cced087624..ea2e4903fa 100644
--- a/src/ReactiveUI.Tests/Routing/Mocks/TestView.cs
+++ b/src/ReactiveUI.Tests/Routing/Mocks/TestView.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 Splat;
-
namespace ReactiveUI.Tests
{
public class TestView : ReactiveUserControl, IScreen
diff --git a/src/ReactiveUI.Tests/Routing/RoutableViewModelMixinTests.cs b/src/ReactiveUI.Tests/Routing/RoutableViewModelMixinTests.cs
index 0a0a6feac1..8002214af5 100644
--- a/src/ReactiveUI.Tests/Routing/RoutableViewModelMixinTests.cs
+++ b/src/ReactiveUI.Tests/Routing/RoutableViewModelMixinTests.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;
-using System.Reactive.Disposables;
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Routing/RoutedViewHostTests.cs b/src/ReactiveUI.Tests/Routing/RoutedViewHostTests.cs
index 62a3656d2d..287a8fd972 100644
--- a/src/ReactiveUI.Tests/Routing/RoutedViewHostTests.cs
+++ b/src/ReactiveUI.Tests/Routing/RoutedViewHostTests.cs
@@ -3,12 +3,12 @@
// 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;
-using System.Reactive.Concurrency;
using System.Windows;
+
using DynamicData;
+
using ReactiveUI.Tests.Wpf;
-using Splat;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Routing/RoutingStateTests.cs b/src/ReactiveUI.Tests/Routing/RoutingStateTests.cs
index 14b0c4f83a..c45a4d12a5 100644
--- a/src/ReactiveUI.Tests/Routing/RoutingStateTests.cs
+++ b/src/ReactiveUI.Tests/Routing/RoutingStateTests.cs
@@ -3,14 +3,12 @@
// 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;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
using DynamicData;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Routing/ViewModelViewHostTests.cs b/src/ReactiveUI.Tests/Routing/ViewModelViewHostTests.cs
index 27b7ed15f2..26d0dd5d91 100644
--- a/src/ReactiveUI.Tests/Routing/ViewModelViewHostTests.cs
+++ b/src/ReactiveUI.Tests/Routing/ViewModelViewHostTests.cs
@@ -3,12 +3,12 @@
// 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;
-using System.Reactive.Concurrency;
using System.Windows;
+
using DynamicData;
+
using ReactiveUI.Tests.Wpf;
-using Splat;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/RxAppTest.cs b/src/ReactiveUI.Tests/RxAppTest.cs
index 67ae61763c..916d3f6e67 100644
--- a/src/ReactiveUI.Tests/RxAppTest.cs
+++ b/src/ReactiveUI.Tests/RxAppTest.cs
@@ -4,7 +4,7 @@
// See the LICENSE file in the project root for full license information.
using System.Diagnostics;
-using System.Reactive.Concurrency;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Suspension/SuspensionHostExtensionsTests.cs b/src/ReactiveUI.Tests/Suspension/SuspensionHostExtensionsTests.cs
index bee934d4d1..aa526b46c7 100644
--- a/src/ReactiveUI.Tests/Suspension/SuspensionHostExtensionsTests.cs
+++ b/src/ReactiveUI.Tests/Suspension/SuspensionHostExtensionsTests.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;
-
using FluentAssertions;
using Xunit;
diff --git a/src/ReactiveUI.Tests/Utilities/ApiApprovalBase.cs b/src/ReactiveUI.Tests/Utilities/ApiApprovalBase.cs
index d036334815..e85eb428f4 100644
--- a/src/ReactiveUI.Tests/Utilities/ApiApprovalBase.cs
+++ b/src/ReactiveUI.Tests/Utilities/ApiApprovalBase.cs
@@ -3,16 +3,12 @@
// 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;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
using PublicApiGenerator;
-using VerifyTests;
-
using VerifyXunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Utilities/CompatMixins.cs b/src/ReactiveUI.Tests/Utilities/CompatMixins.cs
index a93cd0e508..65676e348d 100644
--- a/src/ReactiveUI.Tests/Utilities/CompatMixins.cs
+++ b/src/ReactiveUI.Tests/Utilities/CompatMixins.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;
-using System.Collections.Generic;
-using System.Linq;
-
namespace ReactiveUI.Tests
{
internal static class CompatMixins
diff --git a/src/ReactiveUI.Tests/Utilities/CountingTestScheduler.cs b/src/ReactiveUI.Tests/Utilities/CountingTestScheduler.cs
index 861d4891c7..b503675bd2 100644
--- a/src/ReactiveUI.Tests/Utilities/CountingTestScheduler.cs
+++ b/src/ReactiveUI.Tests/Utilities/CountingTestScheduler.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;
-using System.Collections.Generic;
-using System.Reactive.Concurrency;
-
namespace ReactiveUI.Tests
{
public class CountingTestScheduler : IScheduler
diff --git a/src/ReactiveUI.Tests/Utilities/EnumerableTestMixin.cs b/src/ReactiveUI.Tests/Utilities/EnumerableTestMixin.cs
index 80a33b25bf..e0a1a10805 100644
--- a/src/ReactiveUI.Tests/Utilities/EnumerableTestMixin.cs
+++ b/src/ReactiveUI.Tests/Utilities/EnumerableTestMixin.cs
@@ -3,10 +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;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/Utilities/JsonHelper.cs b/src/ReactiveUI.Tests/Utilities/JsonHelper.cs
index 6015b8fd4f..00d95847f4 100644
--- a/src/ReactiveUI.Tests/Utilities/JsonHelper.cs
+++ b/src/ReactiveUI.Tests/Utilities/JsonHelper.cs
@@ -3,7 +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;
using System.IO;
using System.Text;
diff --git a/src/ReactiveUI.Tests/Utilities/TestLogger.cs b/src/ReactiveUI.Tests/Utilities/TestLogger.cs
index 9cfa08a264..0729737395 100644
--- a/src/ReactiveUI.Tests/Utilities/TestLogger.cs
+++ b/src/ReactiveUI.Tests/Utilities/TestLogger.cs
@@ -3,10 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.ComponentModel;
-using Splat;
namespace ReactiveUI.Tests
{
diff --git a/src/ReactiveUI.Tests/Utilities/UseInvariantCulture.cs b/src/ReactiveUI.Tests/Utilities/UseInvariantCulture.cs
index 9f77784aba..c8294e3465 100644
--- a/src/ReactiveUI.Tests/Utilities/UseInvariantCulture.cs
+++ b/src/ReactiveUI.Tests/Utilities/UseInvariantCulture.cs
@@ -5,7 +5,6 @@
using System.Globalization;
using System.Reflection;
-using System.Threading;
using Xunit.Sdk;
diff --git a/src/ReactiveUI.Tests/WaitForDispatcherSchedulerTests.cs b/src/ReactiveUI.Tests/WaitForDispatcherSchedulerTests.cs
index 0613901ed2..b72c091145 100644
--- a/src/ReactiveUI.Tests/WaitForDispatcherSchedulerTests.cs
+++ b/src/ReactiveUI.Tests/WaitForDispatcherSchedulerTests.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;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/WhenAny/Mockups/HostTestFixture.cs b/src/ReactiveUI.Tests/WhenAny/Mockups/HostTestFixture.cs
index bb443c2ddf..aec4edcda6 100644
--- a/src/ReactiveUI.Tests/WhenAny/Mockups/HostTestFixture.cs
+++ b/src/ReactiveUI.Tests/WhenAny/Mockups/HostTestFixture.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.Tests
{
///
diff --git a/src/ReactiveUI.Tests/WhenAny/ReactiveNotifyPropertyChangedMixinTest.cs b/src/ReactiveUI.Tests/WhenAny/ReactiveNotifyPropertyChangedMixinTest.cs
index 83d68c324b..7f873bb690 100644
--- a/src/ReactiveUI.Tests/WhenAny/ReactiveNotifyPropertyChangedMixinTest.cs
+++ b/src/ReactiveUI.Tests/WhenAny/ReactiveNotifyPropertyChangedMixinTest.cs
@@ -3,17 +3,12 @@
// 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Threading;
using DynamicData;
+
using Microsoft.Reactive.Testing;
+
using ReactiveUI.Testing;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Tests/WhenAny/TestWhenAnyObsViewModel.cs b/src/ReactiveUI.Tests/WhenAny/TestWhenAnyObsViewModel.cs
index e60b6bd723..ff6f76808d 100644
--- a/src/ReactiveUI.Tests/WhenAny/TestWhenAnyObsViewModel.cs
+++ b/src/ReactiveUI.Tests/WhenAny/TestWhenAnyObsViewModel.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;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
using DynamicData;
using DynamicData.Binding;
diff --git a/src/ReactiveUI.Tests/WhenAny/WhenAnyObservableTests.cs b/src/ReactiveUI.Tests/WhenAny/WhenAnyObservableTests.cs
index 86b152e8be..645d99be33 100644
--- a/src/ReactiveUI.Tests/WhenAny/WhenAnyObservableTests.cs
+++ b/src/ReactiveUI.Tests/WhenAny/WhenAnyObservableTests.cs
@@ -3,15 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
using DynamicData;
using DynamicData.Binding;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.Winforms/ActivationForViewFetcher.cs b/src/ReactiveUI.Winforms/ActivationForViewFetcher.cs
index 0eed34158c..af42849463 100644
--- a/src/ReactiveUI.Winforms/ActivationForViewFetcher.cs
+++ b/src/ReactiveUI.Winforms/ActivationForViewFetcher.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;
using System.ComponentModel;
using System.Globalization;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows.Forms;
-using Splat;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Winforms/ContentControlBindingHook.cs b/src/ReactiveUI.Winforms/ContentControlBindingHook.cs
index 9ad8586652..a772ee2339 100644
--- a/src/ReactiveUI.Winforms/ContentControlBindingHook.cs
+++ b/src/ReactiveUI.Winforms/ContentControlBindingHook.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;
-using System.Linq;
using System.Windows.Forms;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Winforms/CreatesWinformsCommandBinding.cs b/src/ReactiveUI.Winforms/CreatesWinformsCommandBinding.cs
index 12593ff3f5..522dd51706 100644
--- a/src/ReactiveUI.Winforms/CreatesWinformsCommandBinding.cs
+++ b/src/ReactiveUI.Winforms/CreatesWinformsCommandBinding.cs
@@ -3,12 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows.Forms;
using System.Windows.Input;
diff --git a/src/ReactiveUI.Winforms/ObservableCollectionChangedToListChangedTransformer.cs b/src/ReactiveUI.Winforms/ObservableCollectionChangedToListChangedTransformer.cs
index 2b89671ce0..b1c9265f49 100644
--- a/src/ReactiveUI.Winforms/ObservableCollectionChangedToListChangedTransformer.cs
+++ b/src/ReactiveUI.Winforms/ObservableCollectionChangedToListChangedTransformer.cs
@@ -3,10 +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.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Linq;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Winforms/PanelSetMethodBindingConverter.cs b/src/ReactiveUI.Winforms/PanelSetMethodBindingConverter.cs
index 7bfda41632..031d79bcf7 100644
--- a/src/ReactiveUI.Winforms/PanelSetMethodBindingConverter.cs
+++ b/src/ReactiveUI.Winforms/PanelSetMethodBindingConverter.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;
-using System.Collections.Generic;
-using System.Linq;
using System.Windows.Forms;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Winforms/Registrations.cs b/src/ReactiveUI.Winforms/Registrations.cs
index 41a7f61be8..256ac1b2aa 100644
--- a/src/ReactiveUI.Winforms/Registrations.cs
+++ b/src/ReactiveUI.Winforms/Registrations.cs
@@ -3,12 +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;
-using System.Reactive.Concurrency;
using System.Windows.Forms;
-using Splat;
-
namespace ReactiveUI.Winforms;
///
diff --git a/src/ReactiveUI.Winforms/RoutedViewHost.cs b/src/ReactiveUI.Winforms/RoutedViewHost.cs
index 07f2e0b7f4..affb3ef044 100644
--- a/src/ReactiveUI.Winforms/RoutedViewHost.cs
+++ b/src/ReactiveUI.Winforms/RoutedViewHost.cs
@@ -3,10 +3,7 @@
// 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;
using System.ComponentModel;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Windows.Forms;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Winforms/TableContentSetMethodBindingConverter.cs b/src/ReactiveUI.Winforms/TableContentSetMethodBindingConverter.cs
index 5ee88b42bc..229a4c8ca1 100644
--- a/src/ReactiveUI.Winforms/TableContentSetMethodBindingConverter.cs
+++ b/src/ReactiveUI.Winforms/TableContentSetMethodBindingConverter.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;
-using System.Collections.Generic;
-using System.Linq;
using System.Windows.Forms;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Winforms/ViewModelViewHost.cs b/src/ReactiveUI.Winforms/ViewModelViewHost.cs
index 10d744d4e8..4f471dea0c 100644
--- a/src/ReactiveUI.Winforms/ViewModelViewHost.cs
+++ b/src/ReactiveUI.Winforms/ViewModelViewHost.cs
@@ -3,11 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Windows.Forms;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Winforms/WinformsCreatesObservableForProperty.cs b/src/ReactiveUI.Winforms/WinformsCreatesObservableForProperty.cs
index 850a132e39..3313fd4710 100644
--- a/src/ReactiveUI.Winforms/WinformsCreatesObservableForProperty.cs
+++ b/src/ReactiveUI.Winforms/WinformsCreatesObservableForProperty.cs
@@ -3,16 +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;
using System.ComponentModel;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
-using System.Windows.Forms;
-
-using Splat;
namespace ReactiveUI.Winforms;
diff --git a/src/ReactiveUI.Wpf/ActivationForViewFetcher.cs b/src/ReactiveUI.Wpf/ActivationForViewFetcher.cs
index 784c98b651..60301363c7 100644
--- a/src/ReactiveUI.Wpf/ActivationForViewFetcher.cs
+++ b/src/ReactiveUI.Wpf/ActivationForViewFetcher.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;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows;
-using System.Windows.Threading;
namespace ReactiveUI;
diff --git a/src/ReactiveUI.Wpf/AutoSuspendHelper.cs b/src/ReactiveUI.Wpf/AutoSuspendHelper.cs
index fdf29abb0f..e83513be41 100644
--- a/src/ReactiveUI.Wpf/AutoSuspendHelper.cs
+++ b/src/ReactiveUI.Wpf/AutoSuspendHelper.cs
@@ -3,13 +3,7 @@
// 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;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Windows;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI.Wpf/Common/AutoDataTemplateBindingHook.cs b/src/ReactiveUI.Wpf/Common/AutoDataTemplateBindingHook.cs
index 062c5172e4..70c7ca747e 100644
--- a/src/ReactiveUI.Wpf/Common/AutoDataTemplateBindingHook.cs
+++ b/src/ReactiveUI.Wpf/Common/AutoDataTemplateBindingHook.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;
-using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Markup;
diff --git a/src/ReactiveUI.Wpf/Common/BooleanToVisibilityHint.cs b/src/ReactiveUI.Wpf/Common/BooleanToVisibilityHint.cs
index 46902c1137..e051e1deb7 100644
--- a/src/ReactiveUI.Wpf/Common/BooleanToVisibilityHint.cs
+++ b/src/ReactiveUI.Wpf/Common/BooleanToVisibilityHint.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;
-using System.Diagnostics.CodeAnalysis;
-
#if HAS_UNO
namespace ReactiveUI.Uno
#else
diff --git a/src/ReactiveUI.Wpf/Common/BooleanToVisibilityTypeConverter.cs b/src/ReactiveUI.Wpf/Common/BooleanToVisibilityTypeConverter.cs
index 655d5c5ec6..adce0bef4d 100644
--- a/src/ReactiveUI.Wpf/Common/BooleanToVisibilityTypeConverter.cs
+++ b/src/ReactiveUI.Wpf/Common/BooleanToVisibilityTypeConverter.cs
@@ -7,7 +7,6 @@
using Microsoft.Maui;
#endif
-using System;
#if HAS_WINUI
using Microsoft.UI.Xaml;
#elif NETFX_CORE || HAS_UNO
diff --git a/src/ReactiveUI.Wpf/Common/PlatformOperations.cs b/src/ReactiveUI.Wpf/Common/PlatformOperations.cs
index c704b69cf8..2c9f8d1eb5 100644
--- a/src/ReactiveUI.Wpf/Common/PlatformOperations.cs
+++ b/src/ReactiveUI.Wpf/Common/PlatformOperations.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
#if HAS_UNO
namespace ReactiveUI.Uno
#else
diff --git a/src/ReactiveUI.Wpf/Common/ReactivePage.cs b/src/ReactiveUI.Wpf/Common/ReactivePage.cs
index 923b3f870b..9614389888 100644
--- a/src/ReactiveUI.Wpf/Common/ReactivePage.cs
+++ b/src/ReactiveUI.Wpf/Common/ReactivePage.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;
-using System.Diagnostics.CodeAnalysis;
#if HAS_MAUI
using Microsoft.Maui.Controls;
diff --git a/src/ReactiveUI.Wpf/Common/ReactiveUserControl.cs b/src/ReactiveUI.Wpf/Common/ReactiveUserControl.cs
index 926b72f52a..007f78879e 100644
--- a/src/ReactiveUI.Wpf/Common/ReactiveUserControl.cs
+++ b/src/ReactiveUI.Wpf/Common/ReactiveUserControl.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;
-using System.Diagnostics.CodeAnalysis;
#if HAS_WINUI
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
diff --git a/src/ReactiveUI.Wpf/Common/RoutedViewHost.cs b/src/ReactiveUI.Wpf/Common/RoutedViewHost.cs
index d9dd19015c..c00f509a3a 100644
--- a/src/ReactiveUI.Wpf/Common/RoutedViewHost.cs
+++ b/src/ReactiveUI.Wpf/Common/RoutedViewHost.cs
@@ -3,13 +3,7 @@
// 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;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reactive.Linq;
using ReactiveUI;
-using Splat;
#if HAS_WINUI
using Microsoft.UI.Xaml;
@@ -21,7 +15,6 @@
#else
using System.Windows;
-using System.Windows.Controls;
#endif
diff --git a/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs b/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs
index 12cb596101..d76402fc3c 100644
--- a/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs
+++ b/src/ReactiveUI.Wpf/Common/ViewModelViewHost.cs
@@ -3,13 +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;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using Splat;
-
#if HAS_WINUI
using Microsoft.UI.Xaml;
@@ -24,7 +17,6 @@
#else
using System.Windows;
-using System.Windows.Controls;
#endif
diff --git a/src/ReactiveUI.Wpf/DependencyObjectObservableForProperty.cs b/src/ReactiveUI.Wpf/DependencyObjectObservableForProperty.cs
index a98712fa6d..954bb1a138 100644
--- a/src/ReactiveUI.Wpf/DependencyObjectObservableForProperty.cs
+++ b/src/ReactiveUI.Wpf/DependencyObjectObservableForProperty.cs
@@ -3,14 +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;
using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI.Wpf/Registrations.cs b/src/ReactiveUI.Wpf/Registrations.cs
index 7ddd43feb7..7162a72495 100644
--- a/src/ReactiveUI.Wpf/Registrations.cs
+++ b/src/ReactiveUI.Wpf/Registrations.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;
-using System.Reactive.Concurrency;
-using Splat;
-
namespace ReactiveUI.Wpf;
///
diff --git a/src/ReactiveUI.Wpf/TransitioningContentControl.cs b/src/ReactiveUI.Wpf/TransitioningContentControl.cs
index 996f986e32..4e02ac441d 100644
--- a/src/ReactiveUI.Wpf/TransitioningContentControl.cs
+++ b/src/ReactiveUI.Wpf/TransitioningContentControl.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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
using System.Runtime.CompilerServices;
using System.Windows;
using System.Windows.Controls;
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs b/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs
index 0ef632de57..03ec59936d 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs
@@ -6,8 +6,9 @@
using ReactiveUI.XamForms;
using ReactiveUI.XamForms.Tests.Activation;
using ReactiveUI.XamForms.Tests.Activation.Mocks;
-using Splat;
+
using Xamarin.Forms;
+
using Xunit;
namespace ReactiveUI.Tests
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/App.xaml.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/App.xaml.cs
index 02e6fda3db..bd49fe5d8f 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/App.xaml.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/App.xaml.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 Xamarin.Forms;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShell.xaml.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShell.xaml.cs
index 2b6c9685c3..64ffac457f 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShell.xaml.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShell.xaml.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShellViewModel.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShellViewModel.cs
index bb3db846bc..7b84e0ae63 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShellViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/AppShellViewModel.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ApplicationFixture.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ApplicationFixture.cs
index 697d912ea2..e78d12f586 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ApplicationFixture.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ApplicationFixture.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;
-using Splat;
using Xamarin.Forms;
using Xamarin.Forms.Mocks;
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageView.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageView.cs
index bd98ee71e1..0d9bfeb656 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageView.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageView.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageViewModel.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageViewModel.cs
index a5a6dbd9fa..53f0c0d2ca 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/CarouselPageViewModel.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageView.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageView.cs
index 671c343adb..4eb2fad206 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageView.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageView.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageViewModel.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageViewModel.cs
index 57fb89fc98..b28536a1d9 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ContentPageViewModel.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyOutPageViewModel.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyOutPageViewModel.cs
index 7d1712cce1..b0f114ba84 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyOutPageViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyOutPageViewModel.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageView.xaml.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageView.xaml.cs
index 06365982a3..6ccfbe2107 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageView.xaml.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageView.xaml.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;
-using System.Reactive.Disposables;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageViewFlyoutMenuItem.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageViewFlyoutMenuItem.cs
index 2a2bf7e9ca..6100bbb972 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageViewFlyoutMenuItem.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/FlyoutPageViewFlyoutMenuItem.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;
-
namespace ReactiveUI.XamForms.Tests.Activation.Mocks
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellView.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellView.cs
index 9501ea0fb9..f5420333b6 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellView.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellView.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellViewModel.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellViewModel.cs
index 64255ada01..2623c3e152 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/ShellViewModel.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageView.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageView.cs
index f0f68ae114..59aba1fcc2 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageView.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageView.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageViewModel.cs b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageViewModel.cs
index 0c4f3ff9d3..86351ef804 100644
--- a/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Activation/Mocks/TabbedPageViewModel.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.Disposables;
-
namespace ReactiveUI.XamForms.Tests.Activation
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Mocks/ChildViewModel.cs b/src/ReactiveUI.XamForms.Tests/Mocks/ChildViewModel.cs
index 46e2a1b705..747a4c462b 100644
--- a/src/ReactiveUI.XamForms.Tests/Mocks/ChildViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Mocks/ChildViewModel.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;
-
-using Splat;
-
namespace ReactiveUI.XamForms.Tests.Mocks
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Mocks/MainViewModel.cs b/src/ReactiveUI.XamForms.Tests/Mocks/MainViewModel.cs
index c47e103323..3c677910f3 100644
--- a/src/ReactiveUI.XamForms.Tests/Mocks/MainViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Mocks/MainViewModel.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;
-
-using Splat;
-
namespace ReactiveUI.XamForms.Tests.Mocks
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/Mocks/NavigationViewModel.cs b/src/ReactiveUI.XamForms.Tests/Mocks/NavigationViewModel.cs
index ec10ca8408..05100e5c8f 100644
--- a/src/ReactiveUI.XamForms.Tests/Mocks/NavigationViewModel.cs
+++ b/src/ReactiveUI.XamForms.Tests/Mocks/NavigationViewModel.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Linq;
-
-using Splat;
-
namespace ReactiveUI.XamForms.Tests.Mocks
{
///
diff --git a/src/ReactiveUI.XamForms.Tests/RoutedViewHostTest.cs b/src/ReactiveUI.XamForms.Tests/RoutedViewHostTest.cs
index dcd0ea38c8..6781870b71 100644
--- a/src/ReactiveUI.XamForms.Tests/RoutedViewHostTest.cs
+++ b/src/ReactiveUI.XamForms.Tests/RoutedViewHostTest.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;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
using ReactiveUI.XamForms.Tests.Mocks;
-using Splat;
+
using Xunit;
namespace ReactiveUI.XamForms.Tests
diff --git a/src/ReactiveUI.XamForms/ActivationForViewFetcher.cs b/src/ReactiveUI.XamForms/ActivationForViewFetcher.cs
index ba1499b38a..8a1bf9cbc3 100644
--- a/src/ReactiveUI.XamForms/ActivationForViewFetcher.cs
+++ b/src/ReactiveUI.XamForms/ActivationForViewFetcher.cs
@@ -3,10 +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;
using System.ComponentModel;
-using System.Reactive.Linq;
using System.Reflection;
+
using Xamarin.Forms;
namespace ReactiveUI.XamForms;
diff --git a/src/ReactiveUI.XamForms/AutoSuspendHelper.cs b/src/ReactiveUI.XamForms/AutoSuspendHelper.cs
index 43d331c6ff..e497de3a46 100644
--- a/src/ReactiveUI.XamForms/AutoSuspendHelper.cs
+++ b/src/ReactiveUI.XamForms/AutoSuspendHelper.cs
@@ -3,12 +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;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Subjects;
-using Splat;
-
namespace ReactiveUI.XamForms;
///
diff --git a/src/ReactiveUI.XamForms/DisableAnimationAttribute.cs b/src/ReactiveUI.XamForms/DisableAnimationAttribute.cs
index f8fa95f649..c550d1c7ac 100644
--- a/src/ReactiveUI.XamForms/DisableAnimationAttribute.cs
+++ b/src/ReactiveUI.XamForms/DisableAnimationAttribute.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;
-
namespace ReactiveUI.XamForms;
///
diff --git a/src/ReactiveUI.XamForms/ReactiveMasterDetailPage.cs b/src/ReactiveUI.XamForms/ReactiveMasterDetailPage.cs
index 30fc953ad5..f0dc5e537d 100644
--- a/src/ReactiveUI.XamForms/ReactiveMasterDetailPage.cs
+++ b/src/ReactiveUI.XamForms/ReactiveMasterDetailPage.cs
@@ -3,7 +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;
using Xamarin.Forms;
namespace ReactiveUI.XamForms;
diff --git a/src/ReactiveUI.XamForms/ReactiveShellContent.cs b/src/ReactiveUI.XamForms/ReactiveShellContent.cs
index 4da71b362c..94f713f3ef 100644
--- a/src/ReactiveUI.XamForms/ReactiveShellContent.cs
+++ b/src/ReactiveUI.XamForms/ReactiveShellContent.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;
-using Splat;
using Xamarin.Forms;
namespace ReactiveUI.XamForms;
diff --git a/src/ReactiveUI.XamForms/Registrations.cs b/src/ReactiveUI.XamForms/Registrations.cs
index bcb15f7e42..614da53e98 100644
--- a/src/ReactiveUI.XamForms/Registrations.cs
+++ b/src/ReactiveUI.XamForms/Registrations.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;
-
namespace ReactiveUI.XamForms;
///
diff --git a/src/ReactiveUI.XamForms/RoutedViewHost.cs b/src/ReactiveUI.XamForms/RoutedViewHost.cs
index 29bb077ae9..fe543862fe 100644
--- a/src/ReactiveUI.XamForms/RoutedViewHost.cs
+++ b/src/ReactiveUI.XamForms/RoutedViewHost.cs
@@ -3,14 +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;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
using System.Reflection;
-using Splat;
+
using Xamarin.Forms;
namespace ReactiveUI.XamForms;
diff --git a/src/ReactiveUI.XamForms/ViewModelViewHost.cs b/src/ReactiveUI.XamForms/ViewModelViewHost.cs
index a3141f8941..2c26c0fc83 100644
--- a/src/ReactiveUI.XamForms/ViewModelViewHost.cs
+++ b/src/ReactiveUI.XamForms/ViewModelViewHost.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;
-using System.Reactive.Linq;
-using Splat;
using Xamarin.Forms;
namespace ReactiveUI.XamForms;
diff --git a/src/ReactiveUI.sln b/src/ReactiveUI.sln
index 16699a746f..49a701b553 100644
--- a/src/ReactiveUI.sln
+++ b/src/ReactiveUI.sln
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.build.props = Directory.build.props
Directory.build.targets = Directory.build.targets
global.json = global.json
+ GlobalUsings.cs = GlobalUsings.cs
stylecop.json = stylecop.json
..\version.json = ..\version.json
EndProjectSection
diff --git a/src/ReactiveUI/Activation/CanActivateViewFetcher.cs b/src/ReactiveUI/Activation/CanActivateViewFetcher.cs
index 3f08d0c28f..b29cf596a2 100644
--- a/src/ReactiveUI/Activation/CanActivateViewFetcher.cs
+++ b/src/ReactiveUI/Activation/CanActivateViewFetcher.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;
-using System.Reactive.Linq;
using System.Reflection;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Activation/IActivationForViewFetcher.cs b/src/ReactiveUI/Activation/IActivationForViewFetcher.cs
index c64c8181be..71654ea6f7 100644
--- a/src/ReactiveUI/Activation/IActivationForViewFetcher.cs
+++ b/src/ReactiveUI/Activation/IActivationForViewFetcher.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Activation/ViewForMixins.cs b/src/ReactiveUI/Activation/ViewForMixins.cs
index 595c72b35f..06b0b57671 100644
--- a/src/ReactiveUI/Activation/ViewForMixins.cs
+++ b/src/ReactiveUI/Activation/ViewForMixins.cs
@@ -3,13 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Activation/ViewModelActivator.cs b/src/ReactiveUI/Activation/ViewModelActivator.cs
index b36a9031ef..a56c14a796 100644
--- a/src/ReactiveUI/Activation/ViewModelActivator.cs
+++ b/src/ReactiveUI/Activation/ViewModelActivator.cs
@@ -3,14 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Subjects;
-using System.Threading;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Command/CommandBinder.cs b/src/ReactiveUI/Bindings/Command/CommandBinder.cs
index ab79e56c35..b8aec991b9 100644
--- a/src/ReactiveUI/Bindings/Command/CommandBinder.cs
+++ b/src/ReactiveUI/Bindings/Command/CommandBinder.cs
@@ -3,10 +3,7 @@
// 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;
-using System.Linq.Expressions;
using System.Windows.Input;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs b/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs
index e5732be63d..6f2bef5c7d 100644
--- a/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs
@@ -3,13 +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;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Windows.Input;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.cs b/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.cs
index 988308e3a7..25a1e6b5d5 100644
--- a/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.cs
+++ b/src/ReactiveUI/Bindings/Command/CommandBinderImplementationMixins.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;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
using System.Windows.Input;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs b/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs
index 81791f1ecb..995b44d27d 100644
--- a/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.cs
+++ b/src/ReactiveUI/Bindings/Command/CreatesCommandBinding.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;
-using System.Linq;
using System.Reflection;
using System.Windows.Input;
-using Splat;
namespace ReactiveUI;
#pragma warning disable RCS1102 // Make class static. Used as base class.
diff --git a/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaCommandParameter.cs b/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaCommandParameter.cs
index ae40e4a5c0..cf8c4d8cb7 100644
--- a/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaCommandParameter.cs
+++ b/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaCommandParameter.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;
-using System.Linq;
-using System.Reactive.Disposables;
using System.Reflection;
using System.Windows.Input;
diff --git a/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaEvent.cs b/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaEvent.cs
index d2f17446ae..93124227a3 100644
--- a/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaEvent.cs
+++ b/src/ReactiveUI/Bindings/Command/CreatesCommandBindingViaEvent.cs
@@ -3,11 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows.Input;
diff --git a/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs b/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs
index c686c2585e..650c06eeb4 100644
--- a/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Command/ICommandBinderImplementation.cs
@@ -3,10 +3,7 @@
// 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;
-using System.Linq.Expressions;
using System.Windows.Input;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Bindings/Command/RelayCommand.cs b/src/ReactiveUI/Bindings/Command/RelayCommand.cs
index df7e5b6f01..6b6e76261f 100644
--- a/src/ReactiveUI/Bindings/Command/RelayCommand.cs
+++ b/src/ReactiveUI/Bindings/Command/RelayCommand.cs
@@ -3,7 +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;
using System.Windows.Input;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Bindings/Converter/ByteToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/ByteToStringTypeConverter.cs
index 2ed4c03f2b..206e3197d6 100644
--- a/src/ReactiveUI/Bindings/Converter/ByteToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/ByteToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/DecimalToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/DecimalToStringTypeConverter.cs
index e92ff3b647..3dbd778ccc 100644
--- a/src/ReactiveUI/Bindings/Converter/DecimalToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/DecimalToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/DoubleToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/DoubleToStringTypeConverter.cs
index 807b791b1f..9101fdb6e5 100644
--- a/src/ReactiveUI/Bindings/Converter/DoubleToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/DoubleToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/EqualityTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/EqualityTypeConverter.cs
index f500a2a523..aa8159b545 100644
--- a/src/ReactiveUI/Bindings/Converter/EqualityTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/EqualityTypeConverter.cs
@@ -3,10 +3,7 @@
// 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;
-using System.Linq;
using System.Reflection;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Bindings/Converter/IntegerToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/IntegerToStringTypeConverter.cs
index 8476df059b..7d18c00dee 100644
--- a/src/ReactiveUI/Bindings/Converter/IntegerToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/IntegerToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/LongToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/LongToStringTypeConverter.cs
index 939c5e45ed..63049d78d2 100644
--- a/src/ReactiveUI/Bindings/Converter/LongToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/LongToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/NullableByteToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/NullableByteToStringTypeConverter.cs
index 53b1d9edbf..60763959cb 100644
--- a/src/ReactiveUI/Bindings/Converter/NullableByteToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/NullableByteToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/NullableDecimalToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/NullableDecimalToStringTypeConverter.cs
index 5c0e4f137e..8dbe106852 100644
--- a/src/ReactiveUI/Bindings/Converter/NullableDecimalToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/NullableDecimalToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/NullableDoubleToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/NullableDoubleToStringTypeConverter.cs
index b490725149..c0f53a53be 100644
--- a/src/ReactiveUI/Bindings/Converter/NullableDoubleToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/NullableDoubleToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/NullableIntegerToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/NullableIntegerToStringTypeConverter.cs
index 512a049eb7..131ced088c 100644
--- a/src/ReactiveUI/Bindings/Converter/NullableIntegerToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/NullableIntegerToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/NullableLongToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/NullableLongToStringTypeConverter.cs
index b5fdca16a9..886fc53845 100644
--- a/src/ReactiveUI/Bindings/Converter/NullableLongToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/NullableLongToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/NullableShortToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/NullableShortToStringTypeConverter.cs
index 44ae5cddda..b3a08234e6 100644
--- a/src/ReactiveUI/Bindings/Converter/NullableShortToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/NullableShortToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/NullableSingleToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/NullableSingleToStringTypeConverter.cs
index 3a997e8be8..70fa62a5f0 100644
--- a/src/ReactiveUI/Bindings/Converter/NullableSingleToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/NullableSingleToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/ShortToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/ShortToStringTypeConverter.cs
index 86e55862eb..bff8e3da42 100644
--- a/src/ReactiveUI/Bindings/Converter/ShortToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/ShortToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/SingleToStringTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/SingleToStringTypeConverter.cs
index 6628c215b0..65b637209e 100644
--- a/src/ReactiveUI/Bindings/Converter/SingleToStringTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/SingleToStringTypeConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Converter/StringConverter.cs b/src/ReactiveUI/Bindings/Converter/StringConverter.cs
index 83248900c8..7b7c0bca86 100644
--- a/src/ReactiveUI/Bindings/Converter/StringConverter.cs
+++ b/src/ReactiveUI/Bindings/Converter/StringConverter.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/IBindingTypeConverter.cs b/src/ReactiveUI/Bindings/IBindingTypeConverter.cs
index b0bb9212e1..9a7d24990f 100644
--- a/src/ReactiveUI/Bindings/IBindingTypeConverter.cs
+++ b/src/ReactiveUI/Bindings/IBindingTypeConverter.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;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/ISetMethodBindingConverter.cs b/src/ReactiveUI/Bindings/ISetMethodBindingConverter.cs
index 9b75bd86df..dee4defc11 100644
--- a/src/ReactiveUI/Bindings/ISetMethodBindingConverter.cs
+++ b/src/ReactiveUI/Bindings/ISetMethodBindingConverter.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;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Interaction/IInteractionBinderImplementation.cs b/src/ReactiveUI/Bindings/Interaction/IInteractionBinderImplementation.cs
index d129470d3e..27f20e52fc 100644
--- a/src/ReactiveUI/Bindings/Interaction/IInteractionBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Interaction/IInteractionBinderImplementation.cs
@@ -3,11 +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;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Interaction/InteractionBinderImplementation.cs b/src/ReactiveUI/Bindings/Interaction/InteractionBinderImplementation.cs
index e492991064..115efbea33 100644
--- a/src/ReactiveUI/Bindings/Interaction/InteractionBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Interaction/InteractionBinderImplementation.cs
@@ -3,13 +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;
-using System.Linq.Expressions;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Interaction/InteractionBindingMixins.cs b/src/ReactiveUI/Bindings/Interaction/InteractionBindingMixins.cs
index ff087cdf07..4f4f711979 100644
--- a/src/ReactiveUI/Bindings/Interaction/InteractionBindingMixins.cs
+++ b/src/ReactiveUI/Bindings/Interaction/InteractionBindingMixins.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;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Property/IPropertyBinderImplementation.cs b/src/ReactiveUI/Bindings/Property/IPropertyBinderImplementation.cs
index eae428bdb8..130245309e 100644
--- a/src/ReactiveUI/Bindings/Property/IPropertyBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Property/IPropertyBinderImplementation.cs
@@ -3,11 +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;
-using System.Linq.Expressions;
-
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs b/src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs
index ba9d7525b5..553e49d3b1 100644
--- a/src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs
+++ b/src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs
@@ -3,18 +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;
-using System.Collections.Generic;
-using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Bindings/Property/PropertyBindingMixins.cs b/src/ReactiveUI/Bindings/Property/PropertyBindingMixins.cs
index 60076c3a37..82862b7db0 100644
--- a/src/ReactiveUI/Bindings/Property/PropertyBindingMixins.cs
+++ b/src/ReactiveUI/Bindings/Property/PropertyBindingMixins.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;
-using System.Linq.Expressions;
-using System.Reactive;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Reactive/IReactiveBinding.cs b/src/ReactiveUI/Bindings/Reactive/IReactiveBinding.cs
index 91016fb974..ed6679e504 100644
--- a/src/ReactiveUI/Bindings/Reactive/IReactiveBinding.cs
+++ b/src/ReactiveUI/Bindings/Reactive/IReactiveBinding.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;
-using System.Linq.Expressions;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Bindings/Reactive/ReactiveBinding.cs b/src/ReactiveUI/Bindings/Reactive/ReactiveBinding.cs
index 3c1629faaa..cd4e06aea9 100644
--- a/src/ReactiveUI/Bindings/Reactive/ReactiveBinding.cs
+++ b/src/ReactiveUI/Bindings/Reactive/ReactiveBinding.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;
-using System.Linq.Expressions;
-
namespace ReactiveUI;
internal class ReactiveBinding : IReactiveBinding
diff --git a/src/ReactiveUI/Comparers/ChainedComparer.cs b/src/ReactiveUI/Comparers/ChainedComparer.cs
index bde46328da..2f280cd059 100644
--- a/src/ReactiveUI/Comparers/ChainedComparer.cs
+++ b/src/ReactiveUI/Comparers/ChainedComparer.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;
-using System.Collections.Generic;
-
namespace ReactiveUI;
internal sealed class ChainedComparer : IComparer
diff --git a/src/ReactiveUI/Comparers/ComparerChainingExtensions.cs b/src/ReactiveUI/Comparers/ComparerChainingExtensions.cs
index 96e286c964..5c1ec7bfc9 100644
--- a/src/ReactiveUI/Comparers/ComparerChainingExtensions.cs
+++ b/src/ReactiveUI/Comparers/ComparerChainingExtensions.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;
-using System.Collections.Generic;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Comparers/IComparerBuilder.cs b/src/ReactiveUI/Comparers/IComparerBuilder.cs
index a098350fc1..e87ad58430 100644
--- a/src/ReactiveUI/Comparers/IComparerBuilder.cs
+++ b/src/ReactiveUI/Comparers/IComparerBuilder.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;
-using System.Collections.Generic;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Comparers/OrderedComparer.cs b/src/ReactiveUI/Comparers/OrderedComparer.cs
index 11c7e9e6c9..852ae542a5 100644
--- a/src/ReactiveUI/Comparers/OrderedComparer.cs
+++ b/src/ReactiveUI/Comparers/OrderedComparer.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;
-using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/EventHandlers/LocalizableAttribute.cs b/src/ReactiveUI/EventHandlers/LocalizableAttribute.cs
index 62c0a73854..ed34ab59e0 100644
--- a/src/ReactiveUI/EventHandlers/LocalizableAttribute.cs
+++ b/src/ReactiveUI/EventHandlers/LocalizableAttribute.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;
-
#if PORTABLE || NETFX_CORE || ANDROID
namespace ReactiveUI
{
diff --git a/src/ReactiveUI/Expression/ExpressionRewriter.cs b/src/ReactiveUI/Expression/ExpressionRewriter.cs
index 45df9d3a97..1043b7f5c6 100644
--- a/src/ReactiveUI/Expression/ExpressionRewriter.cs
+++ b/src/ReactiveUI/Expression/ExpressionRewriter.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
using System.Reflection;
using System.Text;
-using System.Threading.Tasks;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Expression/Reflection.cs b/src/ReactiveUI/Expression/Reflection.cs
index 692e48586f..07e79978cb 100644
--- a/src/ReactiveUI/Expression/Reflection.cs
+++ b/src/ReactiveUI/Expression/Reflection.cs
@@ -3,16 +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;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
using System.Reflection;
using System.Text;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Interactions/Interaction.cs b/src/ReactiveUI/Interactions/Interaction.cs
index f89cd4eae3..04b260be6e 100644
--- a/src/ReactiveUI/Interactions/Interaction.cs
+++ b/src/ReactiveUI/Interactions/Interaction.cs
@@ -3,16 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
-using System.Threading.Tasks;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interactions/InteractionContext.cs b/src/ReactiveUI/Interactions/InteractionContext.cs
index 5e62ed0103..7b3488dab3 100644
--- a/src/ReactiveUI/Interactions/InteractionContext.cs
+++ b/src/ReactiveUI/Interactions/InteractionContext.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;
-using System.Threading;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interactions/UnhandledInteractionException.cs b/src/ReactiveUI/Interactions/UnhandledInteractionException.cs
index 6f470355bf..ac926d0419 100644
--- a/src/ReactiveUI/Interactions/UnhandledInteractionException.cs
+++ b/src/ReactiveUI/Interactions/UnhandledInteractionException.cs
@@ -3,7 +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;
using System.Runtime.Serialization;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Interfaces/ICanActivate.cs b/src/ReactiveUI/Interfaces/ICanActivate.cs
index 890ef1bff7..39d62dd453 100644
--- a/src/ReactiveUI/Interfaces/ICanActivate.cs
+++ b/src/ReactiveUI/Interfaces/ICanActivate.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;
-using System.Reactive;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/ICreatesCommandBinding.cs b/src/ReactiveUI/Interfaces/ICreatesCommandBinding.cs
index 93488c44fb..90e33ccf6e 100644
--- a/src/ReactiveUI/Interfaces/ICreatesCommandBinding.cs
+++ b/src/ReactiveUI/Interfaces/ICreatesCommandBinding.cs
@@ -3,7 +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;
using System.Windows.Input;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Interfaces/ICreatesObservableForProperty.cs b/src/ReactiveUI/Interfaces/ICreatesObservableForProperty.cs
index 49490b5adc..8015885f0b 100644
--- a/src/ReactiveUI/Interfaces/ICreatesObservableForProperty.cs
+++ b/src/ReactiveUI/Interfaces/ICreatesObservableForProperty.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;
-using System.Linq.Expressions;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/IHandleObservableErrors.cs b/src/ReactiveUI/Interfaces/IHandleObservableErrors.cs
index 6f313db6f3..737864d519 100644
--- a/src/ReactiveUI/Interfaces/IHandleObservableErrors.cs
+++ b/src/ReactiveUI/Interfaces/IHandleObservableErrors.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/IMessageBus.cs b/src/ReactiveUI/Interfaces/IMessageBus.cs
index c4dae6d205..fd9316b669 100644
--- a/src/ReactiveUI/Interfaces/IMessageBus.cs
+++ b/src/ReactiveUI/Interfaces/IMessageBus.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;
-using System.Reactive.Concurrency;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/IObservedChange.cs b/src/ReactiveUI/Interfaces/IObservedChange.cs
index b52a6eb1b3..392887a32e 100644
--- a/src/ReactiveUI/Interfaces/IObservedChange.cs
+++ b/src/ReactiveUI/Interfaces/IObservedChange.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.Linq.Expressions;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/IPropertyBindingHook.cs b/src/ReactiveUI/Interfaces/IPropertyBindingHook.cs
index 6ecfadfea7..00749e4c6b 100644
--- a/src/ReactiveUI/Interfaces/IPropertyBindingHook.cs
+++ b/src/ReactiveUI/Interfaces/IPropertyBindingHook.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/IReactiveNotifyPropertyChanged.cs b/src/ReactiveUI/Interfaces/IReactiveNotifyPropertyChanged.cs
index cd37f5ed63..119746ab47 100644
--- a/src/ReactiveUI/Interfaces/IReactiveNotifyPropertyChanged.cs
+++ b/src/ReactiveUI/Interfaces/IReactiveNotifyPropertyChanged.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/ISuspensionDriver.cs b/src/ReactiveUI/Interfaces/ISuspensionDriver.cs
index db058f62f2..2d3543ad88 100644
--- a/src/ReactiveUI/Interfaces/ISuspensionDriver.cs
+++ b/src/ReactiveUI/Interfaces/ISuspensionDriver.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;
-using System.Reactive;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/ISuspensionHost.cs b/src/ReactiveUI/Interfaces/ISuspensionHost.cs
index 4f7e8bf355..83b9815fbf 100644
--- a/src/ReactiveUI/Interfaces/ISuspensionHost.cs
+++ b/src/ReactiveUI/Interfaces/ISuspensionHost.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;
-using System.Reactive;
-
namespace ReactiveUI;
/* Nicked from http://caliburnmicro.codeplex.com/wikipage?title=Working%20with%20Windows%20Phone%207%20v1.1
*
diff --git a/src/ReactiveUI/Interfaces/IViewLocator.cs b/src/ReactiveUI/Interfaces/IViewLocator.cs
index 3c6a90620a..d8a00a990e 100644
--- a/src/ReactiveUI/Interfaces/IViewLocator.cs
+++ b/src/ReactiveUI/Interfaces/IViewLocator.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 Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/IWantsToRegisterStuff.cs b/src/ReactiveUI/Interfaces/IWantsToRegisterStuff.cs
index f9186ccb70..529988894a 100644
--- a/src/ReactiveUI/Interfaces/IWantsToRegisterStuff.cs
+++ b/src/ReactiveUI/Interfaces/IWantsToRegisterStuff.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Interfaces/ObservedChange.cs b/src/ReactiveUI/Interfaces/ObservedChange.cs
index 98aac960be..70ca7078ea 100644
--- a/src/ReactiveUI/Interfaces/ObservedChange.cs
+++ b/src/ReactiveUI/Interfaces/ObservedChange.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.Linq.Expressions;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Legacy/CollectionDebugView.cs b/src/ReactiveUI/Legacy/CollectionDebugView.cs
index b8a2a568c5..07e2067dab 100644
--- a/src/ReactiveUI/Legacy/CollectionDebugView.cs
+++ b/src/ReactiveUI/Legacy/CollectionDebugView.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;
-using System.Collections.Generic;
using System.Diagnostics;
namespace ReactiveUI.Legacy;
diff --git a/src/ReactiveUI/Legacy/RefcountDisposeWrapper.cs b/src/ReactiveUI/Legacy/RefcountDisposeWrapper.cs
index 115d994855..62a78c31a7 100644
--- a/src/ReactiveUI/Legacy/RefcountDisposeWrapper.cs
+++ b/src/ReactiveUI/Legacy/RefcountDisposeWrapper.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;
-using System.Threading;
-
namespace ReactiveUI.Legacy;
internal sealed class RefcountDisposeWrapper
diff --git a/src/ReactiveUI/Mixins/AutoPersistHelper.cs b/src/ReactiveUI/Mixins/AutoPersistHelper.cs
index 64330853f5..ca9832d6c1 100644
--- a/src/ReactiveUI/Mixins/AutoPersistHelper.cs
+++ b/src/ReactiveUI/Mixins/AutoPersistHelper.cs
@@ -3,21 +3,13 @@
// 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;
-using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using DynamicData;
using DynamicData.Binding;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Mixins/ChangeSetMixin.cs b/src/ReactiveUI/Mixins/ChangeSetMixin.cs
index 765836bc51..d612a699b4 100644
--- a/src/ReactiveUI/Mixins/ChangeSetMixin.cs
+++ b/src/ReactiveUI/Mixins/ChangeSetMixin.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;
-using System.Reactive.Linq;
using DynamicData;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Mixins/CompatMixins.cs b/src/ReactiveUI/Mixins/CompatMixins.cs
index 76b6138e64..b99316b445 100644
--- a/src/ReactiveUI/Mixins/CompatMixins.cs
+++ b/src/ReactiveUI/Mixins/CompatMixins.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;
-using System.Collections.Generic;
-using System.Linq;
-
namespace ReactiveUI;
internal static class CompatMixins
diff --git a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs
index c418d233d7..1d67500b3a 100644
--- a/src/ReactiveUI/Mixins/DependencyResolverMixins.cs
+++ b/src/ReactiveUI/Mixins/DependencyResolverMixins.cs
@@ -3,13 +3,7 @@
// 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;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
using System.Reflection;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Mixins/ExpressionMixins.cs b/src/ReactiveUI/Mixins/ExpressionMixins.cs
index f4797f56a8..11f3e2ef7e 100644
--- a/src/ReactiveUI/Mixins/ExpressionMixins.cs
+++ b/src/ReactiveUI/Mixins/ExpressionMixins.cs
@@ -3,11 +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;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
using System.Reflection;
using System.Text;
diff --git a/src/ReactiveUI/Mixins/ObservableLoggingMixin.cs b/src/ReactiveUI/Mixins/ObservableLoggingMixin.cs
index e992efea31..a361c42644 100644
--- a/src/ReactiveUI/Mixins/ObservableLoggingMixin.cs
+++ b/src/ReactiveUI/Mixins/ObservableLoggingMixin.cs
@@ -3,10 +3,7 @@
// 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;
using System.Globalization;
-using System.Reactive.Linq;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Mixins/ObservableMixins.cs b/src/ReactiveUI/Mixins/ObservableMixins.cs
index 0bf1d85c71..abb299343f 100644
--- a/src/ReactiveUI/Mixins/ObservableMixins.cs
+++ b/src/ReactiveUI/Mixins/ObservableMixins.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;
-using System.Reactive.Linq;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Mixins/ObservedChangedMixin.cs b/src/ReactiveUI/Mixins/ObservedChangedMixin.cs
index 2c1a462f4a..3e86954656 100644
--- a/src/ReactiveUI/Mixins/ObservedChangedMixin.cs
+++ b/src/ReactiveUI/Mixins/ObservedChangedMixin.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;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Mixins/PreserveAttribute.cs b/src/ReactiveUI/Mixins/PreserveAttribute.cs
index aca447ddc5..8896461880 100644
--- a/src/ReactiveUI/Mixins/PreserveAttribute.cs
+++ b/src/ReactiveUI/Mixins/PreserveAttribute.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;
-
namespace ReactiveUI;
[AttributeUsage(AttributeTargets.All)]
diff --git a/src/ReactiveUI/Mixins/ReactiveNotifyPropertyChangedMixin.cs b/src/ReactiveUI/Mixins/ReactiveNotifyPropertyChangedMixin.cs
index 4a7b012dfd..87141065ce 100644
--- a/src/ReactiveUI/Mixins/ReactiveNotifyPropertyChangedMixin.cs
+++ b/src/ReactiveUI/Mixins/ReactiveNotifyPropertyChangedMixin.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/ObservableForProperty/INPCObservableForProperty.cs b/src/ReactiveUI/ObservableForProperty/INPCObservableForProperty.cs
index 5b6936b422..53c7f59d23 100644
--- a/src/ReactiveUI/ObservableForProperty/INPCObservableForProperty.cs
+++ b/src/ReactiveUI/ObservableForProperty/INPCObservableForProperty.cs
@@ -3,11 +3,7 @@
// 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;
using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
using System.Reflection;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ObservableForProperty/IROObservableForProperty.cs b/src/ReactiveUI/ObservableForProperty/IROObservableForProperty.cs
index 377f46b84a..ab3d11b30b 100644
--- a/src/ReactiveUI/ObservableForProperty/IROObservableForProperty.cs
+++ b/src/ReactiveUI/ObservableForProperty/IROObservableForProperty.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;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
using System.Reflection;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ObservableForProperty/OAPHCreationHelperMixin.cs b/src/ReactiveUI/ObservableForProperty/OAPHCreationHelperMixin.cs
index 601dc28151..fcc9776cc4 100644
--- a/src/ReactiveUI/ObservableForProperty/OAPHCreationHelperMixin.cs
+++ b/src/ReactiveUI/ObservableForProperty/OAPHCreationHelperMixin.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;
-using System.Linq.Expressions;
-using System.Reactive.Concurrency;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/ObservableForProperty/ObservableAsPropertyHelper.cs b/src/ReactiveUI/ObservableForProperty/ObservableAsPropertyHelper.cs
index 49ffa855ee..ab30604e35 100644
--- a/src/ReactiveUI/ObservableForProperty/ObservableAsPropertyHelper.cs
+++ b/src/ReactiveUI/ObservableForProperty/ObservableAsPropertyHelper.cs
@@ -3,15 +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;
-using System.Diagnostics.Contracts;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs b/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs
index d4b1239b0f..c9f9cf7fd9 100644
--- a/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs
+++ b/src/ReactiveUI/ObservableForProperty/POCOObservableForProperty.cs
@@ -3,12 +3,7 @@
// 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;
using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ObservableFuncMixins.cs b/src/ReactiveUI/ObservableFuncMixins.cs
index 7ed7ba701f..30cc32cfa5 100644
--- a/src/ReactiveUI/ObservableFuncMixins.cs
+++ b/src/ReactiveUI/ObservableFuncMixins.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;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/PlatformRegistrationManager.cs b/src/ReactiveUI/PlatformRegistrationManager.cs
index cf028baf32..cbf85333a6 100644
--- a/src/ReactiveUI/PlatformRegistrationManager.cs
+++ b/src/ReactiveUI/PlatformRegistrationManager.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/android/AndroidCommandBinders.cs b/src/ReactiveUI/Platforms/android/AndroidCommandBinders.cs
index e7c8807c91..527b406c23 100644
--- a/src/ReactiveUI/Platforms/android/AndroidCommandBinders.cs
+++ b/src/ReactiveUI/Platforms/android/AndroidCommandBinders.cs
@@ -3,9 +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;
-using System.Linq.Expressions;
using System.Reflection;
+
using Android.Views;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/AndroidObservableForWidgets.cs b/src/ReactiveUI/Platforms/android/AndroidObservableForWidgets.cs
index 4d2174b511..6e5eee6c3d 100644
--- a/src/ReactiveUI/Platforms/android/AndroidObservableForWidgets.cs
+++ b/src/ReactiveUI/Platforms/android/AndroidObservableForWidgets.cs
@@ -3,17 +3,13 @@
// 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;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Linq;
using System.Runtime.Versioning;
+
using Android.OS;
using Android.Text;
using Android.Views;
using Android.Widget;
+
using Observable = System.Reactive.Linq.Observable;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/AutoSuspendHelper.cs b/src/ReactiveUI/Platforms/android/AutoSuspendHelper.cs
index 00796bee0f..65d9f80d91 100644
--- a/src/ReactiveUI/Platforms/android/AutoSuspendHelper.cs
+++ b/src/ReactiveUI/Platforms/android/AutoSuspendHelper.cs
@@ -3,18 +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;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-
using Android.App;
using Android.OS;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/android/BundleSuspensionDriver.cs b/src/ReactiveUI/Platforms/android/BundleSuspensionDriver.cs
index 98ffb4c381..540511dc6e 100644
--- a/src/ReactiveUI/Platforms/android/BundleSuspensionDriver.cs
+++ b/src/ReactiveUI/Platforms/android/BundleSuspensionDriver.cs
@@ -3,10 +3,7 @@
// 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;
using System.IO;
-using System.Reactive;
-using System.Reactive.Linq;
using System.Runtime.Serialization.Formatters.Binary;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/ContextExtensions.cs b/src/ReactiveUI/Platforms/android/ContextExtensions.cs
index f60c491dbf..905569d98f 100644
--- a/src/ReactiveUI/Platforms/android/ContextExtensions.cs
+++ b/src/ReactiveUI/Platforms/android/ContextExtensions.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;
-using System.Reactive.Linq;
using Android.Content;
using Android.OS;
diff --git a/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs b/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs
index 698bffbac0..f28608d094 100644
--- a/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs
+++ b/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs
@@ -3,12 +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;
using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
+
using Android.App;
using Android.Views;
diff --git a/src/ReactiveUI/Platforms/android/FlexibleCommandBinder.cs b/src/ReactiveUI/Platforms/android/FlexibleCommandBinder.cs
index 75ac069409..b8c62bb465 100644
--- a/src/ReactiveUI/Platforms/android/FlexibleCommandBinder.cs
+++ b/src/ReactiveUI/Platforms/android/FlexibleCommandBinder.cs
@@ -3,11 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows.Input;
diff --git a/src/ReactiveUI/Platforms/android/HandlerScheduler.cs b/src/ReactiveUI/Platforms/android/HandlerScheduler.cs
index b14f167469..bad8d24254 100644
--- a/src/ReactiveUI/Platforms/android/HandlerScheduler.cs
+++ b/src/ReactiveUI/Platforms/android/HandlerScheduler.cs
@@ -3,16 +3,7 @@
// 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using Android.App;
using Android.OS;
-using ReactiveUI;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/IgnoreResourceAttribute.cs b/src/ReactiveUI/Platforms/android/IgnoreResourceAttribute.cs
index 32f7cf76d9..87891ece08 100644
--- a/src/ReactiveUI/Platforms/android/IgnoreResourceAttribute.cs
+++ b/src/ReactiveUI/Platforms/android/IgnoreResourceAttribute.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/android/JavaHolder.cs b/src/ReactiveUI/Platforms/android/JavaHolder.cs
index 125474af50..444b723313 100644
--- a/src/ReactiveUI/Platforms/android/JavaHolder.cs
+++ b/src/ReactiveUI/Platforms/android/JavaHolder.cs
@@ -3,10 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Text;
using Object = Java.Lang.Object;
diff --git a/src/ReactiveUI/Platforms/android/LayoutViewHost.cs b/src/ReactiveUI/Platforms/android/LayoutViewHost.cs
index 49ea5c4b74..61e5617481 100644
--- a/src/ReactiveUI/Platforms/android/LayoutViewHost.cs
+++ b/src/ReactiveUI/Platforms/android/LayoutViewHost.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;
-using System.Diagnostics.CodeAnalysis;
using Android.Content;
using Android.Views;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/LinkerOverrides.cs b/src/ReactiveUI/Platforms/android/LinkerOverrides.cs
index 82f020588c..1674cc7bc2 100644
--- a/src/ReactiveUI/Platforms/android/LinkerOverrides.cs
+++ b/src/ReactiveUI/Platforms/android/LinkerOverrides.cs
@@ -3,17 +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;
-using System.Collections.Generic;
-using System.Linq;
using System.Runtime.Versioning;
-using System.Text;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
using Android.Widget;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/ObjectExtension.cs b/src/ReactiveUI/Platforms/android/ObjectExtension.cs
index 667e53ac9d..9cb6a4e729 100644
--- a/src/ReactiveUI/Platforms/android/ObjectExtension.cs
+++ b/src/ReactiveUI/Platforms/android/ObjectExtension.cs
@@ -3,7 +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;
using Object = Java.Lang.Object;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/PlatformOperations.cs b/src/ReactiveUI/Platforms/android/PlatformOperations.cs
index dacc1545c8..9e7e8afb25 100644
--- a/src/ReactiveUI/Platforms/android/PlatformOperations.cs
+++ b/src/ReactiveUI/Platforms/android/PlatformOperations.cs
@@ -3,7 +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;
using Android.App;
using Android.Content;
using Android.Views;
diff --git a/src/ReactiveUI/Platforms/android/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/android/PlatformRegistrations.cs
index 24278bb3c2..c66808181a 100644
--- a/src/ReactiveUI/Platforms/android/PlatformRegistrations.cs
+++ b/src/ReactiveUI/Platforms/android/PlatformRegistrations.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;
-using System.Reactive.Concurrency;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/android/ReactiveActivity.cs b/src/ReactiveUI/Platforms/android/ReactiveActivity.cs
index d62da5c635..bd9379cda0 100644
--- a/src/ReactiveUI/Platforms/android/ReactiveActivity.cs
+++ b/src/ReactiveUI/Platforms/android/ReactiveActivity.cs
@@ -3,15 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using System.Threading.Tasks;
+
using Android.App;
using Android.Content;
using Android.Runtime;
diff --git a/src/ReactiveUI/Platforms/android/ReactiveFragment.cs b/src/ReactiveUI/Platforms/android/ReactiveFragment.cs
index 1686c7e6e0..994a53ba99 100644
--- a/src/ReactiveUI/Platforms/android/ReactiveFragment.cs
+++ b/src/ReactiveUI/Platforms/android/ReactiveFragment.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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Runtime.Versioning;
+
using Android.App;
using Android.Runtime;
diff --git a/src/ReactiveUI/Platforms/android/ReactivePreferenceActivity.cs b/src/ReactiveUI/Platforms/android/ReactivePreferenceActivity.cs
index 49fcba6965..e1e0f3c5e7 100644
--- a/src/ReactiveUI/Platforms/android/ReactivePreferenceActivity.cs
+++ b/src/ReactiveUI/Platforms/android/ReactivePreferenceActivity.cs
@@ -3,15 +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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
using System.Runtime.Versioning;
-using System.Threading.Tasks;
+
using Android.App;
using Android.Content;
using Android.Preferences;
diff --git a/src/ReactiveUI/Platforms/android/ReactivePreferenceFragment.cs b/src/ReactiveUI/Platforms/android/ReactivePreferenceFragment.cs
index 95f3f32895..0509e7d79e 100644
--- a/src/ReactiveUI/Platforms/android/ReactivePreferenceFragment.cs
+++ b/src/ReactiveUI/Platforms/android/ReactivePreferenceFragment.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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Runtime.Versioning;
+
using Android.Preferences;
using Android.Runtime;
diff --git a/src/ReactiveUI/Platforms/android/ReactiveViewHost.cs b/src/ReactiveUI/Platforms/android/ReactiveViewHost.cs
index a97f6fd367..38c05cea20 100644
--- a/src/ReactiveUI/Platforms/android/ReactiveViewHost.cs
+++ b/src/ReactiveUI/Platforms/android/ReactiveViewHost.cs
@@ -3,12 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
+
using Android.Content;
using Android.Views;
diff --git a/src/ReactiveUI/Platforms/android/SharedPreferencesExtensions.cs b/src/ReactiveUI/Platforms/android/SharedPreferencesExtensions.cs
index 1cc89355f3..6e111002f4 100644
--- a/src/ReactiveUI/Platforms/android/SharedPreferencesExtensions.cs
+++ b/src/ReactiveUI/Platforms/android/SharedPreferencesExtensions.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;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using Android.Content;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/UsbManagerExtensions.cs b/src/ReactiveUI/Platforms/android/UsbManagerExtensions.cs
index 9bc6f8bba5..c9a2912cd5 100644
--- a/src/ReactiveUI/Platforms/android/UsbManagerExtensions.cs
+++ b/src/ReactiveUI/Platforms/android/UsbManagerExtensions.cs
@@ -3,10 +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;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Runtime.Versioning;
+
using Android.App;
using Android.Content;
using Android.Hardware.Usb;
diff --git a/src/ReactiveUI/Platforms/android/ViewCommandExtensions.cs b/src/ReactiveUI/Platforms/android/ViewCommandExtensions.cs
index e6b3b97bf0..a2d8a44257 100644
--- a/src/ReactiveUI/Platforms/android/ViewCommandExtensions.cs
+++ b/src/ReactiveUI/Platforms/android/ViewCommandExtensions.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Text;
using System.Windows.Input;
+
using Android.Views;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/android/WireUpResourceAttribute.cs b/src/ReactiveUI/Platforms/android/WireUpResourceAttribute.cs
index 636dab50a3..0992dd101a 100644
--- a/src/ReactiveUI/Platforms/android/WireUpResourceAttribute.cs
+++ b/src/ReactiveUI/Platforms/android/WireUpResourceAttribute.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/apple-common/AppSupportJsonSuspensionDriver.cs b/src/ReactiveUI/Platforms/apple-common/AppSupportJsonSuspensionDriver.cs
index adb1ef94b0..654edcd5c8 100644
--- a/src/ReactiveUI/Platforms/apple-common/AppSupportJsonSuspensionDriver.cs
+++ b/src/ReactiveUI/Platforms/apple-common/AppSupportJsonSuspensionDriver.cs
@@ -3,11 +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;
using System.IO;
-using System.Reactive;
-using System.Reactive.Linq;
using System.Runtime.Serialization.Formatters.Binary;
+
using Foundation;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/apple-common/BlockObserveValueDelegate.cs b/src/ReactiveUI/Platforms/apple-common/BlockObserveValueDelegate.cs
index 67eeae86c0..6b0a121364 100644
--- a/src/ReactiveUI/Platforms/apple-common/BlockObserveValueDelegate.cs
+++ b/src/ReactiveUI/Platforms/apple-common/BlockObserveValueDelegate.cs
@@ -3,7 +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;
using Foundation;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/apple-common/Converters/DateTimeNSDateConverter.cs b/src/ReactiveUI/Platforms/apple-common/Converters/DateTimeNSDateConverter.cs
index 182e532b46..eeaa482ec6 100644
--- a/src/ReactiveUI/Platforms/apple-common/Converters/DateTimeNSDateConverter.cs
+++ b/src/ReactiveUI/Platforms/apple-common/Converters/DateTimeNSDateConverter.cs
@@ -3,7 +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;
using Foundation;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/apple-common/IndexNormalizer.cs b/src/ReactiveUI/Platforms/apple-common/IndexNormalizer.cs
index 8fa439d817..452d4ad0dd 100644
--- a/src/ReactiveUI/Platforms/apple-common/IndexNormalizer.cs
+++ b/src/ReactiveUI/Platforms/apple-common/IndexNormalizer.cs
@@ -3,10 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/apple-common/KVOObservableForProperty.cs b/src/ReactiveUI/Platforms/apple-common/KVOObservableForProperty.cs
index 7bc68f3313..3474f3bcd8 100644
--- a/src/ReactiveUI/Platforms/apple-common/KVOObservableForProperty.cs
+++ b/src/ReactiveUI/Platforms/apple-common/KVOObservableForProperty.cs
@@ -3,16 +3,11 @@
// 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;
using System.Globalization;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
+
using Foundation;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/apple-common/NSRunloopScheduler.cs b/src/ReactiveUI/Platforms/apple-common/NSRunloopScheduler.cs
index a7c41591da..9d55fb5cb3 100644
--- a/src/ReactiveUI/Platforms/apple-common/NSRunloopScheduler.cs
+++ b/src/ReactiveUI/Platforms/apple-common/NSRunloopScheduler.cs
@@ -3,11 +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;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
using CoreFoundation;
+
using Foundation;
+
using NSAction = System.Action;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/apple-common/ObservableForPropertyBase.cs b/src/ReactiveUI/Platforms/apple-common/ObservableForPropertyBase.cs
index 01ca803d3b..546bfaca16 100644
--- a/src/ReactiveUI/Platforms/apple-common/ObservableForPropertyBase.cs
+++ b/src/ReactiveUI/Platforms/apple-common/ObservableForPropertyBase.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using Foundation;
#if UIKIT
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs
index 1a4a758a0d..cce599df32 100644
--- a/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs
+++ b/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs
@@ -3,13 +3,7 @@
// 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;
-using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using CoreGraphics;
using Foundation;
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs
index f2188b00f8..43fb837e92 100644
--- a/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs
+++ b/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs
@@ -3,18 +3,11 @@
// 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;
-using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using CoreGraphics;
using Foundation;
#if UIKIT
-using UIKit;
using NSImage = UIKit.UIImage;
using NSImageView = UIKit.UIImageView;
using NSView = UIKit.UIView;
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveSplitViewController.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveSplitViewController.cs
index 032e9db650..316264ca27 100644
--- a/src/ReactiveUI/Platforms/apple-common/ReactiveSplitViewController.cs
+++ b/src/ReactiveUI/Platforms/apple-common/ReactiveSplitViewController.cs
@@ -3,18 +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;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using Foundation;
#if UIKIT
-using UIKit;
using NSSplitViewController = UIKit.UISplitViewController;
-using NSView = UIKit.UIView;
#else
using AppKit;
#endif
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveView.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveView.cs
index 9ac284d3b3..8c39cb8a9b 100644
--- a/src/ReactiveUI/Platforms/apple-common/ReactiveView.cs
+++ b/src/ReactiveUI/Platforms/apple-common/ReactiveView.cs
@@ -3,18 +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;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using CoreGraphics;
using Foundation;
#if UIKIT
-using UIKit;
using NSView = UIKit.UIView;
#else
using AppKit;
diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveViewController.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveViewController.cs
index 2bac227c93..bd3d1e565c 100644
--- a/src/ReactiveUI/Platforms/apple-common/ReactiveViewController.cs
+++ b/src/ReactiveUI/Platforms/apple-common/ReactiveViewController.cs
@@ -3,17 +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;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using Foundation;
#if UIKIT
-using UIKit;
-using NSView = UIKit.UIView;
using NSViewController = UIKit.UIViewController;
#else
using AppKit;
diff --git a/src/ReactiveUI/Platforms/apple-common/TargetActionCommandBinder.cs b/src/ReactiveUI/Platforms/apple-common/TargetActionCommandBinder.cs
index c5ca82ff65..1768d2db7b 100644
--- a/src/ReactiveUI/Platforms/apple-common/TargetActionCommandBinder.cs
+++ b/src/ReactiveUI/Platforms/apple-common/TargetActionCommandBinder.cs
@@ -3,11 +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;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows.Input;
using Foundation;
diff --git a/src/ReactiveUI/Platforms/apple-common/UIViewControllerMixins.cs b/src/ReactiveUI/Platforms/apple-common/UIViewControllerMixins.cs
index 51be2a08e4..d45681e8ca 100644
--- a/src/ReactiveUI/Platforms/apple-common/UIViewControllerMixins.cs
+++ b/src/ReactiveUI/Platforms/apple-common/UIViewControllerMixins.cs
@@ -3,16 +3,7 @@
// 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;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using Foundation;
-
#if UIKIT
-using UIKit;
using NSView = UIKit.UIView;
using NSViewController = UIKit.UIViewController;
#else
diff --git a/src/ReactiveUI/Platforms/apple-common/ViewModelViewHost.cs b/src/ReactiveUI/Platforms/apple-common/ViewModelViewHost.cs
index 44808d5ebf..e7f27ecd17 100644
--- a/src/ReactiveUI/Platforms/apple-common/ViewModelViewHost.cs
+++ b/src/ReactiveUI/Platforms/apple-common/ViewModelViewHost.cs
@@ -3,14 +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;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-
#if UIKIT
using UIKit;
-using NSView = UIKit.UIView;
using NSViewController = UIKit.UIViewController;
#else
using AppKit;
diff --git a/src/ReactiveUI/Platforms/ios/LinkerOverrides.cs b/src/ReactiveUI/Platforms/ios/LinkerOverrides.cs
index f3c9ad64c7..c2be0c5958 100644
--- a/src/ReactiveUI/Platforms/ios/LinkerOverrides.cs
+++ b/src/ReactiveUI/Platforms/ios/LinkerOverrides.cs
@@ -3,7 +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;
using UIKit;
namespace ReactiveUI.Cocoa;
diff --git a/src/ReactiveUI/Platforms/ios/UIKitCommandBinders.cs b/src/ReactiveUI/Platforms/ios/UIKitCommandBinders.cs
index 62eda1b048..c292c78f03 100644
--- a/src/ReactiveUI/Platforms/ios/UIKitCommandBinders.cs
+++ b/src/ReactiveUI/Platforms/ios/UIKitCommandBinders.cs
@@ -3,8 +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;
using System.Reflection;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/ios/UIKitObservableForProperty.cs b/src/ReactiveUI/Platforms/ios/UIKitObservableForProperty.cs
index d688209118..488390cafd 100644
--- a/src/ReactiveUI/Platforms/ios/UIKitObservableForProperty.cs
+++ b/src/ReactiveUI/Platforms/ios/UIKitObservableForProperty.cs
@@ -3,7 +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;
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/mac/AppKitObservableForProperty.cs b/src/ReactiveUI/Platforms/mac/AppKitObservableForProperty.cs
index 4cfd50d901..6b1607cf0c 100644
--- a/src/ReactiveUI/Platforms/mac/AppKitObservableForProperty.cs
+++ b/src/ReactiveUI/Platforms/mac/AppKitObservableForProperty.cs
@@ -3,7 +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;
using AppKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/mac/AutoSuspendHelper.cs b/src/ReactiveUI/Platforms/mac/AutoSuspendHelper.cs
index e70ffa6de4..5e87197fc7 100644
--- a/src/ReactiveUI/Platforms/mac/AutoSuspendHelper.cs
+++ b/src/ReactiveUI/Platforms/mac/AutoSuspendHelper.cs
@@ -3,15 +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;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using AppKit;
+
using Foundation;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs
index 54a758cf1b..ac52f4f4d4 100644
--- a/src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs
+++ b/src/ReactiveUI/Platforms/mac/PlatformRegistrations.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;
-using System.Reactive.Concurrency;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/mac/ReactiveWindowController.cs b/src/ReactiveUI/Platforms/mac/ReactiveWindowController.cs
index dc63a15d90..ce67ef77e0 100644
--- a/src/ReactiveUI/Platforms/mac/ReactiveWindowController.cs
+++ b/src/ReactiveUI/Platforms/mac/ReactiveWindowController.cs
@@ -3,11 +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;
using System.ComponentModel;
-using System.Reactive;
-using System.Reactive.Subjects;
+
using AppKit;
+
using Foundation;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/netstandard2.0/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/netstandard2.0/PlatformRegistrations.cs
index d2c72a6cb4..0d968f6177 100644
--- a/src/ReactiveUI/Platforms/netstandard2.0/PlatformRegistrations.cs
+++ b/src/ReactiveUI/Platforms/netstandard2.0/PlatformRegistrations.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;
-using System.Reactive.Concurrency;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/tizen/EcoreMainloopScheduler.cs b/src/ReactiveUI/Platforms/tizen/EcoreMainloopScheduler.cs
index 91be03e5b3..b8ead616f0 100644
--- a/src/ReactiveUI/Platforms/tizen/EcoreMainloopScheduler.cs
+++ b/src/ReactiveUI/Platforms/tizen/EcoreMainloopScheduler.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;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
using ElmSharp;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/tizen/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/tizen/PlatformRegistrations.cs
index 71a457a983..7f05550fa9 100644
--- a/src/ReactiveUI/Platforms/tizen/PlatformRegistrations.cs
+++ b/src/ReactiveUI/Platforms/tizen/PlatformRegistrations.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;
-using System.Reactive.Concurrency;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/tvos/LinkerOverrides.cs b/src/ReactiveUI/Platforms/tvos/LinkerOverrides.cs
index 8f580413b5..70df54f161 100644
--- a/src/ReactiveUI/Platforms/tvos/LinkerOverrides.cs
+++ b/src/ReactiveUI/Platforms/tvos/LinkerOverrides.cs
@@ -3,7 +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;
using UIKit;
namespace ReactiveUI.Cocoa;
diff --git a/src/ReactiveUI/Platforms/tvos/UIKitCommandBinders.cs b/src/ReactiveUI/Platforms/tvos/UIKitCommandBinders.cs
index 9e7596e0b8..29cbc603fa 100644
--- a/src/ReactiveUI/Platforms/tvos/UIKitCommandBinders.cs
+++ b/src/ReactiveUI/Platforms/tvos/UIKitCommandBinders.cs
@@ -3,8 +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;
using System.Reflection;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/tvos/UIKitObservableForProperty.cs b/src/ReactiveUI/Platforms/tvos/UIKitObservableForProperty.cs
index 7f69b92ff3..4c6d4e7c13 100644
--- a/src/ReactiveUI/Platforms/tvos/UIKitObservableForProperty.cs
+++ b/src/ReactiveUI/Platforms/tvos/UIKitObservableForProperty.cs
@@ -3,7 +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;
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/AutoSuspendHelper.cs b/src/ReactiveUI/Platforms/uikit-common/AutoSuspendHelper.cs
index ef78fe3fb5..86c170132a 100644
--- a/src/ReactiveUI/Platforms/uikit-common/AutoSuspendHelper.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/AutoSuspendHelper.cs
@@ -3,16 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using Foundation;
-using Splat;
+
using UIKit;
+
using NSAction = System.Action;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/CollectionViewSectionInformation.cs b/src/ReactiveUI/Platforms/uikit-common/CollectionViewSectionInformation.cs
index 84dd0ad34d..292a418ea8 100644
--- a/src/ReactiveUI/Platforms/uikit-common/CollectionViewSectionInformation.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/CollectionViewSectionInformation.cs
@@ -3,10 +3,11 @@
// 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;
using System.Collections.Specialized;
using System.Diagnostics.CodeAnalysis;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs b/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs
index fe9edd401f..e7e0d1629b 100644
--- a/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs
@@ -3,22 +3,15 @@
// 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;
using System.Collections;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Globalization;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading;
+
using DynamicData;
using DynamicData.Binding;
+
using Foundation;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/FlexibleCommandBinder.cs b/src/ReactiveUI/Platforms/uikit-common/FlexibleCommandBinder.cs
index 749ac780d2..3899a0ad51 100644
--- a/src/ReactiveUI/Platforms/uikit-common/FlexibleCommandBinder.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/FlexibleCommandBinder.cs
@@ -3,13 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
using System.Reflection;
using System.Windows.Input;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ISectionInformation.cs b/src/ReactiveUI/Platforms/uikit-common/ISectionInformation.cs
index 04124dfd9c..b827473486 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ISectionInformation.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ISectionInformation.cs
@@ -3,8 +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;
using System.Collections.Specialized;
+
using Foundation;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/IUICollViewAdapter.cs b/src/ReactiveUI/Platforms/uikit-common/IUICollViewAdapter.cs
index 3265a0461a..759489de58 100644
--- a/src/ReactiveUI/Platforms/uikit-common/IUICollViewAdapter.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/IUICollViewAdapter.cs
@@ -3,7 +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;
using Foundation;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs b/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs
index 0048b0c81e..96ed36a53d 100644
--- a/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.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;
-using System.Reactive.Concurrency;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionReusableView.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionReusableView.cs
index 6886e9b125..eebc7b181f 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionReusableView.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionReusableView.cs
@@ -3,14 +3,13 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using CoreGraphics;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionView.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionView.cs
index 15d3f008e5..8d92d9d6aa 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionView.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionView.cs
@@ -3,15 +3,13 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using CoreGraphics;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewCell.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewCell.cs
index 8278bc7fa1..8550bf26d6 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewCell.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewCell.cs
@@ -3,15 +3,13 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using CoreGraphics;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewController.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewController.cs
index 77c7d93672..0b13510b39 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewController.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewController.cs
@@ -3,13 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSource.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSource.cs
index 98210e51d5..0d55da9e15 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSource.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSource.cs
@@ -3,12 +3,11 @@
// 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;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Reactive.Subjects;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSourceExtensions.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSourceExtensions.cs
index 71e7f54863..766ec12b5a 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSourceExtensions.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSourceExtensions.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;
-using System.Collections.Generic;
using System.Collections.Specialized;
-using System.Linq;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveNavigationController.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveNavigationController.cs
index 7269a34a14..c9eff84360 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveNavigationController.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveNavigationController.cs
@@ -3,13 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactivePageViewController.cs b/src/ReactiveUI/Platforms/uikit-common/ReactivePageViewController.cs
index d6597c365a..4d4f2a345d 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactivePageViewController.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactivePageViewController.cs
@@ -3,13 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveTabBarController.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveTabBarController.cs
index 5bec6e1599..ec1056bd98 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveTabBarController.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveTabBarController.cs
@@ -3,13 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableView.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableView.cs
index e1bc5b231d..a037ec35b0 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableView.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableView.cs
@@ -3,15 +3,13 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using CoreGraphics;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewCell.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewCell.cs
index 4417e4e92e..93440528ab 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewCell.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewCell.cs
@@ -3,15 +3,13 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using CoreGraphics;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewController.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewController.cs
index 1a82ed5827..0860e6289d 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewController.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewController.cs
@@ -3,13 +3,11 @@
// 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;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Foundation;
+
using NSTableViewController = UIKit.UITableViewController;
using NSTableViewStyle = UIKit.UITableViewStyle;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSource.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSource.cs
index 8ede990865..b7a58bcd1d 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSource.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSource.cs
@@ -3,15 +3,11 @@
// 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;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Reactive.Subjects;
using Foundation;
-using ObjCRuntime;
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSourceExtensions.cs b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSourceExtensions.cs
index 304bb26b0b..f70f6cd118 100644
--- a/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSourceExtensions.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSourceExtensions.cs
@@ -3,12 +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;
-using System.Collections.Generic;
using System.Collections.Specialized;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/RoutedViewHost.cs b/src/ReactiveUI/Platforms/uikit-common/RoutedViewHost.cs
index 6a578db5cd..a570f07bdb 100644
--- a/src/ReactiveUI/Platforms/uikit-common/RoutedViewHost.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/RoutedViewHost.cs
@@ -3,12 +3,11 @@
// 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;
using System.Collections.Specialized;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
+
using DynamicData.Binding;
+
using NSViewController = UIKit.UIViewController;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/TableSectionHeader.cs b/src/ReactiveUI/Platforms/uikit-common/TableSectionHeader.cs
index 031df63d06..f95733258f 100644
--- a/src/ReactiveUI/Platforms/uikit-common/TableSectionHeader.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/TableSectionHeader.cs
@@ -3,7 +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;
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/TableSectionInformation.cs b/src/ReactiveUI/Platforms/uikit-common/TableSectionInformation.cs
index 264a915ad6..181c8cddcb 100644
--- a/src/ReactiveUI/Platforms/uikit-common/TableSectionInformation.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/TableSectionInformation.cs
@@ -3,10 +3,11 @@
// 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;
using System.Collections.Specialized;
using System.Diagnostics.CodeAnalysis;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/UICollectionViewAdapter.cs b/src/ReactiveUI/Platforms/uikit-common/UICollectionViewAdapter.cs
index f6a37c396e..c8133dec20 100644
--- a/src/ReactiveUI/Platforms/uikit-common/UICollectionViewAdapter.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/UICollectionViewAdapter.cs
@@ -3,13 +3,12 @@
// 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;
using System.Diagnostics;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Foundation;
+
using UIKit;
+
using NSAction = System.Action;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/UIControlCommandExtensions.cs b/src/ReactiveUI/Platforms/uikit-common/UIControlCommandExtensions.cs
index c04092ed3a..859da07ccd 100644
--- a/src/ReactiveUI/Platforms/uikit-common/UIControlCommandExtensions.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/UIControlCommandExtensions.cs
@@ -3,9 +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;
-using System.Reactive.Disposables;
using System.Windows.Input;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/uikit-common/UITableViewAdapter.cs b/src/ReactiveUI/Platforms/uikit-common/UITableViewAdapter.cs
index 4097ba2723..1da5bcea01 100644
--- a/src/ReactiveUI/Platforms/uikit-common/UITableViewAdapter.cs
+++ b/src/ReactiveUI/Platforms/uikit-common/UITableViewAdapter.cs
@@ -3,12 +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;
using System.Diagnostics;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
+
using Foundation;
+
using UIKit;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs b/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs
index 8a9dc9324e..c7ed7ea620 100644
--- a/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs
+++ b/src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs
@@ -3,9 +3,7 @@
// 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;
using System.ComponentModel;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ReactiveCommand/CombinedReactiveCommand.cs b/src/ReactiveUI/ReactiveCommand/CombinedReactiveCommand.cs
index 54d96658b7..2e5643db19 100644
--- a/src/ReactiveUI/ReactiveCommand/CombinedReactiveCommand.cs
+++ b/src/ReactiveUI/ReactiveCommand/CombinedReactiveCommand.cs
@@ -3,12 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/ReactiveCommand/IReactiveCommand.cs b/src/ReactiveUI/ReactiveCommand/IReactiveCommand.cs
index 8017854f76..ee4bfefc1e 100644
--- a/src/ReactiveUI/ReactiveCommand/IReactiveCommand.cs
+++ b/src/ReactiveUI/ReactiveCommand/IReactiveCommand.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/ReactiveCommand/ReactiveCommand.cs b/src/ReactiveUI/ReactiveCommand/ReactiveCommand.cs
index b3945cf5f0..543d9e714d 100644
--- a/src/ReactiveUI/ReactiveCommand/ReactiveCommand.cs
+++ b/src/ReactiveUI/ReactiveCommand/ReactiveCommand.cs
@@ -3,17 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using System.Threading;
-using System.Threading.Tasks;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ReactiveCommand/ReactiveCommandBase.cs b/src/ReactiveUI/ReactiveCommand/ReactiveCommandBase.cs
index 8680682b8b..25b1ecbede 100644
--- a/src/ReactiveUI/ReactiveCommand/ReactiveCommandBase.cs
+++ b/src/ReactiveUI/ReactiveCommand/ReactiveCommandBase.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;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
using System.Windows.Input;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ReactiveCommand/ReactiveCommandMixins.cs b/src/ReactiveUI/ReactiveCommand/ReactiveCommandMixins.cs
index b4cbb41e61..2a4f0af1b1 100644
--- a/src/ReactiveUI/ReactiveCommand/ReactiveCommandMixins.cs
+++ b/src/ReactiveUI/ReactiveCommand/ReactiveCommandMixins.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;
-using System.Linq.Expressions;
-using System.Reactive;
-using System.Reactive.Linq;
using System.Windows.Input;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ReactiveObject/IReactiveObject.cs b/src/ReactiveUI/ReactiveObject/IReactiveObject.cs
index b56fe497cf..38feb4083a 100644
--- a/src/ReactiveUI/ReactiveObject/IReactiveObject.cs
+++ b/src/ReactiveUI/ReactiveObject/IReactiveObject.cs
@@ -4,7 +4,6 @@
// See the LICENSE file in the project root for full license information.
using System.ComponentModel;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ReactiveObject/IReactiveObjectExtensions.cs b/src/ReactiveUI/ReactiveObject/IReactiveObjectExtensions.cs
index c20358c21b..c1b55e512c 100644
--- a/src/ReactiveUI/ReactiveObject/IReactiveObjectExtensions.cs
+++ b/src/ReactiveUI/ReactiveObject/IReactiveObjectExtensions.cs
@@ -3,16 +3,7 @@
// 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;
-using System.Collections.Generic;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Runtime.CompilerServices;
-using System.Threading;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ReactiveObject/ReactiveObject.cs b/src/ReactiveUI/ReactiveObject/ReactiveObject.cs
index 23b20f9344..7daa415aeb 100644
--- a/src/ReactiveUI/ReactiveObject/ReactiveObject.cs
+++ b/src/ReactiveUI/ReactiveObject/ReactiveObject.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;
using System.ComponentModel;
-using System.Reactive;
using System.Runtime.Serialization;
-using System.Threading;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/ReactiveObject/ReactiveRecord.cs b/src/ReactiveUI/ReactiveObject/ReactiveRecord.cs
index 40a29070ba..b02192328d 100644
--- a/src/ReactiveUI/ReactiveObject/ReactiveRecord.cs
+++ b/src/ReactiveUI/ReactiveObject/ReactiveRecord.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;
using System.ComponentModel;
-using System.Reactive;
using System.Runtime.Serialization;
-using System.Threading;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Registration/Registrations.cs b/src/ReactiveUI/Registration/Registrations.cs
index c40247f571..50085cc1b6 100644
--- a/src/ReactiveUI/Registration/Registrations.cs
+++ b/src/ReactiveUI/Registration/Registrations.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Routing/MessageBus.cs b/src/ReactiveUI/Routing/MessageBus.cs
index c0cae1b18a..c661309350 100644
--- a/src/ReactiveUI/Routing/MessageBus.cs
+++ b/src/ReactiveUI/Routing/MessageBus.cs
@@ -3,13 +3,7 @@
// 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;
-using System.Collections.Generic;
using System.Globalization;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Routing/RoutableViewModelMixin.cs b/src/ReactiveUI/Routing/RoutableViewModelMixin.cs
index dfb9396853..29a7e4b750 100644
--- a/src/ReactiveUI/Routing/RoutableViewModelMixin.cs
+++ b/src/ReactiveUI/Routing/RoutableViewModelMixin.cs
@@ -3,11 +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;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-
using DynamicData;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Routing/RoutingState.cs b/src/ReactiveUI/Routing/RoutingState.cs
index dd5b51855a..abcd5063d9 100644
--- a/src/ReactiveUI/Routing/RoutingState.cs
+++ b/src/ReactiveUI/Routing/RoutingState.cs
@@ -3,13 +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;
using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
using System.Runtime.Serialization;
+
using DynamicData;
using DynamicData.Binding;
#pragma warning disable 8618
diff --git a/src/ReactiveUI/Routing/RoutingStateMixins.cs b/src/ReactiveUI/Routing/RoutingStateMixins.cs
index 23664d0176..2df656ffd1 100644
--- a/src/ReactiveUI/Routing/RoutingStateMixins.cs
+++ b/src/ReactiveUI/Routing/RoutingStateMixins.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.Linq;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/RxApp.cs b/src/ReactiveUI/RxApp.cs
index 23049b03b5..f8f3f8d826 100644
--- a/src/ReactiveUI/RxApp.cs
+++ b/src/ReactiveUI/RxApp.cs
@@ -3,13 +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;
using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive;
-using System.Reactive.Concurrency;
using System.Runtime.CompilerServices;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/Scheduler/ScheduledSubject.cs b/src/ReactiveUI/Scheduler/ScheduledSubject.cs
index 83145782c2..3b74102766 100644
--- a/src/ReactiveUI/Scheduler/ScheduledSubject.cs
+++ b/src/ReactiveUI/Scheduler/ScheduledSubject.cs
@@ -3,13 +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;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Scheduler/WaitForDispatcherScheduler.cs b/src/ReactiveUI/Scheduler/WaitForDispatcherScheduler.cs
index da9d21fe1a..eb86c2fba6 100644
--- a/src/ReactiveUI/Scheduler/WaitForDispatcherScheduler.cs
+++ b/src/ReactiveUI/Scheduler/WaitForDispatcherScheduler.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;
-using System.Reactive.Concurrency;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Suspension/DummySuspensionDriver.cs b/src/ReactiveUI/Suspension/DummySuspensionDriver.cs
index 0da9efe5e1..7141991d13 100644
--- a/src/ReactiveUI/Suspension/DummySuspensionDriver.cs
+++ b/src/ReactiveUI/Suspension/DummySuspensionDriver.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;
-using System.Reactive;
-using System.Reactive.Linq;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Suspension/SuspensionHost.cs b/src/ReactiveUI/Suspension/SuspensionHost.cs
index 777f9c8db2..b9c660fd6d 100644
--- a/src/ReactiveUI/Suspension/SuspensionHost.cs
+++ b/src/ReactiveUI/Suspension/SuspensionHost.cs
@@ -3,11 +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;
-using System.Reactive;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/Suspension/SuspensionHostExtensions.cs b/src/ReactiveUI/Suspension/SuspensionHostExtensions.cs
index fe854b330d..01662c299a 100644
--- a/src/ReactiveUI/Suspension/SuspensionHostExtensions.cs
+++ b/src/ReactiveUI/Suspension/SuspensionHostExtensions.cs
@@ -3,13 +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;
-using System.Reactive;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Threading;
-using Splat;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/UnhandledErrorException.cs b/src/ReactiveUI/UnhandledErrorException.cs
index eda32aed7e..3e78c6f5ac 100644
--- a/src/ReactiveUI/UnhandledErrorException.cs
+++ b/src/ReactiveUI/UnhandledErrorException.cs
@@ -3,7 +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;
using System.Runtime.Serialization;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/View/DefaultViewLocator.cs b/src/ReactiveUI/View/DefaultViewLocator.cs
index 3eac8d23e0..8f01210bf2 100644
--- a/src/ReactiveUI/View/DefaultViewLocator.cs
+++ b/src/ReactiveUI/View/DefaultViewLocator.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;
-using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Reflection;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/View/SingleInstanceViewAttribute.cs b/src/ReactiveUI/View/SingleInstanceViewAttribute.cs
index 03b7f87767..cd340c3afd 100644
--- a/src/ReactiveUI/View/SingleInstanceViewAttribute.cs
+++ b/src/ReactiveUI/View/SingleInstanceViewAttribute.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/View/ViewContractAttribute.cs b/src/ReactiveUI/View/ViewContractAttribute.cs
index aefa1fcb0d..0e7a8b994e 100644
--- a/src/ReactiveUI/View/ViewContractAttribute.cs
+++ b/src/ReactiveUI/View/ViewContractAttribute.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;
-
namespace ReactiveUI;
///
diff --git a/src/ReactiveUI/View/ViewLocator.cs b/src/ReactiveUI/View/ViewLocator.cs
index f34a15e41a..4b67fc303d 100644
--- a/src/ReactiveUI/View/ViewLocator.cs
+++ b/src/ReactiveUI/View/ViewLocator.cs
@@ -3,9 +3,7 @@
// 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;
using System.Diagnostics.CodeAnalysis;
-using Splat;
namespace ReactiveUI;
diff --git a/src/ReactiveUI/View/ViewLocatorNotFoundException.cs b/src/ReactiveUI/View/ViewLocatorNotFoundException.cs
index 07404a4dd8..fecc7bab2b 100644
--- a/src/ReactiveUI/View/ViewLocatorNotFoundException.cs
+++ b/src/ReactiveUI/View/ViewLocatorNotFoundException.cs
@@ -3,7 +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;
using System.Runtime.Serialization;
namespace ReactiveUI;