updateapi contract files

flcdrg · Feb 2, 2022 · 7e8c2b4 · 7e8c2b4
1 parent 4999e8b
commit 7e8c2b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/....ApiCompatibility.Tests/ApiCompatibilityTests.Interactive_api_is_not_changed.approved.txt b/....ApiCompatibility.Tests/ApiCompatibilityTests.Interactive_api_is_not_changed.approved.txt
@@ -20,7 +20,7 @@ Microsoft.DotNet.Interactive
     public System.String DefaultKernelName { get; set;}
     public KernelHost Host { get;}
     public System.Void Add(Kernel kernel, System.Collections.Generic.IReadOnlyCollection<System.String> aliases = null)
-    public System.Void AddKernelConnection<TKernelConnector>(ConnectKernelCommand<TKernelConnector> connectionCommand)
+    public System.Void AddKernelConnector<TKernelConnector>(ConnectKernelCommand<TKernelConnector> connectionCommand)
      System.Collections.Generic.IEnumerable<System.CommandLine.Parsing.Parser> GetDirectiveParsersForCompletion(Microsoft.DotNet.Interactive.Parsing.DirectiveNode directiveNode, System.Int32 requestPosition)
     public System.Collections.Generic.IEnumerator<Kernel> GetEnumerator()
      SchedulingScope GetHandlingKernelCommandScope(Microsoft.DotNet.Interactive.Commands.KernelCommand command, KernelInvocationContext context)
@@ -167,7 +167,6 @@ Microsoft.DotNet.Interactive
     public static System.Collections.Generic.IEnumerable<Kernel> Subkernels(System.Boolean recursive = False)
     public static System.Collections.Generic.IEnumerable<Kernel> SubkernelsAndSelf(System.Boolean recursive = False)
     public static System.Threading.Tasks.Task<KernelCommandResult> SubmitCodeAsync(System.String code)
-    public static CompositeKernel UseKernelClientConnection<TConnector>(ConnectKernelCommand<TConnector> command)
     public static T UseLogMagicCommand<T>()
     public static T UseQuitCommand<T>(System.Func<System.Threading.Tasks.Task> onQuitAsync = null)
     public static Microsoft.DotNet.Interactive.Connection.ProxyKernel UseValueSharing(Microsoft.DotNet.Interactive.ValueSharing.IKernelValueDeclarer kernelValueDeclarer)
@@ -184,7 +183,7 @@ Microsoft.DotNet.Interactive
     public System.Uri Uri { get;}
     public System.Threading.Tasks.Task ConnectAndWaitAsync()
     public System.Threading.Tasks.Task ConnectAsync()
-    public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Connection.ProxyKernel> CreateProxyKernelOnConnectorAsync(KernelInfo kernelInfo, Microsoft.DotNet.Interactive.Connection.IKernelConnector kernelConnector)
+    public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Connection.ProxyKernel> CreateProxyKernelOnConnectorAsync(KernelInfo kernelInfo, Microsoft.DotNet.Interactive.Connection.KernelConnectorBase kernelConnectorBase)
     public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Connection.ProxyKernel> CreateProxyKernelOnDefaultConnectorAsync(KernelInfo kernelInfo)
     public System.Void Dispose()
     public System.Boolean TryGetKernelByDestinationUri(System.Uri destinationUri, ref Kernel& kernel)
@@ -407,8 +406,6 @@ Microsoft.DotNet.Interactive.Connection
   public abstract class IKernelCommandAndEventSender
     public System.Threading.Tasks.Task SendAsync(Microsoft.DotNet.Interactive.Commands.KernelCommand kernelCommand, System.Threading.CancellationToken cancellationToken)
     public System.Threading.Tasks.Task SendAsync(Microsoft.DotNet.Interactive.Events.KernelEvent kernelEvent, System.Threading.CancellationToken cancellationToken)
-  public abstract class IKernelConnector, System.IDisposable
-    public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Kernel> ConnectKernelAsync(Microsoft.DotNet.Interactive.KernelInfo kernelInfo)
   public abstract class InteractiveProtocolKernelCommandAndEventReceiverBase : KernelCommandAndEventReceiverBase, IKernelCommandAndEventReceiver
     protected System.Threading.Tasks.Task<CommandOrEvent> ReadCommandOrEventAsync(System.Threading.CancellationToken cancellationToken)
     protected System.Threading.Tasks.Task<System.String> ReadMessageAsync(System.Threading.CancellationToken cancellationToken)
