Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -35,4 +35,4 @@ jobs:
run: dotnet build ./src/

- name: Test
run: dotnet test ./src/
run: dotnet test ./src/
4 changes: 2 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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

nuget FsUnit
nuget Microsoft.NET.Test.Sdk
nuget NUnit
nuget NUnit3TestAdapter
nuget NUnit.Analyzers
nuget NUnit.Analyzers
81 changes: 40 additions & 41 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -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))
4 changes: 2 additions & 2 deletions src/Fli.Tests/Fli.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand All @@ -25,4 +25,4 @@
<ProjectReference Include="..\Fli\Fli.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>
12 changes: 2 additions & 10 deletions src/Fli/Command.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Fli/Fli.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<ProjectType>Library</ProjectType>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Configurations>Debug;Release</Configurations>
<Version>1.111.11.0</Version>
Expand Down Expand Up @@ -34,4 +34,4 @@
<None Include="..\..\RELEASE_NOTES.md" Pack="true" PackagePath="\" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>
3 changes: 2 additions & 1 deletion src/Fli/paket.template
Original file line number Diff line number Diff line change
Expand Up @@ -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
FSharp.Core >= LOCKEDVERSION
Loading