Merge 5.6.z back to master [HZ-5255][HZ-2336]
#1025
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR upgrades `System.Linq.Async` and `System.Linq.Async.Queryable`
to resolve clashes on .NET10 runtime.
### Note to `netstandart2.0` users on .NET10 runtime;
`Hazelcast.Net` package has some poly fills to adapt some features on
legacy framework. This is presented over `netstandart2.0` target.
However, if you are running `netstandart2.0` built over .NET10 runtime,
you should override the transient dependency `Microsoft.Bcl.Memory`
package which comes with `Hazelcast.Net.Linq.Async` to escape from any
clashes on .NET10 runtime.
In your `csproj` file;
```
<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>
```
We present the `netstandart2.0` target for legacy framework support as
intention of `netstandart2.0`. If you are trying to run it on modern
runtimes, please consider to target `netstandart2.1` or such as .NET10
for better performance and user experience.
Fix server condition issue detected during release testing, and fixed the vector collection after run the tests properly.
The PR fixes vector vector search hint null failure. Also, Decreases insatiability of `TestDelayedQueue` test by using atomic increment instead ++ operation.
…` [HZ-5280] (#1021) Added null check to prevent usage of `_subscribeTasks` during client dispose. closes #965 The test output that helped to catch issue: ``` Standard Output Messages: + Unobserved Exception: System.NullReferenceException: Object reference not set to an instance of an object. at Hazelcast.Clustering.ClusterEvents.AddSubscriptionsAsync(MemberConnection connection, IReadOnlyCollection`1 subscriptions, CancellationToken cancellationToken) in /home/runner/work/client-compatibility-suites/client-compatibility-suites/client/src/Hazelcast.Net/Clustering/ClusterEvents.cs:line 346 at Hazelcast.Clustering.ClusterEvents.DisposeAsync() in /home/runner/work/client-compatibility-suites/client-compatibility-suites/client/src/Hazelcast.Net/Clustering/ClusterEvents.cs:line 1014 at Hazelcast.Clustering.Cluster.DisposeAsync() in /home/runner/work/client-compatibility-suites/client-compatibility-suites/client/src/Hazelcast.Net/Clustering/Cluster.cs:line 219 ```
The release action failed due to mis placed install action. It should be called after checkout.
Merge the tag back to maintenance branch. --------- Co-authored-by: GitHub Actions (Trigger Release) <[email protected]>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1025 +/- ##
==========================================
+ Coverage 81.44% 82.66% +1.22%
==========================================
Files 1054 1054
Lines 25420 25429 +9
==========================================
+ Hits 20703 21022 +319
+ Misses 4717 4407 -310 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
emreyigit
changed the title
5.6.z to master5.6.z back to master [HZ-5255][HZ-2336]
ihsandemir
reviewed
Dec 9, 2025
Collaborator
ihsandemir
left a comment
ihsandemir
left a comment
There was a problem hiding this comment.
why is this merging not automated during release process? why did you need a PR for it? Is it in the release process document?
Member
Author
|
The merging back operation is part of the release process. We do merge release branch to maintenance automatically but this one is not automatized yet. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As part of
5.6.0release, merge maintenance branch which contains the release tag tomaster.