using the ContainerLocator as the VML resolver.

PrismLibrary · Apr 29, 2020 · 227ea29 · 227ea29
1 parent 845f263
commit 227ea29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs
@@ -47,7 +47,7 @@ void InitializeInternal()
         /// </summary>
         protected virtual void ConfigureViewModelLocator()
         {
-            PrismInitializationExtensions.ConfigureViewModelLocator(Container);
+            PrismInitializationExtensions.ConfigureViewModelLocator();
         }
 
         /// <summary>

diff --git a/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs b/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs
@@ -44,7 +44,7 @@ public void Run()
         /// </summary>
         protected virtual void ConfigureViewModelLocator()
         {
-            PrismInitializationExtensions.ConfigureViewModelLocator(Container);
+            PrismInitializationExtensions.ConfigureViewModelLocator();
         }
 
         /// <summary>

diff --git 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);
             });
         }