Merge pull request #90 from akkadotnet/dev

v1.4.1-RC1 release
akkadotnet · Mar 2, 2020 · 53248e4 · 53248e4
2 parents 800758c + 59a9527
commit 53248e4
Show file tree

Hide file tree

Showing 12 changed files with 309 additions and 135 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,59 +1,2 @@
-#### 1.3.11 February 05 2020 ####
-
-* Breaking change [Fixed: SourceContext should be set consistent with Serilog expectations](https://github.com/akkadotnet/Akka.Logger.Serilog/issues/78)
-
-#### 1.3.10 October 05 2019 ####
-* Upgraded to Serilog v2.9.0
-* Upgraded to Akka 1.3.15
-
-#### 1.3.9 August 23 2018 ####
-* [Fixed: Regression: ForContext API doesn't apply changes](https://github.com/akkadotnet/Akka.Logger.Serilog/issues/51)
-* Upgraded to Akka.NET v1.3.9.
-* Upgraded to Serilog v2.7.1.
-
-#### 1.3.6 April 28 2018 ####
-* Restored `SerilogLogMessageFormatter` in order to fix [Bug: `LogEvent.ToString()` blows up when using Serilog semantic formatting](https://github.com/akkadotnet/Akka.Logger.Serilog/issues/43). 
-* Upgraded to [Akka.NET v1.3.6](https://github.com/akkadotnet/akka.net/releases/tag/v1.3.6).
-
-If you intend on using any of the Serilog semantic logging formats in your logging strings, __you need to use the SerilogLoggingAdapter__ inside your instrumented code or there could be elsewhere inside parts of your `ActorSystem`:
-
-```csharp
-var log = Context.GetLogger<SerilogLoggingAdapter>(); // correct
-log.Info("My boss makes me use {semantic} logging", "semantic"); // serilog semantic logging format
-```
-
-This will allow all logging events to be consumed anywhere inside the `ActorSystem`, including places like the Akka.NET TestKit, without throwing `FormatException`s when they encounter semantic logging syntax outside of the `SerilogLogger`.
-
-#### 1.3.3 January 27 2018 ####
-
-Removed SerilogLogMessageFormatter since its no longer needed
-Support for Akka 1.3.3
-Update to Serilog 2.6.0
-
-#### 1.2.0 April 18 2017 ####
-
-Support for Akka 1.2.0
-
-#### 1.1.3 Januari 26 2017 ####
-
-Support for Akka 1.1.3
-
-Update to Serilog 2.4.0
-
-#### 1.1.2 September 26 2016 ####
-
-Support for Akka 1.1.2
-Update to Serilog 2.2.1
-
-#### 1.1.1 Juli 16 2016 ####
-
-Support for Akka 1.1.1
-Updated to Serilog 2.0.0
-
-#### 1.0.8 March 27 2016 ####
-
-Support for Akka 1.0.8
-
-#### 1.0.7 Februari 29 2016 ####
-
-Support for Akka 1.0.7
+#### 1.4.1-RC1 March 02 2020 ####
+* Updated Serilog to [Akka.NET v1.4.1-RC1](https://getakka.net/community/whats-new/akkadotnet-v1.4.html)
diff --git a/build.fsx b/build.fsx
@@ -16,23 +16,30 @@ let configuration = "Release"
 // Metadata used when signing packages and DLLs
 let signingName = "Akka.Logger.Serilog"
 let signingDescription = "Akka.Logger plugin for Serilog"
-let signingUrl = ""
+let signingUrl = "https://github.com/akkadotnet/Akka.Logger.Serilog"
 
 
 // Read release notes and version
 let solutionFile = FindFirstMatchingFile "*.sln" __SOURCE_DIRECTORY__  // dynamically look up the solution
 let buildNumber = environVarOrDefault "BUILD_NUMBER" "0"
 let hasTeamCity = (not (buildNumber = "0")) // check if we have the TeamCity environment variable for build # set
 let preReleaseVersionSuffix = "beta" + (if (not (buildNumber = "0")) then (buildNumber) else DateTime.UtcNow.Ticks.ToString())
-let versionSuffix = 
-    match (getBuildParam "nugetprerelease") with
-    | "dev" -> preReleaseVersionSuffix
-    | _ -> ""
 
 let releaseNotes =
-    File.ReadLines "./RELEASE_NOTES.md"
+    File.ReadLines (__SOURCE_DIRECTORY__ @@ "RELEASE_NOTES.md")
     |> ReleaseNotesHelper.parseReleaseNotes
 
+let versionFromReleaseNotes =
+    match releaseNotes.SemVer.PreRelease with
+    | Some r -> r.Origin
+    | None -> ""
+
+let versionSuffix = 
+    match (getBuildParam "nugetprerelease") with
+    | "dev" -> preReleaseVersionSuffix
+    | "" -> versionFromReleaseNotes
+    | str -> str
+
 // Directories
 let toolsDir = __SOURCE_DIRECTORY__ @@ "tools"
 let output = __SOURCE_DIRECTORY__  @@ "bin"
@@ -108,42 +115,33 @@ Target "RunTests" (fun _ ->
     projects |> Seq.iter (runSingleProject)
 )
 
-Target "NBench" <| fun _ ->
-    let nbenchTestPath = findToolInSubPath "NBench.Runner.exe" (toolsDir @@ "NBench.Runner*")
-    printfn "Using NBench.Runner: %s" nbenchTestPath
-
-    let nbenchTestAssemblies = !! "./src/**/bin/**/*Tests.Performance.dll" // doesn't support .NET Core at the moment
-
-    let runNBench assembly =
-        let includes = getBuildParam "include"
-        let excludes = getBuildParam "exclude"
-        let teamcityStr = (getBuildParam "teamcity")
-        let enableTeamCity = 
-            match teamcityStr with
-            | null -> false
-            | "" -> false
-            | _ -> bool.Parse teamcityStr
-
-        let args = StringBuilder()
-                |> append assembly
-                |> append (sprintf "output-directory=\"%s\"" outputPerfTests)
-                |> append (sprintf "concurrent=\"%b\"" true)
-                |> append (sprintf "trace=\"%b\"" true)
-                |> append (sprintf "teamcity=\"%b\"" enableTeamCity)
-                |> appendIfNotNullOrEmpty includes "include="
-                |> appendIfNotNullOrEmpty excludes "include="
+Target "NBench" (fun _ ->
+    ensureDirectory outputPerfTests
+    let nbenchTestAssemblies = !! "./src/**/*Tests.Performance.csproj" 
+
+    nbenchTestAssemblies |> Seq.iter(fun project -> 
+        let args = new StringBuilder()
+                |> append "run"
+                |> append "--no-build"
+                |> append "-c"
+                |> append configuration
+                |> append " -- "
+                |> append "--output"
+                |> append outputPerfTests
+                |> append "--concurrent" 
+                |> append "true"
+                |> append "--trace"
+                |> append "true"
+                |> append "--diagnostic"               
                 |> toText
 
         let result = ExecProcess(fun info -> 
-            info.FileName <- nbenchTestPath
-            info.WorkingDirectory <- (Path.GetDirectoryName (FullName nbenchTestPath))
-            info.Arguments <- args) (System.TimeSpan.FromMinutes 45.0) (* Reasonably long-running task. *)
-
-        printfn "result was %i" result
-
-        if result <> 0 then failwithf "NBench.Runner failed. %s %s" nbenchTestPath args
-
-    nbenchTestAssemblies |> Seq.iter runNBench
+            info.FileName <- "dotnet"
+            info.WorkingDirectory <- (Directory.GetParent project).FullName
+            info.Arguments <- args) (System.TimeSpan.FromMinutes 15.0) (* Reasonably long-running task. *)
+        if result <> 0 then failwithf "NBench.Runner failed. %s %s" "dotnet" args
+    )
+)
 
 
 //--------------------------------------------------------------------------------