fixes #61

dansiegel · Nov 26, 2019 · 81b20c7 · 81b20c7
1 parent 4cb9ccf
commit 81b20c7
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/src/Prism.Container.Extensions/ContainerExtensionAttribute.cs b/src/Prism.Container.Extensions/ContainerExtensionAttribute.cs
@@ -0,0 +1,29 @@
+using System;
+using System.ComponentModel;
+using System.Reflection;
+using Prism.Ioc;
+
+namespace Prism.Container.Extensions
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public class ContainerExtensionAttribute : Attribute
+    {
+        private Type containerExtensionType { get; }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public ContainerExtensionAttribute(Type type)
+        {
+            containerExtensionType = type;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IContainerExtension Container => GetContainerExtension();
+
+        private IContainerExtension GetContainerExtension()
+        {
+            var current = containerExtensionType.GetProperty("Current", BindingFlags.Public | BindingFlags.Static);
+            return (IContainerExtension)current.GetValue(null);
+        }
+    }
+}
diff --git a/src/Prism.Container.Extensions/Prism.Container.Extensions.csproj b/src/Prism.Container.Extensions/Prism.Container.Extensions.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Prism.Core" Version="7.2.0.1367" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.1" />
+    <PackageReference Include="Prism.Core" Version="7.2.0.1422" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Prism.Microsoft.DependencyInjection.Extensions/PrismContainerExtension.cs b/src/Prism.Microsoft.DependencyInjection.Extensions/PrismContainerExtension.cs
@@ -1,10 +1,12 @@
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Prism.Container.Extensions;
 using Prism.Ioc;
+using Prism.Microsoft.DependencyInjection;
 
 [assembly: InternalsVisibleTo("Prism.Microsoft.DependencyInjection.Extensions.Tests")]
 [assembly: InternalsVisibleTo("Prism.Microsoft.DependencyInjection.Forms.Extended.Tests")]
@@ -298,7 +300,9 @@ private IServiceProvider GetChildProvider((Type Type, object Instance)[] paramet
                 services.AddSingleton(param.Type, param.Instance);
             }
 
-            return services.BuildServiceProvider();
+            var rootSP = services.BuildServiceProvider();
+
+            return new ConcreteAwareServiceProvider(rootSP);
         }
     }
 }