1.2

README.md

@@ -28,7 +28,7 @@
 **使用Nuget安装**
 
 ```PM
-Install-Package CatLib.Core -Version 1.2.6
+Install-Package CatLib.Core -Version 1.2.7
 ```
 
 **直接下载发布版本**

src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj

@@ -100,6 +100,7 @@
     <Compile Include="..\CatLib.Core\Support\QuickList\InternalList.cs" Link="Support\QuickList\InternalList.cs" />
     <Compile Include="..\CatLib.Core\Support\QuickList\IQuickList.cs" Link="Support\QuickList\IQuickList.cs" />
     <Compile Include="..\CatLib.Core\Support\QuickList\QuickList.cs" Link="Support\QuickList\QuickList.cs" />
+    <Compile Include="..\CatLib.Core\Support\RingBuffer\IRingBuffer.cs" Link="Support\RingBuffer\IRingBuffer.cs" />
     <Compile Include="..\CatLib.Core\Support\RingBuffer\RingBuffer.cs" Link="Support\RingBuffer\RingBuffer.cs" />
     <Compile Include="..\CatLib.Core\Support\SortSet\ISortSet.cs" Link="Support\SortSet\ISortSet.cs" />
     <Compile Include="..\CatLib.Core\Support\SortSet\SortSet.cs" Link="Support\SortSet\SortSet.cs" />
@@ -115,8 +116,6 @@
     <Compile Include="..\CatLib.Core\Support\Util\Dict.cs" Link="Support\Util\Dict.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\Enum.cs" Link="Support\Util\Enum.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\IAwait.cs" Link="Support\Util\IAwait.cs" />
-    <Compile Include="..\CatLib.Core\Support\Util\IReferenceCount.cs" Link="Support\Util\IReferenceCount.cs" />
-    <Compile Include="..\CatLib.Core\Support\Util\ReferenceCount.cs" Link="Support\Util\ReferenceCount.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\Str.cs" Link="Support\Util\Str.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\SystemTime.cs" Link="Support\Util\SystemTime.cs" />
     <Compile Include="..\CatLib.Core\Support\Util\Util.cs" Link="Support\Util\Util.cs" />

src/CatLib.Core.Tests/CatLib.Core.Tests.csproj

@@ -56,7 +56,6 @@
     <Compile Include="Support\Util\ArrTests.cs" />
     <Compile Include="Support\Util\DictTests.cs" />
     <Compile Include="Support\Util\EnumTests.cs" />
-    <Compile Include="Support\Util\ReferenceCountTests.cs" />
     <Compile Include="Support\Util\StrTests.cs" />
     <Compile Include="Support\Util\SystemTimeTests.cs" />
     <Compile Include="Support\VersionTests.cs" />

src/CatLib.Core.Tests/Properties/AssemblyInfo.cs

@@ -25,5 +25,5 @@
 
 [assembly: Guid("3c9f4024-910c-4881-a04d-34a6c3a09019")]
 
-[assembly: AssemblyVersion("1.2.6.0")]
-[assembly: AssemblyFileVersion("1.2.6.0")]
+[assembly: AssemblyVersion("1.2.7.0")]
+[assembly: AssemblyFileVersion("1.2.7.0")]

src/CatLib.Core.Tests/Support/SortSet/SortSetTests.cs

@@ -9,10 +9,9 @@
  * Document: http://catlib.io/
  */
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
-using System.Reflection;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace CatLib.Tests.Stl
 {
@@ -30,6 +29,56 @@ public int Compare(int x, int y)
             }
         }
 
