From 8b3baff4c3ac692be87e093453f488859f15079e Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Fri, 28 Apr 2023 22:07:23 +0200 Subject: [PATCH 1/8] WIP: Update dependencies. --- .config/dotnet-tools.json | 8 +- build.fsx | 111 ++-- build.fsx.lock | 756 ++++++--------------------- paket.lock | 24 +- src/FsUnit.NUnit/Equality.fs | 2 +- src/FsUnit.Xunit/CustomMatchers.fs | 4 +- tests/FsUnit.MsTest.Test/beChoice.fs | 66 +-- tests/FsUnit.Xunit.Test/beChoice.fs | 66 +-- 8 files changed, 294 insertions(+), 743 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6bbb2bcf..2d464818 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,25 +3,25 @@ "isRoot": true, "tools": { "paket": { - "version": "7.2.0", + "version": "7.2.1", "commands": [ "paket" ] }, "fake-cli": { - "version": "5.23.1", + "version": "6.0.0", "commands": [ "fake" ] }, "fsdocs-tool": { - "version": "17.2.0", + "version": "18.1.0", "commands": [ "fsdocs" ] }, "fantomas": { - "version": "5.1.5", + "version": "6.0.1", "commands": [ "fantomas" ] diff --git a/build.fsx b/build.fsx index 1d3d727b..0e160775 100644 --- a/build.fsx +++ b/build.fsx @@ -2,12 +2,12 @@ source https://api.nuget.org/v3/index.json framework: net6.0 storage: none -nuget FSharp.Core +nuget FSharp.Core 6.0.0.0 nuget Fake.Core.Target nuget Fake.Core.Trace nuget Fake.Core.ReleaseNotes nuget Fake.IO.FileSystem -nuget Fake.DotNet.Cli +nuget Fake.DotNet.Cli nuget Fake.DotNet.MSBuild nuget Fake.DotNet.AssemblyInfoFile nuget Fake.DotNet.Paket @@ -67,29 +67,25 @@ let cloneUrl = "git@github.com:fsprojects/FsUnit.git" let release = ReleaseNotes.load "RELEASE_NOTES.md" // Helper active pattern for project types -let (|Fsproj|Csproj|Vbproj|) (projFileName:string) = +let (|Fsproj|Csproj|Vbproj|) (projFileName: string) = match projFileName with | f when f.EndsWith("fsproj") -> Fsproj | f when f.EndsWith("csproj") -> Csproj | f when f.EndsWith("vbproj") -> Vbproj - | _ -> failwith (sprintf "Project file %s not supported. Unknown project type." projFileName) + | _ -> failwith (sprintf "Project file %s not supported. Unknown project type." projFileName) // Generate assembly info files with the right version & up-to-date information Target.create "AssemblyInfo" (fun _ -> let getAssemblyInfoAttributes projectName = - [ AssemblyInfo.Title (projectName) + [ AssemblyInfo.Title(projectName) AssemblyInfo.Product project AssemblyInfo.Description summary AssemblyInfo.Version release.AssemblyVersion AssemblyInfo.FileVersion release.AssemblyVersion ] - let getProjectDetails (projectPath:string) = + let getProjectDetails (projectPath: string) = let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath) - ( projectPath, - projectName, - Path.GetDirectoryName(projectPath), - (getAssemblyInfoAttributes projectName) - ) + (projectPath, projectName, Path.GetDirectoryName(projectPath), (getAssemblyInfoAttributes projectName)) !! "src/**/*.??proj" |> Seq.filter (fun x -> not <| x.Contains(".netstandard")) @@ -98,46 +94,39 @@ Target.create "AssemblyInfo" (fun _ -> match projFileName with | Fsproj -> AssemblyInfoFile.createFSharp (folderName @@ "AssemblyInfo.fs") attributes | Csproj -> AssemblyInfoFile.createCSharp ((folderName @@ "Properties") @@ "AssemblyInfo.cs") attributes - | Vbproj -> AssemblyInfoFile.createVisualBasic ((folderName @@ "My Project") @@ "AssemblyInfo.vb") attributes - ) -) + | Vbproj -> AssemblyInfoFile.createVisualBasic ((folderName @@ "My Project") @@ "AssemblyInfo.vb") attributes)) // Copies binaries from default VS location to expected bin folder // But keeps a subdirectory structure for each project in the // src folder to support multiple project outputs Target.create "CopyBinaries" (fun _ -> !! "src/**/*.??proj" - |> Seq.map (fun f -> ((Path.GetDirectoryName f) @@ "bin/Release", "bin" @@ (Path.GetFileNameWithoutExtension f))) - |> Seq.iter (fun (fromDir, toDir) -> Shell.copyDir toDir fromDir (fun _ -> true)) -) + |> Seq.map (fun f -> ((Path.GetDirectoryName f) @@ "bin/Release", "bin" @@ (Path.GetFileNameWithoutExtension f))) + |> Seq.iter (fun (fromDir, toDir) -> Shell.copyDir toDir fromDir (fun _ -> true))) // -------------------------------------------------------------------------------------- // Clean build results Target.create "Clean" (fun _ -> Shell.cleanDirs - [ - "bin"; "temp"; - "src/FsUnit.NUnit/bin/"; - "src/FsUnit.NUnit/obj/"; - "src/FsUnit.Xunit/bin/"; - "src/FsUnit.Xunit/obj/"; - "src/FsUnit.MsTestUnit/bin/" - "src/FsUnit.MsTestUnit/obj/" - ] -) - -Target.create "CleanDocs" (fun _ -> - Shell.cleanDirs ["docs/output"] -) + [ "bin" + "temp" + "src/FsUnit.NUnit/bin/" + "src/FsUnit.NUnit/obj/" + "src/FsUnit.Xunit/bin/" + "src/FsUnit.Xunit/obj/" + "src/FsUnit.MsTestUnit/bin/" + "src/FsUnit.MsTestUnit/obj/" ]) + +Target.create "CleanDocs" (fun _ -> Shell.cleanDirs [ "docs/output" ]) // -------------------------------------------------------------------------------------- // Check code format & format code using Fantomas let sourceFiles = !! "src/**/*.fs" - ++ "tests/**/*.fs" - -- "./**/*Assembly*.fs" + ++ "tests/**/*.fs" + -- "./**/*Assembly*.fs" Target.create "CheckFormat" (fun _ -> let result = @@ -152,8 +141,7 @@ Target.create "CheckFormat" (fun _ -> elif result.ExitCode = 99 then failwith "Some files need formatting, check output for more info" else - Trace.logf "Errors while formatting: %A" result.Errors -) + Trace.logf "Errors while formatting: %A" result.Errors) Target.create "Format" (fun _ -> let result = @@ -163,32 +151,25 @@ Target.create "Format" (fun _ -> |> DotNet.exec id "fantomas" if not result.OK then - printfn "Errors while formatting all files: %A" result.Messages -) + printfn "Errors while formatting all files: %A" result.Messages) // -------------------------------------------------------------------------------------- // Build library & test project Target.create "Build" (fun _ -> let result = DotNet.exec id "build" "FsUnit.sln -c Release" - if not result.OK - then failwithf "Build failed: %A" result.Errors -) + + if not result.OK then + failwithf "Build failed: %A" result.Errors // -------------------------------------------------------------------------------------- // Run the unit tests using test runner -Target.create "NUnit" (fun _ -> - DotNet.test id "tests/FsUnit.NUnit.Test/" -) +Target.create "NUnit" (fun _ -> DotNet.test id "tests/FsUnit.NUnit.Test/") -Target.create "xUnit" (fun _ -> - DotNet.test id "tests/FsUnit.Xunit.Test/" -) +Target.create "xUnit" (fun _ -> DotNet.test id "tests/FsUnit.Xunit.Test/") -Target.create "MsTest" (fun _ -> - DotNet.test id "tests/FsUnit.MsTest.Test/" -) +Target.create "MsTest" (fun _ -> DotNet.test id "tests/FsUnit.MsTest.Test/") Target.create "RunTests" ignore @@ -196,29 +177,28 @@ Target.create "RunTests" ignore // Build a NuGet package Target.create "NuGet" (fun _ -> - Paket.pack(fun p -> + Paket.pack (fun p -> { p with ToolType = ToolType.CreateLocalTool() OutputPath = "bin" Version = release.NugetVersion - ReleaseNotes = String.toLines release.Notes}) -) + ReleaseNotes = String.toLines release.Notes })) Target.create "PublishNuget" (fun _ -> - Paket.push(fun p -> + Paket.push (fun p -> { p with ToolType = ToolType.CreateLocalTool() - WorkingDir = "bin" }) -) + WorkingDir = "bin" })) // -------------------------------------------------------------------------------------- // Generate the documentation Target.create "GenerateDocs" (fun _ -> - Shell.cleanDir ".fsdocs" - DotNet.exec id "fsdocs" "build --clean --parameters root https://fsprojects.github.io/FsUnit" |> ignore -) + Shell.cleanDir ".fsdocs" + + DotNet.exec id "fsdocs" "build --clean --parameters root https://fsprojects.github.io/FsUnit" + |> ignore) // -------------------------------------------------------------------------------------- // Release Scripts @@ -231,8 +211,7 @@ Target.create "ReleaseDocs" (fun _ -> Shell.copyRecursive "output" tempDocsDir true |> Trace.tracefn "%A" Staging.stageAll tempDocsDir Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" release.NugetVersion) - Branches.push tempDocsDir -) + Branches.push tempDocsDir) // -------------------------------------------------------------------------------------- // Run all targets by default. Invoke 'build ' to override @@ -241,12 +220,12 @@ Target.create "All" ignore Target.create "Release" ignore "Clean" - ==> "AssemblyInfo" - ==> "CheckFormat" - ==> "Build" - ==> "CopyBinaries" - ==> "RunTests" - ==> "All" +==> "AssemblyInfo" +==> "CheckFormat" +==> "Build" +==> "CopyBinaries" +==> "RunTests" +==> "All" "Build" ==> "NUnit" diff --git a/build.fsx.lock b/build.fsx.lock index 1827a0bf..551b561d 100644 --- a/build.fsx.lock +++ b/build.fsx.lock @@ -5,492 +5,214 @@ NUGET BlackFox.VsWhere (1.1) FSharp.Core (>= 4.2.3) Microsoft.Win32.Registry (>= 4.7) - Fake.Api.GitHub (5.22) + Fake.Api.GitHub (5.23.1) FSharp.Core (>= 6.0) Octokit (>= 0.50) - Fake.Core.CommandLineParsing (5.22) + Fake.Core.CommandLineParsing (5.23.1) FParsec (>= 1.1.1) FSharp.Core (>= 6.0) - Fake.Core.Context (5.22) + Fake.Core.Context (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Environment (5.22) + Fake.Core.Environment (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.FakeVar (5.22) - Fake.Core.Context (>= 5.22) + Fake.Core.FakeVar (5.23.1) + Fake.Core.Context (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Process (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.FakeVar (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) + Fake.Core.Process (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.FakeVar (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) System.Collections.Immutable (>= 5.0) - Fake.Core.ReleaseNotes (5.22) - Fake.Core.SemVer (>= 5.22) - Fake.Core.String (>= 5.22) + Fake.Core.ReleaseNotes (5.23.1) + Fake.Core.SemVer (>= 5.23.1) + Fake.Core.String (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.SemVer (5.22) + Fake.Core.SemVer (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.String (5.22) + Fake.Core.String (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Target (5.22) - Fake.Core.CommandLineParsing (>= 5.22) - Fake.Core.Context (>= 5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.FakeVar (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) + Fake.Core.Target (5.23.1) + Fake.Core.CommandLineParsing (>= 5.23.1) + Fake.Core.Context (>= 5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.FakeVar (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) FSharp.Control.Reactive (>= 5.0.2) FSharp.Core (>= 6.0) - Fake.Core.Tasks (5.22) - Fake.Core.Trace (>= 5.22) + Fake.Core.Tasks (5.23.1) + Fake.Core.Trace (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Trace (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.FakeVar (>= 5.22) + Fake.Core.Trace (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.FakeVar (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Xml (5.22) - Fake.Core.String (>= 5.22) + Fake.Core.Xml (5.23.1) + Fake.Core.String (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.DotNet.AssemblyInfoFile (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) + Fake.DotNet.AssemblyInfoFile (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.DotNet.Cli (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.DotNet.MSBuild (>= 5.22) - Fake.DotNet.NuGet (>= 5.22) - Fake.IO.FileSystem (>= 5.22) + Fake.DotNet.Cli (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.DotNet.MSBuild (>= 5.23.1) + Fake.DotNet.NuGet (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) Mono.Posix.NETStandard (>= 1.0) Newtonsoft.Json (>= 13.0.1) - Fake.DotNet.Fsi (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.DotNet.MSBuild (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - Fake.Tools.Git (>= 5.22) + Fake.DotNet.Fsi (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.DotNet.MSBuild (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) + Fake.Tools.Git (>= 5.23.1) FSharp.Compiler.Service (>= 37.0) FSharp.Core (>= 6.0) - Fake.DotNet.MSBuild (5.22) + Fake.DotNet.MSBuild (5.23.1) BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) MSBuild.StructuredLogger (>= 2.1.545) - Fake.DotNet.NuGet (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.SemVer (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Tasks (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.Core.Xml (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - Fake.Net.Http (>= 5.22) + Fake.DotNet.NuGet (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.SemVer (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Tasks (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.Core.Xml (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) + Fake.Net.Http (>= 5.23.1) FSharp.Core (>= 6.0) Newtonsoft.Json (>= 13.0.1) NuGet.Protocol (>= 5.11) - Fake.DotNet.Paket (5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.DotNet.Cli (>= 5.22) - Fake.IO.FileSystem (>= 5.22) + Fake.DotNet.Paket (5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.DotNet.Cli (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.IO.FileSystem (5.22) - Fake.Core.String (>= 5.22) + Fake.IO.FileSystem (5.23.1) + Fake.Core.String (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Net.Http (5.22) - Fake.Core.Trace (>= 5.22) + Fake.Net.Http (5.23.1) + Fake.Core.Trace (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Tools.Git (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.SemVer (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) + Fake.Tools.Git (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.SemVer (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) FParsec (1.1.1) FSharp.Core (>= 4.3.4) - FSharp.Compiler.Service (41.0.3) - FSharp.Core (6.0.3) - Microsoft.Build.Framework (>= 17.0) - Microsoft.Build.Tasks.Core (>= 17.0) - Microsoft.Build.Utilities.Core (>= 17.0) - System.Buffers (>= 4.5.1) - System.Collections.Immutable (>= 5.0) - System.Diagnostics.Process (>= 4.3) - System.Diagnostics.TraceSource (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.Linq.Queryable (>= 4.3) - System.Memory (>= 4.5.4) - System.Net.Requests (>= 4.3) - System.Net.Security (>= 4.3.1) + FSharp.Compiler.Service (37.0) + FSharp.Core (>= 4.6.2) + Microsoft.Build.Framework (>= 16.6) + Microsoft.Build.Tasks.Core (>= 16.6) + Microsoft.Build.Utilities.Core (>= 16.6) + System.Buffers (>= 4.5) + System.Collections.Immutable (>= 1.5) + System.Memory (>= 4.5.3) System.Reflection.Emit (>= 4.3) - System.Reflection.Metadata (>= 5.0) + System.Reflection.Metadata (>= 1.6) System.Reflection.TypeExtensions (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Loader (>= 4.3) - System.Security.Claims (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Principal (>= 4.3) - System.Threading.Tasks.Parallel (>= 4.3) - System.Threading.Thread (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - FSharp.Control.Reactive (5.0.2) + System.Runtime.Loader (>= 4.0) + FSharp.Control.Reactive (5.0.5) FSharp.Core (>= 4.7.2) - System.Reactive (>= 5.0) - FSharp.Core (6.0.3) - Microsoft.Build (17.1) - Microsoft.Build.Framework (>= 17.1) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Reflection.Metadata (>= 1.6) - System.Security.Principal.Windows (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) - System.Text.Json (>= 6.0) - System.Threading.Tasks.Dataflow (>= 6.0) - Microsoft.Build.Framework (17.1) - Microsoft.Win32.Registry (>= 4.3) - System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (17.1) - Microsoft.Build.Framework (>= 17.1) - Microsoft.Build.Utilities.Core (>= 17.1) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.CodeDom (>= 4.4) - System.Collections.Immutable (>= 5.0) - System.Reflection.Metadata (>= 1.6) - System.Resources.Extensions (>= 4.6) - System.Security.Cryptography.Pkcs (>= 4.7) - System.Security.Cryptography.Xml (>= 4.7) - System.Security.Permissions (>= 4.7) + System.Reactive (>= 5.0 < 6.0) + FSharp.Core (6.0) + Microsoft.Build.Framework (17.5) + Microsoft.Win32.Registry (>= 5.0) + System.Security.Permissions (>= 6.0) + Microsoft.Build.Tasks.Core (17.5) + Microsoft.Build.Framework (>= 17.5) + Microsoft.Build.Utilities.Core (>= 17.5) + Microsoft.NET.StringTools (>= 17.5) + Microsoft.Win32.Registry (>= 5.0) + System.CodeDom (>= 6.0) + System.Collections.Immutable (>= 6.0) + System.Reflection.Metadata (>= 6.0) + System.Resources.Extensions (>= 6.0) + System.Security.Cryptography.Pkcs (>= 6.0.1) + System.Security.Cryptography.Xml (>= 6.0.1) + System.Security.Permissions (>= 6.0) System.Threading.Tasks.Dataflow (>= 6.0) - Microsoft.Build.Utilities.Core (17.1) - Microsoft.Build.Framework (>= 17.1) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) - Microsoft.NET.StringTools (1.0) - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.NETCore.Platforms (6.0.2) + Microsoft.Build.Utilities.Core (17.5) + Microsoft.Build.Framework (>= 17.5) + Microsoft.NET.StringTools (>= 17.5) + Microsoft.Win32.Registry (>= 5.0) + System.Collections.Immutable (>= 6.0) + System.Configuration.ConfigurationManager (>= 6.0) + System.Security.Permissions (>= 6.0) + System.Text.Encoding.CodePages (>= 6.0) + Microsoft.NET.StringTools (17.5) + System.Memory (>= 4.5.5) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + Microsoft.NETCore.Platforms (7.0.2) Microsoft.NETCore.Targets (5.0) - Microsoft.Win32.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) Microsoft.Win32.Registry (5.0) System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (6.0) + Microsoft.Win32.SystemEvents (7.0) Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.1.630) - Microsoft.Build (>= 16.10) + MSBuild.StructuredLogger (2.1.815) Microsoft.Build.Framework (>= 16.10) - Microsoft.Build.Tasks.Core (>= 16.10) Microsoft.Build.Utilities.Core (>= 16.10) - Newtonsoft.Json (13.0.1) - NuGet.Common (6.1) - NuGet.Frameworks (>= 6.1) - NuGet.Configuration (6.1) - NuGet.Common (>= 6.1) + Newtonsoft.Json (13.0.3) + NuGet.Common (6.5) + NuGet.Frameworks (>= 6.5) + NuGet.Configuration (6.5) + NuGet.Common (>= 6.5) System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (6.1) - NuGet.Packaging (6.1) + NuGet.Frameworks (6.5) + NuGet.Packaging (6.5) Newtonsoft.Json (>= 13.0.1) - NuGet.Configuration (>= 6.1) - NuGet.Versioning (>= 6.1) + NuGet.Configuration (>= 6.5) + NuGet.Versioning (>= 6.5) System.Security.Cryptography.Cng (>= 5.0) System.Security.Cryptography.Pkcs (>= 5.0) - NuGet.Protocol (6.1) - NuGet.Packaging (>= 6.1) - NuGet.Versioning (6.1) - Octokit (0.50) - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.native.System (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Net.Http (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Net.Security (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Security.Cryptography.Apple (4.3.1) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) - runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3.1) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + NuGet.Protocol (6.5) + NuGet.Packaging (>= 6.5) + NuGet.Versioning (6.5) + Octokit (5.1) System.Buffers (4.5.1) - System.CodeDom (6.0) - System.Collections (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Collections.Concurrent (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Reflection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Collections.Immutable (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Configuration.ConfigurationManager (6.0) - System.Security.Cryptography.ProtectedData (>= 6.0) - System.Security.Permissions (>= 6.0) - System.Diagnostics.Debug (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Diagnostics.DiagnosticSource (6.0) + System.CodeDom (7.0) + System.Collections.Immutable (7.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Diagnostics.Process (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.Win32.Primitives (>= 4.3) - Microsoft.Win32.Registry (>= 4.3) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Text.Encoding.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Thread (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - System.Diagnostics.TraceSource (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Diagnostics.Tracing (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Drawing.Common (6.0) - Microsoft.Win32.SystemEvents (>= 6.0) - System.Formats.Asn1 (6.0) - System.Globalization (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Globalization.Calendars (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Globalization (>= 4.3) - System.Runtime (>= 4.3) - System.Globalization.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.InteropServices (>= 4.3) + System.Configuration.ConfigurationManager (7.0) + System.Security.Cryptography.ProtectedData (>= 7.0) + System.Security.Permissions (>= 7.0) + System.Drawing.Common (7.0) + Microsoft.Win32.SystemEvents (>= 7.0) + System.Formats.Asn1 (7.0) System.IO (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading.Tasks (>= 4.3) - System.IO.FileSystem (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.IO.FileSystem.Primitives (4.3) - System.Runtime (>= 4.3) - System.Linq (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Linq.Expressions (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Linq (>= 4.3) - System.ObjectModel (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Emit (>= 4.3) - System.Reflection.Emit.ILGeneration (>= 4.3) - System.Reflection.Emit.Lightweight (>= 4.3) - System.Reflection.Extensions (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Reflection.TypeExtensions (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Linq.Queryable (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Linq (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Extensions (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Memory (4.5.4) - System.Net.Http (4.3.4) - Microsoft.NETCore.Platforms (>= 1.1.1) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Http (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.DiagnosticSource (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Extensions (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Security.Cryptography.X509Certificates (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Net.Primitives (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime (>= 4.3.1) - System.Runtime.Handles (>= 4.3) - System.Net.Requests (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Net.Http (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Net.WebHeaderCollection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Net.Security (4.3.2) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.Win32.Primitives (>= 4.3) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Security (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Collections.Concurrent (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Extensions (>= 4.3) - System.IO (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Claims (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Security.Cryptography.X509Certificates (>= 4.3) - System.Security.Principal (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - System.Net.WebHeaderCollection (4.3) - System.Collections (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.ObjectModel (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) + System.Memory (4.5.5) System.Reactive (5.0) System.Reflection (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -499,193 +221,43 @@ NUGET System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) System.Reflection.Emit (4.7) - System.Reflection.Emit.ILGeneration (4.7) - System.Reflection.Emit.Lightweight (4.7) - System.Reflection.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0.1) - System.Collections.Immutable (>= 6.0) + System.Reflection.Metadata (7.0.1) + System.Collections.Immutable (>= 7.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) System.Reflection.TypeExtensions (4.7) - System.Resources.Extensions (6.0) - System.Resources.ResourceManager (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Globalization (>= 4.3) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) + System.Resources.Extensions (7.0) 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.Extensions (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime (>= 4.3.1) - System.Runtime.Handles (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Runtime.InteropServices (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) System.Runtime.Loader (4.3) System.IO (>= 4.3) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Runtime.Numerics (4.3) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) System.Security.AccessControl (6.0) - System.Security.Claims (4.3) - System.Collections (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Security.Principal (>= 4.3) - System.Security.Cryptography.Algorithms (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Numerics (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) System.Security.Cryptography.Cng (5.0) System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Csp (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.IO (>= 4.3) - System.Reflection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Security.Cryptography.Encoding (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - System.Collections (>= 4.3) - System.Collections.Concurrent (>= 4.3) - System.Linq (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (5.0) - System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Pkcs (6.0) - System.Formats.Asn1 (>= 6.0) - System.Security.Cryptography.Primitives (4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Security.Cryptography.ProtectedData (6.0) - System.Security.Cryptography.X509Certificates (4.3.2) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Http (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Calendars (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Numerics (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Cng (>= 4.3) - System.Security.Cryptography.Csp (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Security.Cryptography.Xml (6.0) - System.Security.AccessControl (>= 6.0) - System.Security.Cryptography.Pkcs (>= 6.0) - System.Security.Permissions (6.0) - System.Security.AccessControl (>= 6.0) - System.Windows.Extensions (>= 6.0) - System.Security.Principal (4.3) - System.Runtime (>= 4.3) + System.Security.Cryptography.Pkcs (7.0.1) + System.Formats.Asn1 (>= 7.0) + System.Security.Cryptography.ProtectedData (7.0.1) + System.Security.Cryptography.Xml (7.0.1) + System.Security.Cryptography.Pkcs (>= 7.0) + System.Security.Permissions (7.0) + System.Windows.Extensions (>= 7.0) System.Security.Principal.Windows (5.0) System.Text.Encoding (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Text.Encoding.CodePages (6.0) + System.Text.Encoding.CodePages (7.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encoding.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Text.Encodings.Web (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.2) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Threading (4.3) - System.Runtime (>= 4.3) - System.Threading.Tasks (>= 4.3) System.Threading.Tasks (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Threading.Tasks.Dataflow (6.0) - System.Threading.Tasks.Parallel (4.3) - System.Collections.Concurrent (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Thread (4.3) - System.Runtime (>= 4.3) - System.Threading.ThreadPool (4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Windows.Extensions (6.0) - System.Drawing.Common (>= 6.0) + System.Threading.Tasks.Dataflow (7.0) + System.Windows.Extensions (7.0) + System.Drawing.Common (>= 7.0) diff --git a/paket.lock b/paket.lock index dfd46048..f3628451 100644 --- a/paket.lock +++ b/paket.lock @@ -2,17 +2,17 @@ RESTRICTION: || (== net6.0) (== net7.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json FSharp.Core (6.0.7) - Microsoft.CodeCoverage (17.4.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.NET.Test.Sdk (17.4.1) - Microsoft.CodeCoverage (>= 17.4.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.TestPlatform.TestHost (>= 17.4.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.NETCore.Platforms (7.0) + Microsoft.CodeCoverage (17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.NET.Test.Sdk (17.5) + Microsoft.CodeCoverage (>= 17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.TestHost (>= 17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.NETCore.Platforms (7.0.2) Microsoft.NETCore.Targets (5.0) - Microsoft.TestPlatform.ObjectModel (17.4.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.ObjectModel (17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NuGet.Frameworks (>= 5.11) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.4.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.TestPlatform.ObjectModel (>= 17.4.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.TestHost (17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.ObjectModel (>= 17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) MSTest.TestAdapter (2.1.2) NETStandard.Library (>= 1.6.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) @@ -20,12 +20,12 @@ NUGET MSTest.TestFramework (3.0.2) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NHamcrest (3.1) - NuGet.Frameworks (6.4) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + NuGet.Frameworks (6.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NUnit (3.13.3) NETStandard.Library (>= 2.0) - NUnit3TestAdapter (4.3.1) + NUnit3TestAdapter (4.4.2) runtime.native.System (4.3.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) @@ -86,7 +86,7 @@ NUGET System.IO (>= 4.3) System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (7.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + System.Reflection.Metadata (7.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) System.Collections.Immutable (>= 7.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) diff --git a/src/FsUnit.NUnit/Equality.fs b/src/FsUnit.NUnit/Equality.fs index 0b5dcfdd..de6e0fc4 100644 --- a/src/FsUnit.NUnit/Equality.fs +++ b/src/FsUnit.NUnit/Equality.fs @@ -10,7 +10,7 @@ open NUnit.Framework.Constraints type Equality<'T when 'T: equality> = static member Reference = - Func<'T, 'T, bool>(fun x y -> FastGenericEqualityComparer<'T>.Equals (x, y)) + Func<'T, 'T, bool>(fun x y -> FastGenericEqualityComparer<'T>.Equals(x, y)) static member Structural = Func<'T, 'T, bool>(fun x y -> StructuralComparisons.StructuralEqualityComparer.Equals(x, y)) diff --git a/src/FsUnit.Xunit/CustomMatchers.fs b/src/FsUnit.Xunit/CustomMatchers.fs index e57cb0e0..c971e528 100644 --- a/src/FsUnit.Xunit/CustomMatchers.fs +++ b/src/FsUnit.Xunit/CustomMatchers.fs @@ -177,10 +177,10 @@ let haveSubstring(expected: string) = CustomMatcher(string expected, (fun s -> (string s).Contains expected)) let ofExactType<'a> = - CustomMatcher(typeof<'a>.ToString (), (fun x -> (unbox x).GetType() = typeof<'a>)) + CustomMatcher(typeof<'a>.ToString(), (fun x -> (unbox x).GetType() = typeof<'a>)) let instanceOfType<'a> = - CustomMatcher(typeof<'a>.ToString (), (fun x -> typeof<'a>.IsInstanceOfType (x))) + CustomMatcher(typeof<'a>.ToString(), (fun x -> typeof<'a>.IsInstanceOfType(x))) let contain expected = let matches(actual: obj) = diff --git a/tests/FsUnit.MsTest.Test/beChoice.fs b/tests/FsUnit.MsTest.Test/beChoice.fs index dd44180e..3867bab7 100644 --- a/tests/FsUnit.MsTest.Test/beChoice.fs +++ b/tests/FsUnit.MsTest.Test/beChoice.fs @@ -7,148 +7,148 @@ open FsUnit.MsTest type ``be choice tests``() = [] member _.``Choice1Of2 should be the first choice``() = - Choice.Choice1Of2 (1) |> should be (choice 1) + Choice.Choice1Of2(1) |> should be (choice 1) [] member _.``Choice1Of3 should be the first choice``() = - Choice.Choice1Of3 (1) |> should be (choice 1) + Choice.Choice1Of3(1) |> should be (choice 1) [] member _.``Choice1Of4 should be the first choice``() = - Choice.Choice1Of4 (1) |> should be (choice 1) + Choice.Choice1Of4(1) |> should be (choice 1) [] member _.``Choice1Of5 should be the first choice``() = - Choice.Choice1Of5 (1) |> should be (choice 1) + Choice.Choice1Of5(1) |> should be (choice 1) [] member _.``Choice1Of6 should be the first choice``() = - Choice.Choice1Of6 (1) + Choice.Choice1Of6(1) |> should be (choice 1) [] member _.``Choice1Of7 should be the first choice``() = - Choice.Choice1Of7 (1) + Choice.Choice1Of7(1) |> should be (choice 1) [] member _.``Choice2Of2 should be the second choice``() = - Choice.Choice2Of2 (1) |> should be (choice 2) + Choice.Choice2Of2(1) |> should be (choice 2) [] member _.``Choice2Of3 should be the second choice``() = - Choice.Choice2Of3 (1) |> should be (choice 2) + Choice.Choice2Of3(1) |> should be (choice 2) [] member _.``Choice2Of4 should be the second choice``() = - Choice.Choice2Of4 (1) |> should be (choice 2) + Choice.Choice2Of4(1) |> should be (choice 2) [] member _.``Choice2Of5 should be the second choice``() = - Choice.Choice2Of5 (1) |> should be (choice 2) + Choice.Choice2Of5(1) |> should be (choice 2) [] member _.``Choice2Of6 should be the second choice``() = - Choice.Choice2Of6 (1) + Choice.Choice2Of6(1) |> should be (choice 2) [] member _.``Choice2Of7 should be the second choice``() = - Choice.Choice2Of7 (1) + Choice.Choice2Of7(1) |> should be (choice 2) [] member _.``Choice3Of3 should be the third choice``() = - Choice.Choice3Of3 (1) |> should be (choice 3) + Choice.Choice3Of3(1) |> should be (choice 3) [] member _.``Choice3Of4 should be the third choice``() = - Choice.Choice3Of4 (1) |> should be (choice 3) + Choice.Choice3Of4(1) |> should be (choice 3) [] member _.``Choice3Of5 should be the third choice``() = - Choice.Choice3Of5 (1) |> should be (choice 3) + Choice.Choice3Of5(1) |> should be (choice 3) [] member _.``Choice3Of6 should be the third choice``() = - Choice.Choice3Of6 (1) + Choice.Choice3Of6(1) |> should be (choice 3) [] member _.``Choice3Of7 should be the third choice``() = - Choice.Choice3Of7 (1) + Choice.Choice3Of7(1) |> should be (choice 3) [] member _.``Choice4Of4 should be the fourth choice``() = - Choice.Choice4Of4 (1) |> should be (choice 4) + Choice.Choice4Of4(1) |> should be (choice 4) [] member _.``Choice4Of5 should be the fourth choice``() = - Choice.Choice4Of5 (1) |> should be (choice 4) + Choice.Choice4Of5(1) |> should be (choice 4) [] member _.``Choice4Of6 should be the fourth choice``() = - Choice.Choice4Of6 (1) + Choice.Choice4Of6(1) |> should be (choice 4) [] member _.``Choice4Of7 should be the fourth choice``() = - Choice.Choice4Of7 (1) + Choice.Choice4Of7(1) |> should be (choice 4) [] member _.``Choice5Of5 should be the fifth choice``() = - Choice.Choice5Of5 (1) |> should be (choice 5) + Choice.Choice5Of5(1) |> should be (choice 5) [] member _.``Choice5Of6 should be the fifth choice``() = - Choice.Choice5Of6 (1) + Choice.Choice5Of6(1) |> should be (choice 5) [] member _.``Choice5Of7 should be the fifth choice``() = - Choice.Choice5Of7 (1) + Choice.Choice5Of7(1) |> should be (choice 5) [] member _.``Choice6Of6 should be the sixth choice``() = - Choice.Choice6Of6 (1) + Choice.Choice6Of6(1) |> should be (choice 6) [] member _.``Choice6Of7 should be the sixth choice``() = - Choice.Choice6Of7 (1) + Choice.Choice6Of7(1) |> should be (choice 6) [] member _.``Choice7Of7 should be the seventh choice``() = - Choice.Choice7Of7 (1) + Choice.Choice7Of7(1) |> should be (choice 7) [] member _.``Choice1Of2 should not be the second choice``() = - Choice.Choice1Of2 (1) |> should not' (be choice 2) + Choice.Choice1Of2(1) |> should not' (be choice 2) [] member _.``Choice2Of3 should not be the third choice``() = - Choice.Choice2Of3 (1) |> should not' (be choice 3) + Choice.Choice2Of3(1) |> should not' (be choice 3) [] member _.``Choice3Of4 should not be the fourth choice``() = - Choice.Choice3Of4 (1) |> should not' (be choice 4) + Choice.Choice3Of4(1) |> should not' (be choice 4) [] member _.``Choice4Of5 should not be the fifth choice``() = - Choice.Choice4Of5 (1) + Choice.Choice4Of5(1) |> should not' (be choice 5) [] member _.``Choice5Of6 should not be the fifth choice``() = - Choice.Choice5Of6 (1) + Choice.Choice5Of6(1) |> should not' (be choice 6) [] member _.``Choice6Of7 should not be the seventh choice``() = - Choice.Choice6Of7 (1) + Choice.Choice6Of7(1) |> should not' (be choice 7) diff --git a/tests/FsUnit.Xunit.Test/beChoice.fs b/tests/FsUnit.Xunit.Test/beChoice.fs index 117c422e..e194f3e0 100644 --- a/tests/FsUnit.Xunit.Test/beChoice.fs +++ b/tests/FsUnit.Xunit.Test/beChoice.fs @@ -6,148 +6,148 @@ open FsUnit.Xunit type ``be choice tests``() = [] member _.``Choice1Of2 should be the first choice``() = - Choice.Choice1Of2 (1) |> should be (choice 1) + Choice.Choice1Of2(1) |> should be (choice 1) [] member _.``Choice1Of3 should be the first choice``() = - Choice.Choice1Of3 (1) |> should be (choice 1) + Choice.Choice1Of3(1) |> should be (choice 1) [] member _.``Choice1Of4 should be the first choice``() = - Choice.Choice1Of4 (1) |> should be (choice 1) + Choice.Choice1Of4(1) |> should be (choice 1) [] member _.``Choice1Of5 should be the first choice``() = - Choice.Choice1Of5 (1) |> should be (choice 1) + Choice.Choice1Of5(1) |> should be (choice 1) [] member _.``Choice1Of6 should be the first choice``() = - Choice.Choice1Of6 (1) + Choice.Choice1Of6(1) |> should be (choice 1) [] member _.``Choice1Of7 should be the first choice``() = - Choice.Choice1Of7 (1) + Choice.Choice1Of7(1) |> should be (choice 1) [] member _.``Choice2Of2 should be the second choice``() = - Choice.Choice2Of2 (1) |> should be (choice 2) + Choice.Choice2Of2(1) |> should be (choice 2) [] member _.``Choice2Of3 should be the second choice``() = - Choice.Choice2Of3 (1) |> should be (choice 2) + Choice.Choice2Of3(1) |> should be (choice 2) [] member _.``Choice2Of4 should be the second choice``() = - Choice.Choice2Of4 (1) |> should be (choice 2) + Choice.Choice2Of4(1) |> should be (choice 2) [] member _.``Choice2Of5 should be the second choice``() = - Choice.Choice2Of5 (1) |> should be (choice 2) + Choice.Choice2Of5(1) |> should be (choice 2) [] member _.``Choice2Of6 should be the second choice``() = - Choice.Choice2Of6 (1) + Choice.Choice2Of6(1) |> should be (choice 2) [] member _.``Choice2Of7 should be the second choice``() = - Choice.Choice2Of7 (1) + Choice.Choice2Of7(1) |> should be (choice 2) [] member _.``Choice3Of3 should be the third choice``() = - Choice.Choice3Of3 (1) |> should be (choice 3) + Choice.Choice3Of3(1) |> should be (choice 3) [] member _.``Choice3Of4 should be the third choice``() = - Choice.Choice3Of4 (1) |> should be (choice 3) + Choice.Choice3Of4(1) |> should be (choice 3) [] member _.``Choice3Of5 should be the third choice``() = - Choice.Choice3Of5 (1) |> should be (choice 3) + Choice.Choice3Of5(1) |> should be (choice 3) [] member _.``Choice3Of6 should be the third choice``() = - Choice.Choice3Of6 (1) + Choice.Choice3Of6(1) |> should be (choice 3) [] member _.``Choice3Of7 should be the third choice``() = - Choice.Choice3Of7 (1) + Choice.Choice3Of7(1) |> should be (choice 3) [] member _.``Choice4Of4 should be the fourth choice``() = - Choice.Choice4Of4 (1) |> should be (choice 4) + Choice.Choice4Of4(1) |> should be (choice 4) [] member _.``Choice4Of5 should be the fourth choice``() = - Choice.Choice4Of5 (1) |> should be (choice 4) + Choice.Choice4Of5(1) |> should be (choice 4) [] member _.``Choice4Of6 should be the fourth choice``() = - Choice.Choice4Of6 (1) + Choice.Choice4Of6(1) |> should be (choice 4) [] member _.``Choice4Of7 should be the fourth choice``() = - Choice.Choice4Of7 (1) + Choice.Choice4Of7(1) |> should be (choice 4) [] member _.``Choice5Of5 should be the fifth choice``() = - Choice.Choice5Of5 (1) |> should be (choice 5) + Choice.Choice5Of5(1) |> should be (choice 5) [] member _.``Choice5Of6 should be the fifth choice``() = - Choice.Choice5Of6 (1) + Choice.Choice5Of6(1) |> should be (choice 5) [] member _.``Choice5Of7 should be the fifth choice``() = - Choice.Choice5Of7 (1) + Choice.Choice5Of7(1) |> should be (choice 5) [] member _.``Choice6Of6 should be the sixth choice``() = - Choice.Choice6Of6 (1) + Choice.Choice6Of6(1) |> should be (choice 6) [] member _.``Choice6Of7 should be the sixth choice``() = - Choice.Choice6Of7 (1) + Choice.Choice6Of7(1) |> should be (choice 6) [] member _.``Choice7Of7 should be the seventh choice``() = - Choice.Choice7Of7 (1) + Choice.Choice7Of7(1) |> should be (choice 7) [] member _.``Choice1Of2 should not be the second choice``() = - Choice.Choice1Of2 (1) |> should not' (be choice 2) + Choice.Choice1Of2(1) |> should not' (be choice 2) [] member _.``Choice2Of3 should not be the third choice``() = - Choice.Choice2Of3 (1) |> should not' (be choice 3) + Choice.Choice2Of3(1) |> should not' (be choice 3) [] member _.``Choice3Of4 should not be the fourth choice``() = - Choice.Choice3Of4 (1) |> should not' (be choice 4) + Choice.Choice3Of4(1) |> should not' (be choice 4) [] member _.``Choice4Of5 should not be the fifth choice``() = - Choice.Choice4Of5 (1) + Choice.Choice4Of5(1) |> should not' (be choice 5) [] member _.``Choice5Of6 should not be the fifth choice``() = - Choice.Choice5Of6 (1) + Choice.Choice5Of6(1) |> should not' (be choice 6) [] member _.``Choice6Of7 should not be the seventh choice``() = - Choice.Choice6Of7 (1) + Choice.Choice6Of7(1) |> should not' (be choice 7) From a073860e558447f3e6df68c743c6451866b649ca Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Fri, 28 Apr 2023 22:57:46 +0200 Subject: [PATCH 2/8] Downgrade to dotnet 6. --- build.fsx | 3 +-- global.json | 2 +- paket.dependencies | 2 +- src/FsUnit.MsTestUnit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj | 2 +- src/FsUnit.NUnit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.NUnit/FsUnit.NUnit.fsproj | 2 +- src/FsUnit.Xunit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.Xunit/FsUnit.Xunit.fsproj | 2 +- tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj | 2 +- tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj | 4 ++-- tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj | 2 +- 12 files changed, 22 insertions(+), 23 deletions(-) diff --git a/build.fsx b/build.fsx index 0e160775..6cbf8c6b 100644 --- a/build.fsx +++ b/build.fsx @@ -1,7 +1,6 @@ #r @"paket: source https://api.nuget.org/v3/index.json framework: net6.0 -storage: none nuget FSharp.Core 6.0.0.0 nuget Fake.Core.Target nuget Fake.Core.Trace @@ -160,7 +159,7 @@ Target.create "Build" (fun _ -> let result = DotNet.exec id "build" "FsUnit.sln -c Release" if not result.OK then - failwithf "Build failed: %A" result.Errors + failwithf "Build failed: %A" result.Errors) // -------------------------------------------------------------------------------------- // Run the unit tests using test runner diff --git a/global.json b/global.json index 6192157a..eb6b3192 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.101", + "version": "6.0.408", "rollForward": "minor" } } \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index f1a3a9f1..89367e26 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,5 @@ source https://api.nuget.org/v3/index.json -framework: net6.0, net7.0, netstandard2.0 +framework: net6.0, netstandard2.0 nuget FSharp.Core ~> 6.0.0 diff --git a/src/FsUnit.MsTestUnit/AssemblyInfo.fs b/src/FsUnit.MsTestUnit/AssemblyInfo.fs index 74c57232..4db08adb 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.2.0" - let [] AssemblyFileVersion = "5.2.0" + let [] AssemblyVersion = "1.3.0.1" + let [] AssemblyFileVersion = "1.3.0.1" diff --git a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj index fda61494..aad23efb 100644 --- a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj +++ b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj @@ -1,6 +1,6 @@  - net6.0;net7.0;netstandard2.0 + net6.0;netstandard2.0 FsUnit.MsTest false diff --git a/src/FsUnit.NUnit/AssemblyInfo.fs b/src/FsUnit.NUnit/AssemblyInfo.fs index 9eb97837..e651c04c 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.2.0" - let [] AssemblyFileVersion = "5.2.0" + let [] AssemblyVersion = "1.3.0.1" + let [] AssemblyFileVersion = "1.3.0.1" diff --git a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj index 3df9bf53..da3689f8 100644 --- a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj +++ b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj @@ -1,6 +1,6 @@  - net6.0;net7.0;netstandard2.0 + net6.0;netstandard2.0 FsUnit.NUnit false true diff --git a/src/FsUnit.Xunit/AssemblyInfo.fs b/src/FsUnit.Xunit/AssemblyInfo.fs index bf50dc6d..27b3d440 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.2.0" - let [] AssemblyFileVersion = "5.2.0" + let [] AssemblyVersion = "1.3.0.1" + let [] AssemblyFileVersion = "1.3.0.1" diff --git a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj index d3d166c0..ba6afd45 100644 --- a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj +++ b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj @@ -1,6 +1,6 @@  - net6.0;net7.0;netstandard2.0 + net6.0;netstandard2.0 FsUnit.Xunit false diff --git a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj index c0db8367..8e64e038 100644 --- a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj +++ b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 true diff --git a/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj b/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj index 85b099e2..12b1ebba 100644 --- a/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj +++ b/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj @@ -1,6 +1,6 @@ - + - net7.0 + net6.0 false diff --git a/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj b/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj index 37888429..56cbbc28 100644 --- a/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj +++ b/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj @@ -1,6 +1,6 @@  - net7.0 + net6.0 From c9a180b93ebc465937c71a20839dcca476253737 Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Sun, 30 Apr 2023 22:30:07 +0200 Subject: [PATCH 3/8] Replace DotNet.test with DotNet.exec. --- .github/workflows/main.yml | 2 +- build.fsx | 18 +++++++++++++++--- global.json | 2 +- paket.dependencies | 2 +- src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj | 2 +- src/FsUnit.NUnit/FsUnit.NUnit.fsproj | 2 +- src/FsUnit.Xunit/FsUnit.Xunit.fsproj | 2 +- .../FsUnit.MsTest.Test.fsproj | 2 +- .../FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj | 2 +- .../FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj | 2 +- 10 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ee4dbfe..ef995561 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, macOS-latest, ubuntu-latest] - dotnet: [7.0.101] + dotnet: [7.0.203] runs-on: ${{ matrix.os }} steps: diff --git a/build.fsx b/build.fsx index 6cbf8c6b..9e08211a 100644 --- a/build.fsx +++ b/build.fsx @@ -164,11 +164,23 @@ Target.create "Build" (fun _ -> // -------------------------------------------------------------------------------------- // Run the unit tests using test runner -Target.create "NUnit" (fun _ -> DotNet.test id "tests/FsUnit.NUnit.Test/") +Target.create "NUnit" (fun _ -> + let result = DotNet.exec id "test" "tests/FsUnit.NUnit.Test/" -Target.create "xUnit" (fun _ -> DotNet.test id "tests/FsUnit.Xunit.Test/") + if not result.OK then + failwithf "NUnit test failed: %A" result.Errors) + +Target.create "xUnit" (fun _ -> + let result = DotNet.exec id "test" "tests/FsUnit.Xunit.Test/" + + if not result.OK then + failwithf "xUnit test failed: %A" result.Errors) + +Target.create "MsTest" (fun _ -> + let result = DotNet.exec id "test" "tests/FsUnit.MsTest.Test/" -Target.create "MsTest" (fun _ -> DotNet.test id "tests/FsUnit.MsTest.Test/") + if not result.OK then + failwithf "MsTest test failed: %A" result.Errors) Target.create "RunTests" ignore diff --git a/global.json b/global.json index eb6b3192..02be357d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.408", + "version": "7.0.203", "rollForward": "minor" } } \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 89367e26..f1a3a9f1 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,5 @@ source https://api.nuget.org/v3/index.json -framework: net6.0, netstandard2.0 +framework: net6.0, net7.0, netstandard2.0 nuget FSharp.Core ~> 6.0.0 diff --git a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj index aad23efb..fda61494 100644 --- a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj +++ b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + net6.0;net7.0;netstandard2.0 FsUnit.MsTest false diff --git a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj index da3689f8..3df9bf53 100644 --- a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj +++ b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + net6.0;net7.0;netstandard2.0 FsUnit.NUnit false true diff --git a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj index ba6afd45..d3d166c0 100644 --- a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj +++ b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj @@ -1,6 +1,6 @@  - net6.0;netstandard2.0 + net6.0;net7.0;netstandard2.0 FsUnit.Xunit false diff --git a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj index 8e64e038..c0db8367 100644 --- a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj +++ b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 true diff --git a/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj b/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj index 12b1ebba..5779f06d 100644 --- a/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj +++ b/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj @@ -1,6 +1,6 @@  - net6.0 + net7.0 false diff --git a/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj b/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj index 56cbbc28..37888429 100644 --- a/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj +++ b/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj @@ -1,6 +1,6 @@  - net6.0 + net7.0 From 7cb412ceb6a64a35589070ae50b2443dd4e3ffab Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Sun, 30 Apr 2023 22:39:21 +0200 Subject: [PATCH 4/8] Try with net6.0 again. --- .github/workflows/main.yml | 2 +- global.json | 2 +- paket.dependencies | 2 +- paket.lock | 54 +++++++++---------- src/FsUnit.MsTestUnit/AssemblyInfo.fs | 8 +-- src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj | 2 +- src/FsUnit.NUnit/AssemblyInfo.fs | 8 +-- src/FsUnit.NUnit/FsUnit.NUnit.fsproj | 2 +- src/FsUnit.Xunit/AssemblyInfo.fs | 8 +-- src/FsUnit.Xunit/FsUnit.Xunit.fsproj | 2 +- .../FsUnit.MsTest.Test.fsproj | 2 +- .../FsUnit.NUnit.Test.fsproj | 2 +- .../FsUnit.Xunit.Test.fsproj | 2 +- 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef995561..a0c50084 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, macOS-latest, ubuntu-latest] - dotnet: [7.0.203] + dotnet: [6.0.408] runs-on: ${{ matrix.os }} steps: diff --git a/global.json b/global.json index 02be357d..eb6b3192 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.203", + "version": "6.0.408", "rollForward": "minor" } } \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index f1a3a9f1..89367e26 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,5 @@ source https://api.nuget.org/v3/index.json -framework: net6.0, net7.0, netstandard2.0 +framework: net6.0, netstandard2.0 nuget FSharp.Core ~> 6.0.0 diff --git a/paket.lock b/paket.lock index f3628451..9f0b9a5f 100644 --- a/paket.lock +++ b/paket.lock @@ -1,42 +1,42 @@ -RESTRICTION: || (== net6.0) (== net7.0) (== netstandard2.0) +RESTRICTION: || (== net6.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json FSharp.Core (6.0.7) - Microsoft.CodeCoverage (17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.CodeCoverage (17.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) Microsoft.NET.Test.Sdk (17.5) - Microsoft.CodeCoverage (>= 17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.TestPlatform.TestHost (>= 17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.CodeCoverage (>= 17.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.TestHost (>= 17.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) Microsoft.NETCore.Platforms (7.0.2) Microsoft.NETCore.Targets (5.0) - Microsoft.TestPlatform.ObjectModel (17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.ObjectModel (17.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NuGet.Frameworks (>= 5.11) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.TestPlatform.ObjectModel (>= 17.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.TestHost (17.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.TestPlatform.ObjectModel (>= 17.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) MSTest.TestAdapter (2.1.2) - NETStandard.Library (>= 1.6.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - System.Diagnostics.TextWriterTraceListener (>= 4.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + 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 (3.0.2) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NHamcrest (3.1) - NuGet.Frameworks (6.5) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + NuGet.Frameworks (6.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NUnit (3.13.3) NETStandard.Library (>= 2.0) NUnit3TestAdapter (4.4.2) - runtime.native.System (4.3.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + 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.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0) (>= xamarinios)) (&& (== net7.0) (< net6.0) (>= xamarinmac)) (&& (== net7.0) (< net6.0) (>= xamarintvos)) (&& (== net7.0) (< net6.0) (>= xamarinwatchos)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (== netstandard2.0) - System.Collections (4.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== 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 (7.0) - System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Collections.NonGeneric (4.3) System.Diagnostics.Debug (>= 4.3) System.Globalization (>= 4.3) @@ -48,14 +48,14 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Diagnostics.TextWriterTraceListener (4.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + System.Diagnostics.TextWriterTraceListener (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) System.Diagnostics.TraceSource (>= 4.3) System.Globalization (>= 4.3) System.IO (>= 4.3) System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Threading (>= 4.3) - System.Diagnostics.TraceSource (4.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + 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) @@ -75,18 +75,18 @@ NUGET System.Runtime (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading.Tasks (>= 4.3) - System.Memory (4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== 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)) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== net7.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)) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= uap10.1)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< netcoreapp2.0)) (== netstandard2.0) + 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.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 (7.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + System.Reflection.Metadata (7.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) System.Collections.Immutable (>= 7.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -101,12 +101,12 @@ NUGET System.Runtime (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (6.0) System.Runtime.Extensions (4.3.1) 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) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + 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/AssemblyInfo.fs b/src/FsUnit.MsTestUnit/AssemblyInfo.fs index 4db08adb..74c57232 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 = "1.3.0.1" - let [] AssemblyFileVersion = "1.3.0.1" + let [] AssemblyVersion = "5.2.0" + let [] AssemblyFileVersion = "5.2.0" diff --git a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj index fda61494..aad23efb 100644 --- a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj +++ b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj @@ -1,6 +1,6 @@  - net6.0;net7.0;netstandard2.0 + net6.0;netstandard2.0 FsUnit.MsTest false diff --git a/src/FsUnit.NUnit/AssemblyInfo.fs b/src/FsUnit.NUnit/AssemblyInfo.fs index e651c04c..9eb97837 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 = "1.3.0.1" - let [] AssemblyFileVersion = "1.3.0.1" + let [] AssemblyVersion = "5.2.0" + let [] AssemblyFileVersion = "5.2.0" diff --git a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj index 3df9bf53..da3689f8 100644 --- a/src/FsUnit.NUnit/FsUnit.NUnit.fsproj +++ b/src/FsUnit.NUnit/FsUnit.NUnit.fsproj @@ -1,6 +1,6 @@  - net6.0;net7.0;netstandard2.0 + net6.0;netstandard2.0 FsUnit.NUnit false true diff --git a/src/FsUnit.Xunit/AssemblyInfo.fs b/src/FsUnit.Xunit/AssemblyInfo.fs index 27b3d440..bf50dc6d 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 = "1.3.0.1" - let [] AssemblyFileVersion = "1.3.0.1" + let [] AssemblyVersion = "5.2.0" + let [] AssemblyFileVersion = "5.2.0" diff --git a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj index d3d166c0..ba6afd45 100644 --- a/src/FsUnit.Xunit/FsUnit.Xunit.fsproj +++ b/src/FsUnit.Xunit/FsUnit.Xunit.fsproj @@ -1,6 +1,6 @@  - net6.0;net7.0;netstandard2.0 + net6.0;netstandard2.0 FsUnit.Xunit false diff --git a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj index c0db8367..8e64e038 100644 --- a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj +++ b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 true diff --git a/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj b/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj index 5779f06d..12b1ebba 100644 --- a/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj +++ b/tests/FsUnit.NUnit.Test/FsUnit.NUnit.Test.fsproj @@ -1,6 +1,6 @@  - net7.0 + net6.0 false diff --git a/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj b/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj index 37888429..56cbbc28 100644 --- a/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj +++ b/tests/FsUnit.Xunit.Test/FsUnit.Xunit.Test.fsproj @@ -1,6 +1,6 @@  - net7.0 + net6.0 From 0fc4d496703fbdc53774e4f5cb756c838461b37e Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Sun, 30 Apr 2023 23:36:21 +0200 Subject: [PATCH 5/8] Remove net7.0 from paket.template's. --- RELEASE_NOTES.md | 4 ++++ build.fsx | 16 ++++++++-------- src/FsUnit.MsTestUnit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.MsTestUnit/paket.template | 1 - src/FsUnit.NUnit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.NUnit/paket.template | 1 - src/FsUnit.Xunit/AssemblyInfo.fs | 8 ++++---- src/FsUnit.Xunit/paket.template | 1 - 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a94e141e..43040f0d 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ +### 5.3.0.0 - May 1, 2023 +- Remove .NET7 as framework because of incompatibilities. +- Update dependencies. + ### 5.2.0 - Jan 13, 2023 - Align should & throw in xUnit and MsTest. -> (https://github.com/fsprojects/FsUnit/pull/226) - Add .NET7 as TargetFramework. diff --git a/build.fsx b/build.fsx index 9e08211a..00ac6aea 100644 --- a/build.fsx +++ b/build.fsx @@ -6,7 +6,7 @@ nuget Fake.Core.Target nuget Fake.Core.Trace nuget Fake.Core.ReleaseNotes nuget Fake.IO.FileSystem -nuget Fake.DotNet.Cli +nuget Fake.DotNet.Cli nuget Fake.DotNet.MSBuild nuget Fake.DotNet.AssemblyInfoFile nuget Fake.DotNet.Paket @@ -164,7 +164,7 @@ Target.create "Build" (fun _ -> // -------------------------------------------------------------------------------------- // Run the unit tests using test runner -Target.create "NUnit" (fun _ -> +Target.create "NUnit" (fun _ -> let result = DotNet.exec id "test" "tests/FsUnit.NUnit.Test/" if not result.OK then @@ -231,12 +231,12 @@ Target.create "All" ignore Target.create "Release" ignore "Clean" -==> "AssemblyInfo" -==> "CheckFormat" -==> "Build" -==> "CopyBinaries" -==> "RunTests" -==> "All" + ==> "AssemblyInfo" + ==> "CheckFormat" + ==> "Build" + ==> "CopyBinaries" + ==> "RunTests" + ==> "All" "Build" ==> "NUnit" diff --git a/src/FsUnit.MsTestUnit/AssemblyInfo.fs b/src/FsUnit.MsTestUnit/AssemblyInfo.fs index 74c57232..8df301eb 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.2.0" - let [] AssemblyFileVersion = "5.2.0" + let [] AssemblyVersion = "5.3.0.0" + let [] AssemblyFileVersion = "5.3.0.0" diff --git a/src/FsUnit.MsTestUnit/paket.template b/src/FsUnit.MsTestUnit/paket.template index 3225c1e2..ac988256 100644 --- a/src/FsUnit.MsTestUnit/paket.template +++ b/src/FsUnit.MsTestUnit/paket.template @@ -23,7 +23,6 @@ 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/net7.0/FsUnit.* ==> lib/net7.0 ../../bin/FsUnit.MsTest/netstandard2.0/FsUnit.* ==> lib/netstandard2.0 ../../src/install.ps1 ==> tools diff --git a/src/FsUnit.NUnit/AssemblyInfo.fs b/src/FsUnit.NUnit/AssemblyInfo.fs index 9eb97837..7024fdd0 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.2.0" - let [] AssemblyFileVersion = "5.2.0" + let [] AssemblyVersion = "5.3.0.0" + let [] AssemblyFileVersion = "5.3.0.0" diff --git a/src/FsUnit.NUnit/paket.template b/src/FsUnit.NUnit/paket.template index 59e2d801..090338a3 100644 --- a/src/FsUnit.NUnit/paket.template +++ b/src/FsUnit.NUnit/paket.template @@ -23,7 +23,6 @@ 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/net7.0/FsUnit.* ==> lib/net7.0 ../../bin/FsUnit.NUnit/netstandard2.0/FsUnit.* ==> lib/netstandard2.0 ../../src/install.ps1 ==> tools diff --git a/src/FsUnit.Xunit/AssemblyInfo.fs b/src/FsUnit.Xunit/AssemblyInfo.fs index bf50dc6d..1f242f90 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.2.0" - let [] AssemblyFileVersion = "5.2.0" + let [] AssemblyVersion = "5.3.0.0" + let [] AssemblyFileVersion = "5.3.0.0" diff --git a/src/FsUnit.Xunit/paket.template b/src/FsUnit.Xunit/paket.template index 809e1d13..83e1f1e1 100644 --- a/src/FsUnit.Xunit/paket.template +++ b/src/FsUnit.Xunit/paket.template @@ -23,7 +23,6 @@ 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/net7.0/FsUnit.* ==> lib/net7.0 ../../bin/FsUnit.Xunit/netstandard2.0/FsUnit.* ==> lib/netstandard2.0 ../../src/install.ps1 ==> tools From f15708d7f9d9b95d931298e597cd9920778c7dd1 Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Fri, 5 May 2023 21:14:35 +0200 Subject: [PATCH 6/8] Update fantomas to 6.0.2. --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2d464818..e242982e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "fantomas": { - "version": "6.0.1", + "version": "6.0.2", "commands": [ "fantomas" ] From 1f19db5658d4b86a7903524dfd7236ad6367474b Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Sat, 6 May 2023 08:19:11 +0200 Subject: [PATCH 7/8] Update release date. --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 43040f0d..1883ccb0 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -### 5.3.0.0 - May 1, 2023 +### 5.3.0.0 - May 6, 2023 - Remove .NET7 as framework because of incompatibilities. - Update dependencies. From e22b9eb8ef85f48b8ef7f72e76fcf21d4526c83c Mon Sep 17 00:00:00 2001 From: Constantin Tews Date: Sat, 6 May 2023 08:26:05 +0200 Subject: [PATCH 8/8] Fix NugetVersion. --- build.fsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.fsx b/build.fsx index 00ac6aea..9ced32e0 100644 --- a/build.fsx +++ b/build.fsx @@ -192,7 +192,7 @@ Target.create "NuGet" (fun _ -> { p with ToolType = ToolType.CreateLocalTool() OutputPath = "bin" - Version = release.NugetVersion + Version = release.AssemblyVersion ReleaseNotes = String.toLines release.Notes })) Target.create "PublishNuget" (fun _ ->