diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
index f74ab07e31..c3b136d41d 100644
--- a/build/ReactiveUI.props
+++ b/build/ReactiveUI.props
@@ -1,5 +1,5 @@
-
+
diff --git a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
index 6771d3e179..359da3d7c2 100644
--- a/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
+++ b/src/Avalonia.ReactiveUI/AppBuilderExtensions.cs
@@ -9,18 +9,22 @@ namespace Avalonia.ReactiveUI
{
///
/// Initializes ReactiveUI framework to use with Avalonia. Registers Avalonia
- /// scheduler and Avalonia activation for view fetcher. Always remember to
- /// call this method if you are using ReactiveUI in your application.
+ /// scheduler, an activation for view fetcher, a template binding hook. Remember
+ /// to call this method if you are using ReactiveUI in your application.
///
public static TAppBuilder UseReactiveUI(this TAppBuilder builder)
- where TAppBuilder : AppBuilderBase, new()
- {
- return builder.AfterPlatformServicesSetup(_ =>
+ where TAppBuilder : AppBuilderBase, new() =>
+ builder.AfterPlatformServicesSetup(_ => Locator.RegisterResolverCallbackChanged(() =>
{
+ if (Locator.CurrentMutable is null)
+ {
+ return;
+ }
+
+ PlatformRegistrationManager.SetRegistrationNamespaces(RegistrationNamespace.Avalonia);
RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
Locator.CurrentMutable.RegisterConstant(new AvaloniaActivationForViewFetcher(), typeof(IActivationForViewFetcher));
Locator.CurrentMutable.RegisterConstant(new AutoDataTemplateBindingHook(), typeof(IPropertyBindingHook));
- });
- }
+ }));
}
}