Bump version to 1.1.1

* Fixes #1 casting content length to a log event property now works
Zaid-Ajaj · Jan 26, 2019 · 8da9336 · 8da9336
1 parent 3641942
commit 8da9336
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 23 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -62,6 +62,9 @@
     <!-- see https://github.com/fsharp/fslang-design/blob/master/RFCs/FS-1032-fsharp-in-dotnet-sdk.md -->
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+
+    <!-- Disable Paket restore under NCrunch build -->
+    <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
   </PropertyGroup>
 
   <Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
@@ -102,7 +105,11 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
+	<!-- 
+		This value should match the version in the props generated by paket 
+		If they differ, this means we need to do a restore in order to ensure correct dependencies
+	-->
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
     </PropertyGroup>
 
@@ -183,6 +190,7 @@
         <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
         <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
         <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
+        <AllowExplicitVersion>true</AllowExplicitVersion>
       </PackageReference>
     </ItemGroup>
 

diff --git a/README.md b/README.md
@@ -95,8 +95,8 @@ let webAppWithLogging = SerilogAdapter.Enable(webApp, serilogConfig)
 Error handling within the Serilog `HttpHandler` is also handled by Serilog and not Giraffes's internal logger. The error handler is of type: `Exception -> HttpContext -> HttpHandler` with the default handler returning a generic error message from the server:
 ```fs
 let errorHandler ex httpContext = 
-    text "Internal Server Error" >=> setStatusCode 500
-    
+    setStatusCode 500 
+    >=> text "Internal Server Error" 
 ```
 You can override this error handler from the config:
 ```fs

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 1.1.1 - 2019-01-26
+* Fixes #1 casting content length to a log event property now works
+
 #### 1.1.0 - 2018-12-23
 * Ensure correct status code is returned on for unhandled exceptions
 

diff --git a/src/Giraffe.SerilogExtensions/AssemblyInfo.fs b/src/Giraffe.SerilogExtensions/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("Giraffe.SerilogExtensions")>]
 [<assembly: AssemblyProductAttribute("Giraffe.SerilogExtensions")>]
-[<assembly: AssemblyVersionAttribute("1.1.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2018-12-23T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("1.1.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("1.1.0")>]
+[<assembly: AssemblyVersionAttribute("1.1.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2019-01-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("1.1.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("1.1.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","27627af278675c1bb4b8773152ea944d89fc99cf")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","36419420a229a63d501862baff82c3269124a68e")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Giraffe.SerilogExtensions"
     let [<Literal>] AssemblyProduct = "Giraffe.SerilogExtensions"
-    let [<Literal>] AssemblyVersion = "1.1.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2018-12-23T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "1.1.0"
-    let [<Literal>] AssemblyInformationalVersion = "1.1.0"
+    let [<Literal>] AssemblyVersion = "1.1.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2019-01-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "1.1.1"
+    let [<Literal>] AssemblyInformationalVersion = "1.1.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "27627af278675c1bb4b8773152ea944d89fc99cf"
+    let [<Literal>] AssemblyMetadata_GitHash = "36419420a229a63d501862baff82c3269124a68e"
diff --git a/src/Giraffe.SerilogExtensions/Enrichers.fs b/src/Giraffe.SerilogExtensions/Enrichers.fs
@@ -15,5 +15,6 @@ module Enrichers =
               let value = ScalarValue(value)
               KeyValuePair<ScalarValue, LogEventPropertyValue>(key,value)) 
           |> fun pairs -> DictionaryValue(pairs) :> LogEventPropertyValue
+      | :? int64 as longInt -> ScalarValue(longInt) :> LogEventPropertyValue
       | otherwise -> failwithf "Could not convert '%A' into a log event property value" otherwise
       |> fun eventPropValue -> LogEventProperty(name,  eventPropValue)
diff --git a/tests/Giraffe.SerilogExtensions.Tests/AssemblyInfo.fs b/tests/Giraffe.SerilogExtensions.Tests/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("Giraffe.SerilogExtensions.Tests")>]
 [<assembly: AssemblyProductAttribute("Giraffe.SerilogExtensions")>]
-[<assembly: AssemblyVersionAttribute("1.1.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2018-12-23T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("1.1.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("1.1.0")>]
+[<assembly: AssemblyVersionAttribute("1.1.1")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2019-01-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("1.1.1")>]
+[<assembly: AssemblyInformationalVersionAttribute("1.1.1")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","27627af278675c1bb4b8773152ea944d89fc99cf")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","36419420a229a63d501862baff82c3269124a68e")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Giraffe.SerilogExtensions.Tests"
     let [<Literal>] AssemblyProduct = "Giraffe.SerilogExtensions"
-    let [<Literal>] AssemblyVersion = "1.1.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2018-12-23T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "1.1.0"
-    let [<Literal>] AssemblyInformationalVersion = "1.1.0"
+    let [<Literal>] AssemblyVersion = "1.1.1"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2019-01-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "1.1.1"
+    let [<Literal>] AssemblyInformationalVersion = "1.1.1"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "27627af278675c1bb4b8773152ea944d89fc99cf"
+    let [<Literal>] AssemblyMetadata_GitHash = "36419420a229a63d501862baff82c3269124a68e"