dotnet · colombod · Aug 30, 2019 · Aug 30, 2019 · Aug 30, 2019 · Aug 30, 2019
diff --git a/Microsoft.DotNet.Interactive.FSharp.Tests/Microsoft.DotNet.Interactive.FSharp.Tests.fsproj b/Microsoft.DotNet.Interactive.FSharp.Tests/Microsoft.DotNet.Interactive.FSharp.Tests.fsproj
@@ -2,6 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Deterministic Condition="'$(NCrunch)' == '1'">false</Deterministic>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) AND '$(OS)' == 'Windows_NT'">
+    <!-- the 2.1.503 F# compiler can produce PDBs that can't properly be converted, see https://github.com/Microsoft/visualfsharp/issues/5976 -->
+    <PublishWindowsPdb>false</PublishWindowsPdb>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Microsoft.DotNet.Interactive.FSharp/FSharpKernel.fs b/Microsoft.DotNet.Interactive.FSharp/FSharpKernel.fs
@@ -16,24 +16,24 @@ type FSharpKernel() =
     let handleSubmitCode (codeSubmission: SubmitCode) (context: KernelInvocationContext) =
         async {
             let codeSubmissionReceived = CodeSubmissionReceived(codeSubmission.Code, codeSubmission)
-            context.OnNext(codeSubmissionReceived)
+            context.Publish(codeSubmissionReceived)
             let result, errors =
                 try
                     script.Eval(codeSubmission.Code)
                 with
                 | ex -> Error(ex), [||]
             if errors.Length > 0 then
                 let aggregateErrorMessage = System.String.Join("\n", errors)
-                context.OnNext(CommandFailed(aggregateErrorMessage, codeSubmission))
+                context.Publish(CommandFailed(aggregateErrorMessage, codeSubmission))
             match result with
             | Ok(Some(value)) ->
                 let value = value.ReflectionValue
                 let formattedValues = FormattedValue.FromObject(value)
-                context.OnNext(ReturnValueProduced(value, codeSubmission, formattedValues))
+                context.Publish(ReturnValueProduced(value, codeSubmission, formattedValues))
             | Ok(None) -> ()
             | Error(ex) -> context.OnError(ex)
-            context.OnNext(CodeSubmissionEvaluated(codeSubmission))
-            context.OnCompleted()
+            context.Publish(CodeSubmissionEvaluated(codeSubmission))
+            context.Complete()
         }
     override __.HandleAsync(command: IKernelCommand, _context: KernelInvocationContext): Task =
         async {

diff --git a/Microsoft.DotNet.Interactive.Jupyter/KernelExtensions.cs b/Microsoft.DotNet.Interactive.Jupyter/KernelExtensions.cs
@@ -42,15 +42,15 @@ private static T UseHtml<T>(this T kernel)
                                                       .Trim();
 
 
-                        context.OnNext(new Events.DisplayedValueProduced(
+                        context.Publish(new Events.DisplayedValueProduced(
                                            htmlContent,
                                            context.Command,
                                            formattedValues: new[]
                                            {
                                                new FormattedValue("text/html", htmlContent)
                                            }));
 
-                        context.OnCompleted();
+                        context.Complete();
                     }
                 })
             });
@@ -106,7 +106,7 @@ private static Command lsmagic()
 
                     supportedDirectives.Commands.AddRange(context.CurrentKernel.Directives);
 
-                    context.OnNext(new Events.DisplayedValueProduced(supportedDirectives));
+                    context.Publish(new Events.DisplayedValueProduced(supportedDirectives));
 
                     await context.CurrentKernel.VisitSubkernelsAsync(async k =>
                     {
@@ -137,15 +137,15 @@ private static Command javascript()
                                     scriptContent))
                                 .ToString();
 
-                        context.OnNext(new Events.DisplayedValueProduced(
+                        context.Publish(new Events.DisplayedValueProduced(
                                            scriptContent,
                                            context.Command,
                                            formattedValues: new[]
                                            {
                                                new FormattedValue("text/html",
                                                                   value)
                                            }));
-                        context.OnCompleted();
+                        context.Complete();
                     }
                 })
             };