+        [TestMethod]
+        public void TestRandValue()
+        {
+            var sortSets = new SortSet<int, int>();
+            var random = new Random();
+
+            for (var i = 1000; i >= 1; i--)
+            {
+                sortSets.Add(i, random.Next(0, 1000));
+            }
+
+            for (var i = 1; i <= 1000; i++)
+            {
+                if (sortSets.Remove(i))
+                {
+                    continue;
+                }
+
+                Assert.Fail("can not remove i : " + i);
+            }
+
+            Assert.AreEqual(0, sortSets.Count);
+            foreach (var sortSet in sortSets)
+            {
+                Assert.Fail();
+            }
+        }
+
+        [TestMethod]
+        public void TestRank()
+        {
+            var sortSets = new SortSet<int, int>();
+
+            sortSets.Add(1000, 85);
+            sortSets.Add(999, 75);
+            sortSets.Add(998, 185);
+            sortSets.Add(997, 85);
+            sortSets.Add(996, 185);
+            sortSets.Add(995, 85);
+
+            Assert.AreEqual(1, sortSets.GetRank(995));
+            Assert.AreEqual(995, sortSets.GetElementByRank(1));
+            Assert.AreEqual(997, sortSets.GetElementByRank(2));
+            Assert.AreEqual(1000, sortSets.GetElementByRank(3));
+            Assert.AreEqual(996, sortSets.GetElementByRank(4));
+            Assert.AreEqual(998, sortSets.GetElementByRank(5));
+
+            Assert.AreEqual(3, sortSets.GetRangeCount(80, 90));
+        }
+
         [TestMethod]
         public void TestCustomComparer()
         {

src/CatLib.Core/CatLib.Core.csproj

@@ -83,6 +83,7 @@
     <Compile Include="Support\QuickList\InternalList.cs" />
     <Compile Include="Support\QuickList\IQuickList.cs" />
     <Compile Include="Support\QuickList\QuickList.cs" />
+    <Compile Include="Support\RingBuffer\IRingBuffer.cs" />
     <Compile Include="Support\RingBuffer\RingBuffer.cs" />
     <Compile Include="Support\Util\Dict.cs" />
     <Compile Include="Support\SortSet\ISortSet.cs" />
@@ -98,8 +99,6 @@
     <Compile Include="Support\Util\Arr.cs" />
     <Compile Include="Support\Util\Enum.cs" />
     <Compile Include="Support\Util\IAwait.cs" />
-    <Compile Include="Support\Util\IReferenceCount.cs" />
-    <Compile Include="Support\Util\ReferenceCount.cs" />
     <Compile Include="Support\Util\Str.cs" />
     <Compile Include="Support\Util\SystemTime.cs" />
     <Compile Include="Support\Util\Util.cs" />

src/CatLib.Core/CatLib/Application.cs

@@ -11,7 +11,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Threading;
 
 namespace CatLib

src/CatLib.Core/Properties/AssemblyInfo.cs

@@ -26,8 +26,8 @@
 
 [assembly: Guid("4204658e-81fd-4106-a347-890cd369c8a4")]
 
-[assembly: AssemblyVersion("1.2.6.0")]
-[assembly: AssemblyFileVersion("1.2.6.0")]
+[assembly: AssemblyVersion("1.2.7.0")]
+[assembly: AssemblyFileVersion("1.2.7.0")]
 
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor"),
            InternalsVisibleTo("Assembly-CSharp-Editor-firstpass"),

src/CatLib.Core/Support/Container/BindDataExtend.cs

@@ -34,6 +34,22 @@ public static IBindData OnResolving(this IBindData bindData, Action<object> acti
             });
         }
 
+        /// <summary>
+        /// 解决服务时触发的回调
+        /// </summary>
+        /// <param name="bindData">绑定数据</param>
+        /// <param name="action">解决事件</param>
+        /// <returns>服务绑定数据</returns>
+        public static IBindData OnResolving(this IBindData bindData, Action action)
+        {
+            Guard.Requires<ArgumentNullException>(action != null);
+            return bindData.OnResolving((_, instance) =>
+            {
+                action();
+                return instance;
+            });
+        }
+
         /// <summary>
         /// 当静态服务被释放时
         /// </summary>