Update to .NET Core 3

src/NegativeEddy.Leaflet.CoreConsoleHost/ConsoleInput.cs

@@ -1,18 +1,10 @@
-using System;
-using NegativeEddy.Leaflet.IO;
+using NegativeEddy.Leaflet.IO;
 
-namespace NegativeEddy.Leaflet.CoreConsoleHost
+namespace NegativeEddy.Leaflet.CoreConsoleHost;
+
+class ConsoleInput : IZInput
 {
-    class ConsoleInput : IZInput
-    {
-        public char ReadChar()
-        {
-            return Console.ReadKey().KeyChar;
-        }
+    public char ReadChar() => Console.ReadKey().KeyChar;
 
-        public string ReadLine()
-        {
-            return Console.ReadLine();
-        }
-    }
+    public string? ReadLine() => Console.ReadLine();
 }

src/NegativeEddy.Leaflet.CoreConsoleHost/NegativeEddy.Leaflet.CoreConsoleHost.csproj

@@ -1,20 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>NegativeEddy.Leaflet.CoreConsoleHost</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>NegativeEddy.Leaflet.CoreConsoleHost</PackageId>
     <RuntimeIdentifiers>win10-x64;osx.10.11-x64;rhel.7.2-x64;ubuntu.14.04-x64</RuntimeIdentifiers>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup> 
+  <ItemGroup>
     <ProjectReference Include="..\NegativeEddy.Leaflet\NegativeEddy.Leaflet.csproj" />
   </ItemGroup>
-    
+
   <ItemGroup>
     <None Update="GameFiles\**\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/NegativeEddy.Leaflet.CoreConsoleHost/Program.cs

@@ -1,39 +1,28 @@
-using System;
+using NegativeEddy.Leaflet;
+using NegativeEddy.Leaflet.CoreConsoleHost;
 using System.Diagnostics;
-using System.IO;
 
-namespace NegativeEddy.Leaflet.CoreConsoleHost
+var zm = new Interpreter
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var zm = new Interpreter();
-            zm.Input = new ConsoleInput();
-            zm.Output.Subscribe(x => Console.Write(x));
-            zm.Diagnostics.Subscribe(x => Debug.Write(x));
-            zm.DiagnosticsOutputLevel = Interpreter.DiagnosticsLevel.Verbose;
+    Input = new ConsoleInput(),
+    DiagnosticsOutputLevel = Interpreter.DiagnosticsLevel.Verbose,
+};
 
-            string filename = Path.Combine("GameFiles", "minizork.z3");
-            using (var stream = File.OpenRead(filename))
-            {
-                zm.LoadStory(stream);
-            }
-            Console.WriteLine($"Gamefile Version {zm.MainMemory.Header.Version}");
+zm.Output.Subscribe(x => Console.Write(x));
+zm.Diagnostics.Subscribe(x => Debug.Write(x));
 
-            //DumpObjectTree(zm);
+string filename = Path.Combine("GameFiles", "minizork.z3");
+using (var stream = File.OpenRead(filename))
+{
+    zm.LoadStory(stream);
+}
+Console.WriteLine($"Gamefile Version {zm.MainMemory.Header.Version}");
 
-            //DumpObjects(zm);
+//DumpObjectTree(zm);
 
-            RunGame(zm);
-        }
+//DumpObjects(zm);
 
-        private static void RunGame(Interpreter zm)
-        {
-            while (zm.IsRunning)
-            {
-                zm.ExecuteCurrentInstruction();
-            }
-        }
-    }
+while (zm.IsRunning)
+{
+    zm.ExecuteCurrentInstruction();
 }

src/NegativeEddy.Leaflet.CoreConsoleHost/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

src/NegativeEddy.Leaflet.CoreTests/GameFiles/miniZork_input_mailbox.txt

@@ -0,0 +1,4 @@
+open mailbox
+read leaflet
+s
+e