Skip to content

Commit b306793

Browse files
authored
Simplify project structure (#86)
* Use remote host to execute arbitrary function, simplify project structure, using local nuget for akka (for now) * Remove local nuget directory, bump to Akka 1.4.26 * Remove local nuget path from nuget.config
1 parent 4d8e071 commit b306793

File tree

100 files changed

+1158
-753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1158
-753
lines changed

Akka.MultiNodeTestRunner.sln

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{79D71264
1111
build.sh = build.sh
1212
EndProjectSection
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.MultiNode.Shared", "src\Akka.MultiNode.Shared\Akka.MultiNode.Shared.csproj", "{2F249AFE-6F7E-42CA-9D84-A3914F9DD158}"
15-
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.MultiNode.NodeRunner", "src\Akka.MultiNode.NodeRunner\Akka.MultiNode.NodeRunner.csproj", "{5150BF37-8247-4A47-AFB6-300DD7426DC4}"
17-
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.MultiNode.Shared.Tests", "src\Akka.MultiNode.Shared.Tests\Akka.MultiNode.Shared.Tests.csproj", "{6E3C7F54-F954-4D4C-B9CA-ACFEF046E036}"
19-
EndProject
2014
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.TestAdapter", "src\Akka.MultiNode.TestAdapter\Akka.MultiNode.TestAdapter.csproj", "{F3037C62-E780-4619-89B3-BA21C7168DFA}"
2115
EndProject
2216
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.SampleMultiNodeTests", "src\Akka.MultiNode.SampleMultiNodeTests\Akka.MultiNode.SampleMultiNodeTests.csproj", "{89D2C131-718F-4C93-9343-72E5BE6F7317}"
2317
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.TestRunner.Shared", "src\Akka.MultiNode.TestRunner.Shared\Akka.MultiNode.TestRunner.Shared.csproj", "{ECAF9A0E-8ED2-460A-8408-4648F2BC3FB5}"
25-
EndProject
2618
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.TestAdapter.Tests", "src\Akka.MultiNode.TestAdapter.Tests\Akka.MultiNode.TestAdapter.Tests.csproj", "{A66D60EE-714F-4297-A9BD-222CFD868C28}"
2719
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.RemoteHost", "src\Akka.MultiNode.RemoteHost\Akka.MultiNode.RemoteHost.csproj", "{D59D10BA-E776-4AC6-B8F0-BAB40544439C}"
21+
EndProject
2822
Global
2923
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3024
Debug|Any CPU = Debug|Any CPU
3125
Release|Any CPU = Release|Any CPU
3226
EndGlobalSection
3327
GlobalSection(ProjectConfigurationPlatforms) = postSolution
34-
{2F249AFE-6F7E-42CA-9D84-A3914F9DD158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{2F249AFE-6F7E-42CA-9D84-A3914F9DD158}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{2F249AFE-6F7E-42CA-9D84-A3914F9DD158}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{2F249AFE-6F7E-42CA-9D84-A3914F9DD158}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{5150BF37-8247-4A47-AFB6-300DD7426DC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{5150BF37-8247-4A47-AFB6-300DD7426DC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{5150BF37-8247-4A47-AFB6-300DD7426DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{5150BF37-8247-4A47-AFB6-300DD7426DC4}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{6E3C7F54-F954-4D4C-B9CA-ACFEF046E036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{6E3C7F54-F954-4D4C-B9CA-ACFEF046E036}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{6E3C7F54-F954-4D4C-B9CA-ACFEF046E036}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{6E3C7F54-F954-4D4C-B9CA-ACFEF046E036}.Release|Any CPU.Build.0 = Release|Any CPU
4628
{F3037C62-E780-4619-89B3-BA21C7168DFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4729
{F3037C62-E780-4619-89B3-BA21C7168DFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
4830
{F3037C62-E780-4619-89B3-BA21C7168DFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -51,14 +33,14 @@ Global
5133
{89D2C131-718F-4C93-9343-72E5BE6F7317}.Debug|Any CPU.Build.0 = Debug|Any CPU
5234
{89D2C131-718F-4C93-9343-72E5BE6F7317}.Release|Any CPU.ActiveCfg = Release|Any CPU
5335
{89D2C131-718F-4C93-9343-72E5BE6F7317}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{ECAF9A0E-8ED2-460A-8408-4648F2BC3FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55-
{ECAF9A0E-8ED2-460A-8408-4648F2BC3FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
56-
{ECAF9A0E-8ED2-460A-8408-4648F2BC3FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{ECAF9A0E-8ED2-460A-8408-4648F2BC3FB5}.Release|Any CPU.Build.0 = Release|Any CPU
5836
{A66D60EE-714F-4297-A9BD-222CFD868C28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5937
{A66D60EE-714F-4297-A9BD-222CFD868C28}.Debug|Any CPU.Build.0 = Debug|Any CPU
6038
{A66D60EE-714F-4297-A9BD-222CFD868C28}.Release|Any CPU.ActiveCfg = Release|Any CPU
6139
{A66D60EE-714F-4297-A9BD-222CFD868C28}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{D59D10BA-E776-4AC6-B8F0-BAB40544439C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{D59D10BA-E776-4AC6-B8F0-BAB40544439C}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{D59D10BA-E776-4AC6-B8F0-BAB40544439C}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{D59D10BA-E776-4AC6-B8F0-BAB40544439C}.Release|Any CPU.Build.0 = Release|Any CPU
6244
EndGlobalSection
6345
GlobalSection(SolutionProperties) = preSolution
6446
HideSolutionNode = FALSE

build.fsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,7 @@ Target "PublishMntr" (fun _ ->
263263
{ p with
264264
Project = project
265265
Configuration = configuration
266-
Framework = testNetCoreVersion
267-
VersionSuffix = versionSuffix }))
268-
269-
executableProjects |> Seq.iter (fun project ->
270-
DotNetCli.Publish
271-
(fun p ->
272-
{ p with
273-
Project = project
274-
Configuration = configuration
275-
Framework = testNetVersion
266+
Framework = "netstandard2.0"
276267
VersionSuffix = versionSuffix }))
277268
)
278269

src/Akka.MultiNode.NodeRunner/Akka.MultiNode.NodeRunner.csproj

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/Akka.MultiNode.NodeRunner/Discovery.cs

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/Akka.MultiNode.NodeRunner/Nothing.cs

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/Akka.MultiNode.NodeRunner/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\common.props" />
3+
4+
<PropertyGroup>
5+
<OutputType>Exe</OutputType>
6+
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
7+
<LangVersion>8</LangVersion>
8+
<IsPackable>false</IsPackable>
9+
</PropertyGroup>
10+
11+
</Project>

0 commit comments

Comments
 (0)