Merge back 5.5.z to master [API-2260] (#927)

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "docfx": {
-      "version": "2.75.2",
+      "version": "2.77.0",
       "commands": [
         "docfx"
       ]

doc/_docfx.json

@@ -11,7 +11,7 @@
       "dest": "obj/dev/api",
       "disableGitFeatures": true,
       "disableDefaultFilter": false,
-      "properties": { "TargetFramework": "net7.0" },
+      "properties": { "TargetFramework": "net8.0" },
       "memberLayout": "separatePages"
     }
   ],

hz.ps1

@@ -15,7 +15,7 @@
 ## Hazelcast.NET Build Script
 
 # constant
-$defaultServerVersion="5.5.0-SNAPSHOT"
+$defaultServerVersion="5.5.0"
 
 # PowerShell errors can *also* be a pain
 # see https://stackoverflow.com/questions/10666035
@@ -1656,7 +1656,7 @@ function patch-deps ($deps, $name, $target) {
 function hz-build-docs {
 
     # global dotnet tool package in ~/.dotnet/tools/.store/...
-    # local dotnet tool package in ~/.nuget/packages/docfx/2.64.0/tools/net7.0/any/
+    # local dotnet tool package in ~/.nuget/packages/docfx/2.77.0/tools/net8.0/any/
 
     $r = "release"
     if ($isPreRelease) { $r = "pre-$r" }
@@ -1692,7 +1692,7 @@ function hz-build-docs {
     #cp $pluginDll "$docDir/templates/hz/Plugins/"
 
     # so we have to do things differently
-    $v = &dotnet docfx --version # docfx 2.64.0+6a1e6d7eda3339dd5c7cd7a387f5637132122c2d
+    $v = &dotnet docfx --version # docfx 2.77.0+bd00e2b93951e9e7fa6e5abd990d2cd77d7a83bd
     $v = $v.Substring($v.IndexOf(" ")+1)
     $v = $v.Substring(0, $v.IndexOf("+"))
     remove-item ~/.nuget/packages/docfx/$v/tools/$target/any/Hazelcast*
@@ -1701,7 +1701,7 @@ function hz-build-docs {
     # and patch the deps file, this really is not pretty - hardcoding the target path
     $depsFile = "~/.nuget/packages/docfx/$v/tools/$target/any/docfx.deps.json"
     $deps = get-content $depsFile | convertFrom-json
-    $deps = patch-deps $deps "Hazelcast.DocAsCode.Build/$($options.version)" ".NETCoreApp,Version=v7.0"
+    $deps = patch-deps $deps "Hazelcast.DocAsCode.Build/$($options.version)" ".NETCoreApp,Version=v8.0"
     $deps | convertto-json -depth 32 | set-content $depsFile
 
     # prepare docfx.json

src/Directory.Build.props

@@ -86,7 +86,7 @@
     <AssemblyVersion>5.5.0</AssemblyVersion>
     <FileVersion>5.5.0</FileVersion>
     <VersionPrefix>5.5.0</VersionPrefix>
-    <VersionSuffix>preview.0</VersionSuffix>
+    <VersionSuffix></VersionSuffix>
 
     <!-- bundle XML doc in NuGet package-->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Hazelcast.DocAsCode.Build/Hazelcast.DocAsCode.Build.csproj

@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocFx.Build" Version="2.75.2" />
-    <PackageReference Include="DocFx.Build.ManagedReference" Version="2.75.2" />
+    <PackageReference Include="DocFx.Build" Version="2.77.0" />
+    <PackageReference Include="DocFx.Build.ManagedReference" Version="2.77.0" />
     <PackageReference Include="System.Composition" Version="8.0.0" />
   </ItemGroup>
 

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

@@ -22,6 +22,7 @@
 namespace Hazelcast.Tests.CP
 {
     [TestFixture]
+    [Category("enterprise")]
     public class AtomicLongTests : MultiMembersRemoteTestBase
     {
         protected override string RcClusterConfiguration => TestFiles.ReadAllText(this, "Cluster/cp.xml");

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

@@ -22,6 +22,7 @@
 namespace Hazelcast.Tests.CP
 {
     [TestFixture]
+    [Category("enterprise")]
     public class AtomicReferenceTests : MultiMembersRemoteTestBase
     {
         protected override string RcClusterConfiguration => TestFiles.ReadAllText(this, "Cluster/cp.xml");

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

@@ -21,10 +21,12 @@
 using Hazelcast.Messaging;
 using Hazelcast.Networking;
 using Hazelcast.Testing;
+using Hazelcast.Testing.Conditions;
 using NUnit.Framework;
 namespace Hazelcast.Tests.CP
 {
     [Category("enterprise")]
+    [ServerCondition("[5.5)")]
     [Timeout(30_000)]
     public class CPRoutingTests : MultiMembersRemoteTestBase
     {

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

@@ -20,6 +20,7 @@
 namespace Hazelcast.Tests.CP
 {
     [TestFixture]
+    [Category("enterprise")]
     public class CPTests
     {
         [Test]

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

@@ -20,6 +20,7 @@
 namespace Hazelcast.Tests.CP;
 
 [TestFixture]
+[Category("enterprise")]
 public class CountDownLatchTests : MultiMembersRemoteTestBase
 {
     protected override string RcClusterConfiguration => TestFiles.ReadAllText(this, "Cluster/cp.xml");

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

@@ -46,7 +46,9 @@ public static long GetGroupSessionId(this CPSessionManager sm, ICPGroupId groupI
         }
     }
 
+    [Category("enterprise")]
     [Timeout(30_000)]
+    [Category("enterprise")]
     internal class FencedLockTests : MultiMembersRemoteTestBase
     {
         private IFencedLock _lock;

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

@@ -18,7 +18,9 @@
 
 namespace Hazelcast.Tests.CP
 {
+    [Category("enterprise")]
     [TestFixture]
+    [Category("enterprise")]
     public class RaftTests
     {
         [Test]

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

@@ -25,7 +25,9 @@
 
 namespace Hazelcast.Tests.CP;
 
+[Category("enterprise")]
 [TestFixture]
+[Category("enterprise")]
 public class SemaphoreTests : MultiMembersRemoteTestBase
 {
     // does not configure semaphore-not-* semaphores

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

@@ -21,7 +21,7 @@
 using NUnit.Framework;
 namespace Hazelcast.Tests.Clustering
 {
-    [Category("enterprise,nightly")]
+    [Category("enterprise")]
     [ServerCondition("5.5")]
     [Timeout(120_000)]
     public class MemberPartitionGroupServerTestsNightly : MultiMembersRemoteTestBase

src/Hazelcast.Net/Hazelcast.Net.csproj

@@ -59,11 +59,6 @@
     <!-- ContinuousIntegrationBuild is set via a dotnet pack option -->
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="PublicAPI\net8.0\PublicAPI.Unshipped.txt" />
-    <None Remove="PublicAPI\netstandard2.1\PublicAPI.Shipped.txt" />
-    <None Remove="PublicAPI\netstandard2.1\PublicAPI.Unshipped.txt" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
@@ -99,13 +94,11 @@
     <AdditionalFiles Include="PublicAPI/PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI/PublicAPI.Unshipped.txt" />
     <AdditionalFiles Include="PublicAPI/net6.0/PublicAPI.Shipped.txt" Condition=" '$(TargetFramework)' == 'net6.0' " />
-    <AdditionalFiles Include="PublicAPI/net7.0/PublicAPI.Shipped.txt" Condition=" '$(TargetFramework)' == 'net7.0' " />
     <AdditionalFiles Include="PublicAPI/net8.0/PublicAPI.Shipped.txt" Condition=" '$(TargetFramework)' == 'net8.0' " />
     <AdditionalFiles Include="PublicAPI/netstandard2.0/PublicAPI.Shipped.txt" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
     <AdditionalFiles Include="PublicAPI/netstandard2.1/PublicAPI.Shipped.txt" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
 
     <AdditionalFiles Include="PublicAPI/net6.0/PublicAPI.Unshipped.txt" Condition=" '$(TargetFramework)' == 'net6.0' " />
-    <AdditionalFiles Include="PublicAPI/net7.0/PublicAPI.Unshipped.txt" Condition=" '$(TargetFramework)' == 'net7.0' " />
     <AdditionalFiles Include="PublicAPI/net8.0/PublicAPI.Unshipped.txt" Condition=" '$(TargetFramework)' == 'net8.0' " />
     <AdditionalFiles Include="PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
     <AdditionalFiles Include="PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />

src/Hazelcast.Net/Models/ClusterVersion.cs

@@ -37,6 +37,9 @@ public ClusterVersion(byte major, byte minor)
         /// <summary> Returns a string representation of the cluster version. </summary>
         public override string ToString() => $"{Major}.{Minor}";
 
+        /// <summary>
+        /// Either cluster version is know or not.
+        /// </summary>
         public bool IsUnknown => Major == Unknown && Minor == Unknown;
 
         /// <summary> Parses a string representation of the cluster version. </summary>
@@ -56,6 +59,7 @@ public static ClusterVersion Parse(string value)
 
             return new ClusterVersion(major, minor);
         }
+/// <inheritdoc/>
 
 
         public override bool Equals(object obj)
@@ -72,6 +76,7 @@ public override bool Equals(object obj)
 
             return false;
         }
+        /// <inheritdoc/>
 
         public override int GetHashCode()
         {

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

@@ -2622,3 +2622,35 @@ Hazelcast.CP.ISemaphore
 ~Hazelcast.CP.ISemaphore.ReducePermitsAsync(int delta) -> System.Threading.Tasks.Task
 ~Hazelcast.CP.ISemaphore.ReleaseAsync(int permits = 1) -> System.Threading.Tasks.Task
 ~Hazelcast.CP.ISemaphore.TryAcquireAsync(int permits = 1, long timeoutMs = 0) -> System.Threading.Tasks.Task<bool>
+const Hazelcast.Models.ClusterVersion.Unknown = 0 -> byte
+Hazelcast.Exceptions.InvalidPartitionGroupException
+Hazelcast.Exceptions.InvalidPartitionGroupException.InvalidPartitionGroupException() -> void
+Hazelcast.Models.ClusterVersion
+Hazelcast.Models.ClusterVersion.ClusterVersion(byte major, byte minor) -> void
+Hazelcast.Models.ClusterVersion.IsUnknown.get -> bool
+Hazelcast.Models.ClusterVersion.Major.get -> byte
+Hazelcast.Models.ClusterVersion.Minor.get -> byte
+Hazelcast.Networking.NetworkingOptions.CPDirectToLeaderEnabled.get -> bool
+Hazelcast.Networking.NetworkingOptions.CPDirectToLeaderEnabled.set -> void
+Hazelcast.Networking.RoutingMode
+Hazelcast.Networking.RoutingMode.Mode.get -> Hazelcast.Networking.RoutingModes
+Hazelcast.Networking.RoutingMode.Mode.set -> void
+Hazelcast.Networking.RoutingMode.RoutingMode() -> void
+Hazelcast.Networking.RoutingMode.RoutingMode(bool smartRouting) -> void
+Hazelcast.Networking.RoutingMode.Strategy.get -> Hazelcast.Networking.RoutingStrategy
+Hazelcast.Networking.RoutingMode.Strategy.set -> void
+Hazelcast.Networking.RoutingModes
+Hazelcast.Networking.RoutingModes.AllMembers = 2 -> Hazelcast.Networking.RoutingModes
+Hazelcast.Networking.RoutingModes.MultiMember = 1 -> Hazelcast.Networking.RoutingModes
+Hazelcast.Networking.RoutingModes.SingleMember = 0 -> Hazelcast.Networking.RoutingModes
+Hazelcast.Networking.RoutingStrategy
+Hazelcast.Networking.RoutingStrategy.PartitionGroups = 0 -> Hazelcast.Networking.RoutingStrategy
+override Hazelcast.Models.ClusterVersion.GetHashCode() -> int
+~Hazelcast.Exceptions.InvalidPartitionGroupException.InvalidPartitionGroupException(string message) -> void
+~Hazelcast.Exceptions.InvalidPartitionGroupException.InvalidPartitionGroupException(string message, System.Exception innerException) -> void
+~Hazelcast.Exceptions.InvalidPartitionGroupException.InvalidPartitionGroupException(System.Exception innerException) -> void
+~Hazelcast.IHazelcastClient.ClusterVersion.get -> Hazelcast.Models.ClusterVersion
+~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

src/Hazelcast.Net/PublicAPI/PublicAPI.Unshipped.txt

@@ -1 +1,2 @@
 #nullable enable
+