Bump version to 5.0.0-beta.24

causiq · Sep 14, 2018 · 12fa9e8 · 12fa9e8
1 parent 49f295a
commit 12fa9e8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -33,7 +33,7 @@ nuget NodaTime
 nuget RabbitMQ.Client
 nuget SQLite.Interop
 nuget SQLite.Interop.dll
-nuget Suave
+nuget Suave < 2.5
 nuget System.Data.SQLite.Core
 nuget System.Net.Http
 nuget System.Configuration.ConfigurationManager >= 4.5.0-rc1 # topshelf

diff --git a/src/Logary.Facade.Tests/Logary.Facade.Tests.fsproj b/src/Logary.Facade.Tests/Logary.Facade.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Logary.Facade.Tests</AssemblyName>
-    <Version>5.0.0-beta.23</Version>
+    <Version>5.0.0-beta.24</Version>
     <Version>5.0.0-beta.12</Version>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>

diff --git a/src/Logary.Facade/Logary.Facade.fsproj b/src/Logary.Facade/Logary.Facade.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Logary.Facade</AssemblyName>
-    <Version>5.0.0-beta.23</Version>
+    <Version>5.0.0-beta.24</Version>
     <Version>5.0.0-beta.12</Version>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
   </PropertyGroup>

diff --git a/src/Logary.PerfTests/Logary.PerfTests.fsproj b/src/Logary.PerfTests/Logary.PerfTests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
-    <Version>5.0.0-beta.23</Version>
+    <Version>5.0.0-beta.24</Version>
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/src/Logary.Tests/Logary.Tests.fsproj b/src/Logary.Tests/Logary.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <Version>5.0.0-beta.23</Version>
+    <Version>5.0.0-beta.24</Version>
     <Version>5.0.0-beta.12</Version>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <NoWarn>44</NoWarn>

diff --git a/src/Logary/Logary.fsproj b/src/Logary/Logary.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Logary</AssemblyName>
-    <Version>5.0.0-beta.23</Version>
+    <Version>5.0.0-beta.24</Version>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <NoWarn>44;2003</NoWarn>
     <DefineConstants>TYPESHAPE_EXPOSE</DefineConstants>

diff --git a/src/targets/Logary.Targets.Mixpanel/Targets_Mixpanel.fs b/src/targets/Logary.Targets.Mixpanel/Targets_Mixpanel.fs
@@ -13,11 +13,12 @@ open Logary.Internals
 open Logary.Internals.Chiron
 open Logary.Configuration
 
-/// A **very** simple extractor for the `userId` field/`user` field.
+/// A **very** simple extractor for the `userId` field/`user` field/context value.
 let extractUserIdOrUserDotId (m: Message) =
   m
   |> tryGetField "userId"
   |> Option.orElse (m |> tryGetField "user")
+  |> Option.orElse (m |> tryGetContext "userId")
   |> Option.map string
 
 let extractIPField (m: Message) =