Merge pull request #297 from CaptnCodr/feature/xunit-v3

Update xunit to v3 and other dependencies

build.fsx

@@ -127,6 +127,7 @@ let sourceFiles =
     !! "src/**/*.fs"
     ++ "tests/**/*.fs"
     -- "./**/*Assembly*.fs"
+    -- "tests/**/obj/**/*.fs"
 
 Target.create "CheckFormat" (fun _ ->
     let result =

paket.dependencies

@@ -13,9 +13,9 @@ nuget System.Collections.NonGeneric
 
 // xUnit
 nuget NHamcrest
-nuget xunit ~> 2.6.2
+nuget xunit.v3 ~> 1.0.0
 nuget xunit.runner.visualstudio
 
 // MsTest
-nuget MSTest.TestFramework ~> 3.2.2
-nuget MSTest.TestAdapter ~> 3.2.2
+nuget MSTest.TestFramework ~> 3.6.0
+nuget MSTest.TestAdapter ~> 3.6.0

paket.lock

@@ -4,43 +4,43 @@ NUGET
     FSharp.Core (5.0.2)
     Microsoft.ApplicationInsights (2.22)
       System.Diagnostics.DiagnosticSource (>= 5.0)
-    Microsoft.CodeCoverage (17.11.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
-    Microsoft.NET.Test.Sdk (17.11.1)
-      Microsoft.CodeCoverage (>= 17.11.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
-      Microsoft.TestPlatform.TestHost (>= 17.11.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+    Microsoft.Bcl.AsyncInterfaces (9.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+    Microsoft.CodeCoverage (17.12) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
+    Microsoft.NET.Test.Sdk (17.12)
+      Microsoft.CodeCoverage (>= 17.12) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
+      Microsoft.TestPlatform.TestHost (>= 17.12) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
     Microsoft.NETCore.Platforms (7.0.4)
     Microsoft.NETCore.Targets (5.0)
-    Microsoft.Testing.Extensions.Telemetry (1.4)
+    Microsoft.Testing.Extensions.Telemetry (1.4.3)
       Microsoft.ApplicationInsights (>= 2.22)
-      Microsoft.Testing.Platform (>= 1.4)
-    Microsoft.Testing.Extensions.TrxReport.Abstractions (1.4)
-      Microsoft.Testing.Platform (>= 1.4)
-    Microsoft.Testing.Extensions.VSTestBridge (1.4)
+      Microsoft.Testing.Platform (>= 1.4.3)
+    Microsoft.Testing.Extensions.TrxReport.Abstractions (1.4.3)
+      Microsoft.Testing.Platform (>= 1.4.3)
+    Microsoft.Testing.Extensions.VSTestBridge (1.4.3)
       Microsoft.ApplicationInsights (>= 2.22)
-      Microsoft.Testing.Extensions.Telemetry (>= 1.4)
-      Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.4)
-      Microsoft.Testing.Platform (>= 1.4)
-      Microsoft.TestPlatform.ObjectModel (>= 17.11)
-    Microsoft.Testing.Platform (1.4)
-    Microsoft.Testing.Platform.MSBuild (1.4)
-      Microsoft.Testing.Platform (>= 1.4)
-    Microsoft.TestPlatform.ObjectModel (17.11.1)
+      Microsoft.Testing.Extensions.Telemetry (>= 1.4.3)
+      Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.4.3)
+      Microsoft.Testing.Platform (>= 1.4.3)
+      Microsoft.TestPlatform.ObjectModel (>= 17.11.1)
+    Microsoft.Testing.Platform (1.4.3)
+    Microsoft.Testing.Platform.MSBuild (1.4.3)
+      Microsoft.Testing.Platform (>= 1.4.3)
+    Microsoft.TestPlatform.ObjectModel (17.12)
       System.Reflection.Metadata (>= 1.6)
-    Microsoft.TestPlatform.TestHost (17.11.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
-      Microsoft.TestPlatform.ObjectModel (>= 17.11.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+    Microsoft.TestPlatform.TestHost (17.12) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+      Microsoft.TestPlatform.ObjectModel (>= 17.12) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
       Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
-    MSTest.TestAdapter (3.2.2)
-      Microsoft.Testing.Extensions.Telemetry (>= 1.0.2)
-      Microsoft.Testing.Extensions.VSTestBridge (>= 1.0.2)
-      Microsoft.Testing.Platform.MSBuild (>= 1.0.2)
-    MSTest.TestFramework (3.2.2)
+    MSTest.TestAdapter (3.6.4)
+      Microsoft.Testing.Extensions.VSTestBridge (>= 1.4.3)
+      Microsoft.Testing.Platform.MSBuild (>= 1.4.3)
+    MSTest.TestFramework (3.6.4)
     Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
-    NHamcrest (3.4)
+    NHamcrest (4.0)
     NUnit (4.0.1)
     NUnit3TestAdapter (4.6)
-    System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
-    System.Collections.Immutable (8.0)
-      System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
+    System.Buffers (4.6) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
+    System.Collections.Immutable (9.0)
+      System.Memory (>= 4.5.5)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
     System.Collections.NonGeneric (4.3)
       System.Diagnostics.Debug (>= 4.3)
@@ -53,8 +53,8 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Diagnostics.DiagnosticSource (8.0.1)
-      System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
+    System.Diagnostics.DiagnosticSource (9.0)
+      System.Memory (>= 4.5.5)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
     System.Globalization (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
@@ -66,19 +66,20 @@ NUGET
       System.Runtime (>= 4.3)
       System.Text.Encoding (>= 4.3)
       System.Threading.Tasks (>= 4.3)
-    System.Memory (4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== 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) (>= net462)) (== netstandard2.0)
+    System.Memory (4.6)
+      System.Buffers (>= 4.6) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
+      System.Numerics.Vectors (>= 4.6) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
+    System.Numerics.Vectors (4.6) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netcoreapp2.1)) (== 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 (8.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
-      System.Collections.Immutable (>= 8.0)
+    System.Reflection.Metadata (9.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+      System.Collections.Immutable (>= 9.0)
+      System.Memory (>= 4.5.5)
     System.Reflection.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
@@ -92,7 +93,7 @@ NUGET
     System.Runtime (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
-    System.Runtime.CompilerServices.Unsafe (6.0)
+    System.Runtime.CompilerServices.Unsafe (6.1)
     System.Runtime.Extensions (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
@@ -108,18 +109,25 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    xunit (2.6.6)
-      xunit.analyzers (>= 1.10)
-      xunit.assert (>= 2.6.6)
-      xunit.core (2.6.6)
-    xunit.abstractions (2.0.3)
-    xunit.analyzers (1.16)
-    xunit.assert (2.9)
-    xunit.core (2.6.6)
-      xunit.extensibility.core (2.6.6)
-      xunit.extensibility.execution (2.6.6)
-    xunit.extensibility.core (2.6.6)
-      xunit.abstractions (>= 2.0.3)
-    xunit.extensibility.execution (2.6.6)
-      xunit.extensibility.core (2.6.6)
-    xunit.runner.visualstudio (2.8.2)
+    xunit.analyzers (1.18) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+    xunit.runner.visualstudio (3.0)
+    xunit.v3 (1.0)
+      xunit.analyzers (>= 1.18) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.assert (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.core (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+    xunit.v3.assert (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+    xunit.v3.common (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      Microsoft.Bcl.AsyncInterfaces (>= 6.0)
+    xunit.v3.core (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      Microsoft.Testing.Platform.MSBuild (>= 1.4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.extensibility.core (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.runner.inproc.console (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+    xunit.v3.extensibility.core (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.common (1.0)
+    xunit.v3.runner.common (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.common (1.0)
+    xunit.v3.runner.inproc.console (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      Microsoft.Testing.Platform (>= 1.4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.extensibility.core (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      xunit.v3.runner.common (1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))

src/FsUnit.MsTestUnit/paket.template

@@ -9,14 +9,12 @@ projectUrl
     https://github.com/fsprojects/FsUnit
 iconUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/docs/img/logo.png
-licenseExpression
-    https://licenses.nuget.org/MIT
 licenseUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/license.txt
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2012-2024
+    Copyright 2012-2025
 tags
     F# fsharp MsTest FsUnit
 summary

src/FsUnit.MsTestUnit/sample.paket.template

@@ -9,14 +9,12 @@ projectUrl
     https://github.com/fsprojects/FsUnit
 iconUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/docs/img/logo.png
-licenseExpression
-    https://licenses.nuget.org/MIT
 licenseUrl
     https://github.com/fsprojects/FsUnit/blob/master/license.txt
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2015-2024
+    Copyright 2015-2025
 tags
     F# fsharp MsTest FsUnit
 summary

src/FsUnit.NUnit/paket.template

@@ -9,14 +9,12 @@ projectUrl
     https://github.com/fsprojects/FsUnit
 iconUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/docs/img/logo.png
-licenseExpression
-    https://licenses.nuget.org/MIT
 licenseUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/license.txt
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2012-2024
+    Copyright 2012-2025
 tags
     F# fsharp NUnit FsUnit
 summary

src/FsUnit.NUnit/sample.paket.template

@@ -9,14 +9,12 @@ projectUrl
     https://github.com/fsprojects/FsUnit
 iconUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/docs/img/logo.png
-licenseExpression
-    https://licenses.nuget.org/MIT
 licenseUrl
     https://github.com/fsprojects/FsUnit/blob/master/license.txt
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2015-2024
+    Copyright 2015-2025
 tags
     F# fsharp NUnit FsUnit
 summary

src/FsUnit.Xunit/paket.references

@@ -1,3 +1,3 @@
 FSharp.Core
 NHamcrest
-xunit
+xunit.v3

src/FsUnit.Xunit/paket.template

@@ -9,14 +9,12 @@ projectUrl
     https://github.com/fsprojects/FsUnit
 iconUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/docs/img/logo.png
-licenseExpression
-    https://licenses.nuget.org/MIT
 licenseUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/license.txt
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2012-2024
+    Copyright 2012-2025
 tags
     F# fsharp xUnit FsUnit
 summary
@@ -29,6 +27,6 @@ files
     ../../src/install.ps1 ==> tools
 
 dependencies
-    xunit >= LOCKEDVERSION
+    xunit.v3 >= LOCKEDVERSION
     NHamcrest >= LOCKEDVERSION
     FSharp.Core >= LOCKEDVERSION

src/FsUnit.Xunit/sample.paket.template

@@ -9,14 +9,12 @@ projectUrl
     https://github.com/fsprojects/FsUnit
 iconUrl
     https://raw.githubusercontent.com/fsprojects/FsUnit/master/docs/img/logo.png
-licenseExpression
-    https://licenses.nuget.org/MIT
 licenseUrl
     https://github.com/fsprojects/FsUnit/blob/master/license.txt
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2015-2024
+    Copyright 2015-2025
 tags
     F# fsharp xUnit FsUnit
 summary

tests/FsUnit.Xunit.Test/paket.references

@@ -1,4 +1,4 @@
 FSharp.Core
 Microsoft.NET.Test.Sdk
-xunit
+xunit.v3
 xunit.runner.visualstudio