fixed: #301 and releasing v4.3.1

Author: maximv

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.3.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.3.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)

docs/DryIoc.Docs/VersionHistory.md

@@ -1,6 +1,10 @@
 Version History
 ---------------
 
+## v4.3.1 Small feature and bug-fix release / 2020-08-07
+
+- fixed: #301 breakage in scoped enumeration in v4
+
 ## v4.3.0 Small feature and bug-fix release / 2020-07-31
 
 - added: #298 Add RegisterManyIgnoreNoServicesWereRegistered 

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.3.0</version>
+        <version>4.3.1</version>
 
         <authors>Maksim Volkau</authors>
 
@@ -15,6 +15,10 @@
         <tags>IoC Container Inversion-of-Control DI Dependency-Injection DRY Service-Provider Factory</tags>
         <releaseNotes>
 <![CDATA[
+## v4.3.1 Small feature and bug-fix release
+
+- fixed: #301 breakage in scoped enumeration in v4
+
 ## v4.3.0 Small feature and bug-fix release
 
 - added: #298 Add RegisterManyIgnoreNoServicesWereRegistered 

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.3.0</version>
+        <version>4.3.1</version>
         <authors>Maksim Volkau</authors>
         <copyright>Copyright © 2013-2020 Maksim Volkau</copyright>
         <projectUrl>https://github.com/dadhi/DryIoc</projectUrl>
@@ -13,6 +13,10 @@
         <tags>IoC Container Inversion-of-Control DI Dependency-Injection DRY Service-Provider Factory</tags>
         <releaseNotes>
 <![CDATA[
+## v4.3.1 Small feature and bug-fix release
+
+- fixed: #301 breakage in scoped enumeration in v4
+
 ## v4.3.0 Small feature and bug-fix release
 
 - added: #298 Add RegisterManyIgnoreNoServicesWereRegistered

src/DryIoc/Container.cs

@@ -9762,8 +9762,10 @@ public virtual Expression GetExpressionOrDefault(Request request)
                 !request.IsResolutionRoot &&
                 !request.IsDirectlyWrappedInFunc() && 
                 !request.IsWrappedInFuncWithArgs() &&
+                !(request.Reuse.Name is IScopeName) &&
                 !setup.AsResolutionCall && // see #295
                 !setup.UseParentReuse &&
+                setup.Condition == null &&
                 !Made.IsConditional;
 
             var reuse = request.Reuse;

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.3.0</VersionPrefix>
+        <VersionPrefix>4.3.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.3.1 Small feature and bug-fix release
+
+- fixed: #301 breakage in scoped enumeration in v4
+
 ## v4.3.0 Small feature and bug-fix release
 
 - added: #298 Add RegisterManyIgnoreNoServicesWereRegistered 

test/DryIoc.IssuesTests/GHIssue301_Breakage_in_scoped_enumeration_in_v4.cs

@@ -0,0 +1,83 @@
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+
+namespace DryIoc.IssuesTests
+{
+    [TestFixture]
+    public class GHIssue301_Breakage_in_scoped_enumeration_in_v4
+    {
+        [Test]
+        public void Test()
+        {
+            var c = new Container();
+
+            c.RegisterMany<Mode1Comp>(Reuse.Transient, setup: Setup.With(openResolutionScope: true));
+            c.RegisterMany<Mode2Comp>(Reuse.Transient, setup: Setup.With(openResolutionScope: true));
+
+            c.Register<IOoui, Ooui1>(Reuse.ScopedTo<IComp>(), setup: Setup.With(
+                condition: req => req.Any(x => x.ServiceType == typeof(IMode1Comp))));
+
+            c.Register<IOoui, Ooui2>(Reuse.ScopedTo<IComp>(), setup: Setup.With(
+                condition: req => req.Any(x => x.ServiceType == typeof(IMode2Comp))));
+
+            c.RegisterMany<OouiHost>(Reuse.ScopedTo<IComp>());
+            
+            c.RegisterMany<Mode1>();
+            c.RegisterMany<Mode2>();
+
+            var mode1 = c.Resolve<Mode1>();
+            Assert.IsInstanceOf<Ooui1>(mode1.Comp.Oouis.Single());
+
+            var mode2 = c.Resolve<Mode2>();
+            Assert.IsInstanceOf<Ooui2>(mode2.Comp.Oouis.Single());
+        }
+
+        public interface IComp
+        {
+            IEnumerable<IOoui> Oouis { get; }
+        }
+
+        public interface IOoui { }
+        public class Ooui1 : IOoui { }
+        public class Ooui2 : IOoui { }
+
+        public class OouiHost
+        {
+            public readonly IEnumerable<IOoui> Oouis;
+
+            public OouiHost(IEnumerable<IOoui> oouis) => Oouis = oouis;
+        }
+
+        public interface IMode1Comp : IComp { }
+        public interface IMode2Comp : IComp { }
+
+        public class Mode1Comp : IMode1Comp
+        {
+            public IEnumerable<IOoui> Oouis { get; }
+            
+            public Mode1Comp(OouiHost host) => Oouis = host.Oouis;
+        }
+
+        public class Mode2Comp : IMode2Comp
+        {
+            public IEnumerable<IOoui> Oouis { get; }
+
+            public Mode2Comp(OouiHost host) => Oouis = host.Oouis;
+        }
+
+        public class Mode1
+        {
+            public IMode1Comp Comp { get; }
+
+            public Mode1(IMode1Comp comp) => Comp = comp;
+        }
+
+        public class Mode2
+        {
+            public IMode2Comp Comp { get; }
+
+            public Mode2(IMode2Comp comp) => Comp = comp;
+        }
+    }
+}