Skip to content

Commit dd0481b

Browse files
david-driscolldavid-driscoll
authored
Merge pull request #118 from OmniSharp/fix/114
Adds a test for running Language Server. Fixes a small issue with in…
2 parents 413cb3e + 9fc3f6e commit dd0481b

24 files changed

+167
-68
lines changed

‎.azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ resources:
33
- repository: rsg
44
type: github
55
name: RocketSurgeonsGuild/AzureDevopsTemplates
6-
ref: refs/tags/v0.2.8
6+
ref: refs/tags/v0.3.2
77
endpoint: github
88

99
variables:
1010
Configuration: Release
1111
Verbosity: Normal
12-
DotNetVersion: "2.1.500"
13-
CakeVersion: "0.30.0"
14-
NuGetVersion: '4.7.1'
12+
DotNetVersion: "2.2.101"
13+
CakeVersion: "0.32.1"
14+
NuGetVersion: "4.9.2"
1515
Coverage: "$(Agent.BuildDirectory)/c"
1616
VstsCoverage: "$(Coverage)"
1717
Artifacts: $(Build.ArtifactStagingDirectory)

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ tools/*/
3838
/coverage
3939

4040
.idea
41+
coverage.*.xml
42+
coverage.json
43+
coverage.info

‎Common.Build.props

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,17 @@
1111
<PackageProjectUrl>https://github.com/OmniSharp/csharp-language-server-protocol</PackageProjectUrl>
1212
<PackageTags>lsp;language server;language server protocol;language client;language server client</PackageTags>
1313
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\lsp.snk</AssemblyOriginatorKeyFile>
14+
<Logging_Extensions_Version>2.0.0</Logging_Extensions_Version>
1415
</PropertyGroup>
1516
<PropertyGroup>
16-
<Microsoft_Extensions_Logging_Version>2.0.0</Microsoft_Extensions_Logging_Version>
17-
<Microsoft_Extensions_DependencyInjection_Version>2.0.0</Microsoft_Extensions_DependencyInjection_Version>
18-
<Newtonsoft_Version>11.0.2</Newtonsoft_Version>
19-
<SourceLink_Version>2.8.3</SourceLink_Version>
20-
<System_Reactive_Version>4.1.2</System_Reactive_Version>
21-
<MediatR_Version>5.0.1</MediatR_Version>
22-
<MediatR_Extensions_DependencyInjection_Version>5.0.2</MediatR_Extensions_DependencyInjection_Version>
23-
<Autofac_Version>4.8.1</Autofac_Version>
24-
<Autofac_Extensions_DependencyInjection_Version>4.3.1</Autofac_Extensions_DependencyInjection_Version>
25-
<Microsoft_NET_Test_Sdk_Version>15.9.0</Microsoft_NET_Test_Sdk_Version>
26-
<xunit_Version>2.4.1</xunit_Version>
27-
<FluentAssertions_Version>5.5.3</FluentAssertions_Version>
28-
<NSubstitute_Version>3.1.0</NSubstitute_Version>
29-
<Serilog_Extensions_Logging_Version>2.0.2</Serilog_Extensions_Logging_Version>
30-
<Serilog_Sinks_XUnit_Version>1.0.6</Serilog_Sinks_XUnit_Version>
31-
<XunitXml_TestLogger_Version>2.0.0</XunitXml_TestLogger_Version>
32-
<coverlet_Version>2.4.0</coverlet_Version>
17+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18+
<IncludeSymbols>true</IncludeSymbols>
19+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
20+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
22+
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
23+
</PropertyGroup>
24+
<PropertyGroup Condition="'$(TF_BUILD)'!=''">
25+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3326
</PropertyGroup>
3427
</Project>

‎Common.Build.targets

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
4+
</ItemGroup>
5+
6+
<ItemGroup>
7+
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(Logging_Extensions_Version)" />
8+
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="$(Logging_Extensions_Version)" />
9+
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="$(Logging_Extensions_Version)" />
10+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
11+
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
12+
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
13+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
14+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
15+
<PackageReference Update="xunit" Version="2.4.1" />
16+
<PackageReference Update="FluentAssertions" Version="5.6.0" />
17+
<PackageReference Update="NSubstitute" Version="3.1.0" />
18+
<PackageReference Update="Autofac" Version="4.8.1" />
19+
<PackageReference Update="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
20+
<PackageReference Update="Serilog.Extensions.Logging" Version="2.0.2" />
21+
<PackageReference Update="Serilog.Sinks.XUnit" Version="1.0.7" />
22+
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
23+
<PackageReference Update="coverlet.msbuild" Version="2.5.1" />
24+
<PackageReference Update="System.Reactive" Version="4.1.2" />
25+
</ItemGroup>
26+
</Project>

‎build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.8.6";
1+
#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.9.3";
22

33
Task("Submodules")
44
.Does(() => {

‎src/Client/Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="System.Reactive" Version="$(System_Reactive_Version)" />
12+
<PackageReference Include="System.Reactive" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<IsPackable>true</IsPackable>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="SourceLink.Create.CommandLine" Version="$(SourceLink_Version)" PrivateAssets="All" />
1312
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
1413
<_Parameter1>Client.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100391db875e68eb4bfef49ce14313b9e13f2cd3cc89eb273bbe6c11a55044c7d4f566cf092e1c77ef9e7c75b1496ae7f95d925938f5a01793dd8d9f99ae0a7595779b71b971287d7d7b5960d052078d14f5ce1a85ea5c9fb2f59ac735ff7bc215cab469b7c3486006860bad6f4c3b5204ea2f28dd4e1d05e2cca462cfd593b9f9f</_Parameter1>
1514
</AssemblyAttribute>

‎src/Directory.Build.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>

‎src/JsonRpc/JsonRpc.csproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
<PackageDescription>Primitives for working with JsonRpc. This library is used as the base for communication with language servers</PackageDescription>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="System.Reactive" Version="$(System_Reactive_Version)" />
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(Microsoft_Extensions_DependencyInjection_Version)" />
12-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(Microsoft_Extensions_Logging_Version)" />
10+
<PackageReference Include="System.Reactive" />
11+
<PackageReference Include="Microsoft.Extensions.Logging" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
15+
<PackageReference Include="Newtonsoft.Json" />
1316
<Compile Include="../../submodules/MediatR/src/MediatR/**/*.cs" Exclude="**/AssemblyInfo.cs" />
1417
<Compile Include="../../submodules/MediatR.Extensions.Microsoft.DependencyInjection/src/MediatR.Extensions.Microsoft.DependencyInjection/**/*.cs" Exclude="**/AssemblyInfo.cs" />
15-
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Version)" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(Microsoft_Extensions_Logging_Version)" />
17-
<!-- <PackageReference Include="MediatR" Version="$(MediatR_Version)" /> -->
18-
<!-- <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="$(MediatR_Extensions_DependencyInjection_Version)" /> -->
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(Microsoft_Extensions_DependencyInjection_Version)" />
2018
</ItemGroup>
2119
</Project>

‎src/Protocol/Document/Server/IPrepareRenameHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
88
{
99
using static DocumentNames;
1010
[Serial, Method(PrepareRename)]
11-
public interface IPrepareRenameHandler : IJsonRpcRequestHandler<PrepareRenameParams, RangeOrPlaceholderRange>, ICapability<RenameCapability> { }
11+
public interface IPrepareRenameHandler : IJsonRpcRequestHandler<PrepareRenameParams, RangeOrPlaceholderRange>, IRegistration<object>, ICapability<RenameCapability> { }
1212
}

0 commit comments

Comments
 (0)