diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 8839ec34..e7e04c0e 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -69,9 +69,11 @@ true + - + + diff --git a/Expecto.BenchmarkDotNet/AssemblyInfo.fs b/Expecto.BenchmarkDotNet/AssemblyInfo.fs index cb6df442..a4464b31 100644 --- a/Expecto.BenchmarkDotNet/AssemblyInfo.fs +++ b/Expecto.BenchmarkDotNet/AssemblyInfo.fs @@ -6,8 +6,8 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = @@ -15,5 +15,5 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Expecto.BenchmarkDotNet" let [] AssemblyCopyright = "Copyright 2018" let [] AssemblyDescription = "Advanced testing library for F#" - let [] AssemblyVersion = "7.0.1" - let [] AssemblyFileVersion = "7.0.1" + let [] AssemblyVersion = "8.0.0" + let [] AssemblyFileVersion = "8.0.0" diff --git a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj index bf26d603..6cdc6971 100644 --- a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj +++ b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj @@ -2,7 +2,7 @@ Expecto.BenchmarkDotNet Expecto.BenchmarkDotNet - 7.0.1 + 8.0.0 net461;netcoreapp2.0 diff --git a/Expecto.FsCheck/AssemblyInfo.fs b/Expecto.FsCheck/AssemblyInfo.fs index d5fb06f4..e8666054 100644 --- a/Expecto.FsCheck/AssemblyInfo.fs +++ b/Expecto.FsCheck/AssemblyInfo.fs @@ -6,8 +6,8 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = @@ -15,5 +15,5 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Expecto.FsCheck" let [] AssemblyCopyright = "Copyright 2018" let [] AssemblyDescription = "Advanced testing library for F#" - let [] AssemblyVersion = "7.0.1" - let [] AssemblyFileVersion = "7.0.1" + let [] AssemblyVersion = "8.0.0" + let [] AssemblyFileVersion = "8.0.0" diff --git a/Expecto.FsCheck/Expecto.FsCheck.fsproj b/Expecto.FsCheck/Expecto.FsCheck.fsproj index 620e0240..b3aac5f0 100644 --- a/Expecto.FsCheck/Expecto.FsCheck.fsproj +++ b/Expecto.FsCheck/Expecto.FsCheck.fsproj @@ -2,7 +2,7 @@ Expecto.FsCheck Expecto.FsCheck - 7.0.1 + 8.0.0 net461;netstandard2.0 diff --git a/Expecto.Hopac/AssemblyInfo.fs b/Expecto.Hopac/AssemblyInfo.fs index a4a9f79f..6ad4b262 100644 --- a/Expecto.Hopac/AssemblyInfo.fs +++ b/Expecto.Hopac/AssemblyInfo.fs @@ -6,8 +6,8 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = @@ -15,5 +15,5 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Expecto.Hopac" let [] AssemblyCopyright = "Copyright 2018" let [] AssemblyDescription = "Advanced testing library for F#" - let [] AssemblyVersion = "7.0.1" - let [] AssemblyFileVersion = "7.0.1" + let [] AssemblyVersion = "8.0.0" + let [] AssemblyFileVersion = "8.0.0" diff --git a/Expecto.Hopac/Expecto.Hopac.fsproj b/Expecto.Hopac/Expecto.Hopac.fsproj index e0010e32..ae2a5665 100644 --- a/Expecto.Hopac/Expecto.Hopac.fsproj +++ b/Expecto.Hopac/Expecto.Hopac.fsproj @@ -2,7 +2,7 @@ Expecto.Hopac Expecto.Hopac - 7.0.1 + 8.0.0 net461;netstandard2.0 diff --git a/Expecto/AssemblyInfo.fs b/Expecto/AssemblyInfo.fs index 0875a445..b76ef924 100644 --- a/Expecto/AssemblyInfo.fs +++ b/Expecto/AssemblyInfo.fs @@ -6,8 +6,8 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = @@ -15,5 +15,5 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Expecto" let [] AssemblyCopyright = "Copyright 2018" let [] AssemblyDescription = "Advanced testing library for F#" - let [] AssemblyVersion = "7.0.1" - let [] AssemblyFileVersion = "7.0.1" + let [] AssemblyVersion = "8.0.0" + let [] AssemblyFileVersion = "8.0.0" diff --git a/Expecto/Expecto.fsproj b/Expecto/Expecto.fsproj index 7615dd81..dbc3fd3e 100644 --- a/Expecto/Expecto.fsproj +++ b/Expecto/Expecto.fsproj @@ -3,7 +3,7 @@ Expecto Expecto - 7.0.1 + 8.0.0 net461;netstandard2.0 diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7e1f8fa9..db51ccc4 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,9 @@ -#### 8.0.0 – 2018-04-28 -* Upgrade Logary.Facade and bump major because of a int64 -> float change in the logging facade. Add docs on how to get extra value/stacktrace parsing when using Expecto. +#### 8.0.0 – 2018-05-08 +* Upgrade Logary.Facade and bump major because of a int64 to float change. thanks @haf +* Add docs on how to get extra value/stacktrace parsing when using Expecto. thanks @haf +* Fixed flipped throwsT not passing exception type through. #244 thanks @daniel-chambers +* Fixed all and allEqual call enumeration more than once. #245 thanks @kleidemos +* Add passing cancellation token to run functions. #229 thanks @AnthonyLloyd #### 7.0.1 - 2018-04-07 * Default printer log with list name. #236 thanks @jackfoxy diff --git a/paket-files/logary/logary/src/Logary.Facade/Facade.fs b/paket-files/logary/logary/src/Logary.Facade/Facade.fs index 9b10413a..240a90c0 100644 --- a/paket-files/logary/logary/src/Logary.Facade/Facade.fs +++ b/paket-files/logary/logary/src/Logary.Facade/Facade.fs @@ -1,4 +1,4 @@ -/// The logging namespace, which contains the logging abstraction for this +/// The logging namespace, which contains the logging abstraction for this /// library. See https://github.com/logary/logary for details. This module is /// completely stand-alone in that it has no external references and its adapter /// in Logary has been well tested. @@ -540,7 +540,7 @@ module internal LiterateTokenisation = | :? int16 | :? int32 | :? int64 | :? decimal | :? float | :? double -> NumericSymbol | :? string | :? char -> StringSymbol | _ -> OtherSymbol - + /// Converts a `PointValue` into a sequence literate tokens. The returned `Set` contains /// the names of the properties that were found in the `Event` template. let tokenisePointValue (options: LiterateOptions) (fields: Map) = function @@ -587,7 +587,7 @@ module internal LiterateTokenisation = // regular text go ((line, Text) :: (Environment.NewLine, Text) :: lines) go [] - + /// Converts all exceptions in a `Message` into a sequence of literate tokens. let tokeniseMessageExns (context: LiterateOptions) message = let exnExceptionParts = @@ -742,8 +742,8 @@ module internal LiterateFormatting = else yield Environment.NewLine, Text yield! tokeniseExtraField options message field } - - let tokeniseTimestamp format (options: LiterateOptions) (message: Message) = + + let tokeniseTimestamp format (options: LiterateOptions) (message: Message) = let localDateTimeOffset = DateTimeOffset(message.utcTicks, TimeSpan.Zero).ToLocalTime() let formattedTimestamp = localDateTimeOffset.ToString(format, options.formatProvider) seq { yield formattedTimestamp, Subtext } @@ -789,7 +789,7 @@ module internal LiterateFormatting = // render the message template first so we have the template-matched fields available let fieldsInMessageTemplate, messageParts = tokenisePointValue options message.fields message.value - + let tokeniseOutputTemplateField fieldName format = seq { match fieldName with | "timestamp" -> yield! tokeniseTimestamp format options message @@ -1045,7 +1045,7 @@ module Message = timestamp = Global.timestamp () level = level } - /// Create a new event log message – like `event` but with parameters flipped. + /// Create a new event log message � like `event` but with parameters flipped. /// Useful to use with `Logger.log` with point-free style, to reduce the /// noise. E.g. `logger.logVerbose (eventX "Returned {code}" >> setField "code" 24)` let eventX template level =