Merge pull request #3 from fsprojects/master

Merging

.config/dotnet-tools.json

@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.223.0",
+      "version": "5.227.0",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.16.1",
+      "version": "5.18.2",
       "commands": [
         "fake"
       ]
     },
     "dotnet-serve": {
-      "version": "1.4.1",
+      "version": "1.5.0",
       "commands": [
         "dotnet-serve"
       ]

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+### 3.6.0 - Oct 30, 2019
+* Added `supersetOf` operator - https://github.com/fsprojects/FsUnit/pull/141
+
 ### 3.5.0 - Oct 2, 2019
 * Added `ofCase` matcher - https://github.com/fsprojects/FsUnit/pull/134
 * Removed MbUnit from source code

build.fsx

@@ -171,20 +171,18 @@ Target.create "RunTests" ignore
 // Build a NuGet package
 
 Target.create "NuGet" (fun _ ->
-    // Paket.pack(fun p ->
-    //     { p with
-    //         OutputPath = "bin"
-    //         Version = release.NugetVersion
-    //         ReleaseNotes = String.toLines release.Notes})
-    DotNet.exec id "paket" 
-        (sprintf "pack bin --version %s --release-notes \"%s\"" 
-            release.NugetVersion  (String.toLines release.Notes) )
-    |> ignore
+    Paket.pack(fun p ->
+        { p with
+            ToolType = ToolType.CreateLocalTool()
+            OutputPath = "bin"
+            Version = release.NugetVersion
+            ReleaseNotes = String.toLines release.Notes})
 )
 
 Target.create "PublishNuget" (fun _ ->
     Paket.push(fun p ->
         { p with
+            ToolType = ToolType.CreateLocalTool()
             WorkingDir = "bin" })
 )
 

build.fsx.lock

@@ -4,137 +4,139 @@ NUGET
   remote: https://www.nuget.org/api/v2
     BlackFox.VsWhere (1.0)
       FSharp.Core (>= 4.2.3)
-    Fake.Api.GitHub (5.17)
+    Fake.Api.GitHub (5.18.2)
       FSharp.Core (>= 4.7)
       Octokit (>= 0.36)
-    Fake.Core.CommandLineParsing (5.17)
+    Fake.Core.CommandLineParsing (5.18.2)
       FParsec (>= 1.0.3)
       FSharp.Core (>= 4.7)
-    Fake.Core.Context (5.17)
+    Fake.Core.Context (5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.Core.Environment (5.17)
+    Fake.Core.Environment (5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.Core.FakeVar (5.17)
-      Fake.Core.Context (>= 5.17)
+    Fake.Core.FakeVar (5.18.2)
+      Fake.Core.Context (>= 5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.Core.Process (5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.FakeVar (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
+    Fake.Core.Process (5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.FakeVar (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
       FSharp.Core (>= 4.7)
       System.Diagnostics.Process (>= 4.3)
-    Fake.Core.ReleaseNotes (5.17)
-      Fake.Core.SemVer (>= 5.17)
-      Fake.Core.String (>= 5.17)
+    Fake.Core.ReleaseNotes (5.18.2)
+      Fake.Core.SemVer (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.Core.SemVer (5.17)
+    Fake.Core.SemVer (5.18.2)
       FSharp.Core (>= 4.7)
       System.Runtime.Numerics (>= 4.3)
-    Fake.Core.String (5.17)
+    Fake.Core.String (5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.Core.Target (5.17)
-      Fake.Core.CommandLineParsing (>= 5.17)
-      Fake.Core.Context (>= 5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.FakeVar (>= 5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
+    Fake.Core.Target (5.18.2)
+      Fake.Core.CommandLineParsing (>= 5.18.2)
+      Fake.Core.Context (>= 5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.FakeVar (>= 5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
       FSharp.Control.Reactive (>= 4.2)
       FSharp.Core (>= 4.7)
       System.Reactive.Compatibility (>= 4.2)
-    Fake.Core.Tasks (5.17)
-      Fake.Core.Trace (>= 5.17)
+    Fake.Core.Tasks (5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.Core.Trace (5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.FakeVar (>= 5.17)
+    Fake.Core.Trace (5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.FakeVar (>= 5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.Core.Xml (5.17)
-      Fake.Core.String (>= 5.17)
+    Fake.Core.Xml (5.18.2)
+      Fake.Core.String (>= 5.18.2)
       FSharp.Core (>= 4.7)
       System.Xml.ReaderWriter (>= 4.3.1)
       System.Xml.XDocument (>= 4.3)
       System.Xml.XPath (>= 4.3)
       System.Xml.XPath.XDocument (>= 4.3)
       System.Xml.XPath.XmlDocument (>= 4.3)
-    Fake.DotNet.AssemblyInfoFile (5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
+    Fake.DotNet.AssemblyInfoFile (5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.DotNet.Cli (5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.DotNet.MSBuild (>= 5.17)
-      Fake.DotNet.NuGet (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
+    Fake.DotNet.Cli (5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.DotNet.MSBuild (>= 5.18.2)
+      Fake.DotNet.NuGet (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
       FSharp.Core (>= 4.7)
+      Mono.Posix.NETStandard (>= 1.0)
       Newtonsoft.Json (>= 12.0.2)
-    Fake.DotNet.FSFormatting (5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
+    Fake.DotNet.FSFormatting (5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.DotNet.Fsi (5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.DotNet.MSBuild (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
-      Fake.Tools.Git (>= 5.17)
+    Fake.DotNet.Fsi (5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.DotNet.MSBuild (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
+      Fake.Tools.Git (>= 5.18.2)
       FSharp.Compiler.Service (>= 32.0)
       FSharp.Core (>= 4.7)
-    Fake.DotNet.MSBuild (5.17)
+    Fake.DotNet.MSBuild (5.18.2)
       BlackFox.VsWhere (>= 1.0)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
       FSharp.Core (>= 4.7)
       MSBuild.StructuredLogger (>= 2.0.110)
-    Fake.DotNet.NuGet (5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.Core.SemVer (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Tasks (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.Core.Xml (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
-      Fake.Net.Http (>= 5.17)
+    Fake.DotNet.NuGet (5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.Core.SemVer (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Tasks (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.Core.Xml (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
+      Fake.Net.Http (>= 5.18.2)
       FSharp.Core (>= 4.7)
       Newtonsoft.Json (>= 12.0.2)
       NuGet.Protocol (>= 4.9.4)
       System.Net.Http (>= 4.3.4)
-    Fake.DotNet.Paket (5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
+    Fake.DotNet.Paket (5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.DotNet.Cli (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
       FSharp.Core (>= 4.7)
-    Fake.IO.FileSystem (5.17)
-      Fake.Core.String (>= 5.17)
+    Fake.IO.FileSystem (5.18.2)
+      Fake.Core.String (>= 5.18.2)
       FSharp.Core (>= 4.7)
       System.Diagnostics.FileVersionInfo (>= 4.3)
       System.IO.FileSystem.Watcher (>= 4.3)
-    Fake.Net.Http (5.17)
-      Fake.Core.Trace (>= 5.17)
+    Fake.Net.Http (5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
       FSharp.Core (>= 4.7)
       System.Net.Http (>= 4.3.4)
-    Fake.Tools.Git (5.17)
-      Fake.Core.Environment (>= 5.17)
-      Fake.Core.Process (>= 5.17)
-      Fake.Core.SemVer (>= 5.17)
-      Fake.Core.String (>= 5.17)
-      Fake.Core.Trace (>= 5.17)
-      Fake.IO.FileSystem (>= 5.17)
+    Fake.Tools.Git (5.18.2)
+      Fake.Core.Environment (>= 5.18.2)
+      Fake.Core.Process (>= 5.18.2)
+      Fake.Core.SemVer (>= 5.18.2)
+      Fake.Core.String (>= 5.18.2)
+      Fake.Core.Trace (>= 5.18.2)
+      Fake.IO.FileSystem (>= 5.18.2)
       FSharp.Core (>= 4.7)
     FParsec (1.0.3)
       FSharp.Core (>= 4.2.3)
@@ -186,6 +188,7 @@ NUGET
       System.Memory (>= 4.5.3)
       System.Security.AccessControl (>= 4.6)
       System.Security.Principal.Windows (>= 4.6)
+    Mono.Posix.NETStandard (1.0)
     MSBuild.StructuredLogger (2.0.110)
       Microsoft.Build (>= 15.8.166)
       Microsoft.Build.Framework (>= 15.8.166)
@@ -194,23 +197,23 @@ NUGET
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (12.0.2)
-    NuGet.Common (5.3)
-      NuGet.Frameworks (>= 5.3)
+    NuGet.Common (5.3.1)
+      NuGet.Frameworks (>= 5.3.1)
       System.Diagnostics.Process (>= 4.3)
       System.Threading.Thread (>= 4.3)
-    NuGet.Configuration (5.3)
-      NuGet.Common (>= 5.3)
+    NuGet.Configuration (5.3.1)
+      NuGet.Common (>= 5.3.1)
       System.Security.Cryptography.ProtectedData (>= 4.3)
-    NuGet.Frameworks (5.3)
-    NuGet.Packaging (5.3)
+    NuGet.Frameworks (5.3.1)
+    NuGet.Packaging (5.3.1)
       Newtonsoft.Json (>= 9.0.1)
-      NuGet.Configuration (>= 5.3)
-      NuGet.Versioning (>= 5.3)
+      NuGet.Configuration (>= 5.3.1)
+      NuGet.Versioning (>= 5.3.1)
       System.Dynamic.Runtime (>= 4.3)
-    NuGet.Protocol (5.3)
-      NuGet.Packaging (>= 5.3)
+    NuGet.Protocol (5.3.1)
+      NuGet.Packaging (>= 5.3.1)
       System.Dynamic.Runtime (>= 4.3)
-    NuGet.Versioning (5.3)
+    NuGet.Versioning (5.3.1)
     Octokit (0.36)
     runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
     runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)

src/FsUnit.MsTestUnit/AssemblyInfo.fs

@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FsUnit.MsTest")>]
 [<assembly: AssemblyProductAttribute("FsUnit")>]
 [<assembly: AssemblyDescriptionAttribute("FsUnit is a set of libraries that makes unit-testing with F# more enjoyable.")>]
-[<assembly: AssemblyVersionAttribute("3.5.0")>]
-[<assembly: AssemblyFileVersionAttribute("3.5.0")>]
+[<assembly: AssemblyVersionAttribute("3.6.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.6.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FsUnit.MsTest"
     let [<Literal>] AssemblyProduct = "FsUnit"
     let [<Literal>] AssemblyDescription = "FsUnit is a set of libraries that makes unit-testing with F# more enjoyable."
-    let [<Literal>] AssemblyVersion = "3.5.0"
-    let [<Literal>] AssemblyFileVersion = "3.5.0"
+    let [<Literal>] AssemblyVersion = "3.6.0"
+    let [<Literal>] AssemblyFileVersion = "3.6.0"

src/FsUnit.NUnit/AssemblyInfo.fs

@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FsUnit.NUnit")>]
 [<assembly: AssemblyProductAttribute("FsUnit")>]
 [<assembly: AssemblyDescriptionAttribute("FsUnit is a set of libraries that makes unit-testing with F# more enjoyable.")>]
-[<assembly: AssemblyVersionAttribute("3.5.0")>]
-[<assembly: AssemblyFileVersionAttribute("3.5.0")>]
+[<assembly: AssemblyVersionAttribute("3.6.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.6.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FsUnit.NUnit"
     let [<Literal>] AssemblyProduct = "FsUnit"
     let [<Literal>] AssemblyDescription = "FsUnit is a set of libraries that makes unit-testing with F# more enjoyable."
-    let [<Literal>] AssemblyVersion = "3.5.0"
-    let [<Literal>] AssemblyFileVersion = "3.5.0"
+    let [<Literal>] AssemblyVersion = "3.6.0"
+    let [<Literal>] AssemblyFileVersion = "3.6.0"

src/FsUnit.Xunit/AssemblyInfo.fs

@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FsUnit.Xunit")>]
 [<assembly: AssemblyProductAttribute("FsUnit")>]
 [<assembly: AssemblyDescriptionAttribute("FsUnit is a set of libraries that makes unit-testing with F# more enjoyable.")>]
-[<assembly: AssemblyVersionAttribute("3.5.0")>]
-[<assembly: AssemblyFileVersionAttribute("3.5.0")>]
+[<assembly: AssemblyVersionAttribute("3.6.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.6.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FsUnit.Xunit"
     let [<Literal>] AssemblyProduct = "FsUnit"
     let [<Literal>] AssemblyDescription = "FsUnit is a set of libraries that makes unit-testing with F# more enjoyable."
-    let [<Literal>] AssemblyVersion = "3.5.0"
-    let [<Literal>] AssemblyFileVersion = "3.5.0"
+    let [<Literal>] AssemblyVersion = "3.6.0"
+    let [<Literal>] AssemblyFileVersion = "3.6.0"

tests/FsUnit.MsTest.Test/beSupersetOf.fs

@@ -31,4 +31,9 @@ type ``be supersetOf tests`` ()=
 
     [<TestMethod>] member test.
      ``1 to 10 should be superset of 1 to 10`` ()=
-        [1..10] |> should be (supersetOf [1..10])
+        [1..10] |> should be (supersetOf [1..10])
+
+    [<TestMethod>] member test.
+     ``should fail on '1 to 10 should not be superset of 1 to 10'`` ()=
+        shouldFail (fun () -> 
+            [1..10] |> should not' (be supersetOf [1..10]))