Merge Back 5.6.z to master

.github/actions/install/action.yml

@@ -59,7 +59,7 @@ runs:
 
 
     - name: Install .NET #on Windows
-      #if: inputs.dotnet == 'true' && inputs.os == 'windows-latest'
+      if: inputs.dotnet == 'true' # && inputs.os == 'windows-latest'
       uses: actions/setup-dotnet@v5
       with:
           dotnet-version: |

.github/workflows/build-release.yml

@@ -285,15 +285,7 @@ jobs:
     needs: [ analyze, build-release ]
     if: needs.analyze.outputs.todo == 'release'
 
-    steps:
-
-      # Install our environment
-      - name: Install environment
-        uses: ./.github/actions/install
-        with:
-          os: ubuntu-latest
-          dotnet: true
-          java: false             
+    steps:        
 
       # checkout the hazelcast/hazelcast-csharp-client repository
       - name: Checkout code

.github/workflows/trigger-release.yml

@@ -56,6 +56,11 @@ jobs:
     # finalize + trigger the release
     - name: Trigger Release
       if: ${{ github.event.inputs.dryrun == 'false' }}
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_OWNER: hazelcast
+        GH_REPO: hazelcast-csharp-client
+        GH_BRANCH: release/${{ github.ref_name }}
       shell: pwsh
       run: |
         ./hz.ps1 -noRestore -localRestore update-doc-version

doc/latest-version

@@ -1 +1 @@
-5.4.0
+5.6.0

doc/versions.md

@@ -6,7 +6,7 @@ Versions lifecycle and support period follows the Hazelcast [Version Support Win
 
 ### Current Version
 
-* <curdoc>5.5.0 [general documentation](xref:doc-index-5-4-0) and [API reference](xref:api-index-5-4-0)</curdoc>
+* <curdoc>5.6.0 [general documentation](xref:doc-index-5-6-0) and [API reference](xref:api-index-5-6-0)</curdoc>
 
 ### Preview
 

doc/xrefmap.yml

@@ -88,3 +88,8 @@ references:
   href: 5.4.0/doc/index.html
 - uid: api-index-5-4-0
   href: 5.4.0/api/index.html
+- uid: doc-index-5-6-0
+  name: 5.6.0
+  href: 5.6.0/doc/index.html
+- uid: api-index-5-6-0
+  href: 5.6.0/api/index.html

src/Directory.Build.props

@@ -83,9 +83,9 @@
     <Version>4.0.0-alpha.2</Version>
     -->
 
-    <AssemblyVersion>5.5.0</AssemblyVersion>
-    <FileVersion>5.5.0</FileVersion>
-    <VersionPrefix>5.5.0</VersionPrefix>
+    <AssemblyVersion>5.6.0</AssemblyVersion>
+    <FileVersion>5.6.0</FileVersion>
+    <VersionPrefix>5.6.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
 
     <!-- bundle XML doc in NuGet package-->

src/Hazelcast.Net.Examples/Hazelcast.Net.Examples.csproj

@@ -8,6 +8,11 @@
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- no XML documentation here -->
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+  </PropertyGroup>
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>Hazelcast.Examples</RootNamespace>
@@ -35,21 +40,4 @@
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />    
   </ItemGroup>
-
-  <!-- START - This section is required to resolve reference ambigutity raised in NET10
-  https://github.com/dotnet/docs/issues/44886
-  -->
-  <ItemGroup Condition="'$(TargetFramework)' != 'net10.0' and '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'net48'">
-    <PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.0" Aliases="SystemLinqAsyncEnumerable" />
-  </ItemGroup>
-
-  <Target Name="_SetAliasOnBuiltInSystemLinqAsyncEnumerable" BeforeTargets="ResolveAssemblyReferences">
-    <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-      <Reference Condition="'%(Reference.AssemblyName)' == 'System.Linq.AsyncEnumerable'">
-        <Aliases>SystemLinqAsyncEnumerable</Aliases>
-      </Reference>
-    </ItemGroup>
-  </Target>
-  <!-- END - This section is required to resolve refence ambigutity raised in NET10 -->
-
 </Project>

src/Hazelcast.Net.Linq.Async/Hazelcast.Net.Linq.Async.csproj

@@ -51,13 +51,10 @@
         </None>            
     </ItemGroup>
 
-  <!-- Note: async linq interfaces are moved to NET after net10.0. So, users must arrange references accordingly.       
-       https://learn.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/10.0/asyncenumerable   -->
-  <ItemGroup>
-    <PackageReference Include="System.Linq.Async" Version="6.0.3">      
+  <ItemGroup >
+    <PackageReference Include="System.Linq.Async" Version="7.0.0">
     </PackageReference>
-    <PackageReference Include="System.Linq.Async.Queryable" Version="6.0.3">
+    <PackageReference Include="System.Linq.Async.Queryable" Version="7.0.0">
     </PackageReference>
-  </ItemGroup>   
-
+  </ItemGroup>
 </Project>

src/Hazelcast.Net.Testing/Hazelcast.Net.Testing.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -33,10 +33,21 @@
     </PackageReference>
     <PackageReference Include="NuGet.Versioning" Version="6.14.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
-    <PackageReference Include="System.Linq.Async.Queryable" Version="6.0.3" />
+    <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />        
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.0" Aliases="MicrosoftBclMemory" />
+  </ItemGroup>
+
+  <Target Name="_SetAliasOnBuiltInSystemMemory" BeforeTargets="ResolveAssemblyReferences">
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+      <Reference Condition="'%(Reference.AssemblyName)' == 'Microsoft.Bcl.Memory'" Version="10.0.0">
+        <Aliases>MicrosoftBclMemory</Aliases>
+      </Reference>
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <ProjectReference Include="..\Hazelcast.Net.Linq.Async\Hazelcast.Net.Linq.Async.csproj" />
     <ProjectReference Include="..\Hazelcast.Net\Hazelcast.Net.csproj" />

src/Hazelcast.Net.Testing/TestData/EmployeeTestObject.cs

@@ -33,5 +33,18 @@ public DateTime Started
         }
         public long StartedAtTimeStamp { get; set; }
         public char Type { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (this == obj) return true;
+            if (obj == null || GetType() != obj.GetType()) return false;
+            var that = (EmployeeTestObject)obj;
+            return Id == that.Id &&
+                   Name == that.Name &&
+                   Salary.Equals(that.Salary) &&
+                   StartedAtTimeStamp == that.StartedAtTimeStamp &&
+                   Type == that.Type;
+        }
+
     }
 }

