Skip to content

Upgrade NHamcrest & drop NETStandard.Library #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 15, 2022
Merged

Upgrade NHamcrest & drop NETStandard.Library #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d04f9c2
Upgrade NHamcrest and drop Netstandard.
CaptnCodr Aug 5, 2022
74b53bc
Add netstandard2.0 for backward compatibility.
CaptnCodr Aug 8, 2022
69fb448
Add netstandard2.0 as targetFramework to nuspec.
CaptnCodr Aug 8, 2022
29efaef
Final deps update.
CaptnCodr Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 8 additions & 6 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
21 changes: 10 additions & 11 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/FsUnit.MsTestUnit/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/FsUnit.MsTestUnit/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FSharp.Core
NETStandard.Library
NHamcrest
MSTest.TestFramework
5 changes: 3 additions & 2 deletions src/FsUnit.MsTestUnit/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions src/FsUnit.NUnit/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion src/FsUnit.NUnit/FsUnit.NUnit.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/FsUnit.NUnit/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
FSharp.Core
NETStandard.Library
NUnit
5 changes: 3 additions & 2 deletions src/FsUnit.NUnit/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions src/FsUnit.Xunit/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion src/FsUnit.Xunit/FsUnit.Xunit.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/FsUnit.Xunit/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FSharp.Core
NETStandard.Library
NHamcrest
xunit
5 changes: 3 additions & 2 deletions src/FsUnit.Xunit/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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