a couple small API cleanups

src/Microsoft.DotNet.Interactive.ApiCompatibility.Tests/ApiCompatibilityTests.Interactive_api_is_not_changed.approved.txt

@@ -179,7 +179,6 @@ Microsoft.DotNet.Interactive
     public System.Threading.Tasks.Task EndInvoke(System.IAsyncResult result)
     public System.Threading.Tasks.Task Invoke(Microsoft.DotNet.Interactive.Commands.KernelCommand command, KernelInvocationContext context, KernelPipelineContinuation next)
   public class KernelCommandResult
-    .ctor(Microsoft.DotNet.Interactive.Commands.KernelCommand command)
     public Microsoft.DotNet.Interactive.Commands.KernelCommand Command { get;}
     public System.Collections.Generic.IReadOnlyList<Microsoft.DotNet.Interactive.Events.KernelEvent> Events { get;}
   public class KernelCommandScheduler : KernelScheduler<Microsoft.DotNet.Interactive.Commands.KernelCommand,KernelCommandResult>, IKernelScheduler<Microsoft.DotNet.Interactive.Commands.KernelCommand,KernelCommandResult>, System.IDisposable
@@ -390,7 +389,6 @@ Microsoft.DotNet.Interactive.Commands
     public System.CommandLine.Parsing.ParseResult KernelChooserParseResult { get;}
     public System.Uri OriginUri { get; set;}
     public KernelCommand Parent { get;}
-    public System.Collections.Generic.IDictionary<System.String,System.Object> Properties { get;}
     public Microsoft.DotNet.Interactive.CommandRoutingSlip RoutingSlip { get;}
     public System.String TargetKernelName { get;}
     public System.Boolean Equals(KernelCommand other)

src/Microsoft.DotNet.Interactive.CSharpProject.Tests/SerializationTests.cs

@@ -55,8 +55,7 @@ public void All_command_types_are_round_trip_serializable(KernelCommand command)
             .Should()
             .BeEquivalentToRespectingRuntimeTypes(
                 originalEnvelope,
-                o => o.Excluding(e => e.Command.Properties)
-                    .Excluding(e => e.Command.Handler));
+                o => o.Excluding(e => e.Command.Handler));
     }
 
     [Theory]
@@ -84,8 +83,7 @@ public void All_event_types_are_round_trip_serializable(KernelEvent @event)
             .Should()
             .BeEquivalentToRespectingRuntimeTypes(
                 originalEnvelope,
-                o => o.Excluding(envelope => envelope.Event.Command.Properties)
-                    .Excluding(memberInfo => ignoredProperties.Contains($"{memberInfo.DeclaringType.Name}.{memberInfo.Name}"))
+                o => o.Excluding(memberInfo => ignoredProperties.Contains($"{memberInfo.DeclaringType.Name}.{memberInfo.Name}"))
             );
     }
 

src/Microsoft.DotNet.Interactive.PackageManagement/KernelSupportsNugetExtensions.cs

@@ -30,8 +30,6 @@ public static T UseNugetDirective<T>(this T kernel, bool useResultsCache = true)
         return kernel;
     }
 
-    private static readonly string installPackagesPropertyName = "commandIHandler.InstallPackages";
-
     private static Command i()
     {
         var iDirective = new Command("#i")
@@ -152,20 +150,7 @@ private static bool EndsInDirectorySeparator(string path)
     {
         return path.Length > 0 && path.EndsWith(Path.DirectorySeparatorChar);
     }
-
-    private static void CreateOrUpdateDisplayValue(KernelInvocationContext context, string name, object content)
-    {
-        if (!context.Command.Properties.TryGetValue(name, out var displayed))
-        {
-            displayed = context.Display(content);
-            context.Command.Properties.Add(name, displayed);
-        }
-        else
-        {
-            (displayed as DisplayedValue)?.Update(content);
-        }
-    }
-
+
     internal static KernelCommandInvocation DoNugetRestore()
     {
         return async (_, invocationContext) =>
@@ -183,8 +168,8 @@ async Task Restore(KernelInvocationContext context)
 
                 var installMessage = new InstallPackagesMessage(requestedSources, requestedPackages, Array.Empty<string>(), 0);
 
-                CreateOrUpdateDisplayValue(context, installPackagesPropertyName, installMessage);
-
+                var displayedValue = context.Display(installMessage);
+                
                 var restorePackagesTask = kernel.RestoreAsync();
                 var delay = 500;
                 while (await Task.WhenAny(Task.Delay(delay), restorePackagesTask) != restorePackagesTask)
@@ -195,7 +180,8 @@ async Task Restore(KernelInvocationContext context)
                     }
 
                     installMessage.Progress++;
-                    CreateOrUpdateDisplayValue(context, installPackagesPropertyName, installMessage);
+
+                    displayedValue.Update(installMessage);
                 }
 
                 var result = await restorePackagesTask;
