From 227ea29338a5616e8aa37b82e7811fe648d1d252 Mon Sep 17 00:00:00 2001 From: Brian Lagunas Date: Wed, 29 Apr 2020 09:29:32 -0600 Subject: [PATCH] using the ContainerLocator as the VML resolver. --- src/Wpf/Prism.Wpf/PrismApplicationBase.cs | 2 +- src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs | 2 +- src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs index 9600a9fe58..23a40bf308 100644 --- a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs +++ b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs @@ -47,7 +47,7 @@ void InitializeInternal() /// protected virtual void ConfigureViewModelLocator() { - PrismInitializationExtensions.ConfigureViewModelLocator(Container); + PrismInitializationExtensions.ConfigureViewModelLocator(); } /// diff --git a/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs b/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs index 7c4312705a..701e496912 100644 --- a/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs +++ b/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs @@ -44,7 +44,7 @@ public void Run() /// protected virtual void ConfigureViewModelLocator() { - PrismInitializationExtensions.ConfigureViewModelLocator(Container); + PrismInitializationExtensions.ConfigureViewModelLocator(); } /// diff --git a/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs b/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs index 09de3178e0..5800204137 100644 --- a/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs +++ b/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs @@ -19,11 +19,11 @@ namespace Prism { internal static class PrismInitializationExtensions { - internal static void ConfigureViewModelLocator(IContainerProvider containerProvider) + internal static void ConfigureViewModelLocator() { ViewModelLocationProvider.SetDefaultViewModelFactory((view, type) => { - return containerProvider.Resolve(type); + return ContainerLocator.Container.Resolve(type); }); }