releasing DryIoc v4.2.3

dadhi · Jul 4, 2020 · 6384027 · 6384027
1 parent 3eb968e
commit 6384027
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 28 deletions.
diff --git a/README.md b/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.2.2) :: [Previous Versions](https://github.com/dadhi/DryIoc/blob/master/docs/DryIoc.Docs/VersionHistory.md)
+- [Release Notes](https://github.com/dadhi/DryIoc/releases/tag/v4.2.3) :: [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)

diff --git a/docs/DryIoc.Docs/Home.md b/docs/DryIoc.Docs/Home.md
@@ -163,12 +163,10 @@ Get from NuGet:
   - __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)
 
-## v4.2.2 / 2020-07-02
+## v4.2.3 Bug-fix release
 
-- fixed: #288 Recursive resolution ignores current scope .Use() instance 
-- small perf improvements
+- fixed: #289 Think how to make Use to directly replace scoped service without special asResolutionCall setup
 
-[Release Notes](https://github.com/dadhi/DryIoc/releases/tag/v4.2.2)
+[Release Notes](https://github.com/dadhi/DryIoc/releases/tag/v4.2.3)
 
 ### [Previous Versions](VersionHistory.md)
-
diff --git a/docs/DryIoc.Docs/VersionHistory.md b/docs/DryIoc.Docs/VersionHistory.md
@@ -1,6 +1,10 @@
 Version History
 ---------------
 
+## v4.2.3 Bug-fix release / 2020-07-04
+
+- fixed: #289 Think how to make Use to directly replace scoped service without special asResolutionCall setup
+
 ## v4.2.2 Bug-fix release / 2020-07-02
 
 - fixed: #288 Recursive resolution ignores current scope .Use() instance 

diff --git a/nuspecs/DryIoc.Internal.nuspec b/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.2.2</version>
+        <version>4.2.3</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.2.3 Bug-fix release
+
+- fixed: #289 Think how to make Use to directly replace scoped service without special asResolutionCall setup
+
 ## v4.2.2 Bug-fix release
 
 - fixed: #288 Recursive resolution ignores current scope .Use() instance 

diff --git a/nuspecs/DryIoc.nuspec b/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.2.2</version>
+        <version>4.2.3</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.2.3 Bug-fix release
+
+- fixed: #289 Think how to make Use to directly replace scoped service without special asResolutionCall setup
+
 ## v4.2.2 Bug-fix release
 
 - fixed: #288 Recursive resolution ignores current scope .Use() instance 

diff --git a/src/DryIoc/Container.cs b/src/DryIoc/Container.cs
@@ -11486,24 +11486,9 @@ public void SetOrAdd(int id, object item)
             var itemRef = new ImMapEntry<object>(id, item);
             ref var map = ref _maps[id & MAP_COUNT_SUFFIX_MASK];
             var oldMap = map;
-            var newMap = oldMap.AddOrKeepEntry(itemRef);
-            if (Interlocked.CompareExchange(ref map, newMap, oldMap) == oldMap)
-            {
-                if (newMap == oldMap)
-                {
-                    itemRef = newMap.GetEntryOrDefault(id);
-                    if (ReferenceEquals(itemRef.Value, item))
-                        return;
-                    itemRef.Value = item;
-                }
-            }
-            else
-            {
-                // todo: @incomplete
-                var anotherItemRef = Ref.SwapAndGetNewValue(ref map, itemRef, (x, i) => x.AddOrKeepEntry(itemRef)).GetEntryOrDefault(id);
-                if (!ReferenceEquals(anotherItemRef, itemRef))
-                    anotherItemRef.Value = item;
-            }
+            var newMap = oldMap.AddOrUpdateEntry(itemRef);
+            if (Interlocked.CompareExchange(ref map, newMap, oldMap) != oldMap)
+                Ref.Swap(ref map, itemRef, (x, i) => x.AddOrUpdateEntry(i));
 
             if (item is IDisposable disp && disp != this)
                 AddUnorderedDisposable(disp);

diff --git a/src/DryIoc/DryIoc.csproj b/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.2.2</VersionPrefix>
+        <VersionPrefix>4.2.3</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.2.3 Bug-fix release
+
+- fixed: #289 Think how to make Use to directly replace scoped service without special asResolutionCall setup
+
 ## v4.2.2 Bug-fix release
 
 - fixed: #288 Recursive resolution ignores current scope .Use() instance 

diff --git a/..._to_make_Use_to_directly_replace_scoped_service_without_special_asResolutionCall_setup.cs b/..._to_make_Use_to_directly_replace_scoped_service_without_special_asResolutionCall_setup.cs
@@ -26,13 +26,16 @@ public void Test()
 
                 using (var __ = c.OpenScope())
                 {
+                    var innerChildNormal = c.Resolve<Child>();
+
                     // inject instance
                     var inner = c.Resolve<IResolverContext>();
                     inner.CurrentScope.SetOrAdd(childFactory.FactoryID, outerChildInstance);
 
                     // direct type resolution works
                     var innerChildInstance = c.Resolve<Child>();
-                    Assert.AreSame(outerChildInstance, innerChildInstance);
+                    Assert.AreNotSame(innerChildNormal, innerChildInstance);
+                    Assert.AreSame(outerChildInstance,  innerChildInstance);
 
                     // recursive type resolution skips the instance and calls the factory even though the instance is placed to the current scope
                     var innerParentInstance = c.Resolve<Parent>();