Skip to content

Commit 650228a

Browse files
merged with latest master
2 parents 7268b7f + 4389c7b commit 650228a

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

src/Directory.Build.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<AssetTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
4-
<PackageVersion Condition="'$(GitVersion_NuGetVersion)' != ''">$(GitVersion_NuGetVersion)</PackageVersion>
5-
<AssemblyVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</AssemblyVersion>
6-
<FileVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</FileVersion>
7-
<InformationalVersion Condition="'$(GitVersion_InformationalVersion)' != ''">$(GitVersion_InformationalVersion)</InformationalVersion>
3+
<AssetTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
4+
<PackageVersion Condition="'$(GitVersion_NuGetVersion)' != ''">$(GitVersion_NuGetVersion)</PackageVersion>
5+
<AssemblyVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</AssemblyVersion>
6+
<FileVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</FileVersion>
7+
<InformationalVersion Condition="'$(GitVersion_InformationalVersion)' != ''">$(GitVersion_InformationalVersion)</InformationalVersion>
8+
<LangVersion>Latest</LangVersion>
89
</PropertyGroup>
9-
</Project>
10+
</Project>

src/Lsp/LanguageServer.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
using System;
2+
using System.Collections.Concurrent;
23
using System.Collections.Generic;
34
using System.IO;
45
using System.Linq;
@@ -214,6 +215,9 @@ private async Task DynamicallyRegisterHandlers()
214215
registrations.Add(handler.Registration);
215216
}
216217

218+
if (registrations.Count == 0)
219+
return; // No dynamic registrations supported by client.
220+
217221
var @params = new RegistrationParams() { Registrations = registrations };
218222

219223
await this.RegisterCapability(@params);
@@ -261,4 +265,4 @@ public void Dispose()
261265

262266
public IDictionary<string, JToken> Experimental { get; } = new Dictionary<string, JToken>();
263267
}
264-
}
268+
}

test/Directory.Build.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AssetTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
4+
<LangVersion>Latest</LangVersion>
5+
</PropertyGroup>
6+
</Project>

test/JsonRpc.Tests/JsonRpc.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<WarningsAsErrors>true</WarningsAsErrors>
55
<PlatformTarget>AnyCPU</PlatformTarget>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7-
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
87
</PropertyGroup>
98
<ItemGroup>
109
<ProjectReference Include="..\..\src\JsonRpc\JsonRpc.csproj" />

test/Lsp.Tests/Lsp.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<WarningsAsErrors>true</WarningsAsErrors>
55
<PlatformTarget>AnyCPU</PlatformTarget>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7-
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net45+win8</AssetTargetFallback>
87
</PropertyGroup>
98
<ItemGroup>
109
<None Remove="**\*.json" />

0 commit comments

Comments
 (0)