diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ae0d37afa..46c017dca 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "fake-cli": { - "version": "6.0.0", + "version": "6.1.3", "commands": [ "fake" ] }, "paket": { - "version": "7.2.1", + "version": "8.0.3", "commands": [ "paket" ] diff --git a/build.fsx b/build.fsx index 32aabfcd4..de91afe73 100644 --- a/build.fsx +++ b/build.fsx @@ -1,8 +1,34 @@ // -------------------------------------------------------------------------------------- // FAKE build script // -------------------------------------------------------------------------------------- +#if FAKE #r "paket: groupref build //" #load ".fake/build.fsx/intellisense.fsx" +#else +#r "nuget: MSBuild.StructuredLogger" +#r "nuget: Fake.Core" +#r "nuget: Fake.Core.Target" +#r "nuget: Fake.Core.Process" +#r "nuget: Fake.DotNet.Cli" +#r "nuget: Fake.Core.ReleaseNotes" +#r "nuget: Fake.DotNet.AssemblyInfoFile" +#r "nuget: Fake.DotNet.Paket" +#r "nuget: Fake.Tools.Git" +#r "nuget: Fake.Core.Environment" +#r "nuget: Fake.Core.UserInput" +#r "nuget: Fake.IO.FileSystem" +#r "nuget: Fake.DotNet.MsBuild" +#r "nuget: Fake.Api.GitHub" +// Boilerplate +System.Environment.GetCommandLineArgs() +|> Array.skip 2 // skip fsi.exe; build.fsx +|> Array.toList +|> Fake.Core.Context.FakeExecutionContext.Create false __SOURCE_FILE__ +|> Fake.Core.Context.RuntimeContext.Fake +|> Fake.Core.Context.setExecutionContext + +#endif + open Fake.Core open Fake.DotNet diff --git a/paket.dependencies b/paket.dependencies index 55a3eab40..8f795342f 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -23,10 +23,10 @@ nuget Microsoft.Build.Locator # don't expose as a package reference nuget Microsoft.SourceLink.GitHub copy_local: true # don't copy runtime assets -nuget Microsoft.Build.Framework == 17.2.0 copy_local: false +nuget Microsoft.Build.Framework copy_local: false nuget Microsoft.Build.Tasks.Core copy_local: false -nuget Microsoft.Build.Utilities.Core == 17.2.0 copy_local: false -nuget Microsoft.Build == 17.2.0 copy_local: false +nuget Microsoft.Build.Utilities.Core copy_local: false +nuget Microsoft.Build copy_local: false group Docs source https://api.nuget.org/v3/index.json @@ -47,8 +47,8 @@ group Build strategy: min nuget System.Reactive ~> 5 - nuget MSBuild.StructuredLogger == 2.1.815 - nuget FSharp.Core ~> 5.0 + nuget MSBuild.StructuredLogger + nuget FSharp.Core nuget Fake.Core.Target nuget Fake.Core.Process nuget Fake.DotNet.Cli diff --git a/paket.lock b/paket.lock index 177bf2fb8..4018cdda3 100644 --- a/paket.lock +++ b/paket.lock @@ -703,123 +703,124 @@ NUGET BlackFox.VsWhere (1.1) FSharp.Core (>= 4.2.3) Microsoft.Win32.Registry (>= 4.7) - Fake.Api.GitHub (5.20.4) - FSharp.Core (>= 4.7.2) - Octokit (>= 0.48) - Fake.Core.CommandLineParsing (5.20.4) + Fake.Api.GitHub (6.1.3) + FSharp.Core (>= 8.0.301) + Octokit (>= 13.0.1) + Fake.Core.CommandLineParsing (6.1.3) FParsec (>= 1.1.1) - FSharp.Core (>= 4.7.2) - Fake.Core.Context (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Environment (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.FakeVar (5.20.4) - Fake.Core.Context (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Process (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.FakeVar (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - System.Collections.Immutable (>= 1.7.1) - Fake.Core.ReleaseNotes (5.20.4) - Fake.Core.SemVer (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.SemVer (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.String (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Target (5.20.4) - Fake.Core.CommandLineParsing (>= 5.20.4) - Fake.Core.Context (>= 5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.FakeVar (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - FSharp.Control.Reactive (>= 4.4.2) - FSharp.Core (>= 4.7.2) - Fake.Core.Tasks (5.20.4) - Fake.Core.Trace (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Trace (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.FakeVar (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.UserInput (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Xml (5.20.4) - Fake.Core.String (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.DotNet.AssemblyInfoFile (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.DotNet.Cli (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.DotNet.MSBuild (>= 5.20.4) - Fake.DotNet.NuGet (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) + FSharp.Core (>= 8.0.301) + Fake.Core.Context (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Environment (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.FakeVar (6.1.3) + Fake.Core.Context (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Process (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + System.Collections.Immutable (>= 8.0) + Fake.Core.ReleaseNotes (6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.SemVer (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.String (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Target (6.1.3) + Fake.Core.CommandLineParsing (>= 6.1.3) + Fake.Core.Context (>= 6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Control.Reactive (>= 5.0.2) + FSharp.Core (>= 8.0.301) + Fake.Core.Tasks (6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Trace (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.UserInput (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Xml (6.1.3) + Fake.Core.String (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.DotNet.AssemblyInfoFile (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.DotNet.Cli (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.DotNet.MSBuild (>= 6.1.3) + Fake.DotNet.NuGet (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) Mono.Posix.NETStandard (>= 1.0) - Newtonsoft.Json (>= 12.0.3) - Fake.DotNet.MSBuild (5.20.4) + Newtonsoft.Json (>= 13.0.3) + Fake.DotNet.MSBuild (6.1.3) BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - MSBuild.StructuredLogger (>= 2.1.176) - Fake.DotNet.NuGet (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.SemVer (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Tasks (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.Core.Xml (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - Fake.Net.Http (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Newtonsoft.Json (>= 12.0.3) - NuGet.Protocol (>= 5.6) - Fake.DotNet.Paket (5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.DotNet.Cli (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.IO.FileSystem (5.20.4) - Fake.Core.String (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Net.Http (5.20.4) - Fake.Core.Trace (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Tools.Git (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.SemVer (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + MSBuild.StructuredLogger (>= 2.1.815) + Fake.DotNet.NuGet (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Tasks (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.Core.Xml (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + Fake.Net.Http (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Newtonsoft.Json (>= 13.0.3) + NuGet.Protocol (>= 6.10.1) + Fake.DotNet.Paket (6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.DotNet.Cli (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.IO.FileSystem (6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Net.Http (6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Tools.Git (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) FParsec (1.1.1) FSharp.Core (>= 4.3.4) - FSharp.Control.Reactive (4.4.2) + FSharp.Control.Reactive (5.0.2) FSharp.Core (>= 4.7.2) - System.Reactive (>= 4.4.1) - FSharp.Core (5.0.2) + System.Reactive (>= 5.0) + FSharp.Core (8.0.400) Microsoft.Build.Framework (16.10) System.Security.Permissions (>= 4.7) Microsoft.Build.Utilities.Core (16.10) @@ -844,53 +845,35 @@ NUGET MSBuild.StructuredLogger (2.1.815) Microsoft.Build.Framework (>= 16.10) Microsoft.Build.Utilities.Core (>= 16.10) - Newtonsoft.Json (12.0.3) - NuGet.Common (5.8.1) - NuGet.Frameworks (>= 5.8.1) - NuGet.Configuration (5.6) - NuGet.Common (>= 5.6) - System.Security.Cryptography.ProtectedData (>= 4.3) - NuGet.Frameworks (5.8.1) - NuGet.Packaging (5.6) - Newtonsoft.Json (>= 9.0.1) - NuGet.Configuration (>= 5.6) - NuGet.Versioning (>= 5.6) - System.Dynamic.Runtime (>= 4.3) - NuGet.Protocol (5.6) - NuGet.Packaging (>= 5.6) - System.Dynamic.Runtime (>= 4.3) - NuGet.Versioning (5.6) - Octokit (0.48) + Newtonsoft.Json (13.0.3) + NuGet.Common (6.10.1) + NuGet.Frameworks (>= 6.10.1) + NuGet.Configuration (6.10.1) + NuGet.Common (>= 6.10.1) + System.Security.Cryptography.ProtectedData (>= 4.4) + NuGet.Frameworks (6.10.1) + NuGet.Packaging (6.10.1) + Newtonsoft.Json (>= 13.0.3) + NuGet.Configuration (>= 6.10.1) + NuGet.Versioning (>= 6.10.1) + System.Security.Cryptography.Pkcs (>= 6.0.4) + NuGet.Protocol (6.10.1) + NuGet.Packaging (>= 6.10.1) + NuGet.Versioning (6.10.1) + Octokit (13.0.1) System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Collections.Immutable (5.0) + System.Collections.Immutable (8.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Configuration.ConfigurationManager (4.7) System.Security.Cryptography.ProtectedData (>= 4.7) System.Security.Permissions (>= 4.7) - System.Diagnostics.Debug (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Drawing.Common (4.7) Microsoft.NETCore.Platforms (>= 3.1) Microsoft.Win32.SystemEvents (>= 4.7) - System.Dynamic.Runtime (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Linq (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.ObjectModel (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Emit (>= 4.3) - System.Reflection.Emit.ILGeneration (>= 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.Formats.Asn1 (6.0) System.Globalization (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -901,37 +884,7 @@ NUGET System.Runtime (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading.Tasks (>= 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.Memory (4.5.4) - 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.Reactive (5.0) System.Reflection (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -939,33 +892,10 @@ NUGET System.IO (>= 4.3) System.Reflection.Primitives (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Emit (4.3) - System.IO (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Emit.ILGeneration (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Reflection.Emit.ILGeneration (4.3) - System.Reflection (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Reflection.Emit.Lightweight (4.3) - System.Reflection (>= 4.3) - System.Reflection.Emit.ILGeneration (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - 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.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Reflection.TypeExtensions (4.3) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) System.Resources.ResourceManager (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -975,7 +905,7 @@ NUGET System.Runtime (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) - System.Runtime.CompilerServices.Unsafe (5.0) + System.Runtime.CompilerServices.Unsafe (6.0) System.Runtime.Extensions (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -994,6 +924,8 @@ NUGET System.Security.AccessControl (4.7) Microsoft.NETCore.Platforms (>= 3.1) System.Security.Principal.Windows (>= 4.7) + System.Security.Cryptography.Pkcs (6.0.4) + System.Formats.Asn1 (>= 6.0) System.Security.Cryptography.ProtectedData (4.7) System.Security.Permissions (4.7) System.Security.AccessControl (>= 4.7)