Skip to content

Commit

Permalink
Remove MultiNodeTestRunner projects (#6002)
Browse files Browse the repository at this point in the history
* Remove MultiNodeTestRunner project

* Fix build script
  • Loading branch information
Arkatufus committed Jun 15, 2022
1 parent 6e5dc1e commit 9e64ca3
Show file tree
Hide file tree
Showing 195 changed files with 115 additions and 8,029 deletions.
75 changes: 2 additions & 73 deletions build.fsx
Expand Up @@ -464,77 +464,6 @@ Target "CreateNuget" (fun _ ->
projects |> Seq.iter (runSingleProject)
)

Target "PublishMntr" (fun _ ->
if not skipBuild.Value then
let executableProjects = !! "./src/**/Akka.MultiNodeTestRunner.csproj"

// Windows .NET 4.5.2
executableProjects |> Seq.iter (fun project ->
DotNetCli.Restore
(fun p ->
{ p with
Project = project
AdditionalArgs = ["-r win10-x64"; sprintf "/p:VersionSuffix=%s" versionSuffix] })
)

// Windows .NET 4.5.2
executableProjects |> Seq.iter (fun project ->
DotNetCli.Publish
(fun p ->
{ p with
Project = project
Configuration = configuration
Runtime = "win10-x64"
Framework = testNetFrameworkVersion
VersionSuffix = versionSuffix }))

// Windows .NET 5
executableProjects |> Seq.iter (fun project ->
DotNetCli.Publish
(fun p ->
{ p with
Project = project
Configuration = configuration
Runtime = "win10-x64"
Framework = testNetVersion
VersionSuffix = versionSuffix }))

// Windows .NET Core
executableProjects |> Seq.iter (fun project ->
DotNetCli.Publish
(fun p ->
{ p with
Project = project
Configuration = configuration
Runtime = "win10-x64"
Framework = testNetCoreVersion
VersionSuffix = versionSuffix }))
)

Target "CreateMntrNuget" (fun _ ->
if not skipBuild.Value then
// uses the template file to create a temporary .nuspec file with the correct version
CopyFile "./src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec" "./src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec.template"
let commonPropsVersionPrefix = XMLRead true "./src/common.props" "" "" "//Project/PropertyGroup/VersionPrefix" |> Seq.head
let versionReplacement = List.ofSeq [ "@version@", commonPropsVersionPrefix + (if (not (versionSuffix = "")) then ("-" + versionSuffix) else "") ]
TemplateHelper.processTemplates versionReplacement [ "./src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec" ]

let executableProjects = !! "./src/**/Akka.MultiNodeTestRunner.csproj"

executableProjects |> Seq.iter (fun project ->
DotNetCli.Pack
(fun p ->
{ p with
Project = project
Configuration = configuration
AdditionalArgs = ["--include-symbols"]
VersionSuffix = versionSuffix
OutputPath = "\"" + outputNuGet + "\"" } )
)

DeleteFile "./src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec"
)

Target "PublishNuget" (fun _ ->
let nugetExe = FullName @"./tools/nuget.exe"
let rec publishPackage url apiKey trialsLeft packageFile =
Expand Down Expand Up @@ -716,7 +645,7 @@ Target "RunTestsNetCoreFull" DoNothing

// build dependencies
"Clean" ==> "AssemblyInfo" ==> "Build"
"Build" ==> "PublishMntr" ==> "BuildRelease"
"Build" ==> "BuildRelease"
"ComputeIncrementalChanges" ==> "Build" // compute incremental changes

// tests dependencies
Expand All @@ -729,7 +658,7 @@ Target "RunTestsNetCoreFull" DoNothing
"BuildRelease" ==> "MultiNodeTestsNet"

// nuget dependencies
"BuildRelease" ==> "CreateMntrNuget" ==> "CreateNuget" ==> "PublishNuget" ==> "Nuget"
"BuildRelease" ==> "CreateNuget" ==> "PublishNuget" ==> "Nuget"

// docs
"BuildRelease" ==> "Docfx"
Expand Down
44 changes: 0 additions & 44 deletions src/Akka.sln
Expand Up @@ -31,10 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Remote.TestKit", "core
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Remote.TestKit.Tests", "core\Akka.Remote.TestKit.Tests\Akka.Remote.TestKit.Tests.csproj", "{F338508B-FE01-4132-AC4A-FC00071EA4EB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.MultiNodeTestRunner", "core\Akka.MultiNodeTestRunner\Akka.MultiNodeTestRunner.csproj", "{C1113300-74F1-446A-9914-3020C842EDF1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.NodeTestRunner", "core\Akka.NodeTestRunner\Akka.NodeTestRunner.csproj", "{28520F30-2868-4BD3-9CAE-AC27226C24E3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Tests", "core\Akka.Persistence.Tests\Akka.Persistence.Tests.csproj", "{4492004A-A8D0-45B0-BACC-05BA2F38EC55}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.TCK", "core\Akka.Persistence.TCK\Akka.Persistence.TCK.csproj", "{AD9418B6-C452-4169-94FB-D43DE0BFA966}"
Expand All @@ -43,10 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence", "core\Ak
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.TCK.Tests", "core\Akka.Persistence.TCK.Tests\Akka.Persistence.TCK.Tests.csproj", "{E6CDDAC1-BD68-4C7B-9E6D-569AC6D50793}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.MultiNodeTestRunner.Shared.Tests", "core\Akka.MultiNodeTestRunner.Shared.Tests\Akka.MultiNodeTestRunner.Shared.Tests.csproj", "{91746A3F-21C6-4614-B0AB-A59310D75C51}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.MultiNodeTestRunner.Shared", "core\Akka.MultiNodeTestRunner.Shared\Akka.MultiNodeTestRunner.Shared.csproj", "{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protobuf", "Protobuf", "{98CEB6FB-A277-42FA-A98E-99A8640B26FD}"
ProjectSection(SolutionItems) = preProject
protobuf\ClusterClientMessages.proto = protobuf\ClusterClientMessages.proto
Expand Down Expand Up @@ -385,22 +377,6 @@ Global
{F338508B-FE01-4132-AC4A-FC00071EA4EB}.Release|Any CPU.Build.0 = Release|Any CPU
{F338508B-FE01-4132-AC4A-FC00071EA4EB}.Release|x64.ActiveCfg = Release|Any CPU
{F338508B-FE01-4132-AC4A-FC00071EA4EB}.Release|x86.ActiveCfg = Release|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Debug|x64.ActiveCfg = Debug|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Debug|x86.ActiveCfg = Debug|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Release|Any CPU.Build.0 = Release|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Release|x64.ActiveCfg = Release|Any CPU
{C1113300-74F1-446A-9914-3020C842EDF1}.Release|x86.ActiveCfg = Release|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Debug|x64.ActiveCfg = Debug|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Debug|x86.ActiveCfg = Debug|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Release|Any CPU.Build.0 = Release|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Release|x64.ActiveCfg = Release|Any CPU
{28520F30-2868-4BD3-9CAE-AC27226C24E3}.Release|x86.ActiveCfg = Release|Any CPU
{4492004A-A8D0-45B0-BACC-05BA2F38EC55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4492004A-A8D0-45B0-BACC-05BA2F38EC55}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4492004A-A8D0-45B0-BACC-05BA2F38EC55}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -433,22 +409,6 @@ Global
{E6CDDAC1-BD68-4C7B-9E6D-569AC6D50793}.Release|Any CPU.Build.0 = Release|Any CPU
{E6CDDAC1-BD68-4C7B-9E6D-569AC6D50793}.Release|x64.ActiveCfg = Release|Any CPU
{E6CDDAC1-BD68-4C7B-9E6D-569AC6D50793}.Release|x86.ActiveCfg = Release|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Debug|x64.ActiveCfg = Debug|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Debug|x86.ActiveCfg = Debug|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Release|Any CPU.Build.0 = Release|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Release|x64.ActiveCfg = Release|Any CPU
{91746A3F-21C6-4614-B0AB-A59310D75C51}.Release|x86.ActiveCfg = Release|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Debug|x64.ActiveCfg = Debug|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Debug|x86.ActiveCfg = Debug|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Release|Any CPU.Build.0 = Release|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Release|x64.ActiveCfg = Release|Any CPU
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C}.Release|x86.ActiveCfg = Release|Any CPU
{7DBD5C17-5E9D-40C4-9201-D092751532A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DBD5C17-5E9D-40C4-9201-D092751532A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DBD5C17-5E9D-40C4-9201-D092751532A7}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1318,14 +1278,10 @@ Global
{C8D6A95C-50BF-4416-A212-86B18B87220D} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{E5957C3E-2B1E-469F-A680-7953B4DEA31B} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{F338508B-FE01-4132-AC4A-FC00071EA4EB} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{C1113300-74F1-446A-9914-3020C842EDF1} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{28520F30-2868-4BD3-9CAE-AC27226C24E3} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{4492004A-A8D0-45B0-BACC-05BA2F38EC55} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{AD9418B6-C452-4169-94FB-D43DE0BFA966} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{FCA84DEA-C118-424B-9EB8-34375DFEF18A} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{E6CDDAC1-BD68-4C7B-9E6D-569AC6D50793} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{91746A3F-21C6-4614-B0AB-A59310D75C51} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{964F0EC5-FBE6-47C5-8AE6-145114D5DB8C} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
{7625FD95-4B2C-4A5B-BDD5-94B1493FAC8E} = {588C1513-FAB6-42C3-B6FC-3485F13620CF}
{264C22A4-CAFC-41F6-B82C-4DDC5C196767} = {588C1513-FAB6-42C3-B6FC-3485F13620CF}
{7DBD5C17-5E9D-40C4-9201-D092751532A7} = {7625FD95-4B2C-4A5B-BDD5-94B1493FAC8E}
Expand Down
Expand Up @@ -15,9 +15,9 @@
using Akka.Remote.TestKit;
using FluentAssertions;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using FluentAssertions.Extensions;
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Metrics.Tests.MultiNode
{
Expand Down
Expand Up @@ -22,10 +22,10 @@
using Akka.Routing;
using FluentAssertions;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using FluentAssertions.Extensions;
using Address = Akka.Actor.Address;
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Metrics.Tests.MultiNode
{
Expand Down
Expand Up @@ -14,9 +14,9 @@
using Akka.Remote.TestKit;
using FluentAssertions;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using FluentAssertions.Extensions;
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Metrics.Tests.MultiNode
{
Expand Down
Expand Up @@ -11,6 +11,7 @@
using System.Linq;
using System.Threading;
using Akka.Actor;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Util;
using FluentAssertions;
Expand Down
Expand Up @@ -11,6 +11,7 @@
using System.Linq;
using System.Threading;
using Akka.Actor;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Util;
using FluentAssertions;
Expand Down
Expand Up @@ -9,11 +9,11 @@
using System.Collections.Immutable;
using System.Threading.Tasks;
using Akka.Actor;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.TestKit;
using Akka.TestKit.TestActors;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -8,11 +8,11 @@
using System;
using Akka.Actor;
using Akka.Event;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Remote.Transport;
using Akka.Util;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -10,10 +10,10 @@
using System.Linq;
using Akka.Actor;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Util;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -9,10 +9,10 @@
using System.Linq;
using Akka.Actor;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Util;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -9,6 +9,7 @@
using System.Collections.Immutable;
using System.Linq;
using Akka.Actor;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using FluentAssertions;

Expand Down
Expand Up @@ -10,9 +10,9 @@
using System.Linq;
using System.Threading.Tasks;
using Akka.Actor;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -10,10 +10,10 @@
using System.Collections.Immutable;
using System.Linq;
using Akka.Actor;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Util;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -8,10 +8,10 @@
using System;
using System.Linq;
using Akka.Actor;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.TestKit.TestActors;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -9,6 +9,7 @@
using System.Linq;
using Akka.Actor;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Util;
using FluentAssertions;
Expand Down
Expand Up @@ -15,7 +15,7 @@
using System.Threading.Tasks;
using System.Threading;
using Akka.Event;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;
using Akka.MultiNode.TestAdapter;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -10,10 +10,10 @@
using Akka.Actor;
using Akka.Configuration;
using Akka.Event;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Util;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -9,11 +9,11 @@
using System.Threading;
using Akka.Actor;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.TestKit;
using Akka.Util;
using FluentAssertions;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down
Expand Up @@ -9,6 +9,7 @@
using System.Linq;
using Akka.Actor;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.TestKit;
using Akka.TestKit.TestActors;
Expand Down
Expand Up @@ -8,6 +8,7 @@
using System;
using Akka.Actor;
using Akka.Configuration;
using Akka.MultiNode.TestAdapter;
using Akka.Remote.TestKit;
using Akka.Remote.Transport;
using Akka.TestKit;
Expand Down
Expand Up @@ -13,6 +13,7 @@
using Akka.Cluster.Tools.Singleton;
using Akka.Configuration;
using Akka.DistributedData;
using Akka.MultiNode.TestAdapter;
using Akka.Pattern;
using Akka.Persistence;
using Akka.Remote.TestKit;
Expand All @@ -22,7 +23,6 @@
using Akka.Util;
using FluentAssertions;
using static Akka.Cluster.Sharding.ShardCoordinator;
using MultiNodeFactAttribute = Akka.MultiNode.TestAdapter.MultiNodeFactAttribute;

namespace Akka.Cluster.Sharding.Tests
{
Expand Down

0 comments on commit 9e64ca3

Please sign in to comment.