fixed: #412 and adding the release notes for the v4.8.1

Author: dadhi

README.md

@@ -30,7 +30,7 @@ DryIoc is fast, small, full-featured IoC Container for .NET
     - __DryIoc__ (source code) [![NuGet Badge](https://buildstats.info/nuget/DryIoc)](https://www.nuget.org/packages/DryIoc)
     - __DryIoc.Internal__ (source code with public types made internal) [![NuGet Badge](https://buildstats.info/nuget/DryIoc.Internal)](https://www.nuget.org/packages/DryIoc.Internal)
 
-- [Release Notes](https://github.com/dadhi/DryIoc/releases/tag/v4.8.0) :: [Previous Versions](https://github.com/dadhi/DryIoc/blob/master/docs/DryIoc.Docs/VersionHistory.md)
+- [Release Notes](https://github.com/dadhi/DryIoc/releases/tag/v4.8.1) :: [Previous Versions](https://github.com/dadhi/DryIoc/blob/master/docs/DryIoc.Docs/VersionHistory.md)
 - [Extensions and Companions](Extensions.md)
 - [Documentation][WikiHome]
 - [Contribution guide](CONTRIBUTING.md)

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.8.0-preview-01-b{build}
+version: 4.8.1-preview-01-b{build}
 os: Visual Studio 2017
 test: off
 

docs/DryIoc.Docs/VersionHistory.md

@@ -1,6 +1,10 @@
 Version History
 ---------------
 
+## v4.8.1 Bug-fix release / 2021-07-03
+
+- fixed: #412 ResolveMany not work with generics after any Unregister
+
 ## v4.8.0 Small feature release / 2021-06-04
 
 - added: #406 Allow the registration of the partially closed implementation type

nuspecs/DryIoc.Internal.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata minClientVersion="3.3.0">
         <id>DryIoc.Internal</id>
-        <version>4.8.0</version>
+        <version>4.8.1</version>
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2021 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
@@ -14,6 +14,11 @@
         <tags>IoC Container Inversion-of-Control DI Dependency-Injection DRY Service-Provider Factory</tags>
         <releaseNotes>
 <![CDATA[
+
+## v4.8.1 Bug-fix release
+
+- fixed: #412 ResolveMany not work with generics after any Unregister
+
 ## v4.8.0 Small feature release
 
 - added: #406 Allow the registration of the partially closed implementation type

nuspecs/DryIoc.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata minClientVersion="3.3.0">
         <id>DryIoc</id>
-        <version>4.8.0</version>
+        <version>4.8.1</version>
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2021 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
@@ -14,6 +14,10 @@
         <tags>IoC Container Inversion-of-Control DI Dependency-Injection DRY Service-Provider Factory</tags>
         <releaseNotes>
 <![CDATA[
+## v4.8.1 Bug-fix release
+
+- fixed: #412 ResolveMany not work with generics after any Unregister
+
 ## v4.8.0 Small feature release
 
 - added: #406 Allow the registration of the partially closed implementation type

src/DryIoc/Container.cs

@@ -597,7 +597,7 @@ IEnumerable<object> IResolver.ResolveMany(Type serviceType, object serviceKey,
                 requiredItemType = unwrappedType;
 
             var items = container.GetAllServiceFactories(requiredItemType).ToArrayOrSelf()
-                .Where(x => x.Value != null)
+                .Where(x => x.Value != null) // filter out unregistered services
                 .Select(f => new ServiceRegistrationInfo(f.Value, requiredServiceType, f.Key));
 
             IEnumerable<ServiceRegistrationInfo> openGenericItems = null;
@@ -639,11 +639,9 @@ IEnumerable<object> IResolver.ResolveMany(Type serviceType, object serviceKey,
             {
                 items = items.Where(x => x.Factory.Setup.MatchesMetadata(metadataKey, metadata));
                 if (openGenericItems != null)
-                    openGenericItems = openGenericItems
-                        .Where(x => x.Factory.Setup.MatchesMetadata(metadataKey, metadata));
+                    openGenericItems = openGenericItems.Where(x => x.Factory.Setup.MatchesMetadata(metadataKey, metadata));
                 if (variantGenericItems != null)
-                    variantGenericItems = variantGenericItems
-                        .Where(x => x.Factory.Setup.MatchesMetadata(metadataKey, metadata));
+                    variantGenericItems = variantGenericItems.Where(x => x.Factory.Setup.MatchesMetadata(metadataKey, metadata));
             }
 
             // Exclude composite parent service from items, skip decorators
@@ -2277,11 +2275,12 @@ public IEnumerable<ServiceRegistrationInfo> GetServiceRegistrations()
             {
                 foreach (var entry in Services.Enumerate())
                 {
-                    if (entry.Value.Value is Factory factory)
+                    var fe = entry.Value.Value;
+                    if (fe is Factory factory)
                         yield return new ServiceRegistrationInfo(factory, entry.Value.Key, null);
-                    else
+                    else if (fe != null) // maybe `null` for the unregistered service, see #412
                     {
-                        var factories = ((FactoriesEntry)entry.Value.Value).Factories;
+                        var factories = ((FactoriesEntry)fe).Factories;
                         foreach (var f in factories.Enumerate())
                             yield return new ServiceRegistrationInfo(f.Value, entry.Value.Key, f.Key);
                     }

src/DryIoc/DryIoc.csproj

@@ -5,7 +5,7 @@
         <TargetFrameworks Condition="'$(NoLegacy)' == 'true'">net45;netstandard1.0;netstandard1.3;netstandard2.0</TargetFrameworks>
 
         <Product>DryIoc</Product>
-        <VersionPrefix>4.8.0</VersionPrefix>
+        <VersionPrefix>4.8.1</VersionPrefix>
         <VersionSuffix></VersionSuffix>
 
         <AssemblyName>$(Product)</AssemblyName>
@@ -17,6 +17,10 @@
         <PackageTags>IoC Container Inversion-of-Control DI Dependency-Injection DRY Service-Provider Factory FastExpressionCompiler ImTools</PackageTags>
         <PackageReleaseNotes>
 <![CDATA[
+## v4.8.1 Bug-fix release
+
+- fixed: #412 ResolveMany not work with generics after any Unregister
+
 ## v4.8.0 Small feature release
 
 - added: #406 Allow the registration of the partially closed implementation type

test/DryIoc.UnitTests/UnregisterTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using DryIoc.UnitTests.CUT;
 using NUnit.Framework;
 
@@ -472,5 +473,20 @@ public interface IN { }
         public class M : IM, IN { }
         public class N : IM, IN { }
 
+        [Test]
+        public void Test_issue_412_resolving_open_generics_collection_after_Unregister()
+        {
+            var container = new Container();
+
+            container.Register<NonRelevantService>();
+            container.Unregister<NonRelevantService>();
+            
+            var genericHandlers = container.ResolveMany<IHandler<X>>();
+            Assert.AreEqual(0, genericHandlers.Count());
+        }
+
+        public interface IHandler<T> { } 
+        public class X { }
+        public class NonRelevantService { }
     }
 }