Modernize solution (#201)

akkadotnet · Sep 19, 2023 · 94ef39c · 94ef39c
1 parent a9b0a59
commit 94ef39c
Show file tree

Hide file tree

Showing 13 changed files with 111 additions and 154 deletions.
diff --git a/Akka.MultiNodeTestRunner.sln b/Akka.MultiNodeTestRunner.sln
@@ -9,6 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{79D71264
 		build.fsx = build.fsx
 		build.ps1 = build.ps1
 		build.sh = build.sh
+		README.md = README.md
+		RELEASE_NOTES.md = RELEASE_NOTES.md
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Packages.props = src\Directory.Packages.props
 	EndProjectSection
 EndProject
 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.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.RemoteHost", "src\Akka.MultiNode.RemoteHost\Akka.MultiNode.RemoteHost.csproj", "{D59D10BA-E776-4AC6-B8F0-BAB40544439C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build-system", "build-system", "{C7DE41DA-ADDE-498E-95DB-D760C32D3C6B}"
+	ProjectSection(SolutionItems) = preProject
+		build-system\azure-pipeline.template.yaml = build-system\azure-pipeline.template.yaml
+		build-system\pr-validation.yaml = build-system\pr-validation.yaml
+		build-system\README.md = build-system\README.md
+		build-system\windows-release.yaml = build-system\windows-release.yaml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -48,4 +60,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B99E6BB8-642A-4A68-86DF-69567CBA700A}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C7DE41DA-ADDE-498E-95DB-D760C32D3C6B} = {79D71264-186B-4F62-8930-35DD9ECCAF3B}
+	EndGlobalSection
 EndGlobal
diff --git a/build.fsx b/build.fsx
@@ -64,8 +64,8 @@ Target "Clean" (fun _ ->
 )
 
 Target "AssemblyInfo" (fun _ ->
-    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion    
-    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
+    XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion    
+    XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
 )
 
 Target "Build" (fun _ ->

diff --git a/docs/images/icon.png b/docs/images/icon.png
diff --git a/src/Akka.MultiNode.RemoteHost/Akka.MultiNode.RemoteHost.csproj b/src/Akka.MultiNode.RemoteHost/Akka.MultiNode.RemoteHost.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props" />
-
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
-        <LangVersion>8</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/src/Akka.MultiNode.SampleMultiNodeTests/Akka.MultiNode.SampleMultiNodeTests.csproj b/src/Akka.MultiNode.SampleMultiNodeTests/Akka.MultiNode.SampleMultiNodeTests.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props" />
-
     <PropertyGroup>
         <TargetFrameworks>$(NetCoreTestVersion);$(NetTestVersion)</TargetFrameworks>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Akka.Cluster.TestKit" Version="$(AkkaVersion)" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+        <PackageReference Include="Akka.Cluster.TestKit" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj b/src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj
@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props" />
-
     <PropertyGroup>
         <TargetFrameworks>$(NetCoreTestVersion);$(NetTestVersion)</TargetFrameworks>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-        <PackageReference Include="xunit" Version="$(XunitVersion)" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
-        <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-        <PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio" />
+        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="xunit.runner.utility" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.csproj b/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.csproj
@@ -1,24 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\common.props" />
-
   <PropertyGroup>
     <Description>Visual Studio 2017 15.9+ Test Explorer runner for the Akka.NET MultiNode tests</Description>
     <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
     <IncludeSource>true</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Cluster.TestKit" Version="$(AkkaVersion)" />
-    <PackageReference Include="TeamCity.ServiceMessages" Version="$(TeamCityVersion)" />
-    <PackageReference Include="System.CodeDom" Version="$(CodeDomVersion)" />
-    <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
-    <PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
+    <PackageReference Include="Akka.Cluster.TestKit" />
+    <PackageReference Include="TeamCity.ServiceMessages" />
+    <PackageReference Include="System.CodeDom" />
+    <PackageReference Include="System.Runtime.Loader" />
+    <PackageReference Include="xunit.runner.utility" />
   </ItemGroup>
 
   <ItemGroup>
@@ -60,18 +57,4 @@
       <BuildOutputInPackage Include="$(OutputPath)xunit.runner.utility.netstandard15.dll" />
     </ItemGroup>
   </Target>
-  <!--
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="Internal\Persistence\VisualizerRuntimeTemplate.cs" />
-    <Compile Include="Internal\Persistence\VisualizerRuntimeTemplate.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>VisualizerRuntimeTemplate.tt</DependentUpon>
-    </Compile>
-    <Content Include="Internal\Persistence\VisualizerRuntimeTemplate.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>VisualizerRuntimeTemplate.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  -->
 </Project>
diff --git a/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.nuspec.template b/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.nuspec.template
@@ -11,7 +11,7 @@
     <projectUrl>https://github.com/akkadotnet/akka.net</projectUrl>
     <iconUrl>http://getakka.net/images/AkkaNetLogo.Normal.png</iconUrl>
     <description>Akka.NET Multi-node Test Adapter; used for executing tests written with Akka.Remote.TestKit</description>
-    <copyright>Copyright � 2013-2021 .NET Foundation</copyright>
+    <copyright>Copyright � 2013-2023 .NET Foundation</copyright>
     <tags>akka actors actor model Akka concurrency</tags>
   </metadata>
   <files>