Upgrade to JsonRpc.Standard 0.3.

Target .NET Standard 1.1 & .NET 4.5.

Author: CXuesong

DemoLanguageServer/DemoLanguageServer.csproj

@@ -12,7 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CXuesong.JsonRpc.Standard" Version="0.2.1-int0" />
+    <PackageReference Include="CXuesong.JsonRpc.Dataflow" Version="0.3.0" />
+    <PackageReference Include="CXuesong.JsonRpc.Standard" Version="0.3.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />

DemoLanguageServer/LanguageServerSession.cs

@@ -14,7 +14,7 @@
 
 namespace DemoLanguageServer
 {
-    public class LanguageServerSession : Session
+    public class LanguageServerSession
     {
         private readonly CancellationTokenSource cts = new CancellationTokenSource();
 

DemoLanguageServer/Program.cs

@@ -7,9 +7,9 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using JsonRpc.Dataflow;
 using JsonRpc.Standard.Client;
 using JsonRpc.Standard.Contracts;
-using JsonRpc.Standard.Dataflow;
 using JsonRpc.Standard.Server;
 using LanguageServer.VsCode;
 using Microsoft.Extensions.Logging;
@@ -79,16 +79,14 @@ static void Main(string[] args)
             }
         }
 
-        private static IJsonRpcServiceHost BuildServiceHost(ISession session, TextWriter logWriter,
+        private static DataflowRpcServiceHost BuildServiceHost(LanguageServerSession session, TextWriter logWriter,
             IJsonRpcContractResolver contractResolver, bool debugMode)
         {
             var loggerFactory = new LoggerFactory();
             loggerFactory.AddProvider(new DebugLoggerProvider(null));
-            var builder = new ServiceHostBuilder
+            var builder = new JsonRpcServiceHostBuilder
             {
                 ContractResolver = contractResolver,
-                Session = session,
-                Options = JsonRpcServiceHostOptions.ConsistentResponseSequence,
                 LoggerFactory = loggerFactory
             };
             builder.UseCancellationHandling();
@@ -103,7 +101,12 @@ private static IJsonRpcServiceHost BuildServiceHost(ISession session, TextWriter
                     lock (logWriter) logWriter.WriteLine("< {0}", context.Response);
                 });
             }
-            return builder.Build();
+            var host = builder.Build();
+            var features = new FeatureCollection();
+            features.Set(session);
+            return new DataflowRpcServiceHost(host, features,
+                DataflowRpcServiceHostOptions.ConsistentResponseSequence |
+                DataflowRpcServiceHostOptions.SupportsRequestCancellation);
         }
 
     }

DemoLanguageServer/Services/DemoLanguageServiceBase.cs

@@ -12,7 +12,7 @@ namespace DemoLanguageServer.Services
     public class DemoLanguageServiceBase : JsonRpcService
     {
 
-        protected LanguageServerSession Session => (LanguageServerSession)RequestContext.Session;
+        protected LanguageServerSession Session => RequestContext.Features.Get<LanguageServerSession>();
 
         protected ClientProxy Client => Session.Client;
 

DemoLanguageServer/Services/InitializaionService.cs

@@ -53,7 +53,7 @@ public void Exit()
         [JsonRpcMethod("$/cancelRequest", IsNotification = true)]
         public void CancelRequest(MessageId id)
         {
-            RequestContext.ServiceHost.TryCancelRequest(id);
+            RequestContext.Features.Get<IRequestCancellationFeature>().TryCancel(id);
         }
     }
 }

LanguageServer.VsCode/LanguageServer.VsCode.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DebugType>full</DebugType>
     <PackageId>CXuesong.LanguageServer.VsCode</PackageId>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>CXuesong</Authors>
-    <Version>0.1.1</Version>
+    <Version>0.2.0</Version>
     <Company />
     <Description>A .NET Language Server library for VSCode.</Description>
     <Copyright>Copyright 2017 CXuesong</Copyright>
@@ -15,8 +17,8 @@
     <RepositoryUrl>https://github.com/CXuesong/LanguageServer.NET</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageReleaseNotes>See https://github.com/CXuesong/LanguageServer.NET/releases .</PackageReleaseNotes>
-    <AssemblyVersion>0.1.1.3</AssemblyVersion>
-    <FileVersion>0.1.1.3</FileVersion>
+    <AssemblyVersion>0.2.0.0</AssemblyVersion>
+    <FileVersion>0.2.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -34,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CXuesong.JsonRpc.Standard" Version="0.2.1-int0" />
+    <PackageReference Include="CXuesong.JsonRpc.Standard" Version="0.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
   </ItemGroup>
 

LanguageServer.VsCode/LanguageServerExtensions.cs

@@ -17,7 +17,7 @@ public static class LanguageServerExtensions
         /// Interprets any <see cref="OperationCanceledException" /> thrown by the service
         /// as <c>RequestCancelled</c> error per definition in Language Server Protocol.
         /// </summary>
-        public static void UseCancellationHandling(this ServiceHostBuilder builder)
+        public static void UseCancellationHandling(this JsonRpcServiceHostBuilder builder)
         {
             if (builder == null) throw new ArgumentNullException(nameof(builder));
             builder.Intercept(async (context, next) =>