@@ -204,10 +190,10 @@ async Task Restore(KernelInvocationContext context)
                     requestedSources,
                     Array.Empty<string>(),
                     kernel.ResolvedPackageReferences
-                        .Where(r => requestedPackages.Contains(r.PackageName, StringComparer.OrdinalIgnoreCase))
-                        .Select(s => $"{s.PackageName}, {s.PackageVersion}")
-                        .OrderBy(s => s)
-                        .ToList(),
+                          .Where(r => requestedPackages.Contains(r.PackageName, StringComparer.OrdinalIgnoreCase))
+                          .Select(s => $"{s.PackageName}, {s.PackageVersion}")
+                          .OrderBy(s => s)
+                          .ToList(),
                     0);
 
                 if (result.Succeeded)
@@ -218,12 +204,12 @@ async Task Restore(KernelInvocationContext context)
                         context.Publish(new PackageAdded(resolvedReference, context.Command));
                     }
 
-                    CreateOrUpdateDisplayValue(context, installPackagesPropertyName, resultMessage);
+                    displayedValue.Update(resultMessage);
                 }
                 else
                 {
                     var errors = string.Join(Environment.NewLine, result.Errors);
-                    CreateOrUpdateDisplayValue(context, installPackagesPropertyName, resultMessage);
+                    displayedValue.Update(resultMessage);
                     context.Fail(context.Command, message: errors);
                 }
             }

src/Microsoft.DotNet.Interactive.Tests/Connection/SerializationTests.cs

@@ -55,9 +55,8 @@ public void All_command_types_are_round_trip_serializable(KernelCommand command)
             .Should()
             .BeEquivalentToRespectingRuntimeTypes(
                 originalEnvelope,
-                o => o.Excluding(e => e.Command.Properties)
-                    .Excluding(e => e.Command.Handler)
-                    .Excluding(info => ignoredProperties.Contains($"{info.DeclaringType.Name}.{info.Name}")));
+                o => o.Excluding(e => e.Command.Handler)
+                      .Excluding(info => ignoredProperties.Contains($"{info.DeclaringType.Name}.{info.Name}")));
     }
 
     [Theory]
@@ -85,8 +84,7 @@ public void All_event_types_are_round_trip_serializable(KernelEvent @event)
             .Should()
             .BeEquivalentToRespectingRuntimeTypes(
                 originalEnvelope,
-                o => o.Excluding(envelope => envelope.Event.Command.Properties)
-                    .Excluding(info => ignoredProperties.Contains($"{info.DeclaringType.Name}.{info.Name}")));
+                o => o.Excluding(info => ignoredProperties.Contains($"{info.DeclaringType.Name}.{info.Name}")));
     }
 
     [Theory]

src/Microsoft.DotNet.Interactive/Commands/KernelCommand.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using System.Text.Json.Serialization;
@@ -15,10 +14,8 @@ public abstract class KernelCommand : IEquatable<KernelCommand>
     private KernelCommand _parent;
     private string _token;
 
-    protected KernelCommand(
-        string targetKernelName = null)
+    protected KernelCommand(string targetKernelName = null)
     {
-        Properties = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
         TargetKernelName = targetKernelName;
         RoutingSlip = new CommandRoutingSlip();
     }
@@ -52,9 +49,6 @@ public void SetParent(KernelCommand parent)
         }
     }
 
-    [JsonIgnore]
-    public IDictionary<string, object> Properties { get; }
-
     public string TargetKernelName { get; internal set; }
 
     internal static KernelCommand None => new NoCommand();

src/Microsoft.DotNet.Interactive/KernelCommandResult.cs

@@ -13,7 +13,7 @@ public class KernelCommandResult
 {
     private readonly List<KernelEvent> _events = new();
 
-    public KernelCommandResult(KernelCommand command)
+    internal KernelCommandResult(KernelCommand command)
     {
         Command = command;
     }