minor fixes of enumerable

DevTeam · Jun 20, 2018 · f609d85 · f609d85
1 parent 0d14b44
commit f609d85
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 15 deletions.
diff --git a/IoC.Source/IoC.cs b/IoC.Source/IoC.cs
@@ -1151,7 +1151,6 @@ namespace IoC
     [DebuggerDisplay("Name = {" + nameof(ToString) + "()}")]
     public sealed class Container: IContainer, IResourceStore, IObserver<ContainerEvent>
     {
-        private const string RootName = "/";
         private static long _containerId;
 
         internal static readonly object[] EmptyArgs = Core.CollectionExtensions.EmptyArray<object>();
@@ -1217,7 +1216,7 @@ private static Container Create([NotNull] string name, [NotNull] IContainer pare
 
         private static Container CreateRootContainer([NotNull][ItemNotNull] IEnumerable<IConfiguration> configurations)
         {
-            var container = new Container(RootName, NullContainer.Shared, true);
+            var container = new Container(string.Empty, NullContainer.Shared, true);
             container.ApplyConfigurations(configurations);
             return container;
         }
@@ -1252,13 +1251,14 @@ public bool TryRegister(IEnumerable<FullKey> keys, IDependency dependency, ILife
             if (keys == null) throw new ArgumentNullException(nameof(keys));
             if (dependency == null) throw new ArgumentNullException(nameof(dependency));
             var isRegistered = true;
-            var registrationEntry = new RegistrationEntry(dependency, lifetime, Disposable.Create(UnregisterKeys), keys);
+            var registeredKeys = new List<FullKey>();
+            var registrationEntry = new RegistrationEntry(dependency, lifetime, Disposable.Create(UnregisterKeys), registeredKeys);
 
             void UnregisterKeys()
             {
                 lock (_lockObject)
                 {
-                    foreach (var curKey in keys)
+                    foreach (var curKey in registeredKeys)
                     {
                         if (curKey.Tag == AnyTag)
                         {
@@ -1307,6 +1307,8 @@ void UnregisterKeys()
                         {
                             break;
                         }
+
+                        registeredKeys.Add(key);
                     }
 
                     if (isRegistered)

diff --git a/IoC.Tests/IntegrationTests/ResolveEnumerablesTests.cs b/IoC.Tests/IntegrationTests/ResolveEnumerablesTests.cs
@@ -29,6 +29,26 @@ public void ContainerShouldResolveEnumerable()
             }
         }
 
+        [Fact]
+        public void ContainerShouldResolveGenericEnumerable()
+        {
+            // Given
+            using (var container = Container.Create())
+            {
+                Func<IMyService> func = Mock.Of<IMyService>;
+                // When
+                using (container.Bind<IMyService>().As(Lifetime.Singleton).To(ctx => func()))
+                using (container.Bind<IMyGenericService<TT>>().To(ctx => new MyGenericService<TT>(default(TT), ctx.Container.Inject<IMyService>())))
+                using (container.Bind<IMyGenericService<TT>>().Tag(1).To(ctx => new MyGenericService<TT>(default(TT), ctx.Container.Inject<IMyService>())))
+                using (container.Bind<IMyGenericService<TT>>().Tag("abc").To(ctx => new MyGenericService<TT>(default(TT), ctx.Container.Inject<IMyService>())))
+                {
+                    // Then
+                    var actualInstances = container.Resolve<IEnumerable<IMyGenericService<string>>>().ToList();
+                    actualInstances.Count.ShouldBe(3);
+                }
+            }
+        }
+
         [Fact]
         public void ContainerShouldResolveEnumerableAfterContainerChanged()
         {

diff --git a/IoC/Container.cs b/IoC/Container.cs
@@ -24,7 +24,6 @@
     [DebuggerDisplay("Name = {" + nameof(ToString) + "()}")]
     public sealed class Container: IContainer, IResourceStore, IObserver<ContainerEvent>
     {
-        private const string RootName = "/";
         private static long _containerId;
 
         internal static readonly object[] EmptyArgs = Core.CollectionExtensions.EmptyArray<object>();
@@ -90,7 +89,7 @@ private static Container Create([NotNull] string name, [NotNull] IContainer pare
 
         private static Container CreateRootContainer([NotNull][ItemNotNull] IEnumerable<IConfiguration> configurations)
         {
-            var container = new Container(RootName, NullContainer.Shared, true);
+            var container = new Container(string.Empty, NullContainer.Shared, true);
             container.ApplyConfigurations(configurations);
             return container;
         }
@@ -125,13 +124,14 @@ public bool TryRegister(IEnumerable<FullKey> keys, IDependency dependency, ILife
             if (keys == null) throw new ArgumentNullException(nameof(keys));
             if (dependency == null) throw new ArgumentNullException(nameof(dependency));
             var isRegistered = true;
-            var registrationEntry = new RegistrationEntry(dependency, lifetime, Disposable.Create(UnregisterKeys), keys);
+            var registeredKeys = new List<FullKey>();
+            var registrationEntry = new RegistrationEntry(dependency, lifetime, Disposable.Create(UnregisterKeys), registeredKeys);
 
             void UnregisterKeys()
             {
                 lock (_lockObject)
                 {
-                    foreach (var curKey in keys)
+                    foreach (var curKey in registeredKeys)
                     {
                         if (curKey.Tag == AnyTag)
                         {
@@ -180,6 +180,8 @@ void UnregisterKeys()
                         {
                             break;
                         }
+
+                        registeredKeys.Add(key);
                     }
 
                     if (isRegistered)

diff --git a/Samples/AspNetCore/WebApplication/WebApplication.csproj b/Samples/AspNetCore/WebApplication/WebApplication.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IoC.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="IoC.AspNetCore" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
   </ItemGroup>
 

diff --git a/Samples/EntityFrameworkCore/EntityFrameworkCore.csproj b/Samples/EntityFrameworkCore/EntityFrameworkCore.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IoC.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="IoC.AspNetCore" Version="1.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.0" />
   </ItemGroup>
 

diff --git a/Samples/ShroedingersCat/ShroedingersCat.csproj b/Samples/ShroedingersCat/ShroedingersCat.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IoC.Container" Version="1.1.0" />
+    <PackageReference Include="IoC.Container" Version="1.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/UwpApp/UwpApp.csproj b/Samples/UwpApp/UwpApp.csproj
@@ -141,7 +141,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IoC.Container">
-      <Version>1.1.0</Version>
+      <Version>1.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.1.5</Version>

diff --git a/Samples/WcfServiceLibrary/WcfServiceLibrary.csproj b/Samples/WcfServiceLibrary/WcfServiceLibrary.csproj
@@ -54,7 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IoC.Container">
-      <Version>1.1.0</Version>
+      <Version>1.1.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/WpfApp/WpfApp.csproj b/Samples/WpfApp/WpfApp.csproj
@@ -108,7 +108,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IoC.Container">
-      <Version>1.1.0</Version>
+      <Version>1.1.2</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />