Merge pull request #211 from CaptnCodr/feature/nhamcrest-upgrade

Upgrade NHamcrest & drop NETStandard.Library

RELEASE_NOTES.md

@@ -1,6 +1,9 @@
+### 5.0.2 - Aug 15, 2022
+- Dependency update (NHamcrest 2.0.1 => 3.0.1) -> (https://github.com/fsprojects/FsUnit/pull/211)
+
 ### 5.0.1 - Aug 5, 2022
 - Docs updates
-- Dependecies update
+- Dependencies update
 
 ### 5.0.0 - Apr 9, 2022
 - [BREAKING] xUnit equality assertions executed of expected value instead of actual

paket.dependencies

@@ -1,19 +1,21 @@
-source https://nuget.org/api/v2
-framework: netstandard2.0, net6.0
+source https://api.nuget.org/v3/index.json
+framework: net6.0, netstandard2.0
 
 nuget FSharp.Core ~> 5.0.0
-nuget NETStandard.Library ~> 2.0.0
 
 nuget Microsoft.NET.Test.Sdk
-// For NUnit
+
+// NUnit
 nuget NUnit
 nuget NUnit3TestAdapter
 nuget System.Collections.Immutable
 nuget System.Collections.NonGeneric
-// For xUnit
+
+// xUnit
 nuget NHamcrest
 nuget xunit
 nuget xunit.runner.visualstudio
-// for MsTest
+
+// MsTest
 nuget MSTest.TestFramework
 nuget MSTest.TestAdapter ~> 2.1.2

paket.lock

@@ -1,18 +1,18 @@
 RESTRICTION: || (== net6.0) (== netstandard2.0)
 NUGET
-  remote: https://www.nuget.org/api/v2
+  remote: https://api.nuget.org/v3/index.json
     FSharp.Core (5.0.2)
-    Microsoft.CodeCoverage (17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0))
-    Microsoft.NET.Test.Sdk (17.2)
-      Microsoft.CodeCoverage (>= 17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0))
-      Microsoft.TestPlatform.TestHost (>= 17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
+    Microsoft.CodeCoverage (17.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0))
+    Microsoft.NET.Test.Sdk (17.3)
+      Microsoft.CodeCoverage (>= 17.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0))
+      Microsoft.TestPlatform.TestHost (>= 17.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
     Microsoft.NETCore.Platforms (6.0.5)
     Microsoft.NETCore.Targets (5.0)
-    Microsoft.TestPlatform.ObjectModel (17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
+    Microsoft.TestPlatform.ObjectModel (17.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
       NuGet.Frameworks (>= 5.11)
       System.Reflection.Metadata (>= 1.6)
-    Microsoft.TestPlatform.TestHost (17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
-      Microsoft.TestPlatform.ObjectModel (>= 17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= uap10.0))
+    Microsoft.TestPlatform.TestHost (17.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
+      Microsoft.TestPlatform.ObjectModel (>= 17.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= uap10.0))
       Newtonsoft.Json (>= 9.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= uap10.0))
     MSTest.TestAdapter (2.1.2)
       NETStandard.Library (>= 1.6.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
@@ -23,9 +23,8 @@ NUGET
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0))
-    NHamcrest (2.0.1)
-      NETStandard.Library (>= 1.6.1)
-    NuGet.Frameworks (6.2.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.1))
+    NHamcrest (3.0.1)
+    NuGet.Frameworks (6.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.1))
     NUnit (3.13.3)
       NETStandard.Library (>= 2.0)
     NUnit3TestAdapter (4.2.1)

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("5.0.1")>]
-[<assembly: AssemblyFileVersionAttribute("5.0.1")>]
+[<assembly: AssemblyVersionAttribute("5.0.2")>]
+[<assembly: AssemblyFileVersionAttribute("5.0.2")>]
 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 = "5.0.1"
-    let [<Literal>] AssemblyFileVersion = "5.0.1"
+    let [<Literal>] AssemblyVersion = "5.0.2"
+    let [<Literal>] AssemblyFileVersion = "5.0.2"

