From d04f9c21f851c20747dc7f13fa4b7175901c99f9 Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Fri, 5 Aug 2022 22:14:28 +0200 Subject: [PATCH 1/4] Upgrade NHamcrest and drop Netstandard. --- RELEASE_NOTES.md | 2 +- paket.dependencies | 14 ++++--- paket.lock | 48 +++++++++------------- src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj | 2 +- src/FsUnit.MsTestUnit/paket.references | 1 - src/FsUnit.MsTestUnit/paket.template | 5 +-- src/FsUnit.NUnit/FsUnit.NUnit.fsproj | 2 +- src/FsUnit.NUnit/paket.references | 1 - src/FsUnit.NUnit/paket.template | 5 +-- src/FsUnit.Xunit/FsUnit.Xunit.fsproj | 2 +- src/FsUnit.Xunit/paket.references | 1 - src/FsUnit.Xunit/paket.template | 5 +-- 12 files changed, 37 insertions(+), 51 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7467f546..e89f3e21 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,6 @@ ### 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 diff --git a/paket.dependencies b/paket.dependencies index 708968ed..8cd56eab 100644 --- a/paket.dependencies +++ b/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 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 diff --git a/paket.lock b/paket.lock index 0ccbd6de..e520982b 100644 --- a/paket.lock +++ b/paket.lock @@ -1,44 +1,39 @@ -RESTRICTION: || (== net6.0) (== netstandard2.0) +RESTRICTION: == net6.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.CodeCoverage (17.2) 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.2) + Microsoft.TestPlatform.TestHost (>= 17.2) 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.2) 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)) - Newtonsoft.Json (>= 9.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= uap10.0)) + Microsoft.TestPlatform.TestHost (17.2) + Microsoft.TestPlatform.ObjectModel (>= 17.2) + Newtonsoft.Json (>= 9.0.1) MSTest.TestAdapter (2.1.2) - NETStandard.Library (>= 1.6.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - System.Diagnostics.TextWriterTraceListener (>= 4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + NETStandard.Library (>= 1.6.1) + System.Diagnostics.TextWriterTraceListener (>= 4.3) MSTest.TestFramework (2.2.10) - NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net6.0) (< net5.0)) (== netstandard2.0) - System.Diagnostics.TextWriterTraceListener (>= 4.3) - restriction: || (&& (== net6.0) (< net5.0)) (== netstandard2.0) 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)) + Newtonsoft.Json (13.0.1) + NHamcrest (3.0) + NuGet.Frameworks (6.2.1) NUnit (3.13.3) NETStandard.Library (>= 2.0) NUnit3TestAdapter (4.2.1) - runtime.native.System (4.3.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + runtime.native.System (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) - System.Collections (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) System.Collections.Immutable (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Collections.NonGeneric (4.3) System.Diagnostics.Debug (>= 4.3) @@ -58,7 +53,7 @@ NUGET System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Threading (>= 4.3) - System.Diagnostics.TraceSource (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + System.Diagnostics.TraceSource (4.3) Microsoft.NETCore.Platforms (>= 1.1) runtime.native.System (>= 4.3) System.Collections (>= 4.3) @@ -78,18 +73,13 @@ NUGET System.Runtime (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading.Tasks (>= 4.3) - System.Memory (4.5.5) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) System.Reflection (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.IO (>= 4.3) System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.1)) + System.Reflection.Metadata (6.0.1) System.Collections.Immutable (>= 6.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -109,7 +99,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) System.Runtime (>= 4.3.1) - System.Text.Encoding (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + System.Text.Encoding (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) diff --git a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj index 5316ca96..e2a513c0 100644 --- a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj +++ b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 FsUnit.MsTest false diff --git a/src/FsUnit.MsTestUnit/paket.references b/src/FsUnit.MsTestUnit/paket.references index 627a7b77..31bc36e1 100644 --- a/src/FsUnit.MsTestUnit/paket.references +++ b/src/FsUnit.MsTestUnit/paket.references @@ -1,4 +1,3 @@ FSharp.Core -NETStandard.Library NHamcrest MSTest.TestFramework \ No newline at end of file diff --git a/src/FsUnit.MsTestUnit/paket.template b/src/FsUnit.MsTestUnit/paket.template index 16400ed6..962b0f83 100644 --- a/src/FsUnit.MsTestUnit/paket.template +++ b/src/FsUnit.MsTestUnit/paket.template @@ -22,12 +22,11 @@ summary description FsUnit is a set of extensions that add special testing syntax to MsTest. files - ../../bin/FsUnit.MsTest/netstandard2.0/FsUnit.* ==> lib/netstandard2.0 + ../../bin/FsUnit.MsTest/net6.0/FsUnit.* ==> lib/net6.0 ../../src/install.ps1 ==> tools dependencies - framework: netstandard20 - NETStandard.Library >= LOCKEDVERSION + framework: net6.0 MSTest.TestFramework ~> LOCKEDVERSION NHamcrest ~> LOCKEDVERSION FSharp.Core >= LOCKEDVERSION diff --git a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj index dbb3a6be..0c3bf5b5 100644 --- a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj +++ b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj @@ -1,6 +1,6 @@  - netstandard2.0 + net6.0 FsUnit.NUnit false true diff --git a/src/FsUnit.NUnit/paket.references b/src/FsUnit.NUnit/paket.references index 67218394..9e3b9fdb 100644 --- a/src/FsUnit.NUnit/paket.references +++ b/src/FsUnit.NUnit/paket.references @@ -1,3 +1,2 @@ FSharp.Core -NETStandard.Library NUnit \ No newline at end of file diff --git a/src/FsUnit.NUnit/paket.template b/src/FsUnit.NUnit/paket.template index 3de5aadd..f378bfa1 100644 --- a/src/FsUnit.NUnit/paket.template +++ b/src/FsUnit.NUnit/paket.template @@ -22,11 +22,10 @@ summary description FsUnit is a set of extensions that add special testing syntax to NUnit. files - ../../bin/FsUnit.NUnit/netstandard2.0/FsUnit.* ==> lib/netstandard2.0 + ../../bin/FsUnit.NUnit/net6.0/FsUnit.* ==> lib/net6.0 ../../src/install.ps1 ==> tools dependencies - framework: netstandard20 - NETStandard.Library >= LOCKEDVERSION + framework: net6.0 NUnit ~> LOCKEDVERSION FSharp.Core >= LOCKEDVERSION diff --git a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj index 9ad97a92..fb3477f5 100644 --- a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj +++ b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 FsUnit.Xunit false diff --git a/src/FsUnit.Xunit/paket.references b/src/FsUnit.Xunit/paket.references index cd341455..47b27f59 100644 --- a/src/FsUnit.Xunit/paket.references +++ b/src/FsUnit.Xunit/paket.references @@ -1,4 +1,3 @@ FSharp.Core -NETStandard.Library NHamcrest xunit \ No newline at end of file diff --git a/src/FsUnit.Xunit/paket.template b/src/FsUnit.Xunit/paket.template index 239f780a..a5522cd1 100644 --- a/src/FsUnit.Xunit/paket.template +++ b/src/FsUnit.Xunit/paket.template @@ -22,12 +22,11 @@ summary description FsUnit is a set of extensions that add special testing syntax to xUnit. files - ../../bin/FsUnit.Xunit/netstandard2.0/FsUnit.* ==> lib/netstandard2.0 + ../../bin/FsUnit.Xunit/net6.0/FsUnit.* ==> lib/net6.0 ../../src/install.ps1 ==> tools dependencies - framework: netstandard20 - NETStandard.Library >= LOCKEDVERSION + framework: net6.0 xunit ~> LOCKEDVERSION NHamcrest ~> LOCKEDVERSION FSharp.Core >= LOCKEDVERSION From 74b53bc480919cbb8329663be7abbf41edbabbe7 Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Mon, 8 Aug 2022 10:58:09 +0200 Subject: [PATCH 2/4] Add netstandard2.0 for backward compatibility. --- paket.dependencies | 2 +- paket.lock | 45 +++++++++++++--------- src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj | 2 +- src/FsUnit.MsTestUnit/paket.template | 1 + src/FsUnit.NUnit/FsUnit.NUnit.fsproj | 2 +- src/FsUnit.NUnit/paket.template | 1 + src/FsUnit.Xunit/FsUnit.Xunit.fsproj | 2 +- src/FsUnit.Xunit/paket.template | 1 + 8 files changed, 34 insertions(+), 22 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 8cd56eab..71ec3714 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,5 @@ source https://api.nuget.org/v3/index.json -framework: net6.0 +framework: net6.0, netstandard2.0 nuget FSharp.Core ~> 5.0.0 diff --git a/paket.lock b/paket.lock index e520982b..590201c8 100644 --- a/paket.lock +++ b/paket.lock @@ -1,39 +1,43 @@ -RESTRICTION: == net6.0 +RESTRICTION: || (== net6.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json FSharp.Core (5.0.2) - Microsoft.CodeCoverage (17.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) - Microsoft.TestPlatform.TestHost (>= 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.NETCore.Platforms (6.0.5) Microsoft.NETCore.Targets (5.0) - Microsoft.TestPlatform.ObjectModel (17.2) + Microsoft.TestPlatform.ObjectModel (17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) NuGet.Frameworks (>= 5.11) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.2) - Microsoft.TestPlatform.ObjectModel (>= 17.2) - Newtonsoft.Json (>= 9.0.1) + 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)) + 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) - System.Diagnostics.TextWriterTraceListener (>= 4.3) + NETStandard.Library (>= 1.6.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + System.Diagnostics.TextWriterTraceListener (>= 4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) MSTest.TestFramework (2.2.10) + NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net6.0) (< net5.0)) (== netstandard2.0) + System.Diagnostics.TextWriterTraceListener (>= 4.3) - restriction: || (&& (== net6.0) (< net5.0)) (== netstandard2.0) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.1) - NHamcrest (3.0) - NuGet.Frameworks (6.2.1) + Newtonsoft.Json (13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + NHamcrest (3.0.1) + NuGet.Frameworks (6.2.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.1)) NUnit (3.13.3) NETStandard.Library (>= 2.0) NUnit3TestAdapter (4.2.1) - runtime.native.System (4.3.1) + runtime.native.System (4.3.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Collections (4.3) + System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) + System.Collections (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) System.Collections.Immutable (6.0) + System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Collections.NonGeneric (4.3) System.Diagnostics.Debug (>= 4.3) @@ -53,7 +57,7 @@ NUGET System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Threading (>= 4.3) - System.Diagnostics.TraceSource (4.3) + System.Diagnostics.TraceSource (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) Microsoft.NETCore.Platforms (>= 1.1) runtime.native.System (>= 4.3) System.Collections (>= 4.3) @@ -73,13 +77,18 @@ NUGET System.Runtime (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading.Tasks (>= 4.3) + System.Memory (4.5.5) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0) System.Reflection (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.IO (>= 4.3) System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0.1) + System.Reflection.Metadata (6.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.1)) System.Collections.Immutable (>= 6.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -99,7 +108,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) System.Runtime (>= 4.3.1) - System.Text.Encoding (4.3) + System.Text.Encoding (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) diff --git a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj index e2a513c0..0d0df3cd 100644 --- a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj +++ b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;netstandard2.0 FsUnit.MsTest false diff --git a/src/FsUnit.MsTestUnit/paket.template b/src/FsUnit.MsTestUnit/paket.template index 962b0f83..6bd021a7 100644 --- a/src/FsUnit.MsTestUnit/paket.template +++ b/src/FsUnit.MsTestUnit/paket.template @@ -23,6 +23,7 @@ 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 diff --git a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj index 0c3bf5b5..da3689f8 100644 --- a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj +++ b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj @@ -1,6 +1,6 @@  - net6.0 + net6.0;netstandard2.0 FsUnit.NUnit false true diff --git a/src/FsUnit.NUnit/paket.template b/src/FsUnit.NUnit/paket.template index f378bfa1..eb5b7eca 100644 --- a/src/FsUnit.NUnit/paket.template +++ b/src/FsUnit.NUnit/paket.template @@ -23,6 +23,7 @@ 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 diff --git a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj index fb3477f5..ab555882 100644 --- a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj +++ b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;netstandard2.0 FsUnit.Xunit false diff --git a/src/FsUnit.Xunit/paket.template b/src/FsUnit.Xunit/paket.template index a5522cd1..b3b8787d 100644 --- a/src/FsUnit.Xunit/paket.template +++ b/src/FsUnit.Xunit/paket.template @@ -23,6 +23,7 @@ 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 From 69fb4488e65cb18fe7c983e06f9e330510f49adf Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Mon, 8 Aug 2022 11:34:51 +0200 Subject: [PATCH 3/4] Add netstandard2.0 as targetFramework to nuspec. --- src/FsUnit.MsTestUnit/paket.template | 1 + src/FsUnit.NUnit/paket.template | 1 + src/FsUnit.Xunit/paket.template | 1 + 3 files changed, 3 insertions(+) diff --git a/src/FsUnit.MsTestUnit/paket.template b/src/FsUnit.MsTestUnit/paket.template index 6bd021a7..01ae0d2c 100644 --- a/src/FsUnit.MsTestUnit/paket.template +++ b/src/FsUnit.MsTestUnit/paket.template @@ -31,3 +31,4 @@ dependencies MSTest.TestFramework ~> LOCKEDVERSION NHamcrest ~> LOCKEDVERSION FSharp.Core >= LOCKEDVERSION + framework: netstandard2.0 diff --git a/src/FsUnit.NUnit/paket.template b/src/FsUnit.NUnit/paket.template index eb5b7eca..37df4c27 100644 --- a/src/FsUnit.NUnit/paket.template +++ b/src/FsUnit.NUnit/paket.template @@ -30,3 +30,4 @@ dependencies framework: net6.0 NUnit ~> LOCKEDVERSION FSharp.Core >= LOCKEDVERSION + framework: netstandard2.0 diff --git a/src/FsUnit.Xunit/paket.template b/src/FsUnit.Xunit/paket.template index b3b8787d..f1fd1e3d 100644 --- a/src/FsUnit.Xunit/paket.template +++ b/src/FsUnit.Xunit/paket.template @@ -31,3 +31,4 @@ dependencies xunit ~> LOCKEDVERSION NHamcrest ~> LOCKEDVERSION FSharp.Core >= LOCKEDVERSION + framework: netstandard2.0 From 29efaefc2040557cf547b7039b20fb2ab562a691 Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Mon, 15 Aug 2022 12:48:13 +0200 Subject: [PATCH 4/4] Final deps update. --- RELEASE_NOTES.md | 3 +++ paket.lock | 16 ++++++++-------- src/FsUnit.MsTestUnit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.NUnit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.Xunit/AssemblyInfo.fs | 8 ++++---- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e89f3e21..143fc7fd 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +### 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 - Dependencies update diff --git a/paket.lock b/paket.lock index 590201c8..9251cca8 100644 --- a/paket.lock +++ b/paket.lock @@ -2,17 +2,17 @@ RESTRICTION: || (== net6.0) (== netstandard2.0) NUGET 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)) @@ -24,7 +24,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) NHamcrest (3.0.1) - NuGet.Frameworks (6.2.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.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) diff --git a/src/FsUnit.MsTestUnit/AssemblyInfo.fs b/src/FsUnit.MsTestUnit/AssemblyInfo.fs index 855303bc..d7d07c4f 100644 --- a/src/FsUnit.MsTestUnit/AssemblyInfo.fs +++ b/src/FsUnit.MsTestUnit/AssemblyInfo.fs @@ -5,13 +5,13 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "FsUnit.MsTest" let [] AssemblyProduct = "FsUnit" let [] AssemblyDescription = "FsUnit is a set of libraries that makes unit-testing with F# more enjoyable." - let [] AssemblyVersion = "5.0.1" - let [] AssemblyFileVersion = "5.0.1" + let [] AssemblyVersion = "5.0.2" + let [] AssemblyFileVersion = "5.0.2" diff --git a/src/FsUnit.NUnit/AssemblyInfo.fs b/src/FsUnit.NUnit/AssemblyInfo.fs index 12a312ba..39fec869 100644 --- a/src/FsUnit.NUnit/AssemblyInfo.fs +++ b/src/FsUnit.NUnit/AssemblyInfo.fs @@ -5,13 +5,13 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "FsUnit.NUnit" let [] AssemblyProduct = "FsUnit" let [] AssemblyDescription = "FsUnit is a set of libraries that makes unit-testing with F# more enjoyable." - let [] AssemblyVersion = "5.0.1" - let [] AssemblyFileVersion = "5.0.1" + let [] AssemblyVersion = "5.0.2" + let [] AssemblyFileVersion = "5.0.2" diff --git a/src/FsUnit.Xunit/AssemblyInfo.fs b/src/FsUnit.Xunit/AssemblyInfo.fs index 3f495cad..f13ca10b 100644 --- a/src/FsUnit.Xunit/AssemblyInfo.fs +++ b/src/FsUnit.Xunit/AssemblyInfo.fs @@ -5,13 +5,13 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "FsUnit.Xunit" let [] AssemblyProduct = "FsUnit" let [] AssemblyDescription = "FsUnit is a set of libraries that makes unit-testing with F# more enjoyable." - let [] AssemblyVersion = "5.0.1" - let [] AssemblyFileVersion = "5.0.1" + let [] AssemblyVersion = "5.0.2" + let [] AssemblyFileVersion = "5.0.2"