Adding IContainerInfo

src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs

@@ -2,13 +2,14 @@
 using System.Linq;
 using DryIoc;
 using Prism.Ioc;
+using Prism.Ioc.Internals;
 
 namespace Prism.DryIoc
 {
     /// <summary>
     /// The <see cref="IContainerExtension" /> Implementation to use with DryIoc
     /// </summary>
-    public class DryIocContainerExtension : IContainerExtension<IContainer>
+    public class DryIocContainerExtension : IContainerExtension<IContainer>, IContainerInfo
     {
         /// <summary>
         /// The instance of the wrapped container
@@ -173,5 +174,14 @@ public bool IsRegistered(Type type, string name)
         {
             return Instance.IsRegistered(type, name);
         }
+
+        Type IContainerInfo.GetRegistrationType(string key)
+        {
+            var matchingRegistration = Instance.GetServiceRegistrations().Where(r => key.Equals(r.OptionalServiceKey?.ToString(), StringComparison.Ordinal)).FirstOrDefault();
+            if (matchingRegistration.OptionalServiceKey == null)
+                matchingRegistration = Instance.GetServiceRegistrations().Where(r => key.Equals(r.ImplementationType.Name, StringComparison.Ordinal)).FirstOrDefault();
+
+            return matchingRegistration.ImplementationType;
+        }
     }
 }

src/Containers/Prism.Unity.Shared/UnityContainerExtension.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Prism.Ioc;
+using Prism.Ioc.Internals;
 using Unity;
 using Unity.Resolution;
 
@@ -9,7 +10,7 @@ namespace Prism.Unity
     /// <summary>
     /// The Unity implementation of the <see cref="IContainerExtension" />
     /// </summary>
-    public class UnityContainerExtension : IContainerExtension<IUnityContainer>
+    public class UnityContainerExtension : IContainerExtension<IUnityContainer>, IContainerInfo
     {
         /// <summary>
         /// The instance of the wrapped container
@@ -183,5 +184,17 @@ public bool IsRegistered(Type type, string name)
         {
             return Instance.IsRegistered(type, name);
         }
+
+        Type IContainerInfo.GetRegistrationType(string key)
+        {
+            //First try friendly name registration. If not found, try type registration
+            var matchingRegistration = Instance.Registrations.Where(r => key.Equals(r.Name, StringComparison.Ordinal)).FirstOrDefault();
+            if (matchingRegistration == null)
+            {
+                matchingRegistration = Instance.Registrations.Where(r => key.Equals(r.RegisteredType.Name, StringComparison.Ordinal)).FirstOrDefault();
+            }
+
+            return matchingRegistration?.MappedToType;
+        }
     }
 }

src/Prism.Core/Ioc/Internals/IContainerInfo.cs

@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel;
+
+namespace Prism.Ioc.Internals
+{
+    /// <summary>
+    /// Used to resolve the registered implementation type for a given key
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public interface IContainerInfo
+    {
+        /// <summary>
+        /// Locates the registered implementation <see cref="Type"/> for a give key
+        /// </summary>
+        /// <param name="key">Registration Key</param>
+        /// <returns>Implementation <see cref="Type"/></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        Type GetRegistrationType(string key);
+    }
+}

src/Prism.Core/Ioc/Internals/IContainerInfoExtensions.cs

@@ -0,0 +1,27 @@
+using System;
+using System.ComponentModel;
+
+namespace Prism.Ioc.Internals
+{
+    /// <summary>
+    /// Internal extensions to get the registered implementation for Regions
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static class IContainerInfoExtensions
+    {
+        /// <summary>
+        /// Locates the registered implementation <see cref="Type"/> for a give key
+        /// </summary>
+        /// <param name="container">The <see cref="IContainerExtension"/></param>
+        /// <param name="key">Registration Key</param>
+        /// <returns>Implementation <see cref="Type"/></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static Type GetRegistrationType(this IContainerExtension container, string key)
+        {
+            if (container is IContainerInfo ci)
+                return ci.GetRegistrationType(key);
+
+            return null;
+        }
+    }
+}

src/Wpf/Prism.DryIoc.Wpf/Legacy/DryIocBootstrapper.cs