@@ -440,12 +437,14 @@ Microsoft.DotNet.Interactive.Connection
     .ctor(System.IO.TextWriter writer)
     public System.Threading.Tasks.Task SendAsync(Microsoft.DotNet.Interactive.Commands.KernelCommand kernelCommand, System.Threading.CancellationToken cancellationToken)
     public System.Threading.Tasks.Task SendAsync(Microsoft.DotNet.Interactive.Events.KernelEvent kernelEvent, System.Threading.CancellationToken cancellationToken)
+  public abstract class KernelConnectorBase
+    public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Kernel> ConnectKernelAsync(Microsoft.DotNet.Interactive.KernelInfo kernelInfo)
   public class MultiplexingKernelCommandAndEventReceiver, IKernelCommandAndEventReceiver, System.IDisposable
     .ctor(IKernelCommandAndEventReceiver source)
     public System.Collections.Generic.IAsyncEnumerable<CommandOrEvent> CommandsAndEventsAsync(System.Threading.CancellationToken cancellationToken)
     public IKernelCommandAndEventReceiver CreateChildReceiver()
     public System.Void Dispose()
-  public class NamedPipeKernelConnector, IKernelConnector, System.IDisposable
+  public class NamedPipeKernelConnector : KernelConnectorBase
     .ctor(System.String pipeName)
     public System.String PipeName { get;}
     public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Kernel> ConnectKernelAsync(Microsoft.DotNet.Interactive.KernelInfo kernelInfo)

diff --git a/...eractive.ApiCompatibility.Tests/ApiCompatibilityTests.kql_api_is_not_changed.approved.txt b/...eractive.ApiCompatibility.Tests/ApiCompatibilityTests.kql_api_is_not_changed.approved.txt
@@ -11,13 +11,12 @@ Microsoft.DotNet.Interactive.Kql
     public System.String Cluster { get; set;}
     public System.String Database { get; set;}
     public System.String Token { get; set;}
-  public class KqlKernelConnector, Microsoft.DotNet.Interactive.Connection.IKernelConnector, System.IDisposable
+  public class KqlKernelConnector : Microsoft.DotNet.Interactive.Connection.KernelConnectorBase
     .ctor(System.String cluster, System.String database)
     public System.String Cluster { get;}
     public System.String Database { get;}
     public System.String PathToService { get; set;}
     public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Kernel> ConnectKernelAsync(Microsoft.DotNet.Interactive.KernelInfo kernelInfo)
-    public System.Void Dispose()
   public class KqlKernelExtension, Microsoft.DotNet.Interactive.IKernelExtension
     .ctor()
     public System.Threading.Tasks.Task OnLoadAsync(Microsoft.DotNet.Interactive.Kernel kernel)

diff --git a/...active.ApiCompatibility.Tests/ApiCompatibilityTests.mssql_api_is_not_changed.approved.txt b/...active.ApiCompatibility.Tests/ApiCompatibilityTests.mssql_api_is_not_changed.approved.txt
@@ -106,13 +106,12 @@ Microsoft.DotNet.Interactive.SqlServer
     .ctor()
     public ResultMessage Message { get; set;}
     public System.String OwnerUri { get; set;}
-  public class MsSqlKernelConnector, Microsoft.DotNet.Interactive.Connection.IKernelConnector, System.IDisposable
+  public class MsSqlKernelConnector : Microsoft.DotNet.Interactive.Connection.KernelConnectorBase
     .ctor(System.Boolean createDbContext, System.String connectionString)
     public System.String ConnectionString { get;}
     public System.Boolean CreateDbContext { get;}
     public System.String PathToService { get; set;}
     public System.Threading.Tasks.Task<Microsoft.DotNet.Interactive.Kernel> ConnectKernelAsync(Microsoft.DotNet.Interactive.KernelInfo kernelInfo)
-    public System.Void Dispose()
   public class MsSqlKernelExtension, Microsoft.DotNet.Interactive.IKernelExtension
     .ctor()
     public System.Threading.Tasks.Task OnLoadAsync(Microsoft.DotNet.Interactive.Kernel kernel)