src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <AssemblyName>FsUnit.MsTest</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>

src/FsUnit.MsTestUnit/paket.references

@@ -1,4 +1,3 @@
 FSharp.Core
-NETStandard.Library
 NHamcrest
 MSTest.TestFramework

src/FsUnit.MsTestUnit/paket.template

@@ -22,12 +22,13 @@ summary
 description
     FsUnit is a set of extensions that add special testing syntax to MsTest.
 files
+    ../../bin/FsUnit.MsTest/net6.0/FsUnit.* ==> lib/net6.0
     ../../bin/FsUnit.MsTest/netstandard2.0/FsUnit.* ==> lib/netstandard2.0
     ../../src/install.ps1 ==> tools
 
 dependencies
-    framework: netstandard20
-        NETStandard.Library >= LOCKEDVERSION
+    framework: net6.0
         MSTest.TestFramework ~> LOCKEDVERSION
         NHamcrest ~> LOCKEDVERSION
         FSharp.Core >= LOCKEDVERSION
+    framework: netstandard2.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("5.0.1")>]
-[<assembly: AssemblyFileVersionAttribute("5.0.1")>]
+[<assembly: AssemblyVersionAttribute("5.0.2")>]
+[<assembly: AssemblyFileVersionAttribute("5.0.2")>]
 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 = "5.0.1"
-    let [<Literal>] AssemblyFileVersion = "5.0.1"
+    let [<Literal>] AssemblyVersion = "5.0.2"
+    let [<Literal>] AssemblyFileVersion = "5.0.2"

src/FsUnit.NUnit/FsUnit.NUnit.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <AssemblyName>FsUnit.NUnit</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/FsUnit.NUnit/paket.references

@@ -1,3 +1,2 @@
 FSharp.Core
-NETStandard.Library
 NUnit

src/FsUnit.NUnit/paket.template

@@ -22,11 +22,12 @@ summary
 description
     FsUnit is a set of extensions that add special testing syntax to NUnit.
 files
+    ../../bin/FsUnit.NUnit/net6.0/FsUnit.* ==> lib/net6.0
     ../../bin/FsUnit.NUnit/netstandard2.0/FsUnit.* ==> lib/netstandard2.0
     ../../src/install.ps1 ==> tools
 
 dependencies
-    framework: netstandard20
-        NETStandard.Library >= LOCKEDVERSION
+    framework: net6.0
         NUnit ~> LOCKEDVERSION
         FSharp.Core >= LOCKEDVERSION
+    framework: netstandard2.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("5.0.1")>]
-[<assembly: AssemblyFileVersionAttribute("5.0.1")>]
+[<assembly: AssemblyVersionAttribute("5.0.2")>]
+[<assembly: AssemblyFileVersionAttribute("5.0.2")>]
 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 = "5.0.1"
-    let [<Literal>] AssemblyFileVersion = "5.0.1"
+    let [<Literal>] AssemblyVersion = "5.0.2"
+    let [<Literal>] AssemblyFileVersion = "5.0.2"

src/FsUnit.Xunit/FsUnit.Xunit.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <AssemblyName>FsUnit.Xunit</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>

src/FsUnit.Xunit/paket.references

@@ -1,4 +1,3 @@
 FSharp.Core
-NETStandard.Library
 NHamcrest
 xunit

src/FsUnit.Xunit/paket.template

@@ -22,12 +22,13 @@ summary
 description
     FsUnit is a set of extensions that add special testing syntax to xUnit.
 files
+    ../../bin/FsUnit.Xunit/net6.0/FsUnit.* ==> lib/net6.0
     ../../bin/FsUnit.Xunit/netstandard2.0/FsUnit.* ==> lib/netstandard2.0
     ../../src/install.ps1 ==> tools
 
 dependencies
-    framework: netstandard20
-        NETStandard.Library >= LOCKEDVERSION
+    framework: net6.0
         xunit ~> LOCKEDVERSION
         NHamcrest ~> LOCKEDVERSION
         FSharp.Core >= LOCKEDVERSION
+    framework: netstandard2.0