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
2 changes: 1 addition & 1 deletion Benchmarks/Benchmarks.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions LanguageServerProtocol/LanguageServerProtocol.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
<Compile Include="LanguageServerProtocol.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<!-- Explicitly pinning our FSharp.Core to 6.0.0 so that consumers can use _any_ 6.x version. -->
<!-- <PackageReference Update="FSharp.Core" Version="6.0.0" />-->
<PackageReference Include="StreamJsonRpc" Version="2.16.36" />
<PackageReference Include="StreamJsonRpc" Version="2.22.23" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion MarkdigPatches/MarkdigPatches.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Markdig" Version="0.38.0" />
<PackageReference Include="Markdig" Version="0.43.0" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions Marksman/Marksman.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
<Compile Include="Program.fs"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.SystemCommandLine" Version="0.13.0-beta4"/>
<PackageReference Include="FSharpPlus" Version="1.6.1"/>
<PackageReference Include="FSharp.SystemCommandLine" Version="2.0.0" />
<PackageReference Include="FSharpPlus" Version="1.8.0" />
<PackageReference Include="Glob" Version="1.1.9"/>
<PackageReference Include="Markdig" Version="0.38.0"/>
<PackageReference Include="Markdig" Version="0.43.0" />
<!-- <PackageReference Include="Ionide.LanguageServerProtocol" Version="0.3.1" />-->
<PackageReference Include="Serilog" Version="2.11.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
<PackageReference Include="Tomlyn" Version="0.17.0"/>
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Tomlyn" Version="0.19.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LanguageServerProtocol\LanguageServerProtocol.fsproj"/>
Expand Down
17 changes: 9 additions & 8 deletions Marksman/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,25 @@ let startLSP (args: int * bool) : int =
[<EntryPoint>]
let main args =
let verbosity =
Input.Option([ "--verbose"; "-v" ], 2, "Set logging verbosity level")
Input.option "--verbose"
|> Input.alias "-v"
|> Input.defaultValue 2
|> Input.desc "Set logging verbosity level"

let waitForDebugger =
Input.Option(
[ "--wait-for-debugger" ],
false,
"Wait for debugger to attach before running the program"
)
Input.option "--wait-for-debugger"
|> Input.defaultValue false
|> Input.desc "Wait for debugger to attach before running the program"

let lspCommand =
command "server" {
description "Start LSP server on stdin/stdout"
inputs (verbosity, waitForDebugger)
setHandler startLSP
setAction startLSP
}

rootCommand args {
description "Marksman is a language server for Markdown"
setHandler (fun () -> startLSP (2, false))
setAction (fun () -> startLSP (2, false))
addCommand lspCommand
}
8 changes: 4 additions & 4 deletions Tests/Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Snapper" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down