@@ -1,8 +1,7 @@
-using System;
+using System;
 using System.Globalization;
 using DryIoc;
 using Prism.DryIoc.Properties;
-using Prism.DryIoc.Regions;
 using Prism.Events;
 using Prism.Ioc;
 using Prism.Logging;
@@ -147,7 +146,7 @@ protected virtual void ConfigureContainer()
                 RegisterTypeIfMissing<IRegionNavigationJournalEntry, RegionNavigationJournalEntry>(false);
                 RegisterTypeIfMissing<IRegionNavigationJournal, RegionNavigationJournal>(false);
                 RegisterTypeIfMissing<IRegionNavigationService, RegionNavigationService>(false);
-                RegisterTypeIfMissing<IRegionNavigationContentLoader, DryIocRegionNavigationContentLoader>(true);
+                RegisterTypeIfMissing<IRegionNavigationContentLoader, RegionNavigationContentLoader>(true);
             }
         }
 

src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs

@@ -1,6 +1,5 @@
 using System;
 using DryIoc;
-using Prism.DryIoc.Regions;
 using Prism.Ioc;
 using Prism.Regions;
 
@@ -21,12 +20,6 @@ protected override IContainerExtension CreateContainerExtension()
             return new DryIocContainerExtension(new Container(CreateContainerRules()));
         }
 
-        protected override void RegisterRequiredTypes(IContainerRegistry containerRegistry)
-        {
-            base.RegisterRequiredTypes(containerRegistry);
-            containerRegistry.RegisterSingleton<IRegionNavigationContentLoader, DryIocRegionNavigationContentLoader>();
-        }
-
         protected override void RegisterFrameworkExceptionTypes()
         {
             ExceptionExtensions.RegisterFrameworkExceptionType(typeof(ContainerException));

src/Wpf/Prism.Unity.Wpf/Legacy/UnityBootstrapper.cs

@@ -7,7 +7,6 @@
 using Prism.Regions;
 using Prism.Services.Dialogs;
 using Prism.Unity.Properties;
-using Prism.Unity.Regions;
 using Unity;
 using Unity.Lifetime;
 
@@ -143,7 +142,7 @@ protected virtual void ConfigureContainer()
                 RegisterTypeIfMissing(typeof(IRegionNavigationJournalEntry), typeof(RegionNavigationJournalEntry), false);
                 RegisterTypeIfMissing(typeof(IRegionNavigationJournal), typeof(RegionNavigationJournal), false);
                 RegisterTypeIfMissing(typeof(IRegionNavigationService), typeof(RegionNavigationService), false);
-                RegisterTypeIfMissing(typeof(IRegionNavigationContentLoader), typeof(UnityRegionNavigationContentLoader), true);
+                RegisterTypeIfMissing(typeof(IRegionNavigationContentLoader), typeof(RegionNavigationContentLoader), true);
             }
         }
 

src/Wpf/Prism.Unity.Wpf/PrismApplication.cs

@@ -1,7 +1,5 @@
 using System;
 using Prism.Ioc;
-using Prism.Regions;
-using Prism.Unity.Regions;
 using Unity;
 
 namespace Prism.Unity
@@ -13,12 +11,6 @@ protected override IContainerExtension CreateContainerExtension()
             return new UnityContainerExtension();
         }
 
