From 993a6bfee8a2354685ea5f73434df7fb5d57b24d Mon Sep 17 00:00:00 2001
From: Cassandra Granade <chgranad@microsoft.com>
Date: Thu, 29 Sep 2022 20:46:50 +0000
Subject: [PATCH] Revert to using .NET Core SDK 3.1.423.

---
 .devcontainer/devcontainer.json         | 13 +++++++++++++
 ci/steps-build-core.yml                 |  4 ++--
 examples/echo-kernel/echo-kernel.csproj |  2 +-
 examples/moon-kernel/moon-kernel.csproj |  2 +-
 src/Data/Protocol.cs                    |  8 +++++---
 src/Engines/BaseEngine.cs               |  6 +++---
 src/Engines/ExecuteRequestHandler.cs    |  8 ++++----
 src/Extensions/Conversions.cs           |  2 +-
 src/Extensions/Extensions.cs            |  2 +-
 src/GlobalUsings.cs                     |  8 --------
 src/ResultEncoding/DisplayData.cs       |  4 ++--
 src/Servers/ShellServer.cs              |  2 +-
 src/jupyter-core.csproj                 |  2 +-
 tests/core/core.csproj                  |  2 +-
 14 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 .devcontainer/devcontainer.json
 delete mode 100644 src/GlobalUsings.cs

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..2558748
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,13 @@
+{
+    "extensions": [
+        "ms-dotnettools.csharp"
+    ],
+    "features": {
+        "ghcr.io/devcontainers/features/dotnet:1": {
+            "version": "3.1.423"
+        },
+        "ghcr.io/devcontainers/features/python:1": {
+            "version": "3.8"
+        }
+    }
+}
diff --git a/ci/steps-build-core.yml b/ci/steps-build-core.yml
index e682067..cffd47d 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 6.0.401'
+  displayName: 'Install .NET Core SDK 3.1.423'
   inputs:
-    version: 6.0.401
+    version: 3.1.423
 
 - task: DotNetCoreCLI@2
   displayName: "Build and run unit tests on Core library"
diff --git a/examples/echo-kernel/echo-kernel.csproj b/examples/echo-kernel/echo-kernel.csproj
index 6eabbc2..a772213 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>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</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 6009a54..160750a 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>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0</Version>
   </PropertyGroup>
 
diff --git a/src/Data/Protocol.cs b/src/Data/Protocol.cs
index ca24dee..80c52e0 100644
--- a/src/Data/Protocol.cs
+++ b/src/Data/Protocol.cs
@@ -63,7 +63,7 @@ namespace Microsoft.Jupyter.Core.Protocol
         // each message will have the previous message's header in this field.
         public MessageHeader ParentHeader { get; set; }
 
-        public Dictionary<string, JToken> Metadata { get; set; } = new();
+        public Dictionary<string, JToken> Metadata { get; set; } = new Dictionary<string, JToken>();
 
         // FIXME: make not just an object.
         public MessageContent Content { get; set; }
@@ -205,7 +205,8 @@ namespace Microsoft.Jupyter.Core.Protocol
         public Dictionary<string, string> Data { get; set; }
 
         [JsonProperty("metadata")]
-        public Dictionary<string, Dictionary<string, JToken>> Metadata { get; set; } = new();
+        public Dictionary<string, Dictionary<string, JToken>> Metadata { get; set; }
+            = new Dictionary<string, Dictionary<string, JToken>>();
     }
 
     [JsonObject(MemberSerialization.OptIn)]
@@ -286,7 +287,8 @@ namespace Microsoft.Jupyter.Core.Protocol
         public Dictionary<string, string> Data { get; set; }
 
         [JsonProperty("metadata")]
-        public Dictionary<string, Dictionary<string, JToken>> Metadata { get; set; } = new();
+        public Dictionary<string, Dictionary<string, JToken>> Metadata { get; set; }
+            = new Dictionary<string, Dictionary<string, JToken>>();
 
         [JsonProperty("transient", NullValueHandling=NullValueHandling.Ignore)]
         public TransientDisplayData? Transient { get; set; } = null;
diff --git a/src/Engines/BaseEngine.cs b/src/Engines/BaseEngine.cs
index 0e41dca..ca94d40 100644
--- a/src/Engines/BaseEngine.cs
+++ b/src/Engines/BaseEngine.cs
@@ -413,7 +413,7 @@ namespace Microsoft.Jupyter.Core
                             StreamName = stream,
                             Text = text
                         },
-                        Metadata = new()
+                        Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>()
                     }.AsReplyTo(parent)
                 );
             }
@@ -435,7 +435,7 @@ namespace Microsoft.Jupyter.Core
                     Transient = transient
                 };
                 #if DEBUG
-                Debug.Assert(displayData.Metadata is not null);
+                Debug.Assert(!(displayData.Metadata is null));
                 #endif
 
                 // Send the engine's output to stdout.
