dotnet · colombod · Jul 19, 2019 · Jul 19, 2019
diff --git 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
@@ -20,6 +20,7 @@
     <PackageReference Include="System.Reactive" Version="4.1.5" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Microsoft.DotNet.Interactive\Microsoft.DotNet.Interactive.csproj" />
     <ProjectReference Include="..\WorkspaceServer\WorkspaceServer.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...eServer/Kernel/CodeSubmissionEvaluated.cs → ...et.Interactive/CodeSubmissionEvaluated.cs b/...eServer/Kernel/CodeSubmissionEvaluated.cs → ...et.Interactive/CodeSubmissionEvaluated.cs
diff --git a/.../Kernel/CodeSubmissionEvaluationFailed.cs → ...ractive/CodeSubmissionEvaluationFailed.cs b/.../Kernel/CodeSubmissionEvaluationFailed.cs → ...ractive/CodeSubmissionEvaluationFailed.cs
diff --git a/...ceServer/Kernel/CodeSubmissionReceived.cs → ...Net.Interactive/CodeSubmissionReceived.cs b/...ceServer/Kernel/CodeSubmissionReceived.cs → ...Net.Interactive/CodeSubmissionReceived.cs
diff --git a/.../Kernel/CompleteCodeSubmissionReceived.cs → ...ractive/CompleteCodeSubmissionReceived.cs b/.../Kernel/CompleteCodeSubmissionReceived.cs → ...ractive/CompleteCodeSubmissionReceived.cs
diff --git a/WorkspaceServer/Kernel/CompletionItem.cs → ...soft.DotNet.Interactive/CompletionItem.cs b/WorkspaceServer/Kernel/CompletionItem.cs → ...soft.DotNet.Interactive/CompletionItem.cs
diff --git a/...rver/Kernel/CompletionRequestCompleted.cs → ...Interactive/CompletionRequestCompleted.cs b/...rver/Kernel/CompletionRequestCompleted.cs → ...Interactive/CompletionRequestCompleted.cs
diff --git a/...erver/Kernel/CompletionRequestReceived.cs → ....Interactive/CompletionRequestReceived.cs b/...erver/Kernel/CompletionRequestReceived.cs → ....Interactive/CompletionRequestReceived.cs
diff --git a/WorkspaceServer/Kernel/CompositeKernel.cs → ...oft.DotNet.Interactive/CompositeKernel.cs b/WorkspaceServer/Kernel/CompositeKernel.cs → ...oft.DotNet.Interactive/CompositeKernel.cs
diff --git a/...spaceServer/Kernel/DiagnosticsReceived.cs → ...DotNet.Interactive/DiagnosticsReceived.cs b/...spaceServer/Kernel/DiagnosticsReceived.cs → ...DotNet.Interactive/DiagnosticsReceived.cs
diff --git a/...aceServer/Kernel/DocumentationReceived.cs → ...tNet.Interactive/DocumentationReceived.cs b/...aceServer/Kernel/DocumentationReceived.cs → ...tNet.Interactive/DocumentationReceived.cs
diff --git a/WorkspaceServer/Kernel/FormattedValue.cs → ...soft.DotNet.Interactive/FormattedValue.cs b/WorkspaceServer/Kernel/FormattedValue.cs → ...soft.DotNet.Interactive/FormattedValue.cs
diff --git a/WorkspaceServer/Kernel/IKernel.cs → Microsoft.DotNet.Interactive/IKernel.cs b/WorkspaceServer/Kernel/IKernel.cs → Microsoft.DotNet.Interactive/IKernel.cs
diff --git a/WorkspaceServer/Kernel/IKernelCommand.cs → ...soft.DotNet.Interactive/IKernelCommand.cs b/WorkspaceServer/Kernel/IKernelCommand.cs → ...soft.DotNet.Interactive/IKernelCommand.cs
diff --git a/...paceServer/Kernel/IKernelCommandResult.cs → ...otNet.Interactive/IKernelCommandResult.cs b/...paceServer/Kernel/IKernelCommandResult.cs → ...otNet.Interactive/IKernelCommandResult.cs
diff --git a/WorkspaceServer/Kernel/IKernelEvent.cs → Microsoft.DotNet.Interactive/IKernelEvent.cs b/WorkspaceServer/Kernel/IKernelEvent.cs → Microsoft.DotNet.Interactive/IKernelEvent.cs
diff --git a/WorkspaceServer/Kernel/IRendering.cs → Microsoft.DotNet.Interactive/IRendering.cs b/WorkspaceServer/Kernel/IRendering.cs → Microsoft.DotNet.Interactive/IRendering.cs
diff --git a/...ernel/IncompleteCodeSubmissionReceived.cs → ...ctive/IncompleteCodeSubmissionReceived.cs b/...ernel/IncompleteCodeSubmissionReceived.cs → ...ctive/IncompleteCodeSubmissionReceived.cs
diff --git a/WorkspaceServer/Kernel/KernelBase.cs → Microsoft.DotNet.Interactive/KernelBase.cs b/WorkspaceServer/Kernel/KernelBase.cs → Microsoft.DotNet.Interactive/KernelBase.cs
diff --git a/WorkspaceServer/Kernel/KernelCommandBase.cs → ...t.DotNet.Interactive/KernelCommandBase.cs b/WorkspaceServer/Kernel/KernelCommandBase.cs → ...t.DotNet.Interactive/KernelCommandBase.cs
diff --git a/...nel/KernelCommandNotSupportedException.cs → ...ive/KernelCommandNotSupportedException.cs b/...nel/KernelCommandNotSupportedException.cs → ...ive/KernelCommandNotSupportedException.cs
diff --git a/...aceServer/Kernel/KernelCommandPipeline.cs → ...tNet.Interactive/KernelCommandPipeline.cs b/...aceServer/Kernel/KernelCommandPipeline.cs → ...tNet.Interactive/KernelCommandPipeline.cs
diff --git a/...Kernel/KernelCommandPipelineMiddleware.cs → ...active/KernelCommandPipelineMiddleware.cs b/...Kernel/KernelCommandPipelineMiddleware.cs → ...active/KernelCommandPipelineMiddleware.cs
diff --git a/...spaceServer/Kernel/KernelCommandResult.cs → ...DotNet.Interactive/KernelCommandResult.cs b/...spaceServer/Kernel/KernelCommandResult.cs → ...DotNet.Interactive/KernelCommandResult.cs
diff --git a/WorkspaceServer/Kernel/KernelEventBase.cs → ...oft.DotNet.Interactive/KernelEventBase.cs b/WorkspaceServer/Kernel/KernelEventBase.cs → ...oft.DotNet.Interactive/KernelEventBase.cs
diff --git a/WorkspaceServer/Kernel/KernelException.cs → ...oft.DotNet.Interactive/KernelException.cs b/WorkspaceServer/Kernel/KernelException.cs → ...oft.DotNet.Interactive/KernelException.cs
diff --git a/WorkspaceServer/Kernel/KernelExtensions.cs → ...ft.DotNet.Interactive/KernelExtensions.cs b/WorkspaceServer/Kernel/KernelExtensions.cs → ...ft.DotNet.Interactive/KernelExtensions.cs
diff --git a/...eServer/Kernel/KernelInvocationContext.cs → ...et.Interactive/KernelInvocationContext.cs b/...eServer/Kernel/KernelInvocationContext.cs → ...et.Interactive/KernelInvocationContext.cs
diff --git a/...aceServer/Kernel/KernelPipelineContext.cs → ...tNet.Interactive/KernelPipelineContext.cs b/...aceServer/Kernel/KernelPipelineContext.cs → ...tNet.Interactive/KernelPipelineContext.cs
diff --git a/...rver/Kernel/KernelPipelineContinuation.cs → ...Interactive/KernelPipelineContinuation.cs b/...rver/Kernel/KernelPipelineContinuation.cs → ...Interactive/KernelPipelineContinuation.cs
diff --git a/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj b/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);8002</NoWarn>
+    <!-- Clockwise isn't strongly signed -->
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Reactive" Version="4.1.5" />
+    <PackageReference Include="system.commandline.experimental" Version="0.3.0-alpha.19317.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/...erver/Kernel/NoSuitableKernelException.cs → ....Interactive/NoSuitableKernelException.cs b/...erver/Kernel/NoSuitableKernelException.cs → ....Interactive/NoSuitableKernelException.cs
diff --git a/WorkspaceServer/Kernel/NuGetPackageAdded.cs → ...t.DotNet.Interactive/NuGetPackageAdded.cs b/WorkspaceServer/Kernel/NuGetPackageAdded.cs → ...t.DotNet.Interactive/NuGetPackageAdded.cs
diff --git a/...aceServer/Kernel/NugetPackageReference.cs → ...tNet.Interactive/NugetPackageReference.cs b/...aceServer/Kernel/NugetPackageReference.cs → ...tNet.Interactive/NugetPackageReference.cs
diff --git a/...Server/Kernel/RenderingEngineException.cs → ...t.Interactive/RenderingEngineException.cs b/...Server/Kernel/RenderingEngineException.cs → ...t.Interactive/RenderingEngineException.cs
diff --git a/WorkspaceServer/Kernel/RequestCompletion.cs → ...t.DotNet.Interactive/RequestCompletion.cs b/WorkspaceServer/Kernel/RequestCompletion.cs → ...t.DotNet.Interactive/RequestCompletion.cs
diff --git a/WorkspaceServer/Kernel/RequestDiagnostics.cs → ....DotNet.Interactive/RequestDiagnostics.cs b/WorkspaceServer/Kernel/RequestDiagnostics.cs → ....DotNet.Interactive/RequestDiagnostics.cs
diff --git a/...paceServer/Kernel/RequestDocumentation.cs → ...otNet.Interactive/RequestDocumentation.cs b/...paceServer/Kernel/RequestDocumentation.cs → ...otNet.Interactive/RequestDocumentation.cs
diff --git a/...paceServer/Kernel/RequestSignatureHelp.cs → ...otNet.Interactive/RequestSignatureHelp.cs b/...paceServer/Kernel/RequestSignatureHelp.cs → ...otNet.Interactive/RequestSignatureHelp.cs
diff --git a/WorkspaceServer/Kernel/SendStandardInput.cs → ...t.DotNet.Interactive/SendStandardInput.cs b/WorkspaceServer/Kernel/SendStandardInput.cs → ...t.DotNet.Interactive/SendStandardInput.cs
diff --git a/...aceServer/Kernel/SignatureHelpReceived.cs → ...tNet.Interactive/SignatureHelpReceived.cs b/...aceServer/Kernel/SignatureHelpReceived.cs → ...tNet.Interactive/SignatureHelpReceived.cs
diff --git a/...aceServer/Kernel/StandardErrorReceived.cs → ...tNet.Interactive/StandardErrorReceived.cs b/...aceServer/Kernel/StandardErrorReceived.cs → ...tNet.Interactive/StandardErrorReceived.cs
diff --git a/...aceServer/Kernel/StandardInputReceived.cs → ...tNet.Interactive/StandardInputReceived.cs b/...aceServer/Kernel/StandardInputReceived.cs → ...tNet.Interactive/StandardInputReceived.cs
diff --git a/...ceServer/Kernel/StandardOutputReceived.cs → ...Net.Interactive/StandardOutputReceived.cs b/...ceServer/Kernel/StandardOutputReceived.cs → ...Net.Interactive/StandardOutputReceived.cs
diff --git a/WorkspaceServer/Kernel/Started.cs → Microsoft.DotNet.Interactive/Started.cs b/WorkspaceServer/Kernel/Started.cs → Microsoft.DotNet.Interactive/Started.cs
diff --git a/WorkspaceServer/Kernel/Stopped.cs → Microsoft.DotNet.Interactive/Stopped.cs b/WorkspaceServer/Kernel/Stopped.cs → Microsoft.DotNet.Interactive/Stopped.cs
diff --git a/WorkspaceServer/Kernel/SubmitCode.cs → Microsoft.DotNet.Interactive/SubmitCode.cs b/WorkspaceServer/Kernel/SubmitCode.cs → Microsoft.DotNet.Interactive/SubmitCode.cs
diff --git a/WorkspaceServer/Kernel/ValueProduced.cs → ...osoft.DotNet.Interactive/ValueProduced.cs b/WorkspaceServer/Kernel/ValueProduced.cs → ...osoft.DotNet.Interactive/ValueProduced.cs
diff --git 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
@@ -101,6 +101,7 @@
   <ItemGroup>
     <ProjectReference Include="..\FSharpWorkspaceShim\FSharpWorkspaceShim.fsproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Rendering\Microsoft.DotNet.Interactive.Rendering.csproj" />
+    <ProjectReference Include="..\Microsoft.DotNet.Interactive\Microsoft.DotNet.Interactive.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Try.Markdown\Microsoft.DotNet.Try.Markdown.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Try.Project\Microsoft.DotNet.Try.Project.csproj" />
     <ProjectReference Include="..\MLS.Agent.Tools\MLS.Agent.Tools.csproj" />