-        protected override void RegisterRequiredTypes(IContainerRegistry containerRegistry)
-        {
-            base.RegisterRequiredTypes(containerRegistry);
-            containerRegistry.RegisterSingleton<IRegionNavigationContentLoader, UnityRegionNavigationContentLoader>();
-        }
-
         protected override void RegisterFrameworkExceptionTypes()
         {
             ExceptionExtensions.RegisterFrameworkExceptionType(typeof(ResolutionFailedException));

src/Wpf/Prism.Wpf/Regions/RegionNavigationContentLoader.cs

@@ -5,6 +5,7 @@
 using System.Windows;
 using Prism.Common;
 using Prism.Ioc;
+using Prism.Ioc.Internals;
 using Prism.Properties;
 
 namespace Prism.Regions
@@ -15,7 +16,7 @@ namespace Prism.Regions
     /// </summary>
     public class RegionNavigationContentLoader : IRegionNavigationContentLoader
     {
-        private readonly IContainerProvider _container;
+        private readonly IContainerExtension _container;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RegionNavigationContentLoader"/> class with a service locator.
@@ -127,12 +128,41 @@ protected virtual string GetContractFromNavigationContext(NavigationContext navi
         /// <returns>An enumerable of candidate objects from the <see cref="IRegion"/></returns>
         protected virtual IEnumerable<object> GetCandidatesFromRegion(IRegion region, string candidateNavigationContract)
         {
-            if (region == null)
+            if (region is null)
+            {
                 throw new ArgumentNullException(nameof(region));
+            }
+
+            if (string.IsNullOrEmpty(candidateNavigationContract))
+            {
+                throw new ArgumentNullException(nameof(candidateNavigationContract));
+            }
+
+            var contractCandidates = GetCandidatesFromRegionViews(region, candidateNavigationContract);
+
+            if (!contractCandidates.Any())
+            {
+                var matchingType = _container.GetRegistrationType(candidateNavigationContract);
+                if (matchingType is null)
+                {
+                    return Array.Empty<object>();
+                }
 
-            return region.Views.Where(v =>
-                string.Equals(v.GetType().Name, candidateNavigationContract, StringComparison.Ordinal) ||
-                string.Equals(v.GetType().FullName, candidateNavigationContract, StringComparison.Ordinal));
+                return GetCandidatesFromRegionViews(region, matchingType.FullName);
+            }
+
+            return contractCandidates;
+        }
+
+        private IEnumerable<object> GetCandidatesFromRegionViews(IRegion region, string candidateNavigationContract)
+        {
+            return region.Views.Where(v => ViewIsMatch(v.GetType(), candidateNavigationContract));
+        }
+
+        private static bool ViewIsMatch(Type viewType, string navigationSegment)
+        {
+            var names = new[] { viewType.Name, viewType.FullName };
+            return names.Any(x => x.Equals(navigationSegment, StringComparison.Ordinal));
         }
     }
 }

tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs

@@ -17,7 +17,7 @@ public RegionNavigationContentLoaderFixture()
             _container = CreateContainerExtension();
             _container.RegisterInstance<IContainerExtension>(_container);
             _container.Register<IRegionNavigationService, RegionNavigationService>();
-            _container.Register(typeof(IRegionNavigationContentLoader), RegionNavigationContentLoaderType);
+            _container.Register(typeof(IRegionNavigationContentLoader), typeof(RegionNavigationContentLoader));
             _container.Register<IRegionNavigationJournal, RegionNavigationJournal>();
             ContainerLocator.ResetContainer();
             ContainerLocator.SetContainerExtension(() => _container);

tests/Wpf/Prism.DryIoc.Wpf.Tests/ContainerHelper.cs

@@ -1,7 +1,6 @@
 using System;
 using DryIoc;
 using Prism.DryIoc;
-using Prism.DryIoc.Regions;
 using Prism.Ioc;
 
 namespace Prism.Container.Wpf.Tests
@@ -31,7 +30,5 @@ public static IContainer GetBaseContainer(this IContainerProvider container) =>
         public static Type BaseContainerInterfaceType = typeof(IContainer);
 
         public static Type RegisteredFrameworkException = typeof(ContainerException);
-
-        public static Type RegionNavigationContentLoaderType = typeof(DryIocRegionNavigationContentLoader);
     }
 }

tests/Wpf/Prism.Unity.Wpf.Tests/ContainerHelper.cs

@@ -1,7 +1,6 @@
 using System;
 using Prism.Ioc;
 using Prism.Unity;
-using Prism.Unity.Regions;
 using Unity;
 
 namespace Prism.Container.Wpf.Tests
@@ -27,7 +26,5 @@ public static IUnityContainer GetBaseContainer(this IContainerProvider container
         public static Type BaseContainerInterfaceType = typeof(IUnityContainer);
 
         public static Type RegisteredFrameworkException = typeof(ResolutionFailedException);
-
-        public static Type RegionNavigationContentLoaderType = typeof(UnityRegionNavigationContentLoader);
     }
 }