update for 8.0.0

haf · May 8, 2018 · 04f12c0 · 04f12c0
1 parent 9e3fc59
commit 04f12c0
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 30 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -69,9 +69,11 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
+
     <!-- Do a global restore if required -->
     <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
-    <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" />
 
     <!-- Step 2 Detect project specific changes -->
     <PropertyGroup>

diff --git a/Expecto.BenchmarkDotNet/AssemblyInfo.fs b/Expecto.BenchmarkDotNet/AssemblyInfo.fs
@@ -6,14 +6,14 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Expecto.BenchmarkDotNet")>]
 [<assembly: AssemblyCopyrightAttribute("Copyright 2018")>]
 [<assembly: AssemblyDescriptionAttribute("Advanced testing library for F#")>]
-[<assembly: AssemblyVersionAttribute("7.0.1")>]
-[<assembly: AssemblyFileVersionAttribute("7.0.1")>]
+[<assembly: AssemblyVersionAttribute("8.0.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.0.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Expecto.BenchmarkDotNet"
     let [<Literal>] AssemblyProduct = "Expecto.BenchmarkDotNet"
     let [<Literal>] AssemblyCopyright = "Copyright 2018"
     let [<Literal>] AssemblyDescription = "Advanced testing library for F#"
-    let [<Literal>] AssemblyVersion = "7.0.1"
-    let [<Literal>] AssemblyFileVersion = "7.0.1"
+    let [<Literal>] AssemblyVersion = "8.0.0"
+    let [<Literal>] AssemblyFileVersion = "8.0.0"
diff --git a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.BenchmarkDotNet</AssemblyName>
     <PackageId>Expecto.BenchmarkDotNet</PackageId>
-    <Version>7.0.1</Version>
+    <Version>8.0.0</Version>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Expecto.FsCheck/AssemblyInfo.fs b/Expecto.FsCheck/AssemblyInfo.fs
@@ -6,14 +6,14 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Expecto.FsCheck")>]
 [<assembly: AssemblyCopyrightAttribute("Copyright 2018")>]
 [<assembly: AssemblyDescriptionAttribute("Advanced testing library for F#")>]
-[<assembly: AssemblyVersionAttribute("7.0.1")>]
-[<assembly: AssemblyFileVersionAttribute("7.0.1")>]
+[<assembly: AssemblyVersionAttribute("8.0.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.0.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Expecto.FsCheck"
     let [<Literal>] AssemblyProduct = "Expecto.FsCheck"
     let [<Literal>] AssemblyCopyright = "Copyright 2018"
     let [<Literal>] AssemblyDescription = "Advanced testing library for F#"
-    let [<Literal>] AssemblyVersion = "7.0.1"
-    let [<Literal>] AssemblyFileVersion = "7.0.1"
+    let [<Literal>] AssemblyVersion = "8.0.0"
+    let [<Literal>] AssemblyFileVersion = "8.0.0"
diff --git a/Expecto.FsCheck/Expecto.FsCheck.fsproj b/Expecto.FsCheck/Expecto.FsCheck.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.FsCheck</AssemblyName>
     <PackageId>Expecto.FsCheck</PackageId>
-    <Version>7.0.1</Version>
+    <Version>8.0.0</Version>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Expecto.Hopac/AssemblyInfo.fs b/Expecto.Hopac/AssemblyInfo.fs
@@ -6,14 +6,14 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Expecto.Hopac")>]
 [<assembly: AssemblyCopyrightAttribute("Copyright 2018")>]
 [<assembly: AssemblyDescriptionAttribute("Advanced testing library for F#")>]
-[<assembly: AssemblyVersionAttribute("7.0.1")>]
-[<assembly: AssemblyFileVersionAttribute("7.0.1")>]
+[<assembly: AssemblyVersionAttribute("8.0.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.0.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Expecto.Hopac"
     let [<Literal>] AssemblyProduct = "Expecto.Hopac"
     let [<Literal>] AssemblyCopyright = "Copyright 2018"
     let [<Literal>] AssemblyDescription = "Advanced testing library for F#"
-    let [<Literal>] AssemblyVersion = "7.0.1"
-    let [<Literal>] AssemblyFileVersion = "7.0.1"
+    let [<Literal>] AssemblyVersion = "8.0.0"
+    let [<Literal>] AssemblyFileVersion = "8.0.0"
diff --git a/Expecto.Hopac/Expecto.Hopac.fsproj b/Expecto.Hopac/Expecto.Hopac.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Hopac</AssemblyName>
     <PackageId>Expecto.Hopac</PackageId>
-    <Version>7.0.1</Version>
+    <Version>8.0.0</Version>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Expecto/AssemblyInfo.fs b/Expecto/AssemblyInfo.fs
@@ -6,14 +6,14 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Expecto")>]
 [<assembly: AssemblyCopyrightAttribute("Copyright 2018")>]
 [<assembly: AssemblyDescriptionAttribute("Advanced testing library for F#")>]
-[<assembly: AssemblyVersionAttribute("7.0.1")>]
-[<assembly: AssemblyFileVersionAttribute("7.0.1")>]
+[<assembly: AssemblyVersionAttribute("8.0.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.0.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Expecto"
     let [<Literal>] AssemblyProduct = "Expecto"
     let [<Literal>] AssemblyCopyright = "Copyright 2018"
     let [<Literal>] AssemblyDescription = "Advanced testing library for F#"
-    let [<Literal>] AssemblyVersion = "7.0.1"
-    let [<Literal>] AssemblyFileVersion = "7.0.1"
+    let [<Literal>] AssemblyVersion = "8.0.0"
+    let [<Literal>] AssemblyFileVersion = "8.0.0"
diff --git a/Expecto/Expecto.fsproj b/Expecto/Expecto.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto</AssemblyName>
     <PackageId>Expecto</PackageId>
-    <Version>7.0.1</Version>
+    <Version>8.0.0</Version>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>

diff --git 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
@@ -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<string>` contains
   /// the names of the properties that were found in the `Event` template.
   let tokenisePointValue (options: LiterateOptions) (fields: Map<string, obj>) = 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 =