diff --git a/Microsoft.DotNet.Interactive.Rendering/PocketView.cs b/Microsoft.DotNet.Interactive.Rendering/PocketView.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.DotNet.Interactive.Rendering
 {
     /// <summary>
-    /// Writes HTML using a C# DSL, bypasing the need for specialized parser and compiler infrastructure such as Razor or WebForms require.
+    /// Writes HTML using a C# DSL, bypassing the need for specialized parser and compiler infrastructure such as Razor or WebForms require.
     /// </summary>
     public class PocketView : DynamicObject, ITag
     {

diff --git a/Microsoft.DotNet.Interactive/KernelBase.cs b/Microsoft.DotNet.Interactive/KernelBase.cs
@@ -109,7 +109,7 @@ private async Task HandleLoadExtension(
                     await extension.OnLoadAsync(invocationContext.HandlingKernel);
                 }
 
-                context.OnCompleted();
+                context.Complete();
             };
 
             await next(loadExtension, invocationContext);
@@ -155,8 +155,8 @@ private async Task HandleDirectivesAndSubmitCode(
                 {
                     submitCode.Handler = context =>
                     {
-                        context.OnNext(new CodeSubmissionEvaluated(submitCode));
-                        context.OnCompleted();
+                        context.Publish(new CodeSubmissionEvaluated(submitCode));
+                        context.Complete();
                         return Task.CompletedTask;
                     };
 
@@ -178,14 +178,14 @@ private async Task HandleDisplayValue(
         {
             displayValue.Handler = invocationContext =>
             {
-                invocationContext.OnNext(
+                invocationContext.Publish(
                     new Events.DisplayedValueProduced(
                         displayValue.FormattedValue,
                         displayValue,
                         formattedValues: new[] { displayValue.FormattedValue },
                         valueId: displayValue.ValueId));
 
-                invocationContext.OnCompleted();
+                invocationContext.Complete();
 
                 return Task.CompletedTask;
             };
@@ -200,15 +200,15 @@ private async Task HandleUpdateDisplayValue(
         {
             displayedValue.Handler = invocationContext =>
             {
-                invocationContext.OnNext(
+                invocationContext.Publish(
                     new DisplayedValueUpdated(
                         displayedValue.FormattedValue,
                         valueId: displayedValue.ValueId,
                         command: displayedValue,
                         formattedValues: new[] { displayedValue.FormattedValue }
                         ));
 
-                invocationContext.OnCompleted();
+                invocationContext.Complete();
 
                 return Task.CompletedTask;
             };

diff --git a/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs b/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs
@@ -43,7 +43,7 @@ public async Task SendAsync(
             }
             catch (Exception exception)
             {
-                context.OnNext(
+                context.Publish(
                     new CommandFailed(
                         exception,
                         command));

diff --git a/Microsoft.DotNet.Interactive/KernelInvocationContext.cs b/Microsoft.DotNet.Interactive/KernelInvocationContext.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.DotNet.Interactive
 {
-    public class KernelInvocationContext : IObserver<IKernelEvent>, IDisposable
+    public class KernelInvocationContext : IDisposable
     {
         private readonly KernelInvocationContext _parentContext;
         private static readonly AsyncLocal<Stack<KernelInvocationContext>> _currentStack = new AsyncLocal<Stack<KernelInvocationContext>>();
@@ -30,7 +30,7 @@ private KernelInvocationContext(
 
         public IKernelCommand Command { get; }
 
-        public void OnCompleted()
+        public void Complete()
         {
             IsCompleted = true;
             _events.OnCompleted();
@@ -41,11 +41,11 @@ public void OnError(Exception exception)
             _events.OnError(exception);
         }
 
-        public void OnNext(IKernelEvent @event)
+        public void Publish(IKernelEvent @event)
         {
             if (_parentContext != null)
             {
-                _parentContext.OnNext(@event);
+                _parentContext.Publish(@event);
             }
             else
             {

diff --git a/Microsoft.DotNet.Interactive/KernelStreamClient.cs b/Microsoft.DotNet.Interactive/KernelStreamClient.cs
@@ -51,12 +51,12 @@ public Task Start()
                         streamKernelCommand = obj.ToObject<StreamKernelCommand>();
                         IKernelCommand command = null;
 
-                        if (obj.TryGetValue("Command", out var commandValue))
+                        if (obj.TryGetValue("command", StringComparison.InvariantCultureIgnoreCase ,out var commandValue))
                         {
                             command = DeserializeCommand(streamKernelCommand.CommandType, commandValue);
                         }
 
-                        if (streamKernelCommand.CommandType == "Quit")
+                        if (streamKernelCommand.CommandType == nameof(Quit))
                         {
                             return;
                         }
@@ -85,14 +85,6 @@ public Task Start()
                             }, 
                             streamKernelCommand?.Id ?? -1);
                     }
-                    catch
-                    {
-                        Write(new CommandNotRecognized
-                        {
-                            Body = obj ?? (object)line
-                        }, streamKernelCommand?.Id ?? -1);
-                    }
-
                 }
             });
         }
@@ -102,7 +94,7 @@ private void Write(IKernelEvent e, int id)
             var wrapper = new StreamKernelEvent
             {
                 Id = id,
-                Event = JsonConvert.SerializeObject(e),
+                Event = e,
                 EventType = e.GetType().Name
             };
             var serialized = JsonConvert.SerializeObject(wrapper, _jsonSerializerSettings);

diff --git a/Microsoft.DotNet.Interactive/StreamKernelCommand.cs b/Microsoft.DotNet.Interactive/StreamKernelCommand.cs
@@ -1,9 +1,19 @@
-namespace Microsoft.DotNet.Interactive
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Newtonsoft.Json;
+
+namespace Microsoft.DotNet.Interactive
 {
-    public class StreamKernelCommand
+    internal class StreamKernelCommand
     {
+        [JsonProperty("id")]
         public int Id { get; set; }
+
+        [JsonProperty("commandType")]
         public string CommandType { get; set; }
+
+        [JsonProperty("command")]
         public object Command { get; set; }
     }
 }
diff --git a/Microsoft.DotNet.Interactive/StreamKernelEvent.cs b/Microsoft.DotNet.Interactive/StreamKernelEvent.cs
@@ -5,13 +5,15 @@
 
 namespace Microsoft.DotNet.Interactive
 {
-    public class StreamKernelEvent
+    internal class StreamKernelEvent
     {
         [JsonProperty("id")]
         public int Id { get; set; }
+
         [JsonProperty("eventType")]
         public string EventType { get; set; }
+
         [JsonProperty("event")]
-        public string Event { get; set; }
+        public object Event { get; set; }
     }
 }
diff --git a/Microsoft.DotNet.Interactive/StreamKernelExtensions.cs b/Microsoft.DotNet.Interactive/StreamKernelExtensions.cs
@@ -1,24 +1,32 @@
-using System.IO;
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
 using System.Threading;
 using Microsoft.DotNet.Interactive.Commands;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.DotNet.Interactive
 {
     public static class StreamKernelExtensions
     {
-        static int id = 0;
+        private static int _id;
+        private static readonly JsonSerializerSettings _jsonSerializerSettings = new JsonSerializerSettings
+        {
+            ContractResolver = new CamelCasePropertyNamesContractResolver()
+        };
 
-        public static int WriteMessage(this StreamWriter writer, IKernelCommand command)
+        public static int WriteMessage(this StreamWriter writer, IKernelCommand command, int? correlationId = null)
         {
-            var message = new StreamKernelCommand()
+            var message = new StreamKernelCommand
             {
-                Id = Interlocked.Increment(ref id),
+                Id = correlationId?? Interlocked.Increment(ref _id),
                 CommandType = command.GetType().Name,
                 Command = command
             };
 
-            writer.WriteLine(JsonConvert.SerializeObject(message));
+            writer.WriteLine(JsonConvert.SerializeObject(message, _jsonSerializerSettings));
             writer.Flush();
             return message.Id;
         }

diff --git a/...Tests/Kernel/KernelClientTests.Kernel_can_be_interacted_using_kernel_client.approved.json b/...Tests/Kernel/KernelClientTests.Kernel_can_be_interacted_using_kernel_client.approved.json
@@ -0,0 +1,7 @@
+{"id":1,"eventType":"CodeSubmissionReceived","event":{"code":"var x = 123;","value":"var x = 123;","command":{"code":"var x = 123;","targetKernelName":null,"submissionType":0}}}
+{"id":1,"eventType":"CompleteCodeSubmissionReceived","event":{"code":"var x = 123;","command":{"code":"var x = 123;","targetKernelName":null,"submissionType":0}}}
+{"id":1,"eventType":"CodeSubmissionEvaluated","event":{"code":"var x = 123;","command":{"code":"var x = 123;","targetKernelName":null,"submissionType":0}}}
+{"id":2,"eventType":"CodeSubmissionReceived","event":{"code":"x","value":"x","command":{"code":"x","targetKernelName":null,"submissionType":0}}}
+{"id":2,"eventType":"CompleteCodeSubmissionReceived","event":{"code":"x","command":{"code":"x","targetKernelName":null,"submissionType":0}}}
+{"id":2,"eventType":"ReturnValueProduced","event":{"value":123,"formattedValues":[{"mimeType":"text/plain","value":"123"}],"valueId":null,"command":{"code":"x","targetKernelName":null,"submissionType":0}}}
+{"id":2,"eventType":"CodeSubmissionEvaluated","event":{"code":"x","command":{"code":"x","targetKernelName":null,"submissionType":0}}}
diff --git a/...aceServer.Tests/Kernel/KernelClientTests.Kernel_client_surfaces_json_errors.approved.json b/...aceServer.Tests/Kernel/KernelClientTests.Kernel_client_surfaces_json_errors.approved.json
@@ -0,0 +1 @@
+{"id":-1,"eventType":"CommandParseFailure","event":{"command":null,"body":"{ hello"}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"id":-1,"eventType":"CommandParseFailure","event":{"command":null,"body":"{ hello"}}