@@ -503,7 +503,7 @@ namespace Microsoft.Jupyter.Core
                     {
                         ZmqIdentities = message.ZmqIdentities,
                         ParentHeader = message.Header,
-                        Metadata = new(),
+                        Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>(),
                         Content = null,
                         Header = new MessageHeader
                         {
diff --git a/src/Engines/ExecuteRequestHandler.cs b/src/Engines/ExecuteRequestHandler.cs
index 39c1a42..e75f8c8 100644
--- a/src/Engines/ExecuteRequestHandler.cs
+++ b/src/Engines/ExecuteRequestHandler.cs
@@ -63,7 +63,7 @@ namespace Microsoft.Jupyter.Core
                 {
                     ZmqIdentities = message.ZmqIdentities,
                     ParentHeader = message.Header,
-                    Metadata = new(),
+                    Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>(),
                     Content = new ExecuteInputContent
                     {
                         Code = code,
@@ -115,7 +115,7 @@ namespace Microsoft.Jupyter.Core
                     {
                         ZmqIdentities = message.ZmqIdentities,
                         ParentHeader = message.Header,
-                        Metadata = new(),
+                        Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>(),
                         Content = new ExecuteResultContent
                         {
                             ExecutionCount = executionCount,
@@ -142,7 +142,7 @@ namespace Microsoft.Jupyter.Core
                 {
                     ZmqIdentities = message.ZmqIdentities,
                     ParentHeader = message.Header,
-                    Metadata = new(),
+                    Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>(),
                     Content = new ExecuteReplyContent
                     {
                         ExecuteStatus = engineResponse.Status,
@@ -168,7 +168,7 @@ namespace Microsoft.Jupyter.Core
                 {
                     ZmqIdentities = message.ZmqIdentities,
                     ParentHeader = message.Header,
-                    Metadata = new(),
+                    Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>(),
                     Content = new ExecuteReplyContent
                     {
                         ExecuteStatus = ExecuteStatus.Abort,
diff --git a/src/Extensions/Conversions.cs b/src/Extensions/Conversions.cs
index 1f15285..745cb18 100644
--- a/src/Extensions/Conversions.cs
+++ b/src/Extensions/Conversions.cs
@@ -42,7 +42,7 @@ namespace Microsoft.Jupyter.Core
             new EncodedData
             {
                 Data = data,
-                Metadata = new()
+                Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>()
             };
 
         /// <summary>
diff --git a/src/Extensions/Extensions.cs b/src/Extensions/Extensions.cs
index d16d20e..b7618cf 100644
--- a/src/Extensions/Extensions.cs
+++ b/src/Extensions/Extensions.cs
@@ -53,7 +53,7 @@ namespace Microsoft.Jupyter.Core
                     {
                         ExecutionState = state
                     },
-                    Metadata = new()
+                    Metadata = new Dictionary<string, JToken>()
                 }.AsReplyTo(message)
             );
         }
diff --git a/src/GlobalUsings.cs b/src/GlobalUsings.cs
deleted file mode 100644
index 4ec0752..0000000
--- a/src/GlobalUsings.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-global using System;
-global using System.Collections.Generic;
-global using System.Collections.Immutable;
-global using System.Linq;
-global using System.Threading;
diff --git a/src/ResultEncoding/DisplayData.cs b/src/ResultEncoding/DisplayData.cs
index 2cd4b36..bc5f8c0 100644
--- a/src/ResultEncoding/DisplayData.cs
+++ b/src/ResultEncoding/DisplayData.cs
@@ -35,8 +35,8 @@ namespace Microsoft.Jupyter.Core
         public static MimeBundle Empty() =>
             new MimeBundle
             {
-                Data = new(),
-                Metadata = new()
+                Data = new Dictionary<string, string>(),
+                Metadata = new Dictionary<string, Dictionary<string, JToken>>()
             };
     }
 
diff --git a/src/Servers/ShellServer.cs b/src/Servers/ShellServer.cs
index 02f61af..bc7ea82 100644
--- a/src/Servers/ShellServer.cs
+++ b/src/Servers/ShellServer.cs
@@ -190,7 +190,7 @@ namespace Microsoft.Jupyter.Core
                     {
                         ZmqIdentities = message.ZmqIdentities,
                         ParentHeader = message.Header,
-                        Metadata = new(),
+                        Metadata = new Dictionary<string, Newtonsoft.Json.Linq.JToken>(),
                         Content = this.context.Properties.AsKernelInfoReply(),
                         Header = new MessageHeader
                         {
diff --git a/src/jupyter-core.csproj b/src/jupyter-core.csproj
index dde60d2..f27950e 100644
--- a/src/jupyter-core.csproj
+++ b/src/jupyter-core.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>8.0</LangVersion>
 
     <AssemblyName>Microsoft.Jupyter.Core</AssemblyName>
     <Version Condition=" '$(BUILD_MAJOR)' != ''  ">$(BUILD_MAJOR).$(BUILD_MINOR).0.0</Version>
diff --git a/tests/core/core.csproj b/tests/core/core.csproj
index a6841d2..ccfef64 100644
--- a/tests/core/core.csproj
+++ b/tests/core/core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <AssemblyName>Microsoft.Jupyter.Core.Tests</AssemblyName>