From 6f77029a247c78177e85b3fbc763f6f4aadfd258 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 22 Jul 2019 16:06:54 +0100 Subject: [PATCH 1/5] move files --- DotNetTry.sln | 7 +++++++ .../Microsoft.DotNet.Interactive.Jupyter.csproj | 1 + .../CodeSubmissionEvaluated.cs | 0 .../CodeSubmissionEvaluationFailed.cs | 0 .../CodeSubmissionReceived.cs | 0 .../CompleteCodeSubmissionReceived.cs | 0 .../CompletionItem.cs | 0 .../CompletionRequestCompleted.cs | 0 .../CompletionRequestReceived.cs | 0 .../CompositeKernel.cs | 0 .../DiagnosticsReceived.cs | 0 .../DocumentationReceived.cs | 0 .../ExtensionLoading.cs | 0 .../FormattedValue.cs | 0 .../IKernel.cs | 0 .../IKernelCommand.cs | 0 .../IKernelCommandResult.cs | 0 .../IKernelEvent.cs | 0 .../IKernelExtension.cs | 0 .../IRendering.cs | 0 .../IncompleteCodeSubmissionReceived.cs | 0 .../KernelBase.cs | 0 .../KernelCommandBase.cs | 0 .../KernelCommandInvocation.cs | 0 .../KernelCommandNotSupportedException.cs | 0 .../KernelCommandPipeline.cs | 0 .../KernelCommandPipelineMiddleware.cs | 0 .../KernelCommandResult.cs | 0 .../KernelEventBase.cs | 0 .../KernelException.cs | 0 .../KernelExtensions.cs | 0 .../KernelInvocationContext.cs | 0 .../KernelPipelineContext.cs | 0 .../KernelPipelineContinuation.cs | 0 .../LoadExtension.cs | 0 .../Microsoft.DotNet.Interactive.csproj | 17 +++++++++++++++++ .../NoSuitableKernelException.cs | 0 .../NuGetPackageAdded.cs | 0 .../NugetPackageReference.cs | 0 .../RenderingEngineException.cs | 0 .../RequestCompletion.cs | 0 .../RequestDiagnostics.cs | 0 .../RequestDocumentation.cs | 0 .../RequestSignatureHelp.cs | 0 .../SendStandardInput.cs | 0 .../SignatureHelpReceived.cs | 0 .../StandardErrorReceived.cs | 0 .../StandardInputReceived.cs | 0 .../StandardOutputReceived.cs | 0 .../Started.cs | 0 .../Stopped.cs | 0 .../SubmitCode.cs | 0 .../ValueProduced.cs | 0 WorkspaceServer/Kernel/CSharpKernel.cs | 2 +- WorkspaceServer/WorkspaceServer.csproj | 1 + 55 files changed, 27 insertions(+), 1 deletion(-) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CodeSubmissionEvaluated.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CodeSubmissionEvaluationFailed.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CodeSubmissionReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CompleteCodeSubmissionReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CompletionItem.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CompletionRequestCompleted.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CompletionRequestReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/CompositeKernel.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/DiagnosticsReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/DocumentationReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/ExtensionLoading.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/FormattedValue.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/IKernel.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/IKernelCommand.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/IKernelCommandResult.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/IKernelEvent.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/IKernelExtension.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/IRendering.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/IncompleteCodeSubmissionReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelBase.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelCommandBase.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelCommandInvocation.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelCommandNotSupportedException.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelCommandPipeline.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelCommandPipelineMiddleware.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelCommandResult.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelEventBase.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelException.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelExtensions.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelInvocationContext.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelPipelineContext.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/KernelPipelineContinuation.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/LoadExtension.cs (100%) create mode 100644 Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/NoSuitableKernelException.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/NuGetPackageAdded.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/NugetPackageReference.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/RenderingEngineException.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/RequestCompletion.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/RequestDiagnostics.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/RequestDocumentation.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/RequestSignatureHelp.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/SendStandardInput.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/SignatureHelpReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/StandardErrorReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/StandardInputReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/StandardOutputReceived.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/Started.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/Stopped.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/SubmitCode.cs (100%) rename {WorkspaceServer/Kernel => Microsoft.DotNet.Interactive}/ValueProduced.cs (100%) diff --git a/DotNetTry.sln b/DotNetTry.sln index 183afdc31..c7a22c8ad 100644 --- a/DotNetTry.sln +++ b/DotNetTry.sln @@ -61,6 +61,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactiv EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.Jupyter", "Microsoft.DotNet.Interactive.Jupyter\Microsoft.DotNet.Interactive.Jupyter.csproj", "{113A4166-5734-4F6E-B609-D6CF42679399}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive", "Microsoft.DotNet.Interactive\Microsoft.DotNet.Interactive.csproj", "{2BB7CCD7-73D1-4B16-82EC-A5D0183F8CF5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -175,6 +177,10 @@ Global {113A4166-5734-4F6E-B609-D6CF42679399}.Debug|Any CPU.Build.0 = Debug|Any CPU {113A4166-5734-4F6E-B609-D6CF42679399}.Release|Any CPU.ActiveCfg = Release|Any CPU {113A4166-5734-4F6E-B609-D6CF42679399}.Release|Any CPU.Build.0 = Release|Any CPU + {2BB7CCD7-73D1-4B16-82EC-A5D0183F8CF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2BB7CCD7-73D1-4B16-82EC-A5D0183F8CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2BB7CCD7-73D1-4B16-82EC-A5D0183F8CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2BB7CCD7-73D1-4B16-82EC-A5D0183F8CF5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -206,6 +212,7 @@ Global {B4B9DC70-6BA2-4BC1-A780-7FCEBDB1D218} = {8192FEAD-BCE6-4E62-97E5-2E9EA884BD71} {91902AAC-F4E9-4648-AC6B-4E4A722D3CC5} = {8192FEAD-BCE6-4E62-97E5-2E9EA884BD71} {113A4166-5734-4F6E-B609-D6CF42679399} = {6EE8F484-DFA2-4F0F-939F-400CE78DFAC2} + {2BB7CCD7-73D1-4B16-82EC-A5D0183F8CF5} = {6EE8F484-DFA2-4F0F-939F-400CE78DFAC2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D6CD99BA-B16B-4570-8910-225CBDFFA3AD} diff --git a/Microsoft.DotNet.Interactive.Jupyter/Microsoft.DotNet.Interactive.Jupyter.csproj b/Microsoft.DotNet.Interactive.Jupyter/Microsoft.DotNet.Interactive.Jupyter.csproj index 6581538e1..04de35faa 100644 --- a/Microsoft.DotNet.Interactive.Jupyter/Microsoft.DotNet.Interactive.Jupyter.csproj +++ b/Microsoft.DotNet.Interactive.Jupyter/Microsoft.DotNet.Interactive.Jupyter.csproj @@ -20,6 +20,7 @@ + diff --git a/WorkspaceServer/Kernel/CodeSubmissionEvaluated.cs b/Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs similarity index 100% rename from WorkspaceServer/Kernel/CodeSubmissionEvaluated.cs rename to Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs diff --git a/WorkspaceServer/Kernel/CodeSubmissionEvaluationFailed.cs b/Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs similarity index 100% rename from WorkspaceServer/Kernel/CodeSubmissionEvaluationFailed.cs rename to Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs diff --git a/WorkspaceServer/Kernel/CodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/CodeSubmissionReceived.cs rename to Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs diff --git a/WorkspaceServer/Kernel/CompleteCodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/CompleteCodeSubmissionReceived.cs rename to Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs diff --git a/WorkspaceServer/Kernel/CompletionItem.cs b/Microsoft.DotNet.Interactive/CompletionItem.cs similarity index 100% rename from WorkspaceServer/Kernel/CompletionItem.cs rename to Microsoft.DotNet.Interactive/CompletionItem.cs diff --git a/WorkspaceServer/Kernel/CompletionRequestCompleted.cs b/Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs similarity index 100% rename from WorkspaceServer/Kernel/CompletionRequestCompleted.cs rename to Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs diff --git a/WorkspaceServer/Kernel/CompletionRequestReceived.cs b/Microsoft.DotNet.Interactive/CompletionRequestReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/CompletionRequestReceived.cs rename to Microsoft.DotNet.Interactive/CompletionRequestReceived.cs diff --git a/WorkspaceServer/Kernel/CompositeKernel.cs b/Microsoft.DotNet.Interactive/CompositeKernel.cs similarity index 100% rename from WorkspaceServer/Kernel/CompositeKernel.cs rename to Microsoft.DotNet.Interactive/CompositeKernel.cs diff --git a/WorkspaceServer/Kernel/DiagnosticsReceived.cs b/Microsoft.DotNet.Interactive/DiagnosticsReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/DiagnosticsReceived.cs rename to Microsoft.DotNet.Interactive/DiagnosticsReceived.cs diff --git a/WorkspaceServer/Kernel/DocumentationReceived.cs b/Microsoft.DotNet.Interactive/DocumentationReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/DocumentationReceived.cs rename to Microsoft.DotNet.Interactive/DocumentationReceived.cs diff --git a/WorkspaceServer/Kernel/ExtensionLoading.cs b/Microsoft.DotNet.Interactive/ExtensionLoading.cs similarity index 100% rename from WorkspaceServer/Kernel/ExtensionLoading.cs rename to Microsoft.DotNet.Interactive/ExtensionLoading.cs diff --git a/WorkspaceServer/Kernel/FormattedValue.cs b/Microsoft.DotNet.Interactive/FormattedValue.cs similarity index 100% rename from WorkspaceServer/Kernel/FormattedValue.cs rename to Microsoft.DotNet.Interactive/FormattedValue.cs diff --git a/WorkspaceServer/Kernel/IKernel.cs b/Microsoft.DotNet.Interactive/IKernel.cs similarity index 100% rename from WorkspaceServer/Kernel/IKernel.cs rename to Microsoft.DotNet.Interactive/IKernel.cs diff --git a/WorkspaceServer/Kernel/IKernelCommand.cs b/Microsoft.DotNet.Interactive/IKernelCommand.cs similarity index 100% rename from WorkspaceServer/Kernel/IKernelCommand.cs rename to Microsoft.DotNet.Interactive/IKernelCommand.cs diff --git a/WorkspaceServer/Kernel/IKernelCommandResult.cs b/Microsoft.DotNet.Interactive/IKernelCommandResult.cs similarity index 100% rename from WorkspaceServer/Kernel/IKernelCommandResult.cs rename to Microsoft.DotNet.Interactive/IKernelCommandResult.cs diff --git a/WorkspaceServer/Kernel/IKernelEvent.cs b/Microsoft.DotNet.Interactive/IKernelEvent.cs similarity index 100% rename from WorkspaceServer/Kernel/IKernelEvent.cs rename to Microsoft.DotNet.Interactive/IKernelEvent.cs diff --git a/WorkspaceServer/Kernel/IKernelExtension.cs b/Microsoft.DotNet.Interactive/IKernelExtension.cs similarity index 100% rename from WorkspaceServer/Kernel/IKernelExtension.cs rename to Microsoft.DotNet.Interactive/IKernelExtension.cs diff --git a/WorkspaceServer/Kernel/IRendering.cs b/Microsoft.DotNet.Interactive/IRendering.cs similarity index 100% rename from WorkspaceServer/Kernel/IRendering.cs rename to Microsoft.DotNet.Interactive/IRendering.cs diff --git a/WorkspaceServer/Kernel/IncompleteCodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/IncompleteCodeSubmissionReceived.cs rename to Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs diff --git a/WorkspaceServer/Kernel/KernelBase.cs b/Microsoft.DotNet.Interactive/KernelBase.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelBase.cs rename to Microsoft.DotNet.Interactive/KernelBase.cs diff --git a/WorkspaceServer/Kernel/KernelCommandBase.cs b/Microsoft.DotNet.Interactive/KernelCommandBase.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelCommandBase.cs rename to Microsoft.DotNet.Interactive/KernelCommandBase.cs diff --git a/WorkspaceServer/Kernel/KernelCommandInvocation.cs b/Microsoft.DotNet.Interactive/KernelCommandInvocation.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelCommandInvocation.cs rename to Microsoft.DotNet.Interactive/KernelCommandInvocation.cs diff --git a/WorkspaceServer/Kernel/KernelCommandNotSupportedException.cs b/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelCommandNotSupportedException.cs rename to Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs diff --git a/WorkspaceServer/Kernel/KernelCommandPipeline.cs b/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelCommandPipeline.cs rename to Microsoft.DotNet.Interactive/KernelCommandPipeline.cs diff --git a/WorkspaceServer/Kernel/KernelCommandPipelineMiddleware.cs b/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelCommandPipelineMiddleware.cs rename to Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs diff --git a/WorkspaceServer/Kernel/KernelCommandResult.cs b/Microsoft.DotNet.Interactive/KernelCommandResult.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelCommandResult.cs rename to Microsoft.DotNet.Interactive/KernelCommandResult.cs diff --git a/WorkspaceServer/Kernel/KernelEventBase.cs b/Microsoft.DotNet.Interactive/KernelEventBase.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelEventBase.cs rename to Microsoft.DotNet.Interactive/KernelEventBase.cs diff --git a/WorkspaceServer/Kernel/KernelException.cs b/Microsoft.DotNet.Interactive/KernelException.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelException.cs rename to Microsoft.DotNet.Interactive/KernelException.cs diff --git a/WorkspaceServer/Kernel/KernelExtensions.cs b/Microsoft.DotNet.Interactive/KernelExtensions.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelExtensions.cs rename to Microsoft.DotNet.Interactive/KernelExtensions.cs diff --git a/WorkspaceServer/Kernel/KernelInvocationContext.cs b/Microsoft.DotNet.Interactive/KernelInvocationContext.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelInvocationContext.cs rename to Microsoft.DotNet.Interactive/KernelInvocationContext.cs diff --git a/WorkspaceServer/Kernel/KernelPipelineContext.cs b/Microsoft.DotNet.Interactive/KernelPipelineContext.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelPipelineContext.cs rename to Microsoft.DotNet.Interactive/KernelPipelineContext.cs diff --git a/WorkspaceServer/Kernel/KernelPipelineContinuation.cs b/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs similarity index 100% rename from WorkspaceServer/Kernel/KernelPipelineContinuation.cs rename to Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs diff --git a/WorkspaceServer/Kernel/LoadExtension.cs b/Microsoft.DotNet.Interactive/LoadExtension.cs similarity index 100% rename from WorkspaceServer/Kernel/LoadExtension.cs rename to Microsoft.DotNet.Interactive/LoadExtension.cs diff --git a/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj b/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj new file mode 100644 index 000000000..8e8dbf70c --- /dev/null +++ b/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj @@ -0,0 +1,17 @@ + + + + netstandard2.0 + $(NoWarn);8002 + preview + + + + + + + all + + + + diff --git a/WorkspaceServer/Kernel/NoSuitableKernelException.cs b/Microsoft.DotNet.Interactive/NoSuitableKernelException.cs similarity index 100% rename from WorkspaceServer/Kernel/NoSuitableKernelException.cs rename to Microsoft.DotNet.Interactive/NoSuitableKernelException.cs diff --git a/WorkspaceServer/Kernel/NuGetPackageAdded.cs b/Microsoft.DotNet.Interactive/NuGetPackageAdded.cs similarity index 100% rename from WorkspaceServer/Kernel/NuGetPackageAdded.cs rename to Microsoft.DotNet.Interactive/NuGetPackageAdded.cs diff --git a/WorkspaceServer/Kernel/NugetPackageReference.cs b/Microsoft.DotNet.Interactive/NugetPackageReference.cs similarity index 100% rename from WorkspaceServer/Kernel/NugetPackageReference.cs rename to Microsoft.DotNet.Interactive/NugetPackageReference.cs diff --git a/WorkspaceServer/Kernel/RenderingEngineException.cs b/Microsoft.DotNet.Interactive/RenderingEngineException.cs similarity index 100% rename from WorkspaceServer/Kernel/RenderingEngineException.cs rename to Microsoft.DotNet.Interactive/RenderingEngineException.cs diff --git a/WorkspaceServer/Kernel/RequestCompletion.cs b/Microsoft.DotNet.Interactive/RequestCompletion.cs similarity index 100% rename from WorkspaceServer/Kernel/RequestCompletion.cs rename to Microsoft.DotNet.Interactive/RequestCompletion.cs diff --git a/WorkspaceServer/Kernel/RequestDiagnostics.cs b/Microsoft.DotNet.Interactive/RequestDiagnostics.cs similarity index 100% rename from WorkspaceServer/Kernel/RequestDiagnostics.cs rename to Microsoft.DotNet.Interactive/RequestDiagnostics.cs diff --git a/WorkspaceServer/Kernel/RequestDocumentation.cs b/Microsoft.DotNet.Interactive/RequestDocumentation.cs similarity index 100% rename from WorkspaceServer/Kernel/RequestDocumentation.cs rename to Microsoft.DotNet.Interactive/RequestDocumentation.cs diff --git a/WorkspaceServer/Kernel/RequestSignatureHelp.cs b/Microsoft.DotNet.Interactive/RequestSignatureHelp.cs similarity index 100% rename from WorkspaceServer/Kernel/RequestSignatureHelp.cs rename to Microsoft.DotNet.Interactive/RequestSignatureHelp.cs diff --git a/WorkspaceServer/Kernel/SendStandardInput.cs b/Microsoft.DotNet.Interactive/SendStandardInput.cs similarity index 100% rename from WorkspaceServer/Kernel/SendStandardInput.cs rename to Microsoft.DotNet.Interactive/SendStandardInput.cs diff --git a/WorkspaceServer/Kernel/SignatureHelpReceived.cs b/Microsoft.DotNet.Interactive/SignatureHelpReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/SignatureHelpReceived.cs rename to Microsoft.DotNet.Interactive/SignatureHelpReceived.cs diff --git a/WorkspaceServer/Kernel/StandardErrorReceived.cs b/Microsoft.DotNet.Interactive/StandardErrorReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/StandardErrorReceived.cs rename to Microsoft.DotNet.Interactive/StandardErrorReceived.cs diff --git a/WorkspaceServer/Kernel/StandardInputReceived.cs b/Microsoft.DotNet.Interactive/StandardInputReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/StandardInputReceived.cs rename to Microsoft.DotNet.Interactive/StandardInputReceived.cs diff --git a/WorkspaceServer/Kernel/StandardOutputReceived.cs b/Microsoft.DotNet.Interactive/StandardOutputReceived.cs similarity index 100% rename from WorkspaceServer/Kernel/StandardOutputReceived.cs rename to Microsoft.DotNet.Interactive/StandardOutputReceived.cs diff --git a/WorkspaceServer/Kernel/Started.cs b/Microsoft.DotNet.Interactive/Started.cs similarity index 100% rename from WorkspaceServer/Kernel/Started.cs rename to Microsoft.DotNet.Interactive/Started.cs diff --git a/WorkspaceServer/Kernel/Stopped.cs b/Microsoft.DotNet.Interactive/Stopped.cs similarity index 100% rename from WorkspaceServer/Kernel/Stopped.cs rename to Microsoft.DotNet.Interactive/Stopped.cs diff --git a/WorkspaceServer/Kernel/SubmitCode.cs b/Microsoft.DotNet.Interactive/SubmitCode.cs similarity index 100% rename from WorkspaceServer/Kernel/SubmitCode.cs rename to Microsoft.DotNet.Interactive/SubmitCode.cs diff --git a/WorkspaceServer/Kernel/ValueProduced.cs b/Microsoft.DotNet.Interactive/ValueProduced.cs similarity index 100% rename from WorkspaceServer/Kernel/ValueProduced.cs rename to Microsoft.DotNet.Interactive/ValueProduced.cs diff --git a/WorkspaceServer/Kernel/CSharpKernel.cs b/WorkspaceServer/Kernel/CSharpKernel.cs index 0901d8801..366138373 100644 --- a/WorkspaceServer/Kernel/CSharpKernel.cs +++ b/WorkspaceServer/Kernel/CSharpKernel.cs @@ -80,7 +80,7 @@ private void SetupScriptOptions() return (true, code); } - protected internal override async Task HandleAsync( + protected override async Task HandleAsync( IKernelCommand command, KernelPipelineContext context) { diff --git a/WorkspaceServer/WorkspaceServer.csproj b/WorkspaceServer/WorkspaceServer.csproj index 004944eaf..5ceb5f7ba 100644 --- a/WorkspaceServer/WorkspaceServer.csproj +++ b/WorkspaceServer/WorkspaceServer.csproj @@ -101,6 +101,7 @@ + From 97f9c80309e8b56be6c00127d32f7c06c7e40c80 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 22 Jul 2019 16:42:27 +0100 Subject: [PATCH 2/5] change namespace --- MLS.Agent/CommandLine/CommandLineParser.cs | 1 + .../CodeSubmissionEvaluated.cs | 4 +--- .../CodeSubmissionEvaluationFailed.cs | 2 +- .../CodeSubmissionReceived.cs | 2 +- .../CompleteCodeSubmissionReceived.cs | 4 +--- Microsoft.DotNet.Interactive/CompletionItem.cs | 2 +- .../CompletionRequestCompleted.cs | 2 +- .../CompletionRequestReceived.cs | 2 +- Microsoft.DotNet.Interactive/CompositeKernel.cs | 2 +- .../DiagnosticsReceived.cs | 2 +- .../DocumentationReceived.cs | 2 +- .../ExtensionLoading.cs | 2 +- Microsoft.DotNet.Interactive/FormattedValue.cs | 2 +- Microsoft.DotNet.Interactive/IKernel.cs | 2 +- Microsoft.DotNet.Interactive/IKernelCommand.cs | 2 +- .../IKernelCommandResult.cs | 2 +- Microsoft.DotNet.Interactive/IKernelEvent.cs | 2 +- .../IKernelExtension.cs | 2 +- Microsoft.DotNet.Interactive/IRendering.cs | 12 ------------ .../IncompleteCodeSubmissionReceived.cs | 2 +- Microsoft.DotNet.Interactive/KernelBase.cs | 2 +- .../KernelCommandBase.cs | 2 +- .../KernelCommandInvocation.cs | 2 +- .../KernelCommandNotSupportedException.cs | 2 +- .../KernelCommandPipeline.cs | 2 +- .../KernelCommandPipelineMiddleware.cs | 2 +- .../KernelCommandResult.cs | 2 +- Microsoft.DotNet.Interactive/KernelEventBase.cs | 2 +- Microsoft.DotNet.Interactive/KernelException.cs | 6 +----- .../KernelExtensions.cs | 2 +- .../KernelInvocationContext.cs | 2 +- .../KernelPipelineContext.cs | 4 ++-- .../KernelPipelineContinuation.cs | 2 +- Microsoft.DotNet.Interactive/LoadExtension.cs | 2 +- .../NoSuitableKernelException.cs | 2 +- .../NuGetPackageAdded.cs | 2 +- .../NugetPackageReference.cs | 2 +- .../RenderingEngineException.cs | 17 ----------------- .../RequestCompletion.cs | 2 +- .../RequestDiagnostics.cs | 2 +- .../RequestDocumentation.cs | 2 +- .../RequestSignatureHelp.cs | 2 +- .../SendStandardInput.cs | 2 +- .../SignatureHelpReceived.cs | 4 +--- .../StandardErrorReceived.cs | 2 +- .../StandardInputReceived.cs | 2 +- .../StandardOutputReceived.cs | 2 +- Microsoft.DotNet.Interactive/Started.cs | 2 +- Microsoft.DotNet.Interactive/Stopped.cs | 2 +- Microsoft.DotNet.Interactive/SubmitCode.cs | 2 +- Microsoft.DotNet.Interactive/ValueProduced.cs | 2 +- .../Kernel/CSharpKernelTests.cs | 1 + .../Kernel/CompositeKernelTests.cs | 1 + WorkspaceServer.Tests/Kernel/KernelTests.cs | 1 + .../Kernel/ObservableRunnerTests.cs | 1 + .../Kernel/PackageReferenceTests.cs | 1 + WorkspaceServer.Tests/ObservableProcessTests.cs | 1 + WorkspaceServer/IObservableRunner.cs | 1 + WorkspaceServer/Kernel/CSharpKernel.cs | 2 ++ .../Kernel/CSharpKernelExtensions.cs | 1 + .../Kernel/ProtocolObjectExtensions.cs | 2 ++ WorkspaceServer/ProcessRunner.cs | 1 + 62 files changed, 63 insertions(+), 88 deletions(-) delete mode 100644 Microsoft.DotNet.Interactive/IRendering.cs delete mode 100644 Microsoft.DotNet.Interactive/RenderingEngineException.cs diff --git a/MLS.Agent/CommandLine/CommandLineParser.cs b/MLS.Agent/CommandLine/CommandLineParser.cs index 1c6a80812..8ccaecb82 100644 --- a/MLS.Agent/CommandLine/CommandLineParser.cs +++ b/MLS.Agent/CommandLine/CommandLineParser.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using Clockwise; using Microsoft.AspNetCore.Hosting; +using Microsoft.DotNet.Interactive; using Microsoft.DotNet.Interactive.Jupyter; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs b/Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs index a838d0e64..e4c1cbc4e 100644 --- a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs +++ b/Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs @@ -1,9 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; - -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CodeSubmissionEvaluated : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs b/Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs index bf675507d..82cabc822 100644 --- a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs +++ b/Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CodeSubmissionEvaluationFailed : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs index e9bd0625c..4c064017b 100644 --- a/Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs +++ b/Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CodeSubmissionReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs index 5fd825f19..c2ff21091 100644 --- a/Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs +++ b/Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs @@ -1,9 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; - -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CompleteCodeSubmissionReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CompletionItem.cs b/Microsoft.DotNet.Interactive/CompletionItem.cs index 6bdf582dc..dc94f2b12 100644 --- a/Microsoft.DotNet.Interactive/CompletionItem.cs +++ b/Microsoft.DotNet.Interactive/CompletionItem.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CompletionItem { diff --git a/Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs b/Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs index 48026e50b..e700ceef7 100644 --- a/Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs +++ b/Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CompletionRequestCompleted : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CompletionRequestReceived.cs b/Microsoft.DotNet.Interactive/CompletionRequestReceived.cs index 7e565bb4e..c2b6c543d 100644 --- a/Microsoft.DotNet.Interactive/CompletionRequestReceived.cs +++ b/Microsoft.DotNet.Interactive/CompletionRequestReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CompletionRequestReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CompositeKernel.cs b/Microsoft.DotNet.Interactive/CompositeKernel.cs index b95a6be42..0403068a5 100644 --- a/Microsoft.DotNet.Interactive/CompositeKernel.cs +++ b/Microsoft.DotNet.Interactive/CompositeKernel.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class CompositeKernel : KernelBase, IEnumerable { diff --git a/Microsoft.DotNet.Interactive/DiagnosticsReceived.cs b/Microsoft.DotNet.Interactive/DiagnosticsReceived.cs index 44cef6bfc..999a3ca99 100644 --- a/Microsoft.DotNet.Interactive/DiagnosticsReceived.cs +++ b/Microsoft.DotNet.Interactive/DiagnosticsReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class DiagnosticsReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/DocumentationReceived.cs b/Microsoft.DotNet.Interactive/DocumentationReceived.cs index 13925fa48..4f406f018 100644 --- a/Microsoft.DotNet.Interactive/DocumentationReceived.cs +++ b/Microsoft.DotNet.Interactive/DocumentationReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class DocumentationReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/ExtensionLoading.cs b/Microsoft.DotNet.Interactive/ExtensionLoading.cs index 4c193e0c8..3e2c39b7a 100644 --- a/Microsoft.DotNet.Interactive/ExtensionLoading.cs +++ b/Microsoft.DotNet.Interactive/ExtensionLoading.cs @@ -4,7 +4,7 @@ using System; using System.IO; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class ExtensionLoading : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/FormattedValue.cs b/Microsoft.DotNet.Interactive/FormattedValue.cs index a4dc2e0e4..e71da82ca 100644 --- a/Microsoft.DotNet.Interactive/FormattedValue.cs +++ b/Microsoft.DotNet.Interactive/FormattedValue.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class FormattedValue { diff --git a/Microsoft.DotNet.Interactive/IKernel.cs b/Microsoft.DotNet.Interactive/IKernel.cs index a9a6fc4c8..b12e67df6 100644 --- a/Microsoft.DotNet.Interactive/IKernel.cs +++ b/Microsoft.DotNet.Interactive/IKernel.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public interface IKernel : IDisposable { diff --git a/Microsoft.DotNet.Interactive/IKernelCommand.cs b/Microsoft.DotNet.Interactive/IKernelCommand.cs index fc7b26a7f..19ebd554f 100644 --- a/Microsoft.DotNet.Interactive/IKernelCommand.cs +++ b/Microsoft.DotNet.Interactive/IKernelCommand.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public interface IKernelCommand { diff --git a/Microsoft.DotNet.Interactive/IKernelCommandResult.cs b/Microsoft.DotNet.Interactive/IKernelCommandResult.cs index 054160203..be238711b 100644 --- a/Microsoft.DotNet.Interactive/IKernelCommandResult.cs +++ b/Microsoft.DotNet.Interactive/IKernelCommandResult.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public interface IKernelCommandResult { diff --git a/Microsoft.DotNet.Interactive/IKernelEvent.cs b/Microsoft.DotNet.Interactive/IKernelEvent.cs index 96dc6d414..346edcd0e 100644 --- a/Microsoft.DotNet.Interactive/IKernelEvent.cs +++ b/Microsoft.DotNet.Interactive/IKernelEvent.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public interface IKernelEvent { diff --git a/Microsoft.DotNet.Interactive/IKernelExtension.cs b/Microsoft.DotNet.Interactive/IKernelExtension.cs index 6ef0e2d5e..96cf922bb 100644 --- a/Microsoft.DotNet.Interactive/IKernelExtension.cs +++ b/Microsoft.DotNet.Interactive/IKernelExtension.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public interface IKernelExtension { diff --git a/Microsoft.DotNet.Interactive/IRendering.cs b/Microsoft.DotNet.Interactive/IRendering.cs deleted file mode 100644 index b266dbe44..000000000 --- a/Microsoft.DotNet.Interactive/IRendering.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace WorkspaceServer.Kernel -{ - public interface IRendering - { - string MimeType { get; } - - object Content { get; } - } -} \ No newline at end of file diff --git a/Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs index 943652b84..ee3691280 100644 --- a/Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs +++ b/Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class IncompleteCodeSubmissionReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/KernelBase.cs b/Microsoft.DotNet.Interactive/KernelBase.cs index c8ac003a3..c1f99d071 100644 --- a/Microsoft.DotNet.Interactive/KernelBase.cs +++ b/Microsoft.DotNet.Interactive/KernelBase.cs @@ -14,7 +14,7 @@ using System.Threading; using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public abstract class KernelBase : IKernel { diff --git a/Microsoft.DotNet.Interactive/KernelCommandBase.cs b/Microsoft.DotNet.Interactive/KernelCommandBase.cs index 1bab8c528..1b780334c 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandBase.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandBase.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public abstract class KernelCommandBase : IKernelCommand { diff --git a/Microsoft.DotNet.Interactive/KernelCommandInvocation.cs b/Microsoft.DotNet.Interactive/KernelCommandInvocation.cs index fd8fa2e58..41008cc66 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandInvocation.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandInvocation.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public delegate Task KernelCommandInvocation( KernelInvocationContext context); diff --git a/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs b/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs index ad913c146..93773e2eb 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class KernelCommandNotSupportedException : Exception { diff --git a/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs b/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs index 1972bc38a..be8793c78 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class KernelCommandPipeline { diff --git a/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs b/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs index 2871d55f2..768625a76 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public delegate Task KernelCommandPipelineMiddleware( IKernelCommand command, diff --git a/Microsoft.DotNet.Interactive/KernelCommandResult.cs b/Microsoft.DotNet.Interactive/KernelCommandResult.cs index 93980b677..84ebdd48f 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandResult.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandResult.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { internal class KernelCommandResult : IKernelCommandResult { diff --git a/Microsoft.DotNet.Interactive/KernelEventBase.cs b/Microsoft.DotNet.Interactive/KernelEventBase.cs index de72ad54d..c30406963 100644 --- a/Microsoft.DotNet.Interactive/KernelEventBase.cs +++ b/Microsoft.DotNet.Interactive/KernelEventBase.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public abstract class KernelEventBase : IKernelEvent { diff --git a/Microsoft.DotNet.Interactive/KernelException.cs b/Microsoft.DotNet.Interactive/KernelException.cs index 164f5b7cb..86682968e 100644 --- a/Microsoft.DotNet.Interactive/KernelException.cs +++ b/Microsoft.DotNet.Interactive/KernelException.cs @@ -3,14 +3,10 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class KernelException : Exception { - public KernelException() - { - - } public KernelException(string message) : base(message) { diff --git a/Microsoft.DotNet.Interactive/KernelExtensions.cs b/Microsoft.DotNet.Interactive/KernelExtensions.cs index f609c537e..0355de75f 100644 --- a/Microsoft.DotNet.Interactive/KernelExtensions.cs +++ b/Microsoft.DotNet.Interactive/KernelExtensions.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Pocket; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public static class KernelExtensions { diff --git a/Microsoft.DotNet.Interactive/KernelInvocationContext.cs b/Microsoft.DotNet.Interactive/KernelInvocationContext.cs index bc775c9f8..935803d09 100644 --- a/Microsoft.DotNet.Interactive/KernelInvocationContext.cs +++ b/Microsoft.DotNet.Interactive/KernelInvocationContext.cs @@ -5,7 +5,7 @@ using System.Reactive.Subjects; using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class KernelInvocationContext : IObserver { diff --git a/Microsoft.DotNet.Interactive/KernelPipelineContext.cs b/Microsoft.DotNet.Interactive/KernelPipelineContext.cs index bda81cbbe..f55ca2ee7 100644 --- a/Microsoft.DotNet.Interactive/KernelPipelineContext.cs +++ b/Microsoft.DotNet.Interactive/KernelPipelineContext.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; -using System.Reactive.Linq; using System.Linq; +using System.Reactive.Linq; using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class KernelPipelineContext { diff --git a/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs b/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs index 6da3787bd..b418c1faf 100644 --- a/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs +++ b/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public delegate Task KernelPipelineContinuation( IKernelCommand command, diff --git a/Microsoft.DotNet.Interactive/LoadExtension.cs b/Microsoft.DotNet.Interactive/LoadExtension.cs index 60426b1c2..88bf85397 100644 --- a/Microsoft.DotNet.Interactive/LoadExtension.cs +++ b/Microsoft.DotNet.Interactive/LoadExtension.cs @@ -4,7 +4,7 @@ using System; using System.IO; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class LoadExtension : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/NoSuitableKernelException.cs b/Microsoft.DotNet.Interactive/NoSuitableKernelException.cs index 5cd075892..5b7252e84 100644 --- a/Microsoft.DotNet.Interactive/NoSuitableKernelException.cs +++ b/Microsoft.DotNet.Interactive/NoSuitableKernelException.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class NoSuitableKernelException : Exception { diff --git a/Microsoft.DotNet.Interactive/NuGetPackageAdded.cs b/Microsoft.DotNet.Interactive/NuGetPackageAdded.cs index b81fa373e..95f109997 100644 --- a/Microsoft.DotNet.Interactive/NuGetPackageAdded.cs +++ b/Microsoft.DotNet.Interactive/NuGetPackageAdded.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class NuGetPackageAdded : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/NugetPackageReference.cs b/Microsoft.DotNet.Interactive/NugetPackageReference.cs index 5bcd8c8d4..e6ad0c8d1 100644 --- a/Microsoft.DotNet.Interactive/NugetPackageReference.cs +++ b/Microsoft.DotNet.Interactive/NugetPackageReference.cs @@ -4,7 +4,7 @@ using System; using System.Text.RegularExpressions; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class NugetPackageReference { diff --git a/Microsoft.DotNet.Interactive/RenderingEngineException.cs b/Microsoft.DotNet.Interactive/RenderingEngineException.cs deleted file mode 100644 index 8696f7171..000000000 --- a/Microsoft.DotNet.Interactive/RenderingEngineException.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; - -namespace WorkspaceServer.Kernel -{ - public class RenderingEngineException : Exception - { - public object RenderingSource { get; } - - public RenderingEngineException(Exception exception, object renderingRenderingSource) : base("Rendering Failed",exception) - { - RenderingSource = renderingRenderingSource; - } - } -} \ No newline at end of file diff --git a/Microsoft.DotNet.Interactive/RequestCompletion.cs b/Microsoft.DotNet.Interactive/RequestCompletion.cs index fd1789df6..723fa7028 100644 --- a/Microsoft.DotNet.Interactive/RequestCompletion.cs +++ b/Microsoft.DotNet.Interactive/RequestCompletion.cs @@ -5,7 +5,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class RequestCompletion : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/RequestDiagnostics.cs b/Microsoft.DotNet.Interactive/RequestDiagnostics.cs index 705a4f6a8..13586fa8b 100644 --- a/Microsoft.DotNet.Interactive/RequestDiagnostics.cs +++ b/Microsoft.DotNet.Interactive/RequestDiagnostics.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class RequestDiagnostics : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/RequestDocumentation.cs b/Microsoft.DotNet.Interactive/RequestDocumentation.cs index aa055c1c9..8f52053ef 100644 --- a/Microsoft.DotNet.Interactive/RequestDocumentation.cs +++ b/Microsoft.DotNet.Interactive/RequestDocumentation.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class RequestDocumentation : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/RequestSignatureHelp.cs b/Microsoft.DotNet.Interactive/RequestSignatureHelp.cs index 292beb6af..34080bb6b 100644 --- a/Microsoft.DotNet.Interactive/RequestSignatureHelp.cs +++ b/Microsoft.DotNet.Interactive/RequestSignatureHelp.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class RequestSignatureHelp : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/SendStandardInput.cs b/Microsoft.DotNet.Interactive/SendStandardInput.cs index fc3d58917..34385892e 100644 --- a/Microsoft.DotNet.Interactive/SendStandardInput.cs +++ b/Microsoft.DotNet.Interactive/SendStandardInput.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class SendStandardInput : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/SignatureHelpReceived.cs b/Microsoft.DotNet.Interactive/SignatureHelpReceived.cs index 9b05042e3..f3cdbe2d2 100644 --- a/Microsoft.DotNet.Interactive/SignatureHelpReceived.cs +++ b/Microsoft.DotNet.Interactive/SignatureHelpReceived.cs @@ -1,9 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; - -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class SignatureHelpReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/StandardErrorReceived.cs b/Microsoft.DotNet.Interactive/StandardErrorReceived.cs index 4e60939c2..2fc9e9dc6 100644 --- a/Microsoft.DotNet.Interactive/StandardErrorReceived.cs +++ b/Microsoft.DotNet.Interactive/StandardErrorReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class StandardErrorReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/StandardInputReceived.cs b/Microsoft.DotNet.Interactive/StandardInputReceived.cs index 3b22a7870..bd089003c 100644 --- a/Microsoft.DotNet.Interactive/StandardInputReceived.cs +++ b/Microsoft.DotNet.Interactive/StandardInputReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class StandardInputReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/StandardOutputReceived.cs b/Microsoft.DotNet.Interactive/StandardOutputReceived.cs index d1474cdcd..740468dac 100644 --- a/Microsoft.DotNet.Interactive/StandardOutputReceived.cs +++ b/Microsoft.DotNet.Interactive/StandardOutputReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class StandardOutputReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/Started.cs b/Microsoft.DotNet.Interactive/Started.cs index edb949e33..3e76447a5 100644 --- a/Microsoft.DotNet.Interactive/Started.cs +++ b/Microsoft.DotNet.Interactive/Started.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class Started : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/Stopped.cs b/Microsoft.DotNet.Interactive/Stopped.cs index 821b34fb2..9bdb4b321 100644 --- a/Microsoft.DotNet.Interactive/Stopped.cs +++ b/Microsoft.DotNet.Interactive/Stopped.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class Stopped : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/SubmitCode.cs b/Microsoft.DotNet.Interactive/SubmitCode.cs index d9d764185..4696b6c31 100644 --- a/Microsoft.DotNet.Interactive/SubmitCode.cs +++ b/Microsoft.DotNet.Interactive/SubmitCode.cs @@ -3,7 +3,7 @@ using System; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class SubmitCode : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/ValueProduced.cs b/Microsoft.DotNet.Interactive/ValueProduced.cs index 4ccd136c0..e1052e851 100644 --- a/Microsoft.DotNet.Interactive/ValueProduced.cs +++ b/Microsoft.DotNet.Interactive/ValueProduced.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace WorkspaceServer.Kernel +namespace Microsoft.DotNet.Interactive { public class ValueProduced : KernelEventBase { diff --git a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs index 164367430..c6681d480 100644 --- a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Scripting; +using Microsoft.DotNet.Interactive; using MLS.Agent.Tools; using Newtonsoft.Json; using Pocket; diff --git a/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs b/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs index 1cb038920..b6052872d 100644 --- a/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs @@ -7,6 +7,7 @@ using FluentAssertions; using System.Linq; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive; using WorkspaceServer.Kernel; using Xunit; using Xunit.Abstractions; diff --git a/WorkspaceServer.Tests/Kernel/KernelTests.cs b/WorkspaceServer.Tests/Kernel/KernelTests.cs index 9f62062a8..4c9e720b3 100644 --- a/WorkspaceServer.Tests/Kernel/KernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/KernelTests.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Reactive.Disposables; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive; using WorkspaceServer.Kernel; namespace WorkspaceServer.Tests.Kernel diff --git a/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs b/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs index 7a36be377..b0006961d 100644 --- a/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs +++ b/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using FluentAssertions; using FluentAssertions.Extensions; +using Microsoft.DotNet.Interactive; using WorkspaceServer.Kernel; using Xunit; diff --git a/WorkspaceServer.Tests/Kernel/PackageReferenceTests.cs b/WorkspaceServer.Tests/Kernel/PackageReferenceTests.cs index 7f26ee61d..e89a38bfb 100644 --- a/WorkspaceServer.Tests/Kernel/PackageReferenceTests.cs +++ b/WorkspaceServer.Tests/Kernel/PackageReferenceTests.cs @@ -3,6 +3,7 @@ using System; using FluentAssertions; +using Microsoft.DotNet.Interactive; using WorkspaceServer.Kernel; using Xunit; diff --git a/WorkspaceServer.Tests/ObservableProcessTests.cs b/WorkspaceServer.Tests/ObservableProcessTests.cs index b733d0b2e..6eddec1c7 100644 --- a/WorkspaceServer.Tests/ObservableProcessTests.cs +++ b/WorkspaceServer.Tests/ObservableProcessTests.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using FluentAssertions; using FluentAssertions.Extensions; +using Microsoft.DotNet.Interactive; using WorkspaceServer.Kernel; using WorkspaceServer.Tests.Kernel; using Xunit; diff --git a/WorkspaceServer/IObservableRunner.cs b/WorkspaceServer/IObservableRunner.cs index fb84b01a5..c1faabecf 100644 --- a/WorkspaceServer/IObservableRunner.cs +++ b/WorkspaceServer/IObservableRunner.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive; using WorkspaceServer.Kernel; namespace WorkspaceServer diff --git a/WorkspaceServer/Kernel/CSharpKernel.cs b/WorkspaceServer/Kernel/CSharpKernel.cs index 366138373..1bdc12c71 100644 --- a/WorkspaceServer/Kernel/CSharpKernel.cs +++ b/WorkspaceServer/Kernel/CSharpKernel.cs @@ -15,9 +15,11 @@ using Microsoft.CodeAnalysis.CSharp.Scripting; using Microsoft.CodeAnalysis.Recommendations; using Microsoft.CodeAnalysis.Scripting; +using Microsoft.DotNet.Interactive; using WorkspaceServer.LanguageServices; using Microsoft.DotNet.Interactive.Rendering; using WorkspaceServer.Servers.Scripting; +using CompletionItem = Microsoft.DotNet.Interactive.CompletionItem; using Task = System.Threading.Tasks.Task; namespace WorkspaceServer.Kernel diff --git a/WorkspaceServer/Kernel/CSharpKernelExtensions.cs b/WorkspaceServer/Kernel/CSharpKernelExtensions.cs index 41c0eaced..0765db00f 100644 --- a/WorkspaceServer/Kernel/CSharpKernelExtensions.cs +++ b/WorkspaceServer/Kernel/CSharpKernelExtensions.cs @@ -3,6 +3,7 @@ using System.CommandLine; using System.CommandLine.Invocation; +using Microsoft.DotNet.Interactive; namespace WorkspaceServer.Kernel { diff --git a/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs b/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs index 419f1eea3..d6b9fad2a 100644 --- a/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs +++ b/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs @@ -2,6 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.DotNet.Interactive; + namespace WorkspaceServer.Kernel { internal static class ProtocolObjectExtensions{ diff --git a/WorkspaceServer/ProcessRunner.cs b/WorkspaceServer/ProcessRunner.cs index de947c835..98ff59ffb 100644 --- a/WorkspaceServer/ProcessRunner.cs +++ b/WorkspaceServer/ProcessRunner.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive; using WorkspaceServer.Kernel; namespace WorkspaceServer From a3783f5bfbb932b49c5e9ef2c9d822d7948093b4 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 22 Jul 2019 16:53:12 +0100 Subject: [PATCH 3/5] split commands and event into separate folders --- .../CompleteRequestHandler.cs | 2 ++ Microsoft.DotNet.Interactive.Jupyter/ExecuteRequestHandler.cs | 2 ++ Microsoft.DotNet.Interactive.Jupyter/RequestHandlerBase.cs | 1 + Microsoft.DotNet.Interactive/{ => Commands}/IKernelCommand.cs | 2 +- .../{ => Commands}/KernelCommandBase.cs | 2 +- .../{ => Commands}/RequestCompletion.cs | 2 +- .../{ => Commands}/RequestDiagnostics.cs | 2 +- .../{ => Commands}/RequestDocumentation.cs | 2 +- .../{ => Commands}/RequestSignatureHelp.cs | 2 +- .../{ => Commands}/SendStandardInput.cs | 2 +- Microsoft.DotNet.Interactive/{ => Commands}/SubmitCode.cs | 2 +- Microsoft.DotNet.Interactive/CompositeKernel.cs | 1 + .../{ => Events}/CodeSubmissionEvaluated.cs | 4 +++- .../{ => Events}/CodeSubmissionEvaluationFailed.cs | 3 ++- .../{ => Events}/CodeSubmissionReceived.cs | 3 ++- .../{ => Events}/CompleteCodeSubmissionReceived.cs | 4 +++- .../{ => Events}/CompletionRequestCompleted.cs | 3 ++- .../{ => Events}/CompletionRequestReceived.cs | 4 +++- .../{ => Events}/DiagnosticsReceived.cs | 4 +++- .../{ => Events}/DocumentationReceived.cs | 4 +++- Microsoft.DotNet.Interactive/{ => Events}/ExtensionLoading.cs | 2 +- Microsoft.DotNet.Interactive/{ => Events}/IKernelEvent.cs | 4 +++- .../{ => Events}/IncompleteCodeSubmissionReceived.cs | 4 +++- Microsoft.DotNet.Interactive/{ => Events}/KernelEventBase.cs | 3 ++- .../{ => Events}/NuGetPackageAdded.cs | 2 +- .../{ => Events}/SignatureHelpReceived.cs | 4 +++- .../{ => Events}/StandardErrorReceived.cs | 2 +- .../{ => Events}/StandardInputReceived.cs | 2 +- .../{ => Events}/StandardOutputReceived.cs | 2 +- Microsoft.DotNet.Interactive/{ => Events}/Started.cs | 2 +- Microsoft.DotNet.Interactive/{ => Events}/Stopped.cs | 2 +- Microsoft.DotNet.Interactive/{ => Events}/ValueProduced.cs | 3 ++- Microsoft.DotNet.Interactive/IKernel.cs | 2 ++ Microsoft.DotNet.Interactive/IKernelCommandResult.cs | 1 + Microsoft.DotNet.Interactive/KernelBase.cs | 2 ++ .../KernelCommandNotSupportedException.cs | 1 + Microsoft.DotNet.Interactive/KernelCommandPipeline.cs | 1 + .../KernelCommandPipelineMiddleware.cs | 1 + Microsoft.DotNet.Interactive/KernelCommandResult.cs | 1 + Microsoft.DotNet.Interactive/KernelExtensions.cs | 1 + Microsoft.DotNet.Interactive/KernelInvocationContext.cs | 1 + Microsoft.DotNet.Interactive/KernelPipelineContext.cs | 1 + Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs | 1 + Microsoft.DotNet.Interactive/LoadExtension.cs | 1 + WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs | 2 ++ WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs | 2 ++ WorkspaceServer.Tests/Kernel/KernelTests.cs | 2 ++ WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs | 1 + WorkspaceServer.Tests/ObservableProcessTests.cs | 1 + WorkspaceServer/IObservableRunner.cs | 1 + WorkspaceServer/Kernel/CSharpKernel.cs | 2 ++ WorkspaceServer/Kernel/CSharpKernelExtensions.cs | 1 + WorkspaceServer/Kernel/ProtocolObjectExtensions.cs | 1 + WorkspaceServer/ProcessRunner.cs | 1 + 54 files changed, 83 insertions(+), 28 deletions(-) rename Microsoft.DotNet.Interactive/{ => Commands}/IKernelCommand.cs (82%) rename Microsoft.DotNet.Interactive/{ => Commands}/KernelCommandBase.cs (84%) rename Microsoft.DotNet.Interactive/{ => Commands}/RequestCompletion.cs (95%) rename Microsoft.DotNet.Interactive/{ => Commands}/RequestDiagnostics.cs (83%) rename Microsoft.DotNet.Interactive/{ => Commands}/RequestDocumentation.cs (83%) rename Microsoft.DotNet.Interactive/{ => Commands}/RequestSignatureHelp.cs (83%) rename Microsoft.DotNet.Interactive/{ => Commands}/SendStandardInput.cs (83%) rename Microsoft.DotNet.Interactive/{ => Commands}/SubmitCode.cs (92%) rename Microsoft.DotNet.Interactive/{ => Events}/CodeSubmissionEvaluated.cs (81%) rename Microsoft.DotNet.Interactive/{ => Events}/CodeSubmissionEvaluationFailed.cs (88%) rename Microsoft.DotNet.Interactive/{ => Events}/CodeSubmissionReceived.cs (84%) rename Microsoft.DotNet.Interactive/{ => Events}/CompleteCodeSubmissionReceived.cs (79%) rename Microsoft.DotNet.Interactive/{ => Events}/CompletionRequestCompleted.cs (87%) rename Microsoft.DotNet.Interactive/{ => Events}/CompletionRequestReceived.cs (79%) rename Microsoft.DotNet.Interactive/{ => Events}/DiagnosticsReceived.cs (78%) rename Microsoft.DotNet.Interactive/{ => Events}/DocumentationReceived.cs (79%) rename Microsoft.DotNet.Interactive/{ => Events}/ExtensionLoading.cs (91%) rename Microsoft.DotNet.Interactive/{ => Events}/IKernelEvent.cs (74%) rename Microsoft.DotNet.Interactive/{ => Events}/IncompleteCodeSubmissionReceived.cs (80%) rename Microsoft.DotNet.Interactive/{ => Events}/KernelEventBase.cs (85%) rename Microsoft.DotNet.Interactive/{ => Events}/NuGetPackageAdded.cs (90%) rename Microsoft.DotNet.Interactive/{ => Events}/SignatureHelpReceived.cs (79%) rename Microsoft.DotNet.Interactive/{ => Events}/StandardErrorReceived.cs (89%) rename Microsoft.DotNet.Interactive/{ => Events}/StandardInputReceived.cs (89%) rename Microsoft.DotNet.Interactive/{ => Events}/StandardOutputReceived.cs (89%) rename Microsoft.DotNet.Interactive/{ => Events}/Started.cs (83%) rename Microsoft.DotNet.Interactive/{ => Events}/Stopped.cs (83%) rename Microsoft.DotNet.Interactive/{ => Events}/ValueProduced.cs (88%) diff --git a/Microsoft.DotNet.Interactive.Jupyter/CompleteRequestHandler.cs b/Microsoft.DotNet.Interactive.Jupyter/CompleteRequestHandler.cs index 3291d8c23..786df2785 100644 --- a/Microsoft.DotNet.Interactive.Jupyter/CompleteRequestHandler.cs +++ b/Microsoft.DotNet.Interactive.Jupyter/CompleteRequestHandler.cs @@ -6,6 +6,8 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; using Microsoft.DotNet.Interactive.Jupyter.Protocol; using WorkspaceServer.Kernel; diff --git a/Microsoft.DotNet.Interactive.Jupyter/ExecuteRequestHandler.cs b/Microsoft.DotNet.Interactive.Jupyter/ExecuteRequestHandler.cs index f578375ae..85f0c1ddb 100644 --- a/Microsoft.DotNet.Interactive.Jupyter/ExecuteRequestHandler.cs +++ b/Microsoft.DotNet.Interactive.Jupyter/ExecuteRequestHandler.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; using Microsoft.DotNet.Interactive.Jupyter.Protocol; using WorkspaceServer.Kernel; diff --git a/Microsoft.DotNet.Interactive.Jupyter/RequestHandlerBase.cs b/Microsoft.DotNet.Interactive.Jupyter/RequestHandlerBase.cs index 9e855ec23..a627868d7 100644 --- a/Microsoft.DotNet.Interactive.Jupyter/RequestHandlerBase.cs +++ b/Microsoft.DotNet.Interactive.Jupyter/RequestHandlerBase.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Reactive.Disposables; +using Microsoft.DotNet.Interactive.Commands; using Microsoft.DotNet.Interactive.Jupyter.Protocol; using WorkspaceServer.Kernel; diff --git a/Microsoft.DotNet.Interactive/IKernelCommand.cs b/Microsoft.DotNet.Interactive/Commands/IKernelCommand.cs similarity index 82% rename from Microsoft.DotNet.Interactive/IKernelCommand.cs rename to Microsoft.DotNet.Interactive/Commands/IKernelCommand.cs index 19ebd554f..baf555035 100644 --- a/Microsoft.DotNet.Interactive/IKernelCommand.cs +++ b/Microsoft.DotNet.Interactive/Commands/IKernelCommand.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public interface IKernelCommand { diff --git a/Microsoft.DotNet.Interactive/KernelCommandBase.cs b/Microsoft.DotNet.Interactive/Commands/KernelCommandBase.cs similarity index 84% rename from Microsoft.DotNet.Interactive/KernelCommandBase.cs rename to Microsoft.DotNet.Interactive/Commands/KernelCommandBase.cs index 1b780334c..51c2b683e 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandBase.cs +++ b/Microsoft.DotNet.Interactive/Commands/KernelCommandBase.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public abstract class KernelCommandBase : IKernelCommand { diff --git a/Microsoft.DotNet.Interactive/RequestCompletion.cs b/Microsoft.DotNet.Interactive/Commands/RequestCompletion.cs similarity index 95% rename from Microsoft.DotNet.Interactive/RequestCompletion.cs rename to Microsoft.DotNet.Interactive/Commands/RequestCompletion.cs index 723fa7028..ed27b9607 100644 --- a/Microsoft.DotNet.Interactive/RequestCompletion.cs +++ b/Microsoft.DotNet.Interactive/Commands/RequestCompletion.cs @@ -5,7 +5,7 @@ using System; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public class RequestCompletion : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/RequestDiagnostics.cs b/Microsoft.DotNet.Interactive/Commands/RequestDiagnostics.cs similarity index 83% rename from Microsoft.DotNet.Interactive/RequestDiagnostics.cs rename to Microsoft.DotNet.Interactive/Commands/RequestDiagnostics.cs index 13586fa8b..244b7be11 100644 --- a/Microsoft.DotNet.Interactive/RequestDiagnostics.cs +++ b/Microsoft.DotNet.Interactive/Commands/RequestDiagnostics.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public class RequestDiagnostics : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/RequestDocumentation.cs b/Microsoft.DotNet.Interactive/Commands/RequestDocumentation.cs similarity index 83% rename from Microsoft.DotNet.Interactive/RequestDocumentation.cs rename to Microsoft.DotNet.Interactive/Commands/RequestDocumentation.cs index 8f52053ef..89e2eff7a 100644 --- a/Microsoft.DotNet.Interactive/RequestDocumentation.cs +++ b/Microsoft.DotNet.Interactive/Commands/RequestDocumentation.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public class RequestDocumentation : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/RequestSignatureHelp.cs b/Microsoft.DotNet.Interactive/Commands/RequestSignatureHelp.cs similarity index 83% rename from Microsoft.DotNet.Interactive/RequestSignatureHelp.cs rename to Microsoft.DotNet.Interactive/Commands/RequestSignatureHelp.cs index 34080bb6b..ddda6f91f 100644 --- a/Microsoft.DotNet.Interactive/RequestSignatureHelp.cs +++ b/Microsoft.DotNet.Interactive/Commands/RequestSignatureHelp.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public class RequestSignatureHelp : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/SendStandardInput.cs b/Microsoft.DotNet.Interactive/Commands/SendStandardInput.cs similarity index 83% rename from Microsoft.DotNet.Interactive/SendStandardInput.cs rename to Microsoft.DotNet.Interactive/Commands/SendStandardInput.cs index 34385892e..a4b8f7257 100644 --- a/Microsoft.DotNet.Interactive/SendStandardInput.cs +++ b/Microsoft.DotNet.Interactive/Commands/SendStandardInput.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public class SendStandardInput : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/SubmitCode.cs b/Microsoft.DotNet.Interactive/Commands/SubmitCode.cs similarity index 92% rename from Microsoft.DotNet.Interactive/SubmitCode.cs rename to Microsoft.DotNet.Interactive/Commands/SubmitCode.cs index 4696b6c31..fbf611134 100644 --- a/Microsoft.DotNet.Interactive/SubmitCode.cs +++ b/Microsoft.DotNet.Interactive/Commands/SubmitCode.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Commands { public class SubmitCode : KernelCommandBase { diff --git a/Microsoft.DotNet.Interactive/CompositeKernel.cs b/Microsoft.DotNet.Interactive/CompositeKernel.cs index 0403068a5..552467f8b 100644 --- a/Microsoft.DotNet.Interactive/CompositeKernel.cs +++ b/Microsoft.DotNet.Interactive/CompositeKernel.cs @@ -9,6 +9,7 @@ using System.CommandLine.Invocation; using System.Linq; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs b/Microsoft.DotNet.Interactive/Events/CodeSubmissionEvaluated.cs similarity index 81% rename from Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs rename to Microsoft.DotNet.Interactive/Events/CodeSubmissionEvaluated.cs index e4c1cbc4e..2706a9324 100644 --- a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluated.cs +++ b/Microsoft.DotNet.Interactive/Events/CodeSubmissionEvaluated.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public class CodeSubmissionEvaluated : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs b/Microsoft.DotNet.Interactive/Events/CodeSubmissionEvaluationFailed.cs similarity index 88% rename from Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs rename to Microsoft.DotNet.Interactive/Events/CodeSubmissionEvaluationFailed.cs index 82cabc822..64016fb1f 100644 --- a/Microsoft.DotNet.Interactive/CodeSubmissionEvaluationFailed.cs +++ b/Microsoft.DotNet.Interactive/Events/CodeSubmissionEvaluationFailed.cs @@ -2,8 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using Microsoft.DotNet.Interactive.Commands; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class CodeSubmissionEvaluationFailed : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/Events/CodeSubmissionReceived.cs similarity index 84% rename from Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs rename to Microsoft.DotNet.Interactive/Events/CodeSubmissionReceived.cs index 4c064017b..06c332ab4 100644 --- a/Microsoft.DotNet.Interactive/CodeSubmissionReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/CodeSubmissionReceived.cs @@ -2,8 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using Microsoft.DotNet.Interactive.Commands; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class CodeSubmissionReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/Events/CompleteCodeSubmissionReceived.cs similarity index 79% rename from Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs rename to Microsoft.DotNet.Interactive/Events/CompleteCodeSubmissionReceived.cs index c2ff21091..6513ca37f 100644 --- a/Microsoft.DotNet.Interactive/CompleteCodeSubmissionReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/CompleteCodeSubmissionReceived.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public class CompleteCodeSubmissionReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs b/Microsoft.DotNet.Interactive/Events/CompletionRequestCompleted.cs similarity index 87% rename from Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs rename to Microsoft.DotNet.Interactive/Events/CompletionRequestCompleted.cs index e700ceef7..6fa2dd0fc 100644 --- a/Microsoft.DotNet.Interactive/CompletionRequestCompleted.cs +++ b/Microsoft.DotNet.Interactive/Events/CompletionRequestCompleted.cs @@ -3,8 +3,9 @@ using System; using System.Collections.Generic; +using Microsoft.DotNet.Interactive.Commands; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class CompletionRequestCompleted : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/CompletionRequestReceived.cs b/Microsoft.DotNet.Interactive/Events/CompletionRequestReceived.cs similarity index 79% rename from Microsoft.DotNet.Interactive/CompletionRequestReceived.cs rename to Microsoft.DotNet.Interactive/Events/CompletionRequestReceived.cs index c2b6c543d..c09beb33f 100644 --- a/Microsoft.DotNet.Interactive/CompletionRequestReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/CompletionRequestReceived.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public class CompletionRequestReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/DiagnosticsReceived.cs b/Microsoft.DotNet.Interactive/Events/DiagnosticsReceived.cs similarity index 78% rename from Microsoft.DotNet.Interactive/DiagnosticsReceived.cs rename to Microsoft.DotNet.Interactive/Events/DiagnosticsReceived.cs index 999a3ca99..aa4b0a381 100644 --- a/Microsoft.DotNet.Interactive/DiagnosticsReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/DiagnosticsReceived.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public class DiagnosticsReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/DocumentationReceived.cs b/Microsoft.DotNet.Interactive/Events/DocumentationReceived.cs similarity index 79% rename from Microsoft.DotNet.Interactive/DocumentationReceived.cs rename to Microsoft.DotNet.Interactive/Events/DocumentationReceived.cs index 4f406f018..c57bdc434 100644 --- a/Microsoft.DotNet.Interactive/DocumentationReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/DocumentationReceived.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public class DocumentationReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/ExtensionLoading.cs b/Microsoft.DotNet.Interactive/Events/ExtensionLoading.cs similarity index 91% rename from Microsoft.DotNet.Interactive/ExtensionLoading.cs rename to Microsoft.DotNet.Interactive/Events/ExtensionLoading.cs index 3e2c39b7a..cebbc29d6 100644 --- a/Microsoft.DotNet.Interactive/ExtensionLoading.cs +++ b/Microsoft.DotNet.Interactive/Events/ExtensionLoading.cs @@ -4,7 +4,7 @@ using System; using System.IO; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class ExtensionLoading : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/IKernelEvent.cs b/Microsoft.DotNet.Interactive/Events/IKernelEvent.cs similarity index 74% rename from Microsoft.DotNet.Interactive/IKernelEvent.cs rename to Microsoft.DotNet.Interactive/Events/IKernelEvent.cs index 346edcd0e..6ed5ee427 100644 --- a/Microsoft.DotNet.Interactive/IKernelEvent.cs +++ b/Microsoft.DotNet.Interactive/Events/IKernelEvent.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public interface IKernelEvent { diff --git a/Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs b/Microsoft.DotNet.Interactive/Events/IncompleteCodeSubmissionReceived.cs similarity index 80% rename from Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs rename to Microsoft.DotNet.Interactive/Events/IncompleteCodeSubmissionReceived.cs index ee3691280..07247090c 100644 --- a/Microsoft.DotNet.Interactive/IncompleteCodeSubmissionReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/IncompleteCodeSubmissionReceived.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public class IncompleteCodeSubmissionReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/KernelEventBase.cs b/Microsoft.DotNet.Interactive/Events/KernelEventBase.cs similarity index 85% rename from Microsoft.DotNet.Interactive/KernelEventBase.cs rename to Microsoft.DotNet.Interactive/Events/KernelEventBase.cs index c30406963..29965702e 100644 --- a/Microsoft.DotNet.Interactive/KernelEventBase.cs +++ b/Microsoft.DotNet.Interactive/Events/KernelEventBase.cs @@ -2,8 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using Microsoft.DotNet.Interactive.Commands; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public abstract class KernelEventBase : IKernelEvent { diff --git a/Microsoft.DotNet.Interactive/NuGetPackageAdded.cs b/Microsoft.DotNet.Interactive/Events/NuGetPackageAdded.cs similarity index 90% rename from Microsoft.DotNet.Interactive/NuGetPackageAdded.cs rename to Microsoft.DotNet.Interactive/Events/NuGetPackageAdded.cs index 95f109997..ec74c4aff 100644 --- a/Microsoft.DotNet.Interactive/NuGetPackageAdded.cs +++ b/Microsoft.DotNet.Interactive/Events/NuGetPackageAdded.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class NuGetPackageAdded : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/SignatureHelpReceived.cs b/Microsoft.DotNet.Interactive/Events/SignatureHelpReceived.cs similarity index 79% rename from Microsoft.DotNet.Interactive/SignatureHelpReceived.cs rename to Microsoft.DotNet.Interactive/Events/SignatureHelpReceived.cs index f3cdbe2d2..1d75d20ac 100644 --- a/Microsoft.DotNet.Interactive/SignatureHelpReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/SignatureHelpReceived.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +using Microsoft.DotNet.Interactive.Commands; + +namespace Microsoft.DotNet.Interactive.Events { public class SignatureHelpReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/StandardErrorReceived.cs b/Microsoft.DotNet.Interactive/Events/StandardErrorReceived.cs similarity index 89% rename from Microsoft.DotNet.Interactive/StandardErrorReceived.cs rename to Microsoft.DotNet.Interactive/Events/StandardErrorReceived.cs index 2fc9e9dc6..9db0101e5 100644 --- a/Microsoft.DotNet.Interactive/StandardErrorReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/StandardErrorReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class StandardErrorReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/StandardInputReceived.cs b/Microsoft.DotNet.Interactive/Events/StandardInputReceived.cs similarity index 89% rename from Microsoft.DotNet.Interactive/StandardInputReceived.cs rename to Microsoft.DotNet.Interactive/Events/StandardInputReceived.cs index bd089003c..00e7fb82c 100644 --- a/Microsoft.DotNet.Interactive/StandardInputReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/StandardInputReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class StandardInputReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/StandardOutputReceived.cs b/Microsoft.DotNet.Interactive/Events/StandardOutputReceived.cs similarity index 89% rename from Microsoft.DotNet.Interactive/StandardOutputReceived.cs rename to Microsoft.DotNet.Interactive/Events/StandardOutputReceived.cs index 740468dac..df770ba6c 100644 --- a/Microsoft.DotNet.Interactive/StandardOutputReceived.cs +++ b/Microsoft.DotNet.Interactive/Events/StandardOutputReceived.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class StandardOutputReceived : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/Started.cs b/Microsoft.DotNet.Interactive/Events/Started.cs similarity index 83% rename from Microsoft.DotNet.Interactive/Started.cs rename to Microsoft.DotNet.Interactive/Events/Started.cs index 3e76447a5..ebfc42a3b 100644 --- a/Microsoft.DotNet.Interactive/Started.cs +++ b/Microsoft.DotNet.Interactive/Events/Started.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class Started : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/Stopped.cs b/Microsoft.DotNet.Interactive/Events/Stopped.cs similarity index 83% rename from Microsoft.DotNet.Interactive/Stopped.cs rename to Microsoft.DotNet.Interactive/Events/Stopped.cs index 9bdb4b321..b38ac36f6 100644 --- a/Microsoft.DotNet.Interactive/Stopped.cs +++ b/Microsoft.DotNet.Interactive/Events/Stopped.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class Stopped : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/ValueProduced.cs b/Microsoft.DotNet.Interactive/Events/ValueProduced.cs similarity index 88% rename from Microsoft.DotNet.Interactive/ValueProduced.cs rename to Microsoft.DotNet.Interactive/Events/ValueProduced.cs index e1052e851..fe7ce0a6f 100644 --- a/Microsoft.DotNet.Interactive/ValueProduced.cs +++ b/Microsoft.DotNet.Interactive/Events/ValueProduced.cs @@ -2,8 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Generic; +using Microsoft.DotNet.Interactive.Commands; -namespace Microsoft.DotNet.Interactive +namespace Microsoft.DotNet.Interactive.Events { public class ValueProduced : KernelEventBase { diff --git a/Microsoft.DotNet.Interactive/IKernel.cs b/Microsoft.DotNet.Interactive/IKernel.cs index b12e67df6..cb3680fae 100644 --- a/Microsoft.DotNet.Interactive/IKernel.cs +++ b/Microsoft.DotNet.Interactive/IKernel.cs @@ -4,6 +4,8 @@ using System; using System.Threading; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/IKernelCommandResult.cs b/Microsoft.DotNet.Interactive/IKernelCommandResult.cs index be238711b..70c1fc612 100644 --- a/Microsoft.DotNet.Interactive/IKernelCommandResult.cs +++ b/Microsoft.DotNet.Interactive/IKernelCommandResult.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using Microsoft.DotNet.Interactive.Events; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelBase.cs b/Microsoft.DotNet.Interactive/KernelBase.cs index c1f99d071..e2a832929 100644 --- a/Microsoft.DotNet.Interactive/KernelBase.cs +++ b/Microsoft.DotNet.Interactive/KernelBase.cs @@ -13,6 +13,8 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs b/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs index 93773e2eb..67fc6f2af 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandNotSupportedException.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using Microsoft.DotNet.Interactive.Commands; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs b/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs index be8793c78..79f81dee0 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandPipeline.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs b/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs index 768625a76..3afc0e53b 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandPipelineMiddleware.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelCommandResult.cs b/Microsoft.DotNet.Interactive/KernelCommandResult.cs index 84ebdd48f..761bbdf37 100644 --- a/Microsoft.DotNet.Interactive/KernelCommandResult.cs +++ b/Microsoft.DotNet.Interactive/KernelCommandResult.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using Microsoft.DotNet.Interactive.Events; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelExtensions.cs b/Microsoft.DotNet.Interactive/KernelExtensions.cs index 0355de75f..8992afacb 100644 --- a/Microsoft.DotNet.Interactive/KernelExtensions.cs +++ b/Microsoft.DotNet.Interactive/KernelExtensions.cs @@ -8,6 +8,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; using Pocket; namespace Microsoft.DotNet.Interactive diff --git a/Microsoft.DotNet.Interactive/KernelInvocationContext.cs b/Microsoft.DotNet.Interactive/KernelInvocationContext.cs index 935803d09..ef78f6e26 100644 --- a/Microsoft.DotNet.Interactive/KernelInvocationContext.cs +++ b/Microsoft.DotNet.Interactive/KernelInvocationContext.cs @@ -4,6 +4,7 @@ using System; using System.Reactive.Subjects; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Events; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelPipelineContext.cs b/Microsoft.DotNet.Interactive/KernelPipelineContext.cs index f55ca2ee7..0680b6a8a 100644 --- a/Microsoft.DotNet.Interactive/KernelPipelineContext.cs +++ b/Microsoft.DotNet.Interactive/KernelPipelineContext.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Events; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs b/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs index b418c1faf..be9a6f5e0 100644 --- a/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs +++ b/Microsoft.DotNet.Interactive/KernelPipelineContinuation.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Threading.Tasks; +using Microsoft.DotNet.Interactive.Commands; namespace Microsoft.DotNet.Interactive { diff --git a/Microsoft.DotNet.Interactive/LoadExtension.cs b/Microsoft.DotNet.Interactive/LoadExtension.cs index 88bf85397..b3367159e 100644 --- a/Microsoft.DotNet.Interactive/LoadExtension.cs +++ b/Microsoft.DotNet.Interactive/LoadExtension.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using Microsoft.DotNet.Interactive.Commands; namespace Microsoft.DotNet.Interactive { diff --git a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs index c6681d480..8ab7c565a 100644 --- a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs @@ -8,6 +8,8 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.Scripting; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; using MLS.Agent.Tools; using Newtonsoft.Json; using Pocket; diff --git a/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs b/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs index b6052872d..4c3b9abce 100644 --- a/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/CompositeKernelTests.cs @@ -8,6 +8,8 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; using WorkspaceServer.Kernel; using Xunit; using Xunit.Abstractions; diff --git a/WorkspaceServer.Tests/Kernel/KernelTests.cs b/WorkspaceServer.Tests/Kernel/KernelTests.cs index 4c9e720b3..0f0b1c6d4 100644 --- a/WorkspaceServer.Tests/Kernel/KernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/KernelTests.cs @@ -6,6 +6,8 @@ using System.Reactive.Disposables; using System.Threading.Tasks; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; using WorkspaceServer.Kernel; namespace WorkspaceServer.Tests.Kernel diff --git a/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs b/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs index b0006961d..4f5cd59fb 100644 --- a/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs +++ b/WorkspaceServer.Tests/Kernel/ObservableRunnerTests.cs @@ -12,6 +12,7 @@ using FluentAssertions; using FluentAssertions.Extensions; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Events; using WorkspaceServer.Kernel; using Xunit; diff --git a/WorkspaceServer.Tests/ObservableProcessTests.cs b/WorkspaceServer.Tests/ObservableProcessTests.cs index 6eddec1c7..848412fa1 100644 --- a/WorkspaceServer.Tests/ObservableProcessTests.cs +++ b/WorkspaceServer.Tests/ObservableProcessTests.cs @@ -9,6 +9,7 @@ using FluentAssertions; using FluentAssertions.Extensions; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Events; using WorkspaceServer.Kernel; using WorkspaceServer.Tests.Kernel; using Xunit; diff --git a/WorkspaceServer/IObservableRunner.cs b/WorkspaceServer/IObservableRunner.cs index c1faabecf..1ce76b10f 100644 --- a/WorkspaceServer/IObservableRunner.cs +++ b/WorkspaceServer/IObservableRunner.cs @@ -4,6 +4,7 @@ using System; using System.Threading.Tasks; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Events; using WorkspaceServer.Kernel; namespace WorkspaceServer diff --git a/WorkspaceServer/Kernel/CSharpKernel.cs b/WorkspaceServer/Kernel/CSharpKernel.cs index 1bdc12c71..4505563e9 100644 --- a/WorkspaceServer/Kernel/CSharpKernel.cs +++ b/WorkspaceServer/Kernel/CSharpKernel.cs @@ -16,6 +16,8 @@ using Microsoft.CodeAnalysis.Recommendations; using Microsoft.CodeAnalysis.Scripting; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Commands; +using Microsoft.DotNet.Interactive.Events; using WorkspaceServer.LanguageServices; using Microsoft.DotNet.Interactive.Rendering; using WorkspaceServer.Servers.Scripting; diff --git a/WorkspaceServer/Kernel/CSharpKernelExtensions.cs b/WorkspaceServer/Kernel/CSharpKernelExtensions.cs index 0765db00f..0495f7402 100644 --- a/WorkspaceServer/Kernel/CSharpKernelExtensions.cs +++ b/WorkspaceServer/Kernel/CSharpKernelExtensions.cs @@ -4,6 +4,7 @@ using System.CommandLine; using System.CommandLine.Invocation; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Events; namespace WorkspaceServer.Kernel { diff --git a/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs b/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs index d6b9fad2a..aaef48e69 100644 --- a/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs +++ b/WorkspaceServer/Kernel/ProtocolObjectExtensions.cs @@ -3,6 +3,7 @@ using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Events; namespace WorkspaceServer.Kernel { diff --git a/WorkspaceServer/ProcessRunner.cs b/WorkspaceServer/ProcessRunner.cs index 98ff59ffb..beaa7366e 100644 --- a/WorkspaceServer/ProcessRunner.cs +++ b/WorkspaceServer/ProcessRunner.cs @@ -10,6 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Events; using WorkspaceServer.Kernel; namespace WorkspaceServer From 54a600d886f8ab19a67d92b805e8c60551fda2e9 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 22 Jul 2019 17:03:34 +0100 Subject: [PATCH 4/5] Fix test for extension laoding --- WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs index 8ab7c565a..5b5abb76d 100644 --- a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs @@ -303,7 +303,7 @@ public async Task The_extend_directive_can_be_used_to_load_a_kernel_extension() var extensionDir = Create.EmptyWorkspace() .Directory; - var workspaceServerDllPath = typeof(IKernelExtension).Assembly.Location; + var microsoftDotNetInteractiveDllPath = typeof(IKernelExtension).Assembly.Location; var dirAccessor = new InMemoryDirectoryAccessor(extensionDir) { @@ -311,7 +311,8 @@ public async Task The_extend_directive_can_be_used_to_load_a_kernel_extension() using System; using System.Reflection; using System.Threading.Tasks; -using WorkspaceServer.Kernel; +using Microsoft.DotNet.Interactive; +using Microsoft.DotNet.Interactive.Commands; public class TestKernelExtension : IKernelExtension {{ @@ -330,8 +331,8 @@ public async Task OnLoadAsync(IKernel kernel) - - {workspaceServerDllPath} + + {microsoftDotNetInteractiveDllPath} From c9ff990c7db0a0e9acc8550768f03813b800fd2a Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 22 Jul 2019 17:45:33 +0100 Subject: [PATCH 5/5] typo in test name --- WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs index 5b5abb76d..4c6fe3bd2 100644 --- a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs @@ -56,7 +56,7 @@ public async Task it_returns_the_result_of_a_non_null_expression() } [Fact] - public async Task when_it_throws_exception_after_a_value_was_produced_thne_only_the_error_is_returned() + public async Task when_it_throws_exception_after_a_value_was_produced_then_only_the_error_is_returned() { var kernel = await CreateKernelAsync();