From d7130d776fdd897a7ba20514fe2be0a1827431f2 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Thu, 17 Mar 2022 08:54:22 -0700
Subject: [PATCH 1/7] Update to newtonsoft.json 13.0.1.

---
 src/jupyter-core.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jupyter-core.csproj b/src/jupyter-core.csproj
index c860ff1..50687b9 100644
--- a/src/jupyter-core.csproj
+++ b/src/jupyter-core.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="NetMQ" Version="4.0.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
 
     <PackageReference Include="System.Net.Security" Version="4.3.1" />

From 7cc783bb3191e9d540c11e7f3cd864cb4f11c1a0 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Thu, 17 Mar 2022 09:00:05 -0700
Subject: [PATCH 2/7] Update bin projects to net6.0.

---
 examples/echo-kernel/echo-kernel.csproj |  2 +-
 examples/moon-kernel/moon-kernel.csproj |  2 +-
 src/Engines/CompletionResult.cs         |  2 ++
 src/jupyter-core.csproj                 |  2 +-
 tests/core/InputParserTests.cs          | 16 +++-------------
 tests/core/core.csproj                  |  2 +-
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/examples/echo-kernel/echo-kernel.csproj b/examples/echo-kernel/echo-kernel.csproj
index a772213..6eabbc2 100644
--- a/examples/echo-kernel/echo-kernel.csproj
+++ b/examples/echo-kernel/echo-kernel.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackAsTool>True</PackAsTool>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <!--
       NB: We need for the tool command name to match the pattern dotnet-*,
diff --git a/examples/moon-kernel/moon-kernel.csproj b/examples/moon-kernel/moon-kernel.csproj
index 7b102d0..6009a54 100644
--- a/examples/moon-kernel/moon-kernel.csproj
+++ b/examples/moon-kernel/moon-kernel.csproj
@@ -4,7 +4,7 @@
     <ToolCommandName>dotnet-imoon</ToolCommandName>
     <PackAsTool>True</PackAsTool>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.0</Version>
   </PropertyGroup>
 
diff --git a/src/Engines/CompletionResult.cs b/src/Engines/CompletionResult.cs
index 7ce7b12..6889194 100644
--- a/src/Engines/CompletionResult.cs
+++ b/src/Engines/CompletionResult.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#nullable enable
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/jupyter-core.csproj b/src/jupyter-core.csproj
index 50687b9..8fe1360 100644
--- a/src/jupyter-core.csproj
+++ b/src/jupyter-core.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
 
     <AssemblyName>Microsoft.Jupyter.Core</AssemblyName>
     <Version Condition=" '$(BUILD_MAJOR)' != ''  ">$(BUILD_MAJOR).$(BUILD_MINOR).0.0</Version>
diff --git a/tests/core/InputParserTests.cs b/tests/core/InputParserTests.cs
index ce29b7a..34c7d12 100644
--- a/tests/core/InputParserTests.cs
+++ b/tests/core/InputParserTests.cs
@@ -9,12 +9,7 @@
 
 namespace Microsoft.Jupyter.Core
 {
-    internal class MundaneSymbol : ISymbol
-    {
-        public string Name { get; set; }
-        
-        public SymbolKind Kind { get; set; }
-    }
+    internal record MundaneSymbol(string Name, SymbolKind Kind) : ISymbol;
 
     internal class MockSymbolResolver : ISymbolResolver
     {
@@ -32,13 +27,8 @@ internal class MockSymbolResolver : ISymbolResolver
                 } as ISymbol
             : 
             this.otherSymbols.Contains(symbolName)
-            ? new MundaneSymbol
-                {
-                    Name = symbolName,
-                    Kind = SymbolKind.Callable
-                } as ISymbol
-            :
-            null;
+            ? new MundaneSymbol(symbolName, SymbolKind.Callable) as ISymbol
+            : null;
     }
 
     [TestClass]
diff --git a/tests/core/core.csproj b/tests/core/core.csproj
index 4679090..56a0572 100644
--- a/tests/core/core.csproj
+++ b/tests/core/core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>

From c0e98eb4995ae4a4a003dbd4670ccfc97d6765a9 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Thu, 17 Mar 2022 09:06:56 -0700
Subject: [PATCH 3/7] Update CI definitions as well.

---
 ci/ci.yml               | 3 ++-
 ci/signed.yml           | 3 ++-
 ci/steps-build-core.yml | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ci/ci.yml b/ci/ci.yml
index a5a1f25..31345f4 100644
--- a/ci/ci.yml
+++ b/ci/ci.yml
@@ -23,7 +23,8 @@ variables:
 
 jobs:
 - job: Windows
-  pool: 'Hosted VS2017'
+  pool:
+    vmImage: 'windows-2019'
   steps:
   - template: steps-build-core.yml
   - template: steps-build-samples.yml
diff --git a/ci/signed.yml b/ci/signed.yml
index 82ec9bf..70e93a8 100644
--- a/ci/signed.yml
+++ b/ci/signed.yml
@@ -15,7 +15,8 @@ variables:
 
 jobs:
 - job: Windows
-  pool: 'Hosted VS2017'
+  pool:
+    vmImage: 'windows-2019'
   steps:
   - template: steps-build-core.yml
   - template: steps-build-samples.yml
diff --git a/ci/steps-build-core.yml b/ci/steps-build-core.yml
index 0c48aaa..c9217c6 100644
--- a/ci/steps-build-core.yml
+++ b/ci/steps-build-core.yml
@@ -4,9 +4,9 @@
 
 steps:
 - task: DotNetCoreInstaller@1
-  displayName: 'Install .NET Core SDK 3.1.300'
+  displayName: 'Install .NET Core SDK 6.0.201'
   inputs:
