From 13306c740e5534ab92e079595cc97a632cc10767 Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sun, 2 Jul 2023 15:13:56 +0100 Subject: [PATCH] FSharp.Core update to 5.x. --- docs/QuickStart.fsx | 1 + docs/RunningTests.fsx | 1 + paket.dependencies | 4 ++-- paket.lock | 40 ++++++++++++++++++++-------------------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/docs/QuickStart.fsx b/docs/QuickStart.fsx index 64f56e6f..b13f0106 100644 --- a/docs/QuickStart.fsx +++ b/docs/QuickStart.fsx @@ -3,6 +3,7 @@ #r @"../src/FsCheck.Xunit/bin/Release/netstandard2.0/FsCheck.Xunit.dll" #r @"../packages/xunit.abstractions/lib/netstandard1.0/xunit.abstractions.dll" #r @"../packages/xunit.extensibility.core/lib/netstandard1.1/xunit.core.dll" +#r @"../packages/xunit.extensibility.execution/lib/netstandard1.1/xunit.execution.dotnet.dll" #r "FsCheck" (** diff --git a/docs/RunningTests.fsx b/docs/RunningTests.fsx index 6bc24834..045db06d 100644 --- a/docs/RunningTests.fsx +++ b/docs/RunningTests.fsx @@ -7,6 +7,7 @@ #I @"../src/FsCheck.NUnit/bin/Release/netstandard2.0" #r @"../packages/xunit.abstractions/lib/netstandard1.0/xunit.abstractions.dll" #r @"../packages/xunit.extensibility.core/lib/netstandard1.1/xunit.core.dll" +#r @"../packages/xunit.extensibility.execution/lib/netstandard1.1/xunit.execution.dotnet.dll" #r @"../packages/NUnit/lib/netstandard2.0/nunit.framework.dll" #r "FsCheck" #r "FsCheck.Xunit" diff --git a/paket.dependencies b/paket.dependencies index a94763e5..d210ca96 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -4,7 +4,7 @@ version 7.1.5 framework: auto-detect -nuget FSharp.Core = 4.5.0 +nuget FSharp.Core ~> 5.0.0 nuget Microsoft.NETFramework.ReferenceAssemblies @@ -31,7 +31,7 @@ group Build source https://www.nuget.org/api/v2 source https://api.nuget.org/v3/index.json - nuget FSharp.Core + nuget FSharp.Core ~> 6.0.0 nuget Octokit nuget Fake.Api.GitHub nuget Fake.BuildServer.AppVeyor diff --git a/paket.lock b/paket.lock index ba29907c..52b43170 100644 --- a/paket.lock +++ b/paket.lock @@ -1,7 +1,7 @@ RESTRICTION: || (== net6.0) (== netcoreapp3.1) (== netstandard2.0) NUGET remote: https://www.nuget.org/api/v2 - FSharp.Core (4.5) + FSharp.Core (5.0.2) Microsoft.CodeCoverage (16.11) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0)) Microsoft.NET.Test.Sdk (16.11) Microsoft.CodeCoverage (>= 16.11) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp1.0)) @@ -81,7 +81,7 @@ NUGET System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) System.Reflection.Metadata (5.0) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp1.0)) (&& (== netstandard2.0) (>= netcoreapp2.1)) - System.Collections.Immutable (>= 5.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (== netcoreapp3.1) (== netstandard2.0) + System.Collections.Immutable (>= 5.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< net5.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (== netcoreapp3.1) (== netstandard2.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -112,7 +112,7 @@ NUGET Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) Unquote (6.0) - FSharp.Core (>= 4.2.3) + FSharp.Core (>= 4.7.2) xunit (2.4.1) xunit.analyzers (>= 0.10) xunit.assert (2.4.1) @@ -273,18 +273,18 @@ NUGET FSharp.Control.Reactive (5.0.2) FSharp.Core (>= 4.7.2) System.Reactive (>= 5.0) - FSharp.Core (5.0.2) + FSharp.Core (6.0.7) Microsoft.Build (16.11) - Microsoft.Build.Framework (>= 16.11) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) - Microsoft.NET.StringTools (>= 1.0) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) - Microsoft.Win32.Registry (>= 4.3) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0)) - System.Collections.Immutable (>= 5.0) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) - System.Configuration.ConfigurationManager (>= 4.7) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) - System.Reflection.Metadata (>= 1.6) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0)) - System.Security.Principal.Windows (>= 4.7) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0)) - System.Text.Encoding.CodePages (>= 4.0.1) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net6.0)) - System.Text.Json (>= 4.7) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) - System.Threading.Tasks.Dataflow (>= 4.9) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + Microsoft.Build.Framework (>= 16.11) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0)) + Microsoft.NET.StringTools (>= 1.0) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0)) + Microsoft.Win32.Registry (>= 4.3) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net5.0)) + System.Collections.Immutable (>= 5.0) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0)) + System.Configuration.ConfigurationManager (>= 4.7) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0)) + System.Reflection.Metadata (>= 1.6) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net5.0)) + System.Security.Principal.Windows (>= 4.7) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net5.0)) + System.Text.Encoding.CodePages (>= 4.0.1) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net5.0)) + System.Text.Json (>= 4.7) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0)) + System.Threading.Tasks.Dataflow (>= 4.9) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0)) Microsoft.Build.Framework (16.11) System.Security.Permissions (>= 4.7) Microsoft.Build.Tasks.Core (16.11) @@ -314,7 +314,7 @@ NUGET Microsoft.NETCore.Platforms (5.0.2) Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard1.2)) (&& (== net6.0) (< netstandard1.3)) (&& (== net6.0) (< netstandard1.5)) (== netstandard2.0) Microsoft.Win32.Registry (5.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard1.3)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== netcoreapp3.1) (>= monoandroid) (< netstandard1.3)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) @@ -343,7 +343,7 @@ NUGET NuGet.Packaging (>= 5.11) NuGet.Versioning (5.11) Octokit (0.50) - System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) + System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard1.3)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== netcoreapp3.1) (>= monoandroid) (< netstandard1.3)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) System.CodeDom (5.0) System.Collections.Immutable (5.0) System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) @@ -353,7 +353,7 @@ NUGET System.Drawing.Common (5.0.2) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp3.0)) Microsoft.Win32.SystemEvents (>= 5.0) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (== netstandard2.0) (>= netcoreapp3.0)) System.Formats.Asn1 (5.0) - System.Memory (4.5.4) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) + System.Memory (4.5.4) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== 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)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< 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)) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) @@ -367,7 +367,7 @@ NUGET System.Runtime (4.3.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) System.Runtime.InteropServices.WindowsRuntime (4.3) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) System.Runtime (>= 4.3) System.Security.AccessControl (5.0) @@ -390,8 +390,8 @@ NUGET System.Windows.Extensions (>= 5.0) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp3.0)) System.Security.Principal.Windows (5.0) System.Text.Encoding.CodePages (5.0) - Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.0) (>= netcoreapp2.0)) - System.Text.Json (5.0.2) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net6.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net6.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= net5.0)) (&& (== netstandard2.0) (>= netcoreapp2.0)) + System.Text.Json (5.0.2) - restriction: || (== net6.0) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= net5.0)) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0)) System.Threading.Tasks.Dataflow (5.0) System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (&& (== netcoreapp3.1) (>= net472)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard1.0)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= wp8)) (== netstandard2.0)