diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 691f3b9..eab8acd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, macOS-latest, ubuntu-latest] - dotnet: [8.0.100] + dotnet: [9.0.101] runs-on: ${{ matrix.os }} steps: @@ -35,4 +35,4 @@ jobs: run: dotnet build ./src/ - name: Test - run: dotnet test ./src/ \ No newline at end of file + run: dotnet test ./src/ diff --git a/paket.dependencies b/paket.dependencies index 521a6cb..d97e72c 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,5 @@ source https://api.nuget.org/v3/index.json -framework: net6.0, net7.0, net8.0, netstandard2.0, netstandard2.1 +framework: net8.0, net9.0, netstandard2.0, netstandard2.1 nuget FSharp.Core ~> 6.0.0 @@ -7,4 +7,4 @@ nuget FsUnit nuget Microsoft.NET.Test.Sdk nuget NUnit nuget NUnit3TestAdapter -nuget NUnit.Analyzers \ No newline at end of file +nuget NUnit.Analyzers diff --git a/paket.lock b/paket.lock index eb89c7b..08b7101 100644 --- a/paket.lock +++ b/paket.lock @@ -1,48 +1,47 @@ -RESTRICTION: || (== net6.0) (== net7.0) (== net8.0) (== netstandard2.0) (== netstandard2.1) +RESTRICTION: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (== netstandard2.0) (== netstandard2.1) NUGET remote: https://api.nuget.org/v3/index.json FSharp.Core (6.0.7) - FsUnit (7.0.1) + FsUnit (7.1.1) FSharp.Core (>= 5.0.2) NUnit (>= 4.0.1) - Microsoft.ApplicationInsights (2.23) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.ApplicationInsights (2.23) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) System.Diagnostics.DiagnosticSource (>= 5.0) - Microsoft.CodeCoverage (17.13) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.NET.Test.Sdk (17.13) - Microsoft.CodeCoverage (>= 17.13) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.TestPlatform.TestHost (>= 17.13) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.Testing.Extensions.Telemetry (1.6.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.ApplicationInsights (>= 2.22) - Microsoft.Testing.Platform (>= 1.6.3) - Microsoft.Testing.Extensions.TrxReport.Abstractions (1.6.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.Testing.Platform (>= 1.6.3) - Microsoft.Testing.Extensions.VSTestBridge (1.6.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.Testing.Extensions.Telemetry (>= 1.6.3) - Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.6.3) - Microsoft.Testing.Platform (>= 1.6.3) + Microsoft.CodeCoverage (17.14.1) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= net8.0)) + Microsoft.NET.Test.Sdk (17.14.1) + Microsoft.CodeCoverage (>= 17.14.1) - restriction: || (&& (== net6.0) (>= net462)) (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= net8.0)) + Microsoft.TestPlatform.TestHost (>= 17.14.1) - restriction: || (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net8.0)) + Microsoft.Testing.Extensions.Telemetry (1.8.4) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.ApplicationInsights (>= 2.23) + Microsoft.Testing.Platform (>= 1.8.4) + Microsoft.Testing.Extensions.TrxReport.Abstractions (1.8.4) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Testing.Platform (>= 1.8.4) + Microsoft.Testing.Extensions.VSTestBridge (1.8.4) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Testing.Extensions.Telemetry (>= 1.8.4) + Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.8.4) + Microsoft.Testing.Platform (>= 1.8.4) + Microsoft.TestPlatform.AdapterUtilities (>= 17.13) Microsoft.TestPlatform.ObjectModel (>= 17.13) - Microsoft.Testing.Platform (1.6.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.Testing.Platform.MSBuild (1.6.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.Testing.Platform (>= 1.6.3) - Microsoft.TestPlatform.ObjectModel (17.13) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.13) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.TestPlatform.ObjectModel (>= 17.13) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - NUnit (4.3.2) - NUnit.Analyzers (4.7) - NUnit3TestAdapter (5.0) - Microsoft.Testing.Extensions.VSTestBridge (>= 1.5.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.Testing.Platform.MSBuild (>= 1.5.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Collections.Immutable (9.0.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Memory (>= 4.5.5) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (>= net462)) (== netstandard2.0) (== netstandard2.1) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (>= net462)) (== netstandard2.0) (== netstandard2.1) - System.Diagnostics.DiagnosticSource (9.0.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Memory (>= 4.5.5) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (>= net462)) (== netstandard2.0) (== netstandard2.1) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (>= net462)) (== netstandard2.0) (== netstandard2.1) - System.Memory (4.6.3) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (== netstandard2.0)) (&& (== net8.0) (== netstandard2.1)) (&& (== net8.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Reflection.Metadata (9.0.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Collections.Immutable (>= 9.0.3) - System.Memory (>= 4.5.5) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (>= net462)) (== netstandard2.0) (== netstandard2.1) - System.Runtime.CompilerServices.Unsafe (6.1.2) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (== netstandard2.0)) (&& (== net8.0) (== netstandard2.1)) (&& (== net8.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Testing.Platform (1.8.4) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Testing.Platform.MSBuild (1.8.4) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Testing.Platform (>= 1.8.4) + Microsoft.TestPlatform.AdapterUtilities (17.14.1) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.TestPlatform.ObjectModel (17.14.1) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= net8.0)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + System.Reflection.Metadata (>= 8.0) + Microsoft.TestPlatform.TestHost (17.14.1) - restriction: || (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net8.0)) + Microsoft.TestPlatform.ObjectModel (>= 17.14.1) - restriction: || (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net8.0)) + Newtonsoft.Json (>= 13.0.3) - restriction: || (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net8.0)) + Newtonsoft.Json (13.0.4) - restriction: || (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net8.0)) + NUnit (4.4) + NUnit.Analyzers (4.10) + NUnit3TestAdapter (5.1) + Microsoft.Testing.Extensions.VSTestBridge (>= 1.7.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Testing.Platform.MSBuild (>= 1.7.3) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + System.Collections.Immutable (9.0.9) - restriction: || (&& (== net6.0) (== net9.0)) (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (== net9.0)) (&& (== net7.0) (>= net8.0)) (== net8.0) (&& (== net9.0) (== netstandard2.0)) (&& (== net9.0) (== netstandard2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net8.0)) + System.Diagnostics.DiagnosticSource (9.0.9) - restriction: || (== net6.0) (== net7.0) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + System.Memory (>= 4.5.5) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) (== netstandard2.0) (== netstandard2.1) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) (== netstandard2.0) (== netstandard2.1) + System.Memory (4.6.3) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (== netstandard2.0)) (&& (== net8.0) (== netstandard2.1)) (&& (== net8.0) (>= net462)) (&& (== net9.0) (== netstandard2.0)) (&& (== net9.0) (== netstandard2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + System.Reflection.Metadata (9.0.9) - restriction: || (&& (== net6.0) (>= net8.0)) (&& (== net7.0) (>= net8.0)) (== net8.0) (== net9.0) (&& (== netstandard2.0) (>= net8.0)) (&& (== netstandard2.1) (>= net8.0)) + System.Collections.Immutable (>= 9.0.9) - restriction: || (== net6.0) (== net7.0) (== net8.0) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) (== netstandard2.0) (== netstandard2.1) + System.Runtime.CompilerServices.Unsafe (6.1.2) - restriction: || (== net6.0) (== net7.0) (&& (== net8.0) (== netstandard2.0)) (&& (== net8.0) (== netstandard2.1)) (&& (== net8.0) (>= net462)) (&& (== net9.0) (== netstandard2.0)) (&& (== net9.0) (== netstandard2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1)) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) diff --git a/src/Fli.Tests/Fli.Tests.fsproj b/src/Fli.Tests/Fli.Tests.fsproj index ca7dd88..fae8df9 100644 --- a/src/Fli.Tests/Fli.Tests.fsproj +++ b/src/Fli.Tests/Fli.Tests.fsproj @@ -2,7 +2,7 @@ Library - net8.0 + net9.0 false @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/src/Fli/Command.fs b/src/Fli/Command.fs index 4ede09c..fb71786 100644 --- a/src/Fli/Command.fs +++ b/src/Fli/Command.fs @@ -280,11 +280,7 @@ module Command = /// Executes the given context as a new process. static member execute(context: ShellContext) = - let isStreaming: bool = - match context.config.Output with - | Some s -> match s with Outputs.Stream(s) -> true | _ -> false - | _ -> false - + let isStreaming: bool = match context.config.Output with Some s -> s.IsStream | _ -> false context |> Command.buildProcess |> startProcess @@ -294,11 +290,7 @@ module Command = /// Executes the given context as a new process. static member execute(context: ExecContext) = - let isStreaming: bool = - match context.config.Output with - | Some s -> match s with Outputs.Stream(s) -> true | _ -> false - | _ -> false - + let isStreaming: bool = match context.config.Output with Some s -> s.IsStream | _ -> false context |> Command.buildProcess |> startProcess diff --git a/src/Fli/Fli.fsproj b/src/Fli/Fli.fsproj index 6b18729..2ee26e3 100644 --- a/src/Fli/Fli.fsproj +++ b/src/Fli/Fli.fsproj @@ -3,7 +3,7 @@ Library Library - netstandard2.0;netstandard2.1;net8.0 + netstandard2.0;netstandard2.1;net8.0;net9.0 false Debug;Release 1.111.11.0 @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/src/Fli/paket.template b/src/Fli/paket.template index a04f405..bd87f69 100644 --- a/src/Fli/paket.template +++ b/src/Fli/paket.template @@ -33,10 +33,11 @@ summary F# library to run CLI commands and processes in F# (CE) style. files /bin/Release/net8.0/Fli.* ==> lib/net8.0 + /bin/Release/net9.0/Fli.* ==> lib/net9.0 /bin/Release/netstandard2.0/Fli.* ==> lib/netstandard2.0 /bin/Release/netstandard2.1/Fli.* ==> lib/netstandard2.1 ../install.ps1 ==> tools ../../README.md ==> . ../../RELEASE_NOTES.md ==> . dependencies - FSharp.Core >= LOCKEDVERSION \ No newline at end of file + FSharp.Core >= LOCKEDVERSION