diff --git a/DotNetTry.sln b/DotNetTry.sln index 183afdc31..3bb08d6fe 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Interactive", "Microsoft.DotNet.Interactive\Microsoft.DotNet.Interactive.csproj", "{C7DCC018-CEFB-4BBC-989E-1C664C344B15}" +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 + {C7DCC018-CEFB-4BBC-989E-1C664C344B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C7DCC018-CEFB-4BBC-989E-1C664C344B15}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7DCC018-CEFB-4BBC-989E-1C664C344B15}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C7DCC018-CEFB-4BBC-989E-1C664C344B15}.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} + {C7DCC018-CEFB-4BBC-989E-1C664C344B15} = {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/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/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/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/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj b/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj new file mode 100644 index 000000000..ff50f4ba3 --- /dev/null +++ b/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj @@ -0,0 +1,13 @@ + + + + netstandard2.0 + $(NoWarn);8002 + + + + + + + + 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/CSharpRepl.cs b/WorkspaceServer/Kernel/CSharpRepl.cs index 840c1ebfd..5406971af 100644 --- a/WorkspaceServer/Kernel/CSharpRepl.cs +++ b/WorkspaceServer/Kernel/CSharpRepl.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 8d1c57187..9303d00b1 100644 --- a/WorkspaceServer/WorkspaceServer.csproj +++ b/WorkspaceServer/WorkspaceServer.csproj @@ -101,6 +101,7 @@ +