Merge pull request #31 from AkkaNetContrib/dev

v1.3.2 NuGet release
akkadotnet · Oct 31, 2017 · 6a03c6a · 6a03c6a
2 parents b883b45 + faf94fe
commit 6a03c6a
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 35 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+#### 1.3.2 October 31 2017
+* Support for Akka.NET v1.3.2
+* Support for .NET Standard 1.6
+
 #### 1.2.3 July 10 2017
 
 Support for Akka 1.2.3

diff --git a/build.fsx b/build.fsx
@@ -25,6 +25,10 @@ let versionSuffix =
     | "dev" -> preReleaseVersionSuffix
     | _ -> ""
 
+let releaseNotes =
+  File.ReadLines "./RELEASE_NOTES.md"
+  |> ReleaseNotesHelper.parseReleaseNotes
+
 Target "Clean" (fun _ ->
     CleanDir output
     CleanDir outputTests
@@ -35,6 +39,11 @@ Target "Clean" (fun _ ->
     CleanDirs !! "./**/obj"
 )
 
+Target "AssemblyInfo" (fun _ ->
+    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion    
+    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
+)
+
 Target "RestorePackages" (fun _ ->
     DotNetCli.Restore
         (fun p -> 
@@ -187,16 +196,17 @@ Target "BuildRelease" DoNothing
 Target "Nuget" DoNothing
 
 // build dependencies
-"Clean" ==> "RestorePackages" ==> "Build" ==> "BuildRelease"
+"Clean" ==> "RestorePackages" ==> "AssemblyInfo" ==> "Build" ==> "BuildRelease"
 
 // tests dependencies
 "Clean" ==> "RestorePackages" ==> "RunTests"
 
 // nuget dependencies
-"Clean" ==> "RestorePackages" ==> "Build" ==> "CreateNuget"
+"CreateNuget" ==> "PublishNuget" ==> "Nuget"
 
 // all
 Target "All" DoNothing
+"RunTests" ==> "All"
 "BuildRelease" ==> "All"
 "Nuget" ==> "All"
 

diff --git a/src/Akka.TestKit.NUnit.Tests/Akka.TestKit.NUnit.Tests.csproj b/src/Akka.TestKit.NUnit.Tests/Akka.TestKit.NUnit.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <Import Project="..\common.props" />
   <PropertyGroup>
     <AssemblyTitle>Akka.TestKit.NUnit.Tests</AssemblyTitle>
-    <TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="NUnit" Version="3.8.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitAdapterVersion)" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/src/Akka.TestKit.NUnit/Akka.TestKit.NUnit.csproj b/src/Akka.TestKit.NUnit/Akka.TestKit.NUnit.csproj
@@ -1,22 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
+
   <PropertyGroup>
     <AssemblyTitle>Akka.TestKit.NUnit</AssemblyTitle>
-    <Copyright>Copyright © 2013-2017</Copyright>
-    <Authors>Akka.NET Contrib</Authors>
-    <Description>TestKit for writing tests for Akka.NET using NUnit.</Description>
-    <VersionPrefix>1.3.0</VersionPrefix>
     <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
-    <PackageTags>akka;actors;actor model;Akka;concurrency;testkit;xunit</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/AkkaNetContrib/Akka.TestKit.Nunit</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/AkkaNetContrib/Akka.TestKit.Nunit</PackageLicenseUrl>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <IsPackable>true</IsPackable> 
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit" Version="1.3.1" />
-    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="Akka.TestKit" Version="$(AkkaTestKitVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/src/Akka.TestKit.NUnit3.Tests/Akka.TestKit.NUnit3.Tests.csproj b/src/Akka.TestKit.NUnit3.Tests/Akka.TestKit.NUnit3.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <Import Project="..\common.props" />
   <PropertyGroup>
     <AssemblyTitle>Akka.TestKit.NUnit3.Tests</AssemblyTitle>
-    <TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="NUnit" Version="3.8.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitAdapterVersion)" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/src/Akka.TestKit.NUnit3/Akka.TestKit.NUnit3.csproj b/src/Akka.TestKit.NUnit3/Akka.TestKit.NUnit3.csproj
@@ -1,22 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
+
   <PropertyGroup>
-    <AssemblyTitle>Akka.TestKit.NUnit3</AssemblyTitle>
-    <Copyright>Copyright © 2013-2017</Copyright>
-    <Authors>Akka.NET Contrib</Authors>
-    <Description>TestKit for writing tests for Akka.NET using NUnit.</Description>
-    <VersionPrefix>1.3.0</VersionPrefix>
+    <AssemblyTitle>Akka.TestKit.NUnit</AssemblyTitle>
     <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
-    <PackageTags>akka;actors;actor model;Akka;concurrency;testkit;xunit</PackageTags>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/AkkaNetContrib/Akka.TestKit.Nunit</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/AkkaNetContrib/Akka.TestKit.Nunit</PackageLicenseUrl>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <IsPackable>true</IsPackable> 
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit" Version="1.3.1" />
-    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="Akka.TestKit" Version="$(AkkaTestKitVersion)" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/src/common.props b/src/common.props
@@ -0,0 +1,20 @@
+<Project>
+  <PropertyGroup>
+    <Copyright>Copyright © 2013-2017</Copyright>
+    <Authors>Akka.NET Contrib</Authors>
+    <Description>TestKit for writing tests for Akka.NET using NUnit.</Description>
+    <VersionPrefix>1.2.3</VersionPrefix>
+    <PackageReleaseNotes>Support for Akka 1.2.3</PackageReleaseNotes>
+    <PackageTags>akka;actors;actor model;Akka;concurrency;testkit;nunit</PackageTags>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/AkkaNetContrib/Akka.TestKit.Nunit</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/AkkaNetContrib/Akka.TestKit.Nunit</PackageLicenseUrl>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NUnitVersion>3.8.1</NUnitVersion>
+    <NUnitAdapterVersion>3.8.0</NUnitAdapterVersion>
+    <AkkaTestKitVersion>1.3.2</AkkaTestKitVersion>
+  </PropertyGroup>
+</Project>