src/Hazelcast.Net.Tests/CP/CPRoutingTests.cs

@@ -26,7 +26,7 @@
 namespace Hazelcast.Tests.CP
 {
     [Category("enterprise")]
-    [ServerCondition("[5.5)")]
+    [ServerCondition("[5.5,)")]
     [Timeout(30_000)]
     public class CPRoutingTests : MultiMembersRemoteTestBase
     {

src/Hazelcast.Net.Tests/Clustering/ConnectMembersTests.cs

@@ -217,7 +217,7 @@ async Task ConnectMembers(MemberConnectionQueue memberConnectionQueue, Cancellat
             {
                 await foreach (var request in memberConnectionQueue.WithCancellation(cancellationToken))
                 {
-                    dequeuedRequests++;
+                    Interlocked.Increment(ref dequeuedRequests);
                     if (!memberCount.TryGetValue(request.Member.Id, out var count)) count = 0;
                     memberCount[request.Member.Id] = ++count;
                     logger.LogDebug($"Connect request={dequeuedRequests} member={request.Member.Id.ToShortString()} count={count} result={(count == successCount ? "success" : "failed")}");
@@ -246,9 +246,12 @@ await AssertEx.SucceedsEventually(() =>
             cancellation.Cancel();
             await connecting.CfAwaitCanceled();
 
-            // each member retried twice = twice the 1s delay = 2s
+            // each member retried twice = twice the ~1s delay ~ 2s
             // we should not have completed faster than that, even so the code runs fully in-memory
-            Assert.That(elapsed, Is.GreaterThanOrEqualTo(TimeSpan.FromSeconds(2)));
+            // Note: The queue has 10ms error margin per wait, so we take 20ms total margin for two unsuccessful tries
+            var failedCount = successCount - 1;
+            var expectedMinTotalDelay = TimeSpan.FromMilliseconds(failedCount * 990); // 990ms per failed try including 10ms margin
+            Assert.That(elapsed, Is.GreaterThanOrEqualTo(expectedMinTotalDelay));
             HConsole.WriteLine(this, $"Elapsed: {elapsed}");
 
             Assert.That(queue.Count, Is.EqualTo(0));

src/Hazelcast.Net.Tests/Hazelcast.Net.Tests.csproj

@@ -49,21 +49,9 @@
     <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />    
   </ItemGroup>
 
-  <!-- START - This section is required to resolve reference ambigutity raised in NET10
-  https://github.com/dotnet/docs/issues/44886
-  -->  
-  <ItemGroup Condition="'$(TargetFramework)' != 'net10.0' and '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'net48'">    
-    <PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.0" Aliases="SystemLinqAsyncEnumerable" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net48'">
+    <PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.0" Aliases="MicrosoftBclMemory" />
   </ItemGroup>
-
-  <Target Name="_SetAliasOnBuiltInSystemLinqAsyncEnumerable" BeforeTargets="ResolveAssemblyReferences">
-    <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
-      <Reference Condition="'%(Reference.AssemblyName)' == 'System.Linq.AsyncEnumerable'">
-        <Aliases>SystemLinqAsyncEnumerable</Aliases>
-      </Reference>
-    </ItemGroup>
-  </Target>
-  <!-- END - This section is required to resolve refence ambigutity raised in NET10 -->
 
   <Choose>
     <When Condition="'$(TargetFramework)' != 'net462' or '$(TargetFramework)' != 'net48'">

src/Hazelcast.Net.Tests/Remote/UnisocketTests.cs

@@ -126,7 +126,7 @@ public async Task TestClientConnectsToOneMember()
 
 
         [Test]
-        [ServerCondition("[6.0)")]
+        [ServerCondition("5.6.0")]
         public async Task TestRoutingModesInOrderWithServer()
         {
             var script = @"result = com.hazelcast.client.config.RoutingMode.SINGLE_MEMBER.getId() +
@@ -147,7 +147,7 @@ public async Task TestRoutingModesInOrderWithServer()
         }
 
         [Test]
-        [ServerCondition("[5.5.0,6.0)")]
+        [ServerCondition("[5.5,)")]
         public async Task TestRoutingModesInOrderWithServerWithPreviousPackage()
         {
             var script = @"result = com.hazelcast.client.impl.connection.tcp.RoutingMode.SINGLE_MEMBER.getId() +

src/Hazelcast.Net.Tests/Vector/VectorCollectionTests.cs

@@ -21,7 +21,7 @@
 using NUnit.Framework;
 namespace Hazelcast.Tests.Vector
 {
-    [ServerCondition("[5.5.0")]
+    [ServerCondition("5.5")]
     [Category("enterprise")]
     public class VectorCollectionTests : SingleMemberClientRemoteTestBase
     {

src/Hazelcast.Net/Clustering/ClusterEvents.cs

@@ -343,7 +343,7 @@ private async Task AddSubscriptionsAsync(MemberConnection connection, IReadOnlyC
             }
 
             // we are done now
-            lock (_subscribeTasksMutex) _subscribeTasks.Remove(connection);
+            lock (_subscribeTasksMutex) _subscribeTasks?.Remove(connection);
         }
 
         /// <summary>

src/Hazelcast.Net/DistributedObjects/Impl/HVectorCollection.cs

@@ -17,6 +17,7 @@
 using System.Threading.Tasks;
 using Hazelcast.Clustering;
 using Hazelcast.Core;
+using Hazelcast.Messaging;
 using Hazelcast.Models;
 using Hazelcast.Protocol.Codecs;
 using Hazelcast.Serialization;
@@ -67,22 +68,39 @@
             var rawResponse = VectorCollectionPutIfAbsentCodec.DecodeResponse(response).Value;
             return await DeserializeIVectorDocumentAsync<TVal>(rawResponse).CfAwait();
         }
-        public Task PutAllAsync([NotNull] IDictionary<TKey, IVectorDocument<TVal>> vectorDocumentMap)
+        public async Task PutAllAsync([NotNull] IDictionary<TKey, IVectorDocument<TVal>> vectorDocumentMap)
         {
             vectorDocumentMap.ThrowIfNull();
+            var entriesByPartition = new Dictionary<int, List<KeyValuePair<IData, IVectorDocument<IData>>>>();
 
-            var rawEntries = new List<KeyValuePair<IData, IVectorDocument<IData>>>();
             foreach (var kvp in vectorDocumentMap)
             {
                 var key = kvp.Key ?? throw new ArgumentException($"Key cannot be null in {nameof(vectorDocumentMap)}.");
                 var val = kvp.Value ?? throw new ArgumentException($"Value cannot be null in {nameof(vectorDocumentMap)}.");
-                var dataKey = ToSafeData(key);
-                var dataValue = ToSafeData(val);
-                var rawDocument = new VectorDocument<IData>(dataValue, kvp.Value.Vectors);
-                rawEntries.Add(new KeyValuePair<IData, IVectorDocument<IData>>(dataKey, rawDocument));
+                var(dataKey, rawDocument) = PrepareForPut(key, val);
+                var partitionId = Cluster.Partitioner.GetPartitionId(dataKey.PartitionHash);
+
+                if (entriesByPartition.TryGetValue(partitionId, out var list))
+                {
+                    list.Add(new KeyValuePair<IData, IVectorDocument<IData>>(dataKey, rawDocument));
+                }
+                else
+                {
+                    entriesByPartition[partitionId] = new List<KeyValuePair<IData, IVectorDocument<IData>>>()
+                    {
+                        new KeyValuePair<IData, IVectorDocument<IData>>(dataKey, rawDocument)
+                    };
+                }
             }
-            var message = VectorCollectionPutAllCodec.EncodeRequest(Name, rawEntries);
-            return Cluster.Messaging.SendAsync(message);
+
+            var tasks = new List<Task<ClientMessage>>();
+            foreach (var entry in entriesByPartition)
+            {
+                var message = VectorCollectionPutAllCodec.EncodeRequest(Name, entry.Value);
+                tasks.Add(Cluster.Messaging.SendToPartitionOwnerAsync(message, entry.Key));
+            }
+
+            await Task.WhenAll(tasks).CfAwait();
         }
         public async Task<IVectorDocument<TVal>> RemoveAsync(TKey key)
         {
@@ -137,13 +155,13 @@
             return new VectorSearchResult<TKey, TVal>(entries.Count, entries);
         }
 
         private async Task<IVectorDocument<TVal>> DeserializeIVectorDocumentAsync<TVal>(IVectorDocument<IData> rawResponse)
         {
             if (rawResponse is null)
             {
                 return null;
             }
-            
+
             var userObject = await ToObjectAsync<TVal>(rawResponse.Value).CfAwait();
             return new VectorDocument<TVal>(userObject, rawResponse.Vectors);
         }

src/Hazelcast.Net/Hazelcast.Net.csproj

@@ -68,7 +68,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />

src/Hazelcast.Net/Models/SingleVectorValues.cs

@@ -11,10 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-using Hazelcast.Serialization;
+using System.Linq;
 namespace Hazelcast.Models
 {
     public class SingleVectorValues : VectorValues
     {
         internal SingleVectorValues() { }
         internal SingleVectorValues(float[] vector)
@@ -22,12 +22,22 @@
             Vector = vector;
         }
         public float[] Vector { get; }
-
+
+
+        /// <inheritdoc />
         public override string ToString()
         {
             var val = Vector == null ? "null" : $"[{string.Join(", ", Vector)}]";
             return $"SingleVectorValues{{vector={val}}}";
         }
 
+        /// <inheritdoc />
+        public override bool Equals(object obj)
+        {
+            if (this == obj) return true;
+            if (obj == null || GetType() != obj.GetType()) return false;
+            var that = (SingleVectorValues)obj;
+            return Vector.SequenceEqual(that.Vector);
+        }
     }
 }

src/Hazelcast.Net/Models/VectorSearchOptions.cs

@@ -34,7 +34,7 @@ public VectorSearchOptions(bool includeValue = default,
             IncludeValue = includeValue;
             IncludeVectors = includeVectors;
             Limit = limit;
-            Hints = hints;
+            Hints = hints ?? new Dictionary<string, string>();
         }
 
         /// <summary>

src/Hazelcast.Net/PublicAPI/PublicAPI.Shipped.txt

@@ -2653,4 +2653,5 @@ override Hazelcast.Models.ClusterVersion.GetHashCode() -> int
 ~Hazelcast.Networking.NetworkingOptions.RoutingMode.get -> Hazelcast.Networking.RoutingMode
 ~override Hazelcast.Models.ClusterVersion.Equals(object obj) -> bool
 ~override Hazelcast.Models.ClusterVersion.ToString() -> string
-~static Hazelcast.Models.ClusterVersion.Parse(string value) -> Hazelcast.Models.ClusterVersion
+~static Hazelcast.Models.ClusterVersion.Parse(string value) -> Hazelcast.Models.ClusterVersion
+~override Hazelcast.Models.SingleVectorValues.Equals(object obj) -> bool