Skip to content

Commit

Permalink
Use System.CommandLine for CLI parsing (#888)
Browse files Browse the repository at this point in the history
  • Loading branch information
baronfel authored Apr 7, 2022
1 parent 8f220b0 commit 28c4b5c
Show file tree
Hide file tree
Showing 9 changed files with 266 additions and 172 deletions.
4 changes: 2 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ storage: none

github TheAngryByrd/FsLibLog:f81cba440bf0476bb4e2262b57a067a0d6ab78a7 src/FsLibLog/FsLibLog.fs

nuget Argu
nuget Fantomas.Client
nuget FSharp.Compiler.Service
nuget Ionide.ProjInfo
Expand All @@ -27,7 +26,7 @@ nuget Mono.Cecil >= 0.10.0-beta7
nuget Newtonsoft.Json
# nuget Fake.Runtime prerelease
nuget FSharpLint.Core
nuget FSharp.Core
nuget FSharp.Core content: none
nuget Dapper
nuget Microsoft.Data.Sqlite 2.2.4
nuget Microsoft.Data.Sqlite.Core 2.2.4
Expand All @@ -44,6 +43,7 @@ nuget FSharp.Formatting
nuget FsToolkit.ErrorHandling
nuget FSharpx.Async
nuget CliWrap
nuget System.CommandLine prerelease

nuget Microsoft.NET.Test.Sdk
nuget Dotnet.ReproducibleBuilds copy_local:true
Expand Down
16 changes: 9 additions & 7 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ RESTRICTION: || (== net6.0) (== netstandard2.0)
NUGET
remote: https://api.nuget.org/v3/index.json
altcover (8.2.837)
Argu (6.1.1)
FSharp.Core (>= 4.3.2)
System.Configuration.ConfigurationManager (>= 4.4)
CliWrap (3.4.2)
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
Expand Down Expand Up @@ -67,7 +64,7 @@ NUGET
FSharp.Control.Reactive (5.0.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
FSharp.Core (>= 4.7.2)
System.Reactive (>= 5.0)
FSharp.Core (6.0.3)
FSharp.Core (6.0.3) - content: none
FSharp.Formatting (15.0)
FSharp.Compiler.Service (41.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netstandard2.1))
FSharp.UMX (1.1)
Expand All @@ -92,7 +89,8 @@ NUGET
FSharp.Core (>= 4.7.2)
GitHubActionsTestLogger (1.3)
Microsoft.TestPlatform.ObjectModel (>= 17.0)
ICSharpCode.Decompiler (7.2.0.6844)
ICSharpCode.Decompiler (7.2.1.6856)
Microsoft.Win32.Registry (>= 5.0)
System.Collections.Immutable (>= 5.0)
System.Reflection.Metadata (>= 5.0)
Ionide.KeepAChangelog.Tasks (0.1.6) - copy_local: true
Expand Down Expand Up @@ -224,7 +222,9 @@ NUGET
Microsoft.NETCore.Platforms (>= 1.1)
Microsoft.NETCore.Targets (>= 1.1)
System.Runtime (>= 4.3)
Microsoft.Win32.Registry (5.0) - copy_local: false
Microsoft.Win32.Registry (5.0)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard1.3)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
System.Security.AccessControl (>= 5.0)
System.Security.Principal.Windows (>= 5.0)
Microsoft.Win32.SystemEvents (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Expand Down Expand Up @@ -340,6 +340,8 @@ NUGET
System.Collections.Immutable (6.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.CommandLine (2.0.0-beta3.22114.1)
System.Memory (>= 4.5.4) - restriction: == netstandard2.0
System.Configuration.ConfigurationManager (6.0)
System.Security.Cryptography.ProtectedData (>= 6.0)
System.Security.Permissions (>= 6.0)
Expand Down Expand Up @@ -550,7 +552,7 @@ NUGET
System.Resources.ResourceManager (>= 4.3)
System.Runtime (>= 4.3)
System.Threading.Tasks (>= 4.3)
System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (== netstandard2.0)
System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0)
System.ObjectModel (4.3)
System.Collections (>= 4.3)
System.Diagnostics.Debug (>= 4.3)
Expand Down
2 changes: 2 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<!-- suppress false positive warning FS2003 about invalid version of AssemblyInformationalVersionAttribute -->
<NoWarn>$(NoWarn);FS2003</NoWarn>
<!-- We've got a prerelease dep on System.CommandLine, and NuGet doesn't like that. NuGet can be quiet in this instance. -->
<NoWarn>$(NoWarn);NU5104</NoWarn>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\FsAutoComplete.Logging\FsAutoComplete.Logging.fsproj" />
<TrimmerRootAssembly Include="FsAutoComplete.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="Debug.fs" />
Expand Down
3 changes: 1 addition & 2 deletions src/FsAutoComplete/FsAutoComplete.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,17 @@
<PackageIcon>logo.png</PackageIcon>
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
<Authors>FsAutoComplete contributors</Authors>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
<ItemGroup>
<None Include="../../README.md" Pack="true" PackagePath="\" />
<None Include="logo.png" Pack="true" PackagePath="\" />
<Compile Include="Options.fs" />
<Compile Include="CommandResponse.fs" />
<Compile Include="JsonSerializer.fs" />
<Compile Include="LspHelpers.fs" />
<Compile Include="CodeFixes.fs" />
<Compile Include="CodeFixes/*.fs" />
<Compile Include="FsAutoComplete.Lsp.fs" />
<Compile Include="Parser.fs" />
<Compile Include="Program.fs" />
<None Include="FsAutoComplete.fsproj.paket.references" />
<Content Include="default.win32manifest">
Expand Down
85 changes: 0 additions & 85 deletions src/FsAutoComplete/Options.fs

This file was deleted.

Loading

0 comments on commit 28c4b5c

Please sign in to comment.