diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
index b92d3ddcd6..ba356c2e9a 100644
--- a/build/ReactiveUI.props
+++ b/build/ReactiveUI.props
@@ -1,5 +1,5 @@
-
+
diff --git a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
index cfa7a270be..5a4d625c41 100644
--- a/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
+++ b/src/Avalonia.ReactiveUI/AvaloniaActivationForViewFetcher.cs
@@ -27,7 +27,7 @@ namespace Avalonia.ReactiveUI
///
/// Returns activation observable for activatable Avalonia view.
///
- public IObservable GetActivationForView(IActivatable view)
+ public IObservable GetActivationForView(IActivatableView view)
{
if (!(view is IVisual visual)) return Observable.Return(false);
if (view is WindowBase window) return GetActivationForWindowBase(window);
diff --git a/src/Avalonia.ReactiveUI/RoutedViewHost.cs b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
index 05edeea683..ac5db32c14 100644
--- a/src/Avalonia.ReactiveUI/RoutedViewHost.cs
+++ b/src/Avalonia.ReactiveUI/RoutedViewHost.cs
@@ -53,7 +53,7 @@ namespace Avalonia.ReactiveUI
/// ReactiveUI routing documentation website for more info.
///
///
- public class RoutedViewHost : TransitioningContentControl, IActivatable, IEnableLogger
+ public class RoutedViewHost : TransitioningContentControl, IActivatableView, IEnableLogger
{
///
/// for the property.
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs
index 5b97ab7ae6..ff9e259eab 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_AttachedProperty.cs
@@ -120,6 +120,8 @@ namespace Avalonia.Markup.UnitTests.Parsers
var result = run();
result.Item1.Subscribe(x => { });
+ GC.Collect();
+ GC.WaitForPendingFinalizers();
GC.Collect();
Assert.Null(result.Item2.Target);
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
index 1d85312b1a..643dd3efac 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/AvaloniaActivationForViewFetcherTest.cs
@@ -20,9 +20,9 @@ namespace Avalonia.ReactiveUI.UnitTests
{
public class AvaloniaActivationForViewFetcherTest
{
- public class TestUserControl : UserControl, IActivatable { }
+ public class TestUserControl : UserControl, IActivatableView { }
- public class TestUserControlWithWhenActivated : UserControl, IActivatable
+ public class TestUserControlWithWhenActivated : UserControl, IActivatableView
{
public bool Active { get; private set; }
@@ -38,7 +38,7 @@ namespace Avalonia.ReactiveUI.UnitTests
}
}
- public class TestWindowWithWhenActivated : Window, IActivatable
+ public class TestWindowWithWhenActivated : Window, IActivatableView
{
public bool Active { get; private set; }
@@ -54,7 +54,7 @@ namespace Avalonia.ReactiveUI.UnitTests
}
}
- public class ActivatableViewModel : ISupportsActivation
+ public class ActivatableViewModel : IActivatableViewModel
{
public ViewModelActivator Activator { get; }