-    version: 3.1.100
+    version: 6.0.201
 
 - task: DotNetCoreCLI@2
   displayName: "Build and run unit tests on Core library"

From 6801284945a37a72204dcf15c082f66dedb9ef6d Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Thu, 17 Mar 2022 09:17:01 -0700
Subject: [PATCH 4/7] Build samples against Py37.

---
 ci/steps-build-samples.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/steps-build-samples.yml b/ci/steps-build-samples.yml
index 31a856e..00fd558 100644
--- a/ci/steps-build-samples.yml
+++ b/ci/steps-build-samples.yml
@@ -7,7 +7,7 @@ steps:
   displayName: 'Create conda environment for hosting Jupyter kernels'
   inputs:
     environmentName: core_tests
-    packageSpecs: python=3.6 notebook jupyter_client pytest nose pip>=18.1
+    packageSpecs: python=3.7 notebook jupyter_client pytest nose pip>=18.1
 
 - script: |
      echo $PATH

From 34ac7cb0504aa0e820f17120db12b61b8c2b12d0 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Thu, 17 Mar 2022 09:35:41 -0700
Subject: [PATCH 5/7] Default to empty dictionary for msg metadata.

---
 src/Data/Protocol.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Data/Protocol.cs b/src/Data/Protocol.cs
index 68c3d74..cc74254 100644
--- a/src/Data/Protocol.cs
+++ b/src/Data/Protocol.cs
@@ -62,7 +62,7 @@ public class Message
         public MessageHeader ParentHeader { get; set; }
 
         // FIXME: make not just an object.
-        public object Metadata { get; set; }
+        public object Metadata { get; set; } = new Dictionary<string, object>();
 
         // FIXME: make not just an object.
         public MessageContent Content { get; set; }

From 388a47db317a195676743d4f8485f5c32c5b2789 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Thu, 17 Mar 2022 11:08:21 -0700
Subject: [PATCH 6/7] Prevent null metadata in messages.

---
 src/Extensions/Messages.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Extensions/Messages.cs b/src/Extensions/Messages.cs
index 0496faf..c0fb137 100644
--- a/src/Extensions/Messages.cs
+++ b/src/Extensions/Messages.cs
@@ -118,7 +118,9 @@ public static void SendMessage(this IOutgoingSocket socket, KernelContext contex
                 {
                     message.Header,
                     message.ParentHeader,
-                    message.Metadata,
+                    // Make sure that metadata is never null when going out
+                    // over the wire.
+                    message.Metadata ?? new Dictionary<string, object>(),
                     message.Content
                 }
                 .Select(frame => JsonConvert.SerializeObject(frame))

From 8ecfdbefb610e5c731c41c6d13663282aac6bf10 Mon Sep 17 00:00:00 2001
From: Christopher Granade <cgranade@cgranade.com>
Date: Fri, 18 Mar 2022 08:57:33 -0700
Subject: [PATCH 7/7] Consolidate status handling to avoid missing status
 properties.

---
 src/Data/Protocol.cs | 49 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/Data/Protocol.cs b/src/Data/Protocol.cs
index cc74254..0874d5a 100644
--- a/src/Data/Protocol.cs
+++ b/src/Data/Protocol.cs
@@ -87,6 +87,11 @@ public Message AsReplyTo(Message parent)
 
     }
 
+    public interface IHasStatus<TStatus>
+    {
+        public TStatus Status { get; set; }
+    }
+
     [JsonObject(MemberSerialization.OptIn)]
     public class MessageContent
     {
@@ -129,8 +134,11 @@ public Dictionary<string, object> Data
     }
 
     [JsonObject(MemberSerialization.OptIn)]
-    public class KernelInfoReplyContent : MessageContent
+    public class KernelInfoReplyContent : MessageContent, IHasStatus<ExecuteStatus>
     {
+        [JsonProperty("status")]
+        public ExecuteStatus Status { get; set; } = ExecuteStatus.Ok;
+
         [JsonProperty("protocol_version")]
         public string ProtocolVersion { get => "5.2.0"; }
 
@@ -215,10 +223,25 @@ public class ExecuteInputContent : MessageContent
     }
 
     [JsonObject(MemberSerialization.OptIn)]
-    public class ExecuteReplyContent : MessageContent
+    public class ExecuteReplyContent : MessageContent, IHasStatus<ExecuteStatus>
     {
         [JsonProperty("status")]
-        public ExecuteStatus ExecuteStatus { get; set; }
+        public ExecuteStatus Status { get; set; }
+
+        // For backwards compatability, also define ExecuteStatus as forwarding
+        // to status.
+        [Obsolete("Please use Status.")]
+        public ExecuteStatus ExecuteStatus
+        {
+            get
+            {
+                return Status;
+            }
+            set
+            {
+                Status = value;
+            }
+        }
 
         [JsonProperty("execution_count")]
         public int? ExecutionCount { get; set; }
@@ -232,10 +255,26 @@ public class ExecuteReplyContent : MessageContent
     }
 
     [JsonObject(MemberSerialization.OptIn)]
-    public class CompleteReplyContent : MessageContent
+    public class CompleteReplyContent : MessageContent, IHasStatus<CompleteStatus>
     {
         [JsonProperty("status")]
-        public CompleteStatus CompleteStatus { get; set; }
+        public CompleteStatus Status { get; set; }
+
+
+        // For backwards compatability, also define ExecuteStatus as forwarding
+        // to status.
+        [Obsolete("Please use Status.")]
+        public CompleteStatus CompleteStatus
+        {
+            get
+            {
+                return Status;
+            }
+            set
+            {
+                Status = value;
+            }
+        }
 
         [JsonProperty("matches")]
         public List<string> Matches { get; set; } = new List<string>();