From ec35a80186ce85a014b8eefcf1bf8c49d6cf8c05 Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Mon, 19 Apr 2021 08:05:38 -0500
Subject: [PATCH] restored Akka.Cluster model-based FsCheck specs

---
 src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj |  1 +
 src/core/Akka.Cluster.Tests/ClusterGenerators.cs      |  2 --
 .../MemberOrderingModelBasedTests.cs                  | 11 ++++-------
 src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj   |  2 +-
 .../Akka.Tests.Shared.Internals.csproj                |  1 +
 .../Helpers/FSharpDelegateHelper.cs                   |  2 --
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj b/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj
index 18a9e2568db..450b6e36d88 100644
--- a/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj
+++ b/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="FsCheck.Xunit" Version="$(FsCheckVersion)" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
+    <PackageReference Include="Fsharp.Core" Version="5.0.1" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">
diff --git a/src/core/Akka.Cluster.Tests/ClusterGenerators.cs b/src/core/Akka.Cluster.Tests/ClusterGenerators.cs
index 1eb1c985f7f..8b4a4774323 100644
--- a/src/core/Akka.Cluster.Tests/ClusterGenerators.cs
+++ b/src/core/Akka.Cluster.Tests/ClusterGenerators.cs
@@ -5,7 +5,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-#if FSCHECK
 using System;
 using System.Linq;
 using System.Net;
@@ -54,4 +53,3 @@ public static Arbitrary<MemberStatus> MemberStatusGenerator()
         }
     }
 }
-#endif
diff --git a/src/core/Akka.Cluster.Tests/MemberOrderingModelBasedTests.cs b/src/core/Akka.Cluster.Tests/MemberOrderingModelBasedTests.cs
index 3b91a33fb21..34e29660ed1 100644
--- a/src/core/Akka.Cluster.Tests/MemberOrderingModelBasedTests.cs
+++ b/src/core/Akka.Cluster.Tests/MemberOrderingModelBasedTests.cs
@@ -5,15 +5,13 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-#if FSCHECK
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Tests.Shared.Internals.Helpers;
+using Akka.Util;
 using Akka.Util.Internal;
 using FsCheck;
 using FsCheck.Experimental;
@@ -90,7 +88,7 @@ public MembershipSetup(UniqueAddress[] addresses)
                 // filter out any duplicates
                 _members =
                     addresses.Distinct()
-                        .Select(x => new Member(x, int.MaxValue, MemberStatus.Up, ImmutableHashSet<string>.Empty))
+                        .Select(x => new Member(x, int.MaxValue, MemberStatus.Up, ImmutableHashSet<string>.Empty, AppVersion.Zero))
                         .ToArray();
             }
 
@@ -199,7 +197,7 @@ public override Property Check(MembershipState actual, MembershipModel model)
             {
                 var members = actual.Members;
                 actual.Members = members.Add(new Member(_address, int.MaxValue, MemberStatus.Up,
-                    ImmutableHashSet<string>.Empty));
+                    ImmutableHashSet<string>.Empty, AppVersion.Zero));
 
                 var except = actual.Members.SymmetricExcept(model.AllMembers.Values);
 
@@ -212,7 +210,7 @@ public override MembershipModel Run(MembershipModel model)
             {
                 return
                     model.UpdateMember(new Member(_address, int.MaxValue, MemberStatus.Up,
-                        ImmutableHashSet<string>.Empty));
+                        ImmutableHashSet<string>.Empty, AppVersion.Zero));
             }
 
             public override string ToString()
@@ -249,4 +247,3 @@ public MembershipModel UpdateMember(Member m)
         }
     }
 }
-#endif
diff --git a/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj b/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj
index 7438fcd34e5..7a040e60726 100644
--- a/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj
+++ b/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj
@@ -22,7 +22,7 @@
     <ProjectReference Include="..\Akka.FSharp\Akka.FSharp.fsproj" />
     <ProjectReference Include="..\Akka.TestKit\Akka.TestKit.csproj" />
     <ProjectReference Include="..\Akka.Remote\Akka.Remote.csproj" />
-    <ProjectReference Include="..\Akka.Tests.Shared.Internals\Akka.Tests.Shared.Internals.csproj" />
+
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj b/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj
index 9e398362397..465234b72e3 100644
--- a/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj
+++ b/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="FsCheck.Xunit" Version="$(FsCheckVersion)" />
+    <PackageReference Include="Fsharp.Core" Version="5.0.1" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == '$(NetStandardLibVersion)' ">
diff --git a/src/core/Akka.Tests.Shared.Internals/Helpers/FSharpDelegateHelper.cs b/src/core/Akka.Tests.Shared.Internals/Helpers/FSharpDelegateHelper.cs
index b26ec5be7b1..c684eb0b3e7 100644
--- a/src/core/Akka.Tests.Shared.Internals/Helpers/FSharpDelegateHelper.cs
+++ b/src/core/Akka.Tests.Shared.Internals/Helpers/FSharpDelegateHelper.cs
@@ -5,7 +5,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-#if FSCHECK
 using System;
 using Microsoft.FSharp.Core;
 
@@ -38,4 +37,3 @@ public static FSharpFunc<T1, FSharpFunc<T2, FSharpFunc<T3, TResult>>> Create<T1,
         }
     }
 }
-#endif