Merge pull request #11 from Danthar/master

Update to 1.0.7

Author: Danthar

build.cmd

@@ -26,8 +26,6 @@ src\.nuget\NuGet.exe update -self
 
 src\.nuget\NuGet.exe install FAKE -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion -Version 4.16.1
 
-src\.nuget\NuGet.exe install NUnit.Console -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages\FAKE -ExcludeVersion -Version 3.0.0
-
 if not exist src\packages\SourceLink.Fake\tools\SourceLink.fsx (
   src\.nuget\nuget.exe install SourceLink.Fake -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion
 )

build.fsx

@@ -19,7 +19,7 @@ cd __SOURCE_DIRECTORY__
 
 let product = "Akka.NET"
 let authors = [ "Akka.NET Team" ]
-let copyright = "Copyright © 2013-2016 Akka.NET Team"
+let copyright = "Copyright © 2013-2016 Akka.NET Team"
 let company = "Akka.NET Team"
 let description = "Akka.NET is a port of the popular Java/Scala framework Akka to .NET"
 let tags = ["akka";"actors";"actor";"model";"Akka";"concurrency"]
@@ -53,7 +53,6 @@ let perfOutput = FullName "PerfResults"
 
 let nugetDir = binDir @@ "nuget"
 let workingDir = binDir @@ "build"
-let libDir = workingDir @@ @"lib\net45\"
 let nugetExe = FullName @"src\.nuget\NuGet.exe"
 let docDir = "bin" @@ "doc"
 
@@ -126,11 +125,6 @@ let updateNugetPackages _ =
     | true -> "src/.nuget/NuGet.Dev.Config" 
     | false -> "src/.nuget/NuGet.Config" 
 
-  let getPackages project =
-    match project with
-    | "Akka.Logger.Serilog" -> ["Akka"]
-    | _ -> []
-
   for projectFile in !! "src/**/*.csproj" do
     printfn "Updating packages for %s" projectFile
     let project = Path.GetFileNameWithoutExtension projectFile
@@ -141,10 +135,10 @@ let updateNugetPackages _ =
         (fun p ->
                 { p with
                     ConfigFile = Some (getConfigFile isPreRelease)
-                    Prerelease = true
+                    Prerelease = isPreRelease
                     ToolPath = nugetExe
                     RepositoryPath = "src/Packages"
-                    Ids = getPackages project
+                    Ids = ["Akka";"Serilog"]
                     }) config
 
 Target "UpdateDependencies" <| fun _ ->
@@ -167,13 +161,19 @@ let createNugetPackages _ =
             DeleteDir dir
             not (directoryExists dir)
         runWithRetries del 3 |> ignore
-
+    
+    let mutable dirId = 1
+     
     ensureDirectory nugetDir
     for nuspec in !! "src/**/*.nuspec" do
         printfn "Creating nuget packages for %s" nuspec
 
-        CleanDir workingDir
-
+        let tempBuildDir = workingDir + dirId.ToString()
+        ensureDirectory tempBuildDir
+        //clean it in case this target gets run multiple times. Which if it does is a bug. But hey since TC throws an exception when the dir is actually not empty. Its a nice circuitbreaker
+        CleanDir tempBuildDir
+        
+        let libDir = tempBuildDir @@ @"lib\net45\"
         let project = Path.GetFileNameWithoutExtension nuspec 
         let projectDir = Path.GetDirectoryName nuspec
         let projectFile = (!! (projectDir @@ project + ".*sproj")) |> Seq.head
@@ -194,7 +194,7 @@ let createNugetPackages _ =
                         Version = release.NugetVersion
                         Tags = tags |> String.concat " "
                         OutputPath = outputDir
-                        WorkingDir = workingDir
+                        WorkingDir = tempBuildDir
                         SymbolPackage = symbolPackage
                         Dependencies = packageDependencies })
                 nuspec
@@ -208,7 +208,7 @@ let createNugetPackages _ =
         |> CopyFiles libDir
 
         // Copy all src-files (.cs and .fs files) to workingDir/src
-        let nugetSrcDir = workingDir @@ @"src/"
+        let nugetSrcDir = tempBuildDir @@ @"src/"
         // CreateDir nugetSrcDir
 
         let isCs = hasExt ".cs"
@@ -220,12 +220,12 @@ let createNugetPackages _ =
         //Remove workingDir/src/obj and workingDir/src/bin
         removeDir (nugetSrcDir @@ "obj")
         removeDir (nugetSrcDir @@ "bin")
-
+        
         // Create both normal nuget package and symbols nuget package. 
         // Uses the files we copied to workingDir and outputs to nugetdir
         pack nugetDir NugetSymbolPackage.Nuspec
-        
-        removeDir workingDir
+
+        dirId <- dirId + 1
 
 let publishNugetPackages _ = 
     let rec publishPackage url accessKey trialsLeft packageFile =
@@ -357,4 +357,4 @@ Target "All" DoNothing
 "BuildRelease" ==> "All"
 "Nuget" ==> "All"
 
-RunTargetOrDefault "Help"
+RunTargetOrDefault "Help"

src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj

@@ -31,8 +31,8 @@
     <DocumentationFile>bin\Release\Akka.Logger.Serilog.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Akka, Version=1.0.6.16, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Akka.1.0.6\lib\net45\Akka.dll</HintPath>
+    <Reference Include="Akka, Version=1.0.7.18, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Akka.1.0.7\lib\net45\Akka.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -48,14 +48,17 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Event\Serilog\SerilogLogMessageFormatter.cs" />
     <Compile Include="MessageTemplateCache.cs" />
     <Compile Include="SerilogLogMessageFormatter.cs" />
     <Compile Include="SerilogLogger.cs" />

src/Akka.Logger.Serilog/Event/Serilog/SerilogLogMessageFormatter.cs

@@ -9,6 +9,8 @@
 using Akka.Actor;
 using Akka.Event;
 using Serilog;
+using Akka.Dispatch;
+using Akka.Event;
 
 namespace Akka.Logger.Serilog
 {
@@ -18,7 +20,7 @@ namespace Akka.Logger.Serilog
     /// recognized: <see cref="Debug"/>, <see cref="Info"/>,
     /// <see cref="Warning"/> and <see cref="Error"/>.
     /// </summary>
-    public class SerilogLogger : ReceiveActor
+    public class SerilogLogger : ReceiveActor, IRequiresMessageQueue<ILoggerMessageQueueSemantics>
     {
         private readonly ILoggingAdapter _log = Context.GetLogger();
 

src/Akka.Logger.Serilog/SerilogLogger.cs

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Akka" version="1.0.6" targetFramework="net45" />
+  <package id="Akka" version="1.0.7" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="Serilog" version="1.5.14" targetFramework="net45" />
+  <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
 </packages>

src/Akka.Logger.Serilog/packages.config

@@ -2,7 +2,7 @@
 using System.Reflection;
 
 [assembly: AssemblyCompanyAttribute("Akka.NET Team")]
-[assembly: AssemblyCopyrightAttribute("Copyright � 2013-2016 Akka.NET Team")]
+[assembly: AssemblyCopyrightAttribute("Copyright © 2013-2016 Akka.NET Team")]
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyVersionAttribute("1.0.7.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.7.0")]