Skip to content

Commit 94ef39c

Browse files
ArkatufusArkatufus
authored
Modernize solution (#201)
1 parent a9b0a59 commit 94ef39c

File tree

13 files changed

+111
-154
lines changed

13 files changed

+111
-154
lines changed

‎Akka.MultiNodeTestRunner.sln‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{79D71264
99
build.fsx = build.fsx
1010
build.ps1 = build.ps1
1111
build.sh = build.sh
12+
README.md = README.md
13+
RELEASE_NOTES.md = RELEASE_NOTES.md
14+
src\Directory.Build.props = src\Directory.Build.props
15+
src\Directory.Packages.props = src\Directory.Packages.props
1216
EndProjectSection
1317
EndProject
1418
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.TestAdapter", "src\Akka.MultiNode.TestAdapter\Akka.MultiNode.TestAdapter.csproj", "{F3037C62-E780-4619-89B3-BA21C7168DFA}"
@@ -19,6 +23,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.TestAdapter.
1923
EndProject
2024
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.RemoteHost", "src\Akka.MultiNode.RemoteHost\Akka.MultiNode.RemoteHost.csproj", "{D59D10BA-E776-4AC6-B8F0-BAB40544439C}"
2125
EndProject
26+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build-system", "build-system", "{C7DE41DA-ADDE-498E-95DB-D760C32D3C6B}"
27+
ProjectSection(SolutionItems) = preProject
28+
build-system\azure-pipeline.template.yaml = build-system\azure-pipeline.template.yaml
29+
build-system\pr-validation.yaml = build-system\pr-validation.yaml
30+
build-system\README.md = build-system\README.md
31+
build-system\windows-release.yaml = build-system\windows-release.yaml
32+
EndProjectSection
33+
EndProject
2234
Global
2335
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2436
Debug|Any CPU = Debug|Any CPU
@@ -48,4 +60,7 @@ Global
4860
GlobalSection(ExtensibilityGlobals) = postSolution
4961
SolutionGuid = {B99E6BB8-642A-4A68-86DF-69567CBA700A}
5062
EndGlobalSection
63+
GlobalSection(NestedProjects) = preSolution
64+
{C7DE41DA-ADDE-498E-95DB-D760C32D3C6B} = {79D71264-186B-4F62-8930-35DD9ECCAF3B}
65+
EndGlobalSection
5166
EndGlobal

‎build.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Target "Clean" (fun _ ->
6464
)
6565

6666
Target "AssemblyInfo" (fun _ ->
67-
XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion
68-
XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
67+
XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion
68+
XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
6969
)
7070

7171
Target "Build" (fun _ ->

‎docs/images/icon.png‎

6.93 KB
Loading

‎src/Akka.MultiNode.RemoteHost/Akka.MultiNode.RemoteHost.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\common.props" />
3-
42
<PropertyGroup>
53
<OutputType>Exe</OutputType>
64
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
7-
<LangVersion>8</LangVersion>
85
<IsPackable>false</IsPackable>
96
</PropertyGroup>
107

‎src/Akka.MultiNode.SampleMultiNodeTests/Akka.MultiNode.SampleMultiNodeTests.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\common.props" />
3-
42
<PropertyGroup>
53
<TargetFrameworks>$(NetCoreTestVersion);$(NetTestVersion)</TargetFrameworks>
4+
<IsPackable>false</IsPackable>
65
</PropertyGroup>
76

87
<ItemGroup>
9-
<PackageReference Include="Akka.Cluster.TestKit" Version="$(AkkaVersion)" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
8+
<PackageReference Include="Akka.Cluster.TestKit" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1110
</ItemGroup>
1211

1312
<ItemGroup>

‎src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\common.props" />
3-
42
<PropertyGroup>
53
<TargetFrameworks>$(NetCoreTestVersion);$(NetTestVersion)</TargetFrameworks>
64
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
5+
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
11-
<PackageReference Include="xunit" Version="$(XunitVersion)" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
13-
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
14-
<PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10+
<PackageReference Include="xunit" />
11+
<PackageReference Include="xunit.runner.visualstudio" />
12+
<PackageReference Include="FluentAssertions" />
13+
<PackageReference Include="xunit.runner.utility" />
1514
</ItemGroup>
1615

1716
<ItemGroup>

‎src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.csproj‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\common.props" />
3-
42
<PropertyGroup>
53
<Description>Visual Studio 2017 15.9+ Test Explorer runner for the Akka.NET MultiNode tests</Description>
64
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
75
<IncludeSource>true</IncludeSource>
86
<IncludeSymbols>true</IncludeSymbols>
9-
<LangVersion>8.0</LangVersion>
107
</PropertyGroup>
118

129
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
1310
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
1411
</PropertyGroup>
1512

1613
<ItemGroup>
17-
<PackageReference Include="Akka.Cluster.TestKit" Version="$(AkkaVersion)" />
18-
<PackageReference Include="TeamCity.ServiceMessages" Version="$(TeamCityVersion)" />
19-
<PackageReference Include="System.CodeDom" Version="$(CodeDomVersion)" />
20-
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
21-
<PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
14+
<PackageReference Include="Akka.Cluster.TestKit" />
15+
<PackageReference Include="TeamCity.ServiceMessages" />
16+
<PackageReference Include="System.CodeDom" />
17+
<PackageReference Include="System.Runtime.Loader" />
18+
<PackageReference Include="xunit.runner.utility" />
2219
</ItemGroup>
2320

2421
<ItemGroup>
@@ -60,18 +57,4 @@
6057
<BuildOutputInPackage Include="$(OutputPath)xunit.runner.utility.netstandard15.dll" />
6158
</ItemGroup>
6259
</Target>
63-
<!--
64-
<ItemGroup>
65-
<Compile Include="**\*.cs" Exclude="Internal\Persistence\VisualizerRuntimeTemplate.cs" />
66-
<Compile Include="Internal\Persistence\VisualizerRuntimeTemplate.cs">
67-
<AutoGen>True</AutoGen>
68-
<DesignTime>True</DesignTime>
69-
<DependentUpon>VisualizerRuntimeTemplate.tt</DependentUpon>
70-
</Compile>
71-
<Content Include="Internal\Persistence\VisualizerRuntimeTemplate.tt">
72-
<Generator>TextTemplatingFilePreprocessor</Generator>
73-
<LastGenOutput>VisualizerRuntimeTemplate.cs</LastGenOutput>
74-
</Content>
75-
</ItemGroup>
76-
-->
7760
</Project>

‎src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.nuspec.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<projectUrl>https://github.com/akkadotnet/akka.net</projectUrl>
1212
<iconUrl>http://getakka.net/images/AkkaNetLogo.Normal.png</iconUrl>
1313
<description>Akka.NET Multi-node Test Adapter; used for executing tests written with Akka.Remote.TestKit</description>
14-
<copyright>Copyright � 2013-2021 .NET Foundation</copyright>
14+
<copyright>Copyright � 2013-2023 .NET Foundation</copyright>
1515
<tags>akka actors actor model Akka concurrency</tags>
1616
</metadata>
1717
<files>

0 commit comments

